#5908: RenderPreview invokes renderLitScene if lighting is enabled. P…

…ass the view origin to the renderer.
codereader · Mar 1, 2022 · 8319ffa · 8319ffa
1 parent f1c13d8
commit 8319ffa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/libs/render/NopRenderView.h b/libs/render/NopRenderView.h
@@ -53,6 +53,11 @@ class NopRenderView :
         return _viewer.getVector3();
     }
 
+    void setViewer(const Vector3& viewer)
+    {
+        _viewer = Vector4(viewer, 1.0);
+    }
+
     const Frustum& getFrustum() const override
     {
         return _frustum;

diff --git a/libs/wxutil/preview/RenderPreview.cpp b/libs/wxutil/preview/RenderPreview.cpp
@@ -487,6 +487,7 @@ bool RenderPreview::drawPreview()
 
     // Keep the modelview matrix in the volumetest class up to date
     _view.construct(projection, getModelViewMatrix(), _previewWidth, _previewHeight);
+    _view.setViewer(_viewOrigin);
 
 	// Set the projection and modelview matrices
 	glMatrixMode(GL_PROJECTION);
@@ -507,8 +508,15 @@ bool RenderPreview::drawPreview()
 
     RenderStateFlags flags = getRenderFlagsFill();
 
-    // Launch the back end rendering
-    _renderSystem->renderFullBrightScene(RenderViewType::Camera, flags, _view);
+    // Start back end render phase
+    if (getLightingModeEnabled())
+    {
+        _renderSystem->renderLitScene(flags, _view);
+    }
+    else
+    {
+        _renderSystem->renderFullBrightScene(RenderViewType::Camera, flags, _view);
+    }
 
     // Give subclasses an opportunity to render their own on-screen stuff
     onPostRender();