From a2a9714f240c6cc07124b3690f18ea9c230b261e Mon Sep 17 00:00:00 2001 From: kearwood Date: Tue, 27 Sep 2022 18:49:03 -0700 Subject: [PATCH] Removed camera downsampling functionality no longer in use. A more advanced postfx and compositor will be implemented instead. (Continued) --- kraken/KRCamera.cpp | 18 ------------------ kraken/KRCamera.h | 4 ---- 2 files changed, 22 deletions(-) diff --git a/kraken/KRCamera.cpp b/kraken/KRCamera.cpp index 6563f68..1a029b7 100755 --- a/kraken/KRCamera.cpp +++ b/kraken/KRCamera.cpp @@ -87,7 +87,6 @@ KRCamera::KRCamera(KRScene& scene, std::string name) : KRNode(scene, name) volumetricLightAccumulationBuffer = 0; volumetricLightAccumulationTexture = 0; m_frame_times_filled = 0; - m_downsample = Vector2::One(); m_fade_color = Vector4::Zero(); @@ -184,7 +183,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS GL_PUSH_GROUP_MARKER("Generate Shadowmaps"); 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; } @@ -215,7 +213,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS // Set render target GLDEBUG(glBindFramebuffer(GL_FRAMEBUFFER, lightAccumulationBuffer)); 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(glClear(GL_COLOR_BUFFER_BIT)); @@ -250,10 +247,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS } else { // ----====---- Opaque Geometry, Forward Rendering ----====---- 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 KRRenderPass& forwardOpaquePass = compositeSurface.getForwardOpaquePass(); @@ -991,17 +984,6 @@ const KRViewport& KRCamera::getViewport() const 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) { m_fade_color = fade_color; diff --git a/kraken/KRCamera.h b/kraken/KRCamera.h index cb28a2a..97726d6 100755 --- a/kraken/KRCamera.h +++ b/kraken/KRCamera.h @@ -71,8 +71,6 @@ public: std::string getDebugText(); 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); Vector4 getFadeColor(); @@ -102,8 +100,6 @@ private: float m_particlesAbsoluteTime; - Vector2 m_downsample; - Vector4 m_fade_color; typedef struct