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

Timestamp:

05/15/07 11:46:00 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreRenderingRun.cpp (modified) (11 diffs)
• RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (3 diffs)

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

@@ -13 +13 @@
         String materialName;
         String triggerName;
-        std::map<Renderable*, String>* visibleObjects;
+        std::map<Renderable*, String>* materialRestoreMap;
+        std::set<Renderable*>* visibleObjects;
 public:
     
-        MaterialSetVisitor(String& materialName, std::map<Renderable*, String>* visibleObjects, String trigger = "")
+        MaterialSetVisitor(String& materialName,
+                                                std::map<Renderable*, String>* materialRestoreMap,
+                                                std::set<Renderable*>* visibleObjects,
+                                                String trigger = "")
         {
                 this->materialName = materialName;
+                this->materialRestoreMap = materialRestoreMap;
                 this->visibleObjects = visibleObjects;
                 triggerName = trigger;
@@ -29 +34 @@
                 if( visibleObjects->count(rend) == 0)
                 {
-                        (*visibleObjects)[rend] = rend->getMaterial().getPointer()->getName();
-                        String materialToSet = materialName;
-                        if(triggerName != "")//we have a trigger here
+                        visibleObjects->insert(rend);
+
+                        if( materialRestoreMap->count(rend) == 0)
                         {
-                                OgreTechniqueGroup* tg = (OgreTechniqueGroup*)rend->getRenderTechniqueGroup();
-                                if(tg)
+                                (*materialRestoreMap)[rend] = rend->getMaterial().getPointer()->getName();
+
+                                String materialToSet = materialName;
+                                if(triggerName != "")//we have a trigger here
                                 {
-                                        String triggeredMaterial = tg->getMaterialNameForTrigger(triggerName);
+                                        OgreTechniqueGroup* tg = (OgreTechniqueGroup*)rend->getRenderTechniqueGroup();
+                                        if(tg)
+                                        {
+                                                String triggeredMaterial = tg->getMaterialNameForTrigger(triggerName);
+                                                if(triggeredMaterial != "")//a trigger is associated
+                                                        materialToSet = triggeredMaterial;
+                                        }
+                                }                               
+                                rend->setMaterialName(materialToSet);
+                        }
+                }
+        }
+        bool visit(const Pass* p){return true;}
+        void visit(const RenderablePass* rp)
+        {
+                Renderable* rend = rp->renderable; 
+                if( visibleObjects->count(rend) == 0)
+                {
+                        visibleObjects->insert(rend);
+
+                        if( materialRestoreMap->count(rend) == 0)
+                        {
+                                (*materialRestoreMap)[rend] = rend->getMaterial().getPointer()->getName();
+                                String materialToSet = materialName;
+                                if(triggerName != "")//we have a trigger here
+                                {
+                                        String triggeredMaterial = 
+                                                ((OgreTechniqueGroup*)rend->getRenderTechniqueGroup())
+                                                        ->getMaterialNameForTrigger(triggerName);
                                         if(triggeredMaterial != "")//a trigger is associated
                                                 materialToSet = triggeredMaterial;
+                                }                               
+                                rend->setMaterialName(materialToSet);
+                        }
+                }
+        }
+
+};
+
+class RenderQueueFill
+{
+public: 
+
+        inline void Fill(       RenderQueue* rq, //the queue to add the renderables to
+                                                bool shadowcastersonly,
+                                                std::list<Renderable*>* renderables = 0, //if not null add only these materials
+                                                String materialName = "", //material to set, if "" leave original
+                                                std::map<Renderable*, String>* visibleObjects = 0, //map to restore materials later
+                                                String trigger = "") //trigger
+        {
+                if(renderables == 0)
+                {
+                        SceneManager *sm = Root::getSingleton()._getCurrentSceneManager();
+                        SceneManager::MovableObjectIterator it =  sm->getMovableObjectIterator("Entity");
+                        while(it.hasMoreElements())
+                        {
+                                MovableObject* o = it.getNext();
+                                Entity* e = (Entity*) o;
+                                if( (!shadowcastersonly || e->getCastShadows()) && e->isVisible())
+                                {
+                                        for (int i = 0; i < e->getNumSubEntities(); i++)
+                                        {
+                                                SubEntity* sube = e->getSubEntity(i);
+
+                                                if(materialName != "")
+                                                {
+                                                        String materialToSet = materialName;
+
+                                                        if(trigger != "")
+                                                        {
+                                                                String triggeredMaterial = 
+                                                                ((OgreTechniqueGroup*)sube->getRenderTechniqueGroup())
+                                                                        ->getMaterialNameForTrigger(trigger);
+                                                                if(triggeredMaterial != "")//a trigger is associated
+                                                                materialToSet = triggeredMaterial;
+                                                        }
+
+                                                        if(visibleObjects->count(sube) == 0)
+                                                                (*visibleObjects)[sube] = 
+                                                                        sube->getMaterial().getPointer()->getName();
+                                                        sube->setMaterialName(materialToSet);                                                   
+                                                }
+                                                rq->addRenderable(sube);                                                
+                                        }
                                 }
-                        }                               
-                        rend->setMaterialName(materialToSet);
+                        }
                 }
         }
-        bool visit(const Pass* p){return true;}
-        void visit(const RenderablePass* rp)
-        {
-                Renderable* rend = rp->renderable; 
-                
-                if( visibleObjects->count(rend) == 0)
-                {
-                        (*visibleObjects)[rend] = rend->getMaterial().getPointer()->getName();
-                        String materialToSet = materialName;
-                        if(triggerName != "")//we have a trigger here
-                        {
-                                String triggeredMaterial = 
-                                        ((OgreTechniqueGroup*)rend->getRenderTechniqueGroup())
-                                                ->getMaterialNameForTrigger(triggerName);
-                                if(triggeredMaterial != "")//a trigger is associated
-                                        materialToSet = triggeredMaterial;
-                        }                               
-                        rend->setMaterialName(materialToSet);
-                }
-        }
-
 };
 
@@ -154 +220 @@
         RenderQueue::QueueGroupIterator queueIt = rq->_getQueueGroupIterator();
    
-    while (queueIt.hasMoreElements())
+        visibleObjects.clear();
+        MaterialSetVisitor visitor(materialName, &materialRestoreMap, &visibleObjects, triggerName);    
+        
+        while (queueIt.hasMoreElements())
     {
         RenderQueueGroup* pGroup = queueIt.getNext();
@@ -165 +234 @@
                         const QueuedRenderableCollection& solids = pPriorityGrp->getSolidsBasic();
                         const QueuedRenderableCollection& transparents = pPriorityGrp->getTransparents();
-                        MaterialSetVisitor visitor(materialName, &visibleObjects, triggerName); 
                         solids.acceptVisitor(&visitor, QueuedRenderableCollection::OM_PASS_GROUP);
                         if(!solidsonly)
@@ -175 +243 @@
         rq->clear();
 
-        std::map<Renderable*, String>::iterator it = visibleObjects.begin();
-        std::map<Renderable*, String>::iterator itend = visibleObjects.end();
+        std::set<Renderable*>::iterator it = visibleObjects.begin();
+        std::set<Renderable*>::iterator itend = visibleObjects.end();
 
         while(it != itend)
         {
-                rq->addRenderable((*it).first);
+                rq->addRenderable((*it));
                 it++;
         }
@@ -201 +269 @@
         }
 
-        //sm->_findVisibleObjectsOC(cam, cam->getViewport(), false, false, shadowcastersonly);
         sm->_findVisibleObjects(cam, shadowcastersonly);
         
@@ -207 +274 @@
 }
 
+void OgreRenderingRun::setMaterialForRenderables(String& materialName, bool shadowcastersonly, String triggerName)
+{
+        SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
+        sm->setFindVisibleObjects(false);
+
+        RenderQueueFill RQF;
+        RenderQueue* rq = Root::getSingleton()._getCurrentSceneManager()->getRenderQueue();
+        rq->clear();
+        visibleObjects.clear();
+        RQF.Fill(rq, shadowcastersonly, 0, materialName, &materialRestoreMap, triggerName);
+}
+
 void OgreRenderingRun::restoreMaterials()
 {
         SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
         
-        std::map<Renderable*, String>::iterator it = visibleObjects.begin();
-        std::map<Renderable*, String>::iterator itend = visibleObjects.end();
+        std::map<Renderable*, String>::iterator it = materialRestoreMap.begin();
+        std::map<Renderable*, String>::iterator itend = materialRestoreMap.end();
 
         while(it != itend)
@@ -220 +299 @@
         }
         
-        visibleObjects.clear();
+        materialRestoreMap.clear();
 
         sm->setFindVisibleObjects(true);
@@ -246 +325 @@
         sm->getRenderQueue()->clear();
         sm->getRenderQueue()->addRenderable(fullScreenQuadEntity->getSubEntity(0));
+        bool lastFindVisible = sm->getFindVisibleObjects();
         sm->setFindVisibleObjects(false);
         target->update();
-        sm->setFindVisibleObjects(true);
+        sm->setFindVisibleObjects(lastFindVisible);
 }
 
@@ -329 +409 @@
         sm->getRenderQueue()->clear();
         sm->getRenderQueue()->addRenderable(fullscreenGrid->getSubEntity(0));
+        bool lastFindVisible = sm->getFindVisibleObjects();
         sm->setFindVisibleObjects(false);
         rt->update();
-        sm->setFindVisibleObjects(true);
+        sm->setFindVisibleObjects(lastFindVisible);
 
 }
@@ -373 +454 @@
         sm->getRenderQueue()->clear();
         sm->getRenderQueue()->addRenderable(pixelSprites);
+        bool lastFindVisible = sm->getFindVisibleObjects();
         sm->setFindVisibleObjects(false);
         rt->update();
-        sm->setFindVisibleObjects(true);
-                
-}
-
+        sm->setFindVisibleObjects(lastFindVisible);
+                
+}
+

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp

@@ -84 +84 @@
                 //updateDepthCubeFace(currentFace);
                 //currentFace = (currentFace+1)%6;
+                
+
+                //Timer* t = Root::getSingleton().getTimer();
+                //unsigned long  start =  t->getMicroseconds();         
+                //setMaterialForRenderables(materialName, true);                                
+                //unsigned long  end =  t->getMicroseconds();
+                //double elapsed = (double) (end - start) / 1000.0;
+                //LogManager::getSingleton().logMessage(String("MaterialSetTime: ") + name + " : " + StringConverter::toString(Real(elapsed)) + " ms");
+                //visibleObjects.clear();
 
                 for(int i = 0; i < 6 ; i++)
                         updateDepthCubeFace(i);
+
+                //start =  t->getMicroseconds();
+                
+                restoreMaterials();
+
+                //end =  t->getMicroseconds();
+                //elapsed = (double) (end - start) / 1000000.0;
+                //LogManager::getSingleton().logMessage(String("MaterialRestoreTime: ") + name + " : " +  StringConverter::toString(Real(elapsed)) + " ms");    
         }
         else
@@ -95 +112 @@
 
 void OgreDepthShadowMapRenderingRun::updateDepthCubeFace(int facenum)
-{
+{       
+        Vector3 lightpos = light->getDerivedPosition();                 
         String triggerName = "ILLUM_TRIGGER_SM_POINT";  
-
-        Vector3 lightpos = light->getDerivedPosition();                 
-        
+                
         RenderTarget* rt = depthMapTexture->getBuffer(facenum, 0).getPointer()->getRenderTarget();      
         Camera*  cam =  rt->getViewport(0)->getCamera();
-        cam->setPosition(lightpos);     
         cam->setFarClipDistance(lightFarPlane);
-
+        cam->setPosition(lightpos);
+        
+        
         setMaterialForVisibles(materialName, cam, true, false, triggerName);
+        
         rt->update();
-        restoreMaterials();
-
+
+//      restoreMaterials();
+        
         //rt->writeContentsToFile("shadowmap_" + StringConverter::toString(facenum) + ".dds");
 
@@ -120 +139 @@
                 
                 //rt->writeContentsToFile("shadowmap_blurred_" + StringConverter::toString(facenum) + ".dds");
-        }
-        
+        }       
 }