From: Clément de l'Hamaide <clemaez@hotmail.fr>
Date: Wed, 27 Aug 2014 20:08:20 +0000 (+0200)
Subject: Remove Textures.high logic
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c30ce67e16d2c4287cc040294c026045aea2fbe7;p=simgear.git

Remove Textures.high logic
---

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 4456e4b2..546b807e 100644
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -146,17 +146,12 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
             tname = "unknown.rgb";
         }
 
-        SGPath tpath("Textures.high");
+        SGPath tpath("Textures");
         tpath.append(tname);
         std::string fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
         if (fullTexPath.empty()) {
-            tpath.set("Textures");
-            tpath.append(tname);
-            fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
-            if (fullTexPath.empty()) {
-                SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \""
-                        << tname << "\" in Textures or Textures.high folders.");
-            }
+            SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \""
+                    << tname << "\" in Textures folders.");
         }
 
         if (tpath.lower_extension() == "dds") {
@@ -183,17 +178,12 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
                 tname = "unknown.rgb";
             }
 
-            SGPath tpath("Textures.high");
+            SGPath tpath("Textures");
             tpath.append(tname);
             std::string fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
             if (fullTexPath.empty()) {
-                tpath.set("Textures");
-                tpath.append(tname);
-                fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
-                if (fullTexPath.empty() ) {
-                    SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \""
-                            << tname << "\" in Textures or Textures.high folders.");
-                }
+                SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \""
+                        << tname << "\" in Textures folders.");
             }
 
             if (j == 0) {
@@ -226,20 +216,13 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
         std::string omname = masks[i]->getStringValue();
 
         if (! omname.empty()) {
-            SGPath ompath("Textures.high");
+            SGPath ompath("Textures");
             ompath.append(omname);
-            std::string fullMaskPath =
-              SGModelLib::findDataFile(ompath.str(), options);
-
-            if (fullMaskPath.empty()) {
-                ompath.set("Textures");
-                ompath.append(omname);
-                fullMaskPath = SGModelLib::findDataFile(ompath.str(), options);
-            }
+            std::string fullMaskPath = SGModelLib::findDataFile(ompath.str(), options);
 
             if (fullMaskPath.empty()) {
                 SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \""
-                        << omname << "\" in Textures or Textures.high folders.");
+                        << omname << "\" in Textures folders.");
             }
             else
             {
@@ -353,14 +336,13 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
         std::string treeTexPath = props->getStringValue("tree-texture");
 
         if (! treeTexPath.empty()) {
-            SGPath treePath("Textures.high");
+            SGPath treePath("Textures");
             treePath.append(treeTexPath);
             tree_texture = SGModelLib::findDataFile(treePath.str(), options);
 
             if (tree_texture.empty()) {
-                treePath.set("Textures");
-                treePath.append(treeTexPath);
-                tree_texture = SGModelLib::findDataFile(treePath.str(), options);
+                SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \""
+                        << treeTexPath << "\" in Textures folders.");
             }
         }
     }