#5532: Start with lighting mode enabled and time running, if we have …

…a material to show in the first place
codereader · Mar 7, 2021 · 7579979 · 7579979
1 parent c5625e6
commit 7579979
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/libs/wxutil/preview/RenderPreview.cpp b/libs/wxutil/preview/RenderPreview.cpp
@@ -251,6 +251,20 @@ void RenderPreview::setLightingModeEnabled(bool enabled)
         _renderSystem->setShaderProgram(RenderSystem::SHADER_PROGRAM_NONE);
         queueDraw();
     }
+
+    // Synchronise the button state, if necessary
+    auto* toolbar = static_cast<wxToolBar*>(_mainPanel->FindWindow("RenderPreviewRenderModeToolbar"));
+    auto* textureButton = getToolBarToolByLabel(toolbar, "texturedModeButton");
+    auto* lightingButton = getToolBarToolByLabel(toolbar, "lightingModeButton");
+
+    if (!enabled && !textureButton->IsToggled())
+    {
+        toolbar->ToggleTool(textureButton->GetId(), true);
+    }
+    else if (enabled && !lightingButton->IsToggled())
+    {
+        toolbar->ToggleTool(lightingButton->GetId(), true);
+    }
 }
 
 const scene::GraphPtr& RenderPreview::getScene()

diff --git a/radiant/ui/materials/MaterialPreview.cpp b/radiant/ui/materials/MaterialPreview.cpp
@@ -48,6 +48,8 @@ const MaterialPtr& MaterialPreview::getMaterial()
 
 void MaterialPreview::setMaterial(const MaterialPtr& material)
 {
+    bool hadMaterial = _material != nullptr;
+
     _material = material;
     _sceneIsReady = false;
 
@@ -61,6 +63,16 @@ void MaterialPreview::setMaterial(const MaterialPtr& material)
         }
     }
 
+    if (!hadMaterial && _material)
+    {
+        setLightingModeEnabled(true);
+        startPlayback();
+    }
+    else if (hadMaterial && !_material)
+    {
+        stopPlayback();
+    }
+
     queueDraw();
 }