Changeset 2397 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreIlluminationManager.cpp

Timestamp:

05/28/07 16:30:37 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreIlluminationManager.cpp (modified) (4 diffs)

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreIlluminationManager.cpp

@@ -312 +312 @@
                 OgreTechniqueGroup* group = 0;
 
+                bool materialCopied = false;
                 for(unsigned int t = 0 ; t < mat->getNumTechniques() ; t++)
                 {
@@ -323 +324 @@
                                 if( techniques.size() > 0)
                                 {
+                                        bool needMaterialCopy = false;
+
+                                        std::vector<IllumTechniqueParams*>::iterator it = techniques.begin();
+                                        std::vector<IllumTechniqueParams*>::iterator itend = techniques.end();
+                                        while(it!=itend)
+                                        {
+                                                needMaterialCopy = needMaterialCopy || needMaterialCopyForTechnique(*it);
+                                                it++;
+                                        }
+
                                         if(rend == 0)
                                         {
@@ -339 +350 @@
                                                 sharedruns->updateBounds();
                                         }
-                                        String newMaterialName = mat->getName() + "_clone_" + rend->getName();
-                                        Material* newMat = mat->clone(newMaterialName).getPointer();
-                                        rend->setMaterialName(newMaterialName);
-                                        mat = sube->getMaterial().getPointer();
-                                        break;
+
+                                        if(needMaterialCopy)
+                                        {
+                                                String newMaterialName = mat->getName() + "_clone_" + rend->getName();
+                                                Material* newMat = mat->clone(newMaterialName).getPointer();
+                                                rend->setMaterialName(newMaterialName);
+                                                mat = sube->getMaterial().getPointer();
+                                                materialCopied = true;
+                                        }
+                                        
+                                        if(materialCopied)
+                                                break;
                                 }
                         }
@@ -495 +513 @@
         }
 }
+
+bool OgreIlluminationManager::needMaterialCopyForTechnique(IllumTechniqueParams* params)
+{
+        std::list<RenderTechniqueFactory*>::iterator it = techniqueFactories.begin();
+        std::list<RenderTechniqueFactory*>::iterator itend = techniqueFactories.end();
+                        
+        while(it != itend)
+        {
+                RenderTechniqueFactory* factory = *it;
+                
+                if(factory->isType(params->getTypeName()))
+                        return factory->needMaterialCopy(params);
+
+                it++;
+        }
+}
+
 void OgreIlluminationManager::preAllUpdates()
 {