kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed camera downsampling functionality no longer in use. A more advanced postfx and compositor will be implemented instead. (Continued)

Browse Source
This commit is contained in:
Kearwood Gilbert
2022-09-27 18:49:03 -07:00
parent e60e9bceab
commit a2a9714f24
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kraken/KRCamera.cpp
View File

@@ -87,7 +87,6 @@ KRCamera::KRCamera(KRScene& scene, std::string name) : KRNode(scene, name)
volumetricLightAccumulationBuffer = 0; volumetricLightAccumulationBuffer = 0;
volumetricLightAccumulationTexture = 0; volumetricLightAccumulationTexture = 0;
m_frame_times_filled = 0; m_frame_times_filled = 0;
m_downsample = Vector2::One();
m_fade_color = Vector4::Zero(); m_fade_color = Vector4::Zero();
@@ -184,7 +183,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
GL_PUSH_GROUP_MARKER("Generate Shadowmaps"); GL_PUSH_GROUP_MARKER("Generate Shadowmaps");
scene.render(commandBuffer, compositeSurface, this, m_viewport.getVisibleBounds(), m_viewport, KRNode::RENDER_PASS_GENERATE_SHADOWMAPS, false /*settings.bEnableDeferredLighting*/); scene.render(commandBuffer, compositeSurface, this, m_viewport.getVisibleBounds(), m_viewport, KRNode::RENDER_PASS_GENERATE_SHADOWMAPS, false /*settings.bEnableDeferredLighting*/);
GLDEBUG(glViewport(0, 0, (int)m_viewport.getSize().x, (int)m_viewport.getSize().y));
GL_POP_GROUP_MARKER; GL_POP_GROUP_MARKER;
} }
@@ -215,7 +213,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
// Set render target // Set render target
GLDEBUG(glBindFramebuffer(GL_FRAMEBUFFER, lightAccumulationBuffer)); GLDEBUG(glBindFramebuffer(GL_FRAMEBUFFER, lightAccumulationBuffer));
GLDEBUG(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, compositeDepthTexture, 0)); GLDEBUG(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, compositeDepthTexture, 0));
GLDEBUG(glViewport(0, 0, (int)(m_viewport.getSize().x * m_downsample.x), (int)(m_viewport.getSize().y * m_downsample.y)));
GLDEBUG(glClearColor(0.0f, 0.0f, 0.0f, 0.0f)); GLDEBUG(glClearColor(0.0f, 0.0f, 0.0f, 0.0f));
GLDEBUG(glClear(GL_COLOR_BUFFER_BIT)); GLDEBUG(glClear(GL_COLOR_BUFFER_BIT));
@@ -250,10 +247,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
} else { } else {
// ----====---- Opaque Geometry, Forward Rendering ----====---- // ----====---- Opaque Geometry, Forward Rendering ----====----
GL_PUSH_GROUP_MARKER("Forward Rendering - Opaque"); GL_PUSH_GROUP_MARKER("Forward Rendering - Opaque");
/*
GLDEBUG(glViewport(0, 0, (int)(m_viewport.getSize().x * m_downsample.x), (int)(m_viewport.getSize().y * m_downsample.y)));
*/
// Start render pass // Start render pass
KRRenderPass& forwardOpaquePass = compositeSurface.getForwardOpaquePass(); KRRenderPass& forwardOpaquePass = compositeSurface.getForwardOpaquePass();
@@ -991,17 +984,6 @@ const KRViewport& KRCamera::getViewport() const
return m_viewport; return m_viewport;
} }
Vector2 KRCamera::getDownsample()
{
return m_downsample;
}
void KRCamera::setDownsample(float v)
{
m_downsample = Vector2::Create(v);
}
void KRCamera::setFadeColor(const Vector4& fade_color) void KRCamera::setFadeColor(const Vector4& fade_color)
{ {
m_fade_color = fade_color; m_fade_color = fade_color;

4
kraken/KRCamera.h
View File

@@ -71,8 +71,6 @@ public:
std::string getDebugText(); std::string getDebugText();
void flushSkybox(); // this will delete the skybox and cause the camera to reload a new skybox based on the settings void flushSkybox(); // this will delete the skybox and cause the camera to reload a new skybox based on the settings
Vector2 getDownsample();
void setDownsample(float v);
void setFadeColor(const Vector4& fade_color); void setFadeColor(const Vector4& fade_color);
Vector4 getFadeColor(); Vector4 getFadeColor();
@@ -102,8 +100,6 @@ private:
float m_particlesAbsoluteTime; float m_particlesAbsoluteTime;
Vector2 m_downsample;
Vector4 m_fade_color; Vector4 m_fade_color;
typedef struct typedef struct