#5565: Changes to the global material properties are notifying observers

codereader · Mar 25, 2021 · 11f7cb9 · 11f7cb9
1 parent a0db37e
commit 11f7cb9
Showing 1 changed file with 33 additions and 10 deletions.
diff --git a/radiantcore/shaders/CShader.cpp b/radiantcore/shaders/CShader.cpp
@@ -51,12 +51,14 @@ void CShader::setSortRequest(float sortRequest)
 {
     ensureTemplateCopy();
     _template->setSortRequest(sortRequest);
+    _sigMaterialModified.emit();
 }
 
 void CShader::resetSortReqest()
 {
     ensureTemplateCopy();
     _template->resetSortReqest();
+    _sigMaterialModified.emit();
 }
 
 float CShader::getPolygonOffset() const
@@ -68,6 +70,7 @@ void CShader::setPolygonOffset(float offset)
 {
     ensureTemplateCopy();
     _template->setPolygonOffset(offset);
+    _sigMaterialModified.emit();
 }
 
 TexturePtr CShader::getEditorImage()
@@ -97,6 +100,7 @@ void CShader::setLightFalloffExpressionFromString(const std::string& expressionS
 {
     ensureTemplateCopy();
     _template->setLightFalloffExpressionFromString(expressionString);
+    _sigMaterialModified.emit();
 }
 
 IShaderLayer::MapType CShader::getLightFalloffCubeMapType()
@@ -108,6 +112,7 @@ void CShader::setLightFalloffCubeMapType(IShaderLayer::MapType type)
 {
     ensureTemplateCopy();
     _template->setLightFalloffCubeMapType(type);
+    _sigMaterialModified.emit();
 }
 
 /*
@@ -142,11 +147,6 @@ TexturePtr CShader::lightFalloffImage() {
 	return _texLightFalloff;
 }
 
-
-
-/*
- * Return name of shader.
- */
 std::string CShader::getName() const
 {
 	return _name;
@@ -161,6 +161,7 @@ void CShader::setDescription(const std::string& description)
 {
     ensureTemplateCopy();
     _template->setDescription(description);
+    _sigMaterialModified.emit();
 }
 
 bool CShader::IsInUse() const {
@@ -181,12 +182,14 @@ void CShader::setMaterialFlag(Flags flag)
 {
     ensureTemplateCopy();
     _template->setMaterialFlag(flag);
+    _sigMaterialModified.emit();
 }
 
 void CShader::clearMaterialFlag(Flags flag)
 {
     ensureTemplateCopy();
     _template->clearMaterialFlag(flag);
+    _sigMaterialModified.emit();
 }
 
 bool CShader::IsDefault() const
@@ -204,6 +207,7 @@ void CShader::setCullType(CullType type)
 {
     ensureTemplateCopy();
     _template->setCullType(type);
+    _sigMaterialModified.emit();
 }
 
 ClampType CShader::getClampType() const
@@ -215,6 +219,7 @@ void CShader::setClampType(ClampType type)
 {
     ensureTemplateCopy();
     _template->setClampType(type);
+    _sigMaterialModified.emit();
 }
 
 int CShader::getSurfaceFlags() const
@@ -226,12 +231,14 @@ void CShader::setSurfaceFlag(Material::SurfaceFlags flag)
 {
     ensureTemplateCopy();
     _template->setSurfaceFlag(flag);
+    _sigMaterialModified.emit();
 }
 
 void CShader::clearSurfaceFlag(Material::SurfaceFlags flag)
 {
     ensureTemplateCopy();
     _template->clearSurfaceFlag(flag);
+    _sigMaterialModified.emit();
 }
 
 Material::SurfaceType CShader::getSurfaceType() const
@@ -243,6 +250,7 @@ void CShader::setSurfaceType(SurfaceType type)
 {
     ensureTemplateCopy();
     _template->setSurfaceType(type);
+    _sigMaterialModified.emit();
 }
 
 Material::DeformType CShader::getDeformType() const
@@ -269,6 +277,7 @@ void CShader::setSpectrum(int spectrum)
 {
     ensureTemplateCopy();
     _template->setSpectrum(spectrum);
+    _sigMaterialModified.emit();
 }
 
 Material::DecalInfo CShader::getDecalInfo() const
@@ -314,6 +323,8 @@ void CShader::revertModifications()
     // We need to update that layer reference vector on change
     unrealise();
     realise();
+
+    _sigMaterialModified.emit();
 }
 
 sigc::signal<void>& CShader::sig_materialChanged()
@@ -360,11 +371,10 @@ void CShader::unrealiseLighting()
 	_layers.clear();
 }
 
-/*
- * Set name of shader.
- */
-void CShader::setName(const std::string& name) {
+void CShader::setName(const std::string& name)
+{
 	_name = name;
+    _sigMaterialModified.emit();
 }
 
 IShaderLayer* CShader::firstLayer() const
@@ -391,6 +401,8 @@ std::size_t CShader::addLayer(IShaderLayer::Type type)
     unrealiseLighting();
     realiseLighting();
 
+    _sigMaterialModified.emit();
+
     return newIndex;
 }
 
@@ -402,6 +414,8 @@ void CShader::removeLayer(std::size_t index)
 
     unrealiseLighting();
     realiseLighting();
+
+    _sigMaterialModified.emit();
 }
 
 void CShader::swapLayerPosition(std::size_t first, std::size_t second)
@@ -412,6 +426,8 @@ void CShader::swapLayerPosition(std::size_t first, std::size_t second)
 
     unrealiseLighting();
     realiseLighting();
+
+    _sigMaterialModified.emit();
 }
 
 std::size_t CShader::duplicateLayer(std::size_t index)
@@ -423,6 +439,8 @@ std::size_t CShader::duplicateLayer(std::size_t index)
     unrealiseLighting();
     realiseLighting();
 
+    _sigMaterialModified.emit();
+
     return newIndex;
 }
 
@@ -459,24 +477,28 @@ void CShader::setIsAmbientLight(bool newValue)
 {
     ensureTemplateCopy();
     _template->setIsAmbientLight(newValue);
+    _sigMaterialModified.emit();
 }
 
 void CShader::setIsBlendLight(bool newValue)
 {
     ensureTemplateCopy();
     _template->setIsBlendLight(newValue);
+    _sigMaterialModified.emit();
 }
 
 void CShader::setIsFogLight(bool newValue)
 {
     ensureTemplateCopy();
     _template->setIsFogLight(newValue);
+    _sigMaterialModified.emit();
 }
 
 void CShader::setIsCubicLight(bool newValue)
 {
     ensureTemplateCopy();
     _template->setIsCubicLight(newValue);
+    _sigMaterialModified.emit();
 }
 
 
@@ -509,7 +531,8 @@ bool CShader::isVisible() const {
 	return _visible;
 }
 
-void CShader::setVisible(bool visible) {
+void CShader::setVisible(bool visible)
+{
 	_visible = visible;
 }