Improved tile cache priority scheme.

[simgear.git] / simgear / scene / material / makeEffect.cxx

diff --git a/simgear/scene/material/makeEffect.cxx b/simgear/scene/material/makeEffect.cxx
index 4ce5841f5d2a0ae303862dc133e6396dca0bb928..02ac244f8c016a158b268b037480f0aef39013d2 100644 (file)
--- a/simgear/scene/material/makeEffect.cxx
+++ b/simgear/scene/material/makeEffect.cxx
@@ -128,7 +128,7 @@ Effect* makeEffect(const string& name,
     string effectFileName(name);
     effectFileName += ".eff";
     string absFileName
-        = osgDB::findDataFile(effectFileName, options);
+        = SGModelLib::findDataFile(effectFileName, options);
     if (absFileName.empty()) {
         SG_LOG(SG_INPUT, SG_ALERT, "can't find \"" << effectFileName << "\"");
         return 0;
@@ -205,8 +205,10 @@ Effect* makeEffect(SGPropertyNode* prop,
                     lock(effectMutex);
                 cache = parent->getCache();
                 itr = cache->find(key);
-                if (itr != cache->end()) 
+                if (itr != cache->end()) {
                     effect = itr->second.get();
+                    effect->generator = parent->generator;  // Copy the generators
+                }
             }
             if (!effect.valid()) {
                 effect = new Effect;
@@ -219,6 +221,7 @@ Effect* makeEffect(SGPropertyNode* prop,
                     = cache->insert(make_pair(key, effect));
                 if (!irslt.second)
                     effect = irslt.first->second;
+                effect->generator = parent->generator;  // Copy the generators
             }
         } else {
             SG_LOG(SG_INPUT, SG_ALERT, "can't find base effect " <<
@@ -230,6 +233,21 @@ Effect* makeEffect(SGPropertyNode* prop,
         effect->root = prop;
         effect->parametersProp = effect->root->getChild("parameters");
     }
+    const SGPropertyNode *generateProp = prop->getChild("generate");
+    if(generateProp)
+    {
+        effect->generator.clear();
+
+        // Effect needs some generated properties, like tangent vectors
+        const SGPropertyNode *parameter = generateProp->getChild("normal");
+        if(parameter) effect->setGenerator(Effect::NORMAL, parameter->getIntValue());
+
+        parameter = generateProp->getChild("tangent");
+        if(parameter) effect->setGenerator(Effect::TANGENT, parameter->getIntValue());
+
+        parameter = generateProp->getChild("binormal");
+        if(parameter) effect->setGenerator(Effect::BINORMAL, parameter->getIntValue());
+    }
     if (realizeTechniques) {
         try {
             OpenThreads::ScopedLock<OpenThreads::ReentrantMutex>