#5430: Apply entity class colours each time the colour schemes are ch…

…anged or loaded.

include/ieclasscolours.h

@@ -34,6 +34,9 @@ class IColourManager :
 
     // Removes the override colour for the given entity class
     virtual void removeOverrideColour(const std::string& eclass) = 0;
+
+    // Removes all registered overrides
+    virtual void clearOverrideColours() = 0;
 };
 
 }

radiantcore/eclass/EClassColourManager.cpp

@@ -39,6 +39,11 @@ void EClassColourManager::removeOverrideColour(const std::string& eclass)
     _overrides.erase(eclass);
 }
 
+void EClassColourManager::clearOverrideColours()
+{
+    _overrides.clear();
+}
+
 const std::string& EClassColourManager::getName() const
 {
     static std::string _name(MODULE_ECLASS_COLOUR_MANAGER);

radiantcore/eclass/EClassColourManager.h

@@ -19,6 +19,7 @@ class EClassColourManager :
     void applyColours(const IEntityClassPtr& eclass) override;
     void foreachOverrideColour(const std::function<void(const std::string&, const Vector3&)>& functor) override;
     void removeOverrideColour(const std::string& eclass) override;
+    void clearOverrideColours() override;
 
     // RegisterableModule implementation
 

radiantcore/settings/ColourSchemeManager.cpp

@@ -1,6 +1,7 @@
 #include "ColourSchemeManager.h"
 #include "iregistry.h"
 #include "itextstream.h"
+#include "ieclasscolours.h"
 
 #include "module/StaticModule.h"
 
@@ -122,6 +123,8 @@ void ColourSchemeManager::saveColourSchemes()
 	// Flush the whole colour scheme structure and re-load it from the registry.
 	// This is to remove any remaining artifacts.
 	restoreColourSchemes();
+
+    emitEclassOverrides();
 }
 
 void ColourSchemeManager::loadColourSchemes()
@@ -209,6 +212,7 @@ const StringSet& ColourSchemeManager::getDependencies() const
 	if (_dependencies.empty())
 	{
 		_dependencies.insert(MODULE_XMLREGISTRY);
+		_dependencies.insert(MODULE_ECLASS_COLOUR_MANAGER);
 	}
 
 	return _dependencies;
@@ -219,10 +223,20 @@ void ColourSchemeManager::initialiseModule(const IApplicationContext& ctx)
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 
 	loadColourSchemes();
+    emitEclassOverrides();
 }
 
-void ColourSchemeManager::shutdownModule()
-{}
+void ColourSchemeManager::emitEclassOverrides()
+{
+    auto& colourManager = GlobalEclassColourManager();
+    colourManager.clearOverrideColours();
+
+    // Apply the overrides for the known entity classes
+    auto& activeScheme = getActiveScheme();
+
+    colourManager.addOverrideColour("worldspawn", activeScheme.getColour("default_brush").getColour());
+    colourManager.addOverrideColour("light", activeScheme.getColour("light_volumes").getColour());
+}
 
 module::StaticModule<ColourSchemeManager> colourSchemeManagerModule;
 

radiantcore/settings/ColourSchemeManager.h

@@ -47,10 +47,10 @@ class ColourSchemeManager :
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
 	void initialiseModule(const IApplicationContext& ctx) override;
-	void shutdownModule() override;
 
 private:
 	void saveScheme(const std::string& name);
+	void emitEclassOverrides();
 };
 
 } // namespace

test/WorldspawnColour.cpp

@@ -100,7 +100,7 @@ TEST_F(Quake4WorldspawnColourTest, SchemeBrushColourIsUsed)
 TEST_F(RadiantTest, SchemeBrushColourIsUsed)
 {
     // This setup does have a worldspawn
-    EXPECT_TRUE(GlobalEntityClassManager().findClass("worldspawn"));
+    EXPECT_TRUE(GlobalEntityClassManager().findOrInsert("worldspawn", true));
 
     // Create a worldspawn
     auto worldspawn = GlobalMapModule().findOrInsertWorldspawn();