Changeset 1055 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreSharedRuns.cpp

Timestamp:

06/26/06 09:52:08 (18 years ago)

Author:

szirmay

Message:

 

File:

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

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

@@ -1 +1 @@
 #include "..\include\OgreSharedRuns.h"
 #include "OgreIlluminationManager.h"
+
+void OgreSharedRuns::runChanged(RenderingRunType runType, RenderingRun* run)
+{
+        if(child1 != 0) child1->runChanged(runType, run);
+        if(child2 != 0) child2->runChanged(runType, run);
+        
+        std::vector<TechniqueGroup*>::iterator it = childTechniqueGroups.begin();
+        std::vector<TechniqueGroup*>::iterator itend = childTechniqueGroups.end();
+
+        while(it != itend)
+        {
+                (*it)->runChanged(runType, run);
+                it++;
+        }
+}
+
+void OgreSharedRuns::runUpdated(RenderingRunType runType, RenderingRun* run)
+{
+        if(child1 != 0) child1->runUpdated(runType, run);
+        if(child2 != 0) child2->runUpdated(runType, run);
+        
+
+        std::vector<TechniqueGroup*>::iterator it = childTechniqueGroups.begin();
+        std::vector<TechniqueGroup*>::iterator itend = childTechniqueGroups.end();
+
+        while(it != itend)
+        {
+                (*it)->runUpdated(runType, run);
+                it++;
+        }
+}
 
 RenderingRun* OgreSharedRuns::getRun(RenderingRunType runType)
@@ -108 +139 @@
         {
                 runChanged( (*it).first, (*it).second );
-                runChanged( (*it).first, (*it).second );
                 it++;
         }
@@ -135 +165 @@
 }
 
-bool OgreSharedRuns::haveCommonRuns(SharedRuns* r1, SharedRuns* r2)
+bool OgreSharedRuns::haveCommonRuns(SharedRuns* r1, SharedRuns* r2, std::vector<RenderingRunType>& commonruns)
 {
         OgreSharedRuns* run1 = (OgreSharedRuns*) r1;
@@ -143 +173 @@
         std::map<RenderingRunType, RenderingRun*>::iterator itend = run1->sharedRuns.end();
 
+        bool returnvalue = false;
         while(it != itend)
         {
                 if( run2->hasOwnRun((*it).first))
-                        return true;
-                it++;
-        }
-
-        return false;
+                {
+                        if(                      run1->getRun((*it).first)->asOgreRenderingRun()->
+                                canJoin( run2->getRun((*it).first)->asOgreRenderingRun() )
+                           )
+                        {
+                                returnvalue = true;
+                                commonruns.push_back((*it).first);
+                        }
+                }
+                it++;
+        }
+
+        return returnvalue;
 }
 
 bool OgreSharedRuns::canJoin(SharedRuns* r1, SharedRuns* r2)
 {
+        std::vector<RenderingRunType> commonruns;
         //check if they have common resources
-        if(!haveCommonRuns(r1, r2))
+        if(!haveCommonRuns(r1, r2, commonruns))
                 return false;
-
+        
+        float MAXRAD = 0xffffffff;
         //check bounds
-        float MAXRAD = OgreIlluminationManager::getSingleton().getMaxJoinRadius();
+        for(int i = 0; i < commonruns.size(); i++)
+        {
+         
+         RenderingRunType type = commonruns.at(i);
+         float marad = OgreIlluminationManager::getSingleton().getMaxJoinRadius(type);
+         
+         MAXRAD = std::min(MAXRAD, marad);
+        }
 
         Sphere bSphere1 = ((OgreSharedRuns*) r1)->getBoundingSphere();