#5231: Remove a few remnants of bitmaps path queries against the XMLR…

…egistry. Use the ApplicationContext instead.
codereader · Apr 29, 2020 · 4f8e481 · 4f8e481
1 parent 1d7e354
commit 4f8e481
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/radiant/shaders/MapExpression.cpp b/radiant/shaders/MapExpression.cpp
@@ -2,6 +2,7 @@
 
 #include "itextstream.h"
 #include "ifilesystem.h"
+#include "imodule.h"
 
 #include <iostream>
 
@@ -16,8 +17,8 @@
 #include "string/predicate.h"
 
 /* CONSTANTS */
-namespace {
-
+namespace
+{
 	// Default image maps for optional material stages
 	const std::string IMAGE_BLACK = "_black.bmp";
 	const std::string IMAGE_CUBICLIGHT = "_cubiclight.bmp";
@@ -33,6 +34,11 @@ namespace {
 	const std::string IMAGE_SCRATCH = "_scratch.bmp";
 	const std::string IMAGE_SPOTLIGHT = "_spotlight.bmp";
 	const std::string IMAGE_WHITE = "_white.bmp";
+
+	inline std::string getBitmapsPath()
+	{
+		return module::GlobalModuleRegistry().getApplicationContext().getBitmapsPath();
+	}
 }
 
 namespace shaders {
@@ -646,72 +652,72 @@ ImagePtr ImageExpression::getImage() const
 	// Check for some image keywords and load the correct file
 	if (_imgName == "_black") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_BLACK
+            getBitmapsPath() + IMAGE_BLACK
         );
 	}
 	else if (_imgName == "_cubiclight") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_CUBICLIGHT
+            getBitmapsPath() + IMAGE_CUBICLIGHT
         );
 	}
 	else if (_imgName == "_currentRender") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_CURRENTRENDER
+            getBitmapsPath() + IMAGE_CURRENTRENDER
         );
 	}
 	else if (_imgName == "_default") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_DEFAULT
+            getBitmapsPath() + IMAGE_DEFAULT
         );
 	}
 	else if (_imgName == "_flat") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_FLAT
+            getBitmapsPath() + IMAGE_FLAT
         );
 	}
 	else if (_imgName == "_fog") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_FOG
+            getBitmapsPath() + IMAGE_FOG
         );
 	}
 	else if (_imgName == "_nofalloff") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_NOFALLOFF
+            getBitmapsPath() + IMAGE_NOFALLOFF
         );
 	}
 	else if (_imgName == "_pointlight1") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_POINTLIGHT1
+            getBitmapsPath() + IMAGE_POINTLIGHT1
         );
 	}
 	else if (_imgName == "_pointlight2") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_POINTLIGHT2
+            getBitmapsPath() + IMAGE_POINTLIGHT2
         );
 	}
 	else if (_imgName == "_pointlight3") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_POINTLIGHT3
+            getBitmapsPath() + IMAGE_POINTLIGHT3
         );
 	}
 	else if (_imgName == "_quadratic") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_QUADRATIC
+            getBitmapsPath() + IMAGE_QUADRATIC
         );
 	}
 	else if (_imgName == "_scratch") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_SCRATCH
+            getBitmapsPath() + IMAGE_SCRATCH
         );
 	}
 	else if (_imgName == "_spotlight") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_SPOTLIGHT
+            getBitmapsPath() + IMAGE_SPOTLIGHT
         );
 	}
 	else if (_imgName == "_white") {
 		return GlobalImageLoader().imageFromFile(
-            GlobalRegistry().get("user/paths/bitmapsPath") + IMAGE_WHITE
+            getBitmapsPath() + IMAGE_WHITE
         );
 	}
 	else

diff --git a/radiant/shaders/textures/GLTextureManager.cpp b/radiant/shaders/textures/GLTextureManager.cpp
@@ -1,5 +1,6 @@
 #include "GLTextureManager.h"
 
+#include "imodule.h"
 #include "iradiant.h"
 #include "itextstream.h"
 #include "texturelib.h"
@@ -113,24 +114,21 @@ TexturePtr GLTextureManager::getShaderNotFound()
 TexturePtr GLTextureManager::loadStandardTexture(const std::string& filename)
 {
     // Create the texture path
-    std::string fullpath = GlobalRegistry().get("user/paths/bitmapsPath") + filename;
-
-    TexturePtr returnValue;
+    std::string fullpath = module::GlobalModuleRegistry().getApplicationContext().getBitmapsPath() + filename;
 
     // load the image with the ImageFileLoader (which can handle .bmp)
     ImagePtr img = GlobalImageLoader().imageFromFile(fullpath);
 
-    if (img != ImagePtr()) {
+    if (img)
+    {
         // Bind the (processed) texture and get the OpenGL id
         // The getProcessed() call may substitute the passed image by another
-        returnValue = img->bindTexture(filename);
-    }
-    else {
-        rError() << "[shaders] Couldn't load Standard Texture texture: "
-                            << filename << "\n";
+        return img->bindTexture(filename);
     }
+
+    rError() << "[shaders] Couldn't load Standard Texture texture: " << filename << "\n";
 
-    return returnValue;
+    return TexturePtr();
 }
 
 } // namespace shaders