Renderer|Environment: Fall back to "texture.reflect.default"

If no map-specific reflections are found, use "texture.reflect.default" if that is found instead.
skyjake · Feb 17, 2016 · e62fd0a · e62fd0a
1 parent 158e754
commit e62fd0a
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/doomsday/apps/client/src/render/environ.cpp b/doomsday/apps/client/src/render/environ.cpp
@@ -28,6 +28,7 @@
 
 using namespace de;
 
+static String const ID_DEFAULT       ("default");
 static String const DEF_PATH         ("path");
 static String const DEF_INTERIOR_PATH("interior.path");
 static String const DEF_EXTERIOR_PATH("exterior.path");
@@ -165,16 +166,27 @@ DENG2_PIMPL(Environment)
         auto found = maps.constFind(mapId);
         if(found != maps.constEnd())
         {
-            EnvMaps const &env = found.value();
-            DENG2_ASSERT(!(env.interior.isEmpty() && env.exterior.isEmpty()));
-
-            if(!env.exterior.isEmpty())
+            loadEnvMaps(found.value());
+        }
+        else
+        {
+            // Maybe the default maps, then?
+            found = maps.constFind(ID_DEFAULT);
+            if(found != maps.constEnd())
             {
-                loadCubeMap(reflectionTextures[Exterior], env.exterior);
+                loadEnvMaps(found.value());
             }
+        }
+    }
 
-            loadCubeMap(reflectionTextures[Interior], env.interior);
+    void loadEnvMaps(EnvMaps const &env)
+    {
+        DENG2_ASSERT(!(env.interior.isEmpty() && env.exterior.isEmpty()));
+        if(!env.exterior.isEmpty())
+        {
+            loadCubeMap(reflectionTextures[Exterior], env.exterior);
         }
+        loadCubeMap(reflectionTextures[Interior], env.interior);
     }
 };