Changeset 2397 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src

Timestamp:

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

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src

Files:

• OgreIlluminationManager.cpp (modified) (4 diffs)
• RenderTechniques/OgreDepthShadowReceiverRenderTechnique.cpp (modified) (8 diffs)
• RenderTechniques/OgreHierarchicalParticleSystemTechnique.cpp (modified) (1 diff)
• RenderTechniques/OgrePathMapRenderTechnique.cpp (modified) (1 diff)
• RenderTechniques/OgreSBBRenderTechnique.cpp (modified) (6 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()
 {

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreDepthShadowReceiverRenderTechnique.cpp

@@ -19 +19 @@
                                                                                                 SceneBlendFactor passBlendingDEST,
                                                                                                 bool createNewPasses,
-                                                                                                int startTextureUnitID,                                                 
+                                                                                                int startTextureUnitID,
+                                                                                                bool nearestLightsFromCamera,
                                                                                                 Pass* pass,
                                                                                                 OgreRenderable* parentRenderable,
@@ -42 +43 @@
         this->createNewPasses = createNewPasses;
         this->startTextureUnitID = startTextureUnitID;
+
+        this->nearestLightsFromCamera = nearestLightsFromCamera;
                                                         
         if(createNewPasses)
@@ -86 +89 @@
 {
         LightList lights;
+        Vector3 center = OgreIlluminationManager::getSingleton().getMainCamera()->getWorldPosition();
+        if(!nearestLightsFromCamera)
+                center = ((OgreSharedRuns*) sharedRuns)->getRootPosition();
         Root::getSingleton()._getCurrentSceneManager()->_populateLightList(
-                                                ((OgreSharedRuns*) sharedRuns)->getRootPosition(),
+                                                        center,
                                                         100000.0,
                                                         lights);
@@ -336 +342 @@
                 f->startTextureUnitID =  StringConverter::parseInt(params);
         }
+        void parseNearestFromCamera(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowReceiverRenderTechniqueFactory* f = (OgreDepthShadowReceiverRenderTechniqueFactory*) factory;
+                f->nearestLightsFromCamera = StringConverter::parseBool(params);
+        }
 }
 
@@ -358 +369 @@
         this->attributeParsers.insert(AttribParserList::value_type("new_passes", (ILLUM_ATTRIBUTE_PARSER) parseCreateNewPasses));
         this->attributeParsers.insert(AttribParserList::value_type("start_tex_id", (ILLUM_ATTRIBUTE_PARSER) parseStartTexID));  
+        this->attributeParsers.insert(AttribParserList::value_type("nearest_from_camera", (ILLUM_ATTRIBUTE_PARSER) parseNearestFromCamera));    
 }
 
@@ -382 +394 @@
         createNewPasses = true;
         startTextureUnitID = 0;
+        nearestLightsFromCamera = true;
         
         parseParams(params);
@@ -401 +414 @@
                                                                                                 createNewPasses,
                                                                                                 startTextureUnitID,
+                                                                                                nearestLightsFromCamera,
                                                                                                 pass,
                                                                                                 parentRenderable,
@@ -408 +422 @@
 }
 
+bool OgreDepthShadowReceiverRenderTechniqueFactory::needMaterialCopy(IllumTechniqueParams* params)
+{
+        nearestLightsFromCamera = true;
+        parseParams(params);
+        if(nearestLightsFromCamera)
+                return false;
+        else
+                 return true;
+}
+

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreHierarchicalParticleSystemTechnique.cpp

@@ -34 +34 @@
         this->useVParam = useVParam;
         this->useFParam = useFParam;
-        
+                
         //create the Particle system
         childPSysName = parentOgreRenderable->getName() + "_small_PSYS";

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgrePathMapRenderTechnique.cpp

@@ -23 +23 @@
 
         this->clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentRenderable->getName());
-        
         Pass* passToSet = pass;
 

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreSBBRenderTechnique.cpp

@@ -6 +6 @@
 
 OgreSBBRenderTechnique::OgreSBBRenderTechnique( unsigned char depthTexID,
+                                                                                           bool bindTexture,
                                                                                                 Pass* pass,
                                                                                                 OgreRenderable* parentRenderable,
@@ -14 +15 @@
 {
         this->depthTexID = depthTexID;
+        this->bindTexture = bindTexture;
         
         OgreIlluminationManager::getSingleton().createGlobalRun(ILLUMRUN_SCENE_CAMERA_DEPTH);   
@@ -25 +27 @@
         OgreIlluminationManager::getSingleton().addUpdateListener(this);
         
+        if(bindTexture)
         pass->getTextureUnitState(depthTexID)->setTextureName(run->getDepthTextureName());
         
@@ -70 +73 @@
                 f->depthTexID =  StringConverter::parseUnsignedInt(params);
         }
+        void parseBindTexture(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreSBBRenderTechniqueFactory* f = (OgreSBBRenderTechniqueFactory*) factory;
+                f->bindTexture =  StringConverter::parseBool(params);
+        }
 }
 
@@ -80 +88 @@
         //register parsers
         this->attributeParsers.insert(AttribParserList::value_type("texture_unit_id", (ILLUM_ATTRIBUTE_PARSER) parseDepthTexID));
+        this->attributeParsers.insert(AttribParserList::value_type("bind_texture", (ILLUM_ATTRIBUTE_PARSER) parseBindTexture));
 }
 
@@ -90 +99 @@
         //reset parameters
         depthTexID = 1;
-        
+        bindTexture = true;
+
         parseParams(params);
 
         OgreSBBRenderTechnique* result = new OgreSBBRenderTechnique(
                                                                                                 depthTexID,
+                                                                                                bindTexture,
                                                                                                 pass,
                                                                                                 parentRenderable,