#5532: Notify the preview about the material change, which will in tu…

…rn notify its render system - changes of translation expressions can now immediately be seen
codereader · Mar 13, 2021 · bf963b9 · bf963b9
1 parent 3a90cce
commit bf963b9
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 1 deletion.
diff --git a/include/irender.h b/include/irender.h
@@ -562,6 +562,9 @@ class RenderSystem
 
 	// Subscription to get notified as soon as the openGL extensions have been initialised
 	virtual sigc::signal<void> signal_extensionsInitialised() = 0;
+
+    // Notification about a material change, tries to refresh any constructed shaders basing on it
+    virtual void onMaterialChanged(const std::string& materialName) = 0;
 };
 typedef std::shared_ptr<RenderSystem> RenderSystemPtr;
 typedef std::weak_ptr<RenderSystem> RenderSystemWeakPtr;

diff --git a/radiant/ui/materials/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp
@@ -447,7 +447,7 @@ void MaterialEditor::setupMaterialStageProperties()
 
     createExpressionBinding("MaterialStageTranslateX",
         [](const IShaderLayer::Ptr& layer) { return layer->getTranslationExpression(0); },
-        [](const IEditableShaderLayer::Ptr& layer, const std::string& value) { layer->setTranslationExpressionFromString(0, value); });
+        [this](const IEditableShaderLayer::Ptr& layer, const std::string& value) { layer->setTranslationExpressionFromString(0, value); onMaterialChanged(); });
     createExpressionBinding("MaterialStageTranslateY",
         [](const IShaderLayer::Ptr& layer) { return layer->getTranslationExpression(1); },
         [](const IEditableShaderLayer::Ptr& layer, const std::string& value) { layer->setTranslationExpressionFromString(1, value); });
@@ -1121,4 +1121,9 @@ void MaterialEditor::_onMaterialTypeChoice(wxCommandEvent& ev)
     _material->setSurfaceType(shaders::getSurfaceTypeForString(selectedString.ToStdString()));
 }
 
+void MaterialEditor::onMaterialChanged()
+{
+    _preview->onMaterialChanged();
+}
+
 }
diff --git a/radiant/ui/materials/MaterialEditor.h b/radiant/ui/materials/MaterialEditor.h
@@ -99,6 +99,8 @@ class MaterialEditor :
     void _onStageListSelectionChanged(wxDataViewEvent& ev);
     void _onMaterialTypeChoice(wxCommandEvent& ev);
 
+    void onMaterialChanged();
+
     // Shortcut
     template<typename ObjectClass>
     ObjectClass* getControl(const std::string& name)

diff --git a/radiant/ui/materials/MaterialPreview.cpp b/radiant/ui/materials/MaterialPreview.cpp
@@ -102,6 +102,14 @@ void MaterialPreview::setMaterial(const MaterialPtr& material)
     queueDraw();
 }
 
+void MaterialPreview::onMaterialChanged()
+{
+    if (!_material) return;
+
+    _renderSystem->onMaterialChanged(_material->getName());
+    queueDraw();
+}
+
 bool MaterialPreview::onPreRender()
 {
     if (!_sceneIsReady)

diff --git a/radiant/ui/materials/MaterialPreview.h b/radiant/ui/materials/MaterialPreview.h
@@ -38,6 +38,8 @@ class MaterialPreview :
     const MaterialPtr& getMaterial();
     void setMaterial(const MaterialPtr& material);
 
+    void onMaterialChanged();
+
 protected:
     bool canDrawGrid() override;
     void setupSceneGraph() override;

diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp
@@ -261,6 +261,20 @@ void OpenGLRenderSystem::unrealise()
     }
 }
 
+void OpenGLRenderSystem::onMaterialChanged(const std::string& materialName)
+{
+    auto existingShader = _shaders.find(materialName);
+
+    if (existingShader == _shaders.end() || !_realised)
+    {
+        return;
+    }
+
+    // Re-realise this shader
+    existingShader->second->unrealise();
+    existingShader->second->realise(materialName);
+}
+
 GLProgramFactory& OpenGLRenderSystem::getGLProgramFactory()
 {
     return *_glProgramFactory;

diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.h b/radiantcore/rendersystem/OpenGLRenderSystem.h
@@ -69,6 +69,8 @@ class OpenGLRenderSystem
 	void realise() override;
 	void unrealise() override;
 
+    void onMaterialChanged(const std::string& materialName) override;
+
     GLProgramFactory& getGLProgramFactory();
 
 	std::size_t getTime() const override;