Changeset 1930 for GTP/trunk/Lib/Illum

Timestamp:

01/02/07 06:24:47 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule

Files:

• IllumModule/include/RenderTechniques/ColorCubeMapRenderTechnique.h (modified) (1 diff)
• IllumModule/include/RenderTechniques/CubeMapRenderTechnique.h (modified) (2 diffs)
• IllumModule/src/RenderTechniques/ColorCubeMapRenderTechnique.cpp (modified) (1 diff)
• IllumModule/src/RenderTechniques/CubeMapRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/include/RenderTechniques/OgreColorCubeMapRenderTechnique.h (modified) (1 diff)
• OgreIllumModule/include/RenderTechniques/OgreCubeMapRenderTechnique.h (modified) (1 diff)
• OgreIllumModule/src/RenderTechniques/OgreColorCubeMapRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderTechniques/OgreCubeMapRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderingRuns/OgreCubeMapRenderingRun.cpp (modified) (1 diff)

GTP/trunk/Lib/Illum/IllumModule/IllumModule/include/RenderTechniques/ColorCubeMapRenderTechnique.h

@@ -49 +49 @@
         //inherited
         void runChanged(RenderingRunType runType, RenderingRun* run);
+        void runUpdated(RenderingRunType runType, RenderingRun* run);
 
 protected:
         virtual void colorCubeMapRunChanged(RenderingRun* run) = 0;     
+        virtual void colorCubeMapRunUpdated(RenderingRun* run) = 0;     
 };

GTP/trunk/Lib/Illum/IllumModule/IllumModule/include/RenderTechniques/CubeMapRenderTechnique.h

@@ -41 +41 @@
         
         void runChanged(RenderingRunType runType, RenderingRun* run);
+        void runUpdated(RenderingRunType runType, RenderingRun* run);
 
 protected:
@@ -90 +91 @@
         virtual RenderingRun* createCubeMapRun() = 0;
         virtual void cubeMapRunChanged(RenderingRun* run) = 0;  
+        virtual void cubeMapRunUpdated(RenderingRun* run) = 0;
 };

GTP/trunk/Lib/Illum/IllumModule/IllumModule/src/RenderTechniques/ColorCubeMapRenderTechnique.cpp

@@ -59 +59 @@
 }
 
+void ColorCubeMapRenderTechnique::runUpdated(RenderingRunType runType, RenderingRun* run)
+{
+        if(runType == cubemapLayer)
+                colorCubeMapRunUpdated(run);
+}
+
  void ColorCubeMapRenderTechnique::update(unsigned long frameNum)
 {       

GTP/trunk/Lib/Illum/IllumModule/IllumModule/src/RenderTechniques/CubeMapRenderTechnique.cpp

@@ -37 +37 @@
                 cubeMapRunChanged(run);
 }
+void CubeMapRenderTechnique::runUpdated(RenderingRunType runType, RenderingRun* run)
+{
+        if(runType == ILLUMRUN_CUBEMAP)
+                cubeMapRunUpdated(run);
+}
 
 CubeMapRenderTechnique::~CubeMapRenderTechnique()

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderTechniques/OgreColorCubeMapRenderTechnique.h

@@ -71 +71 @@
         //inherited
         void colorCubeMapRunChanged(RenderingRun* run); 
+        void colorCubeMapRunUpdated(RenderingRun* run); 
 };
 

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderTechniques/OgreCubeMapRenderTechnique.h

@@ -84 +84 @@
         RenderingRun* createCubeMapRun();
         void cubeMapRunChanged(RenderingRun* run);      
+        void cubeMapRunUpdated(RenderingRun* run);      
 };
 

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

@@ -87 +87 @@
 }
 
+void OgreColorCubeMapRenderTechnique::colorCubeMapRunUpdated(RenderingRun* run)
+{
+        OgreCubeMapRenderTechnique::cubeMapRunUpdated(run);
+}
+
 ///Technique factory
 OgreColorCubeMapRenderTechniqueFactory::OgreColorCubeMapRenderTechniqueFactory()

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

@@ -60 +60 @@
         
         if(attachToTexUnit)
-                pass->getTextureUnitState(texID)->setTextureName(cubemapname);
+                pass->getTextureUnitState(texID)->setTextureName(cubemapname);  
+}
+
+void OgreCubeMapRenderTechnique::cubeMapRunUpdated(RenderingRun* run)
+{
+        OgreCubeMapRenderingRun* cuberun =(OgreCubeMapRenderingRun*) (run->asOgreRenderingRun());
+        
         if(getMinMax)
         {

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

@@ -128 +128 @@
 
         if(facenum == 5 && getMinMax)
+        {
                 getCubeMapMinMax();
+                this->sharedRuns->runUpdated(cubemapRunType, this);
+        }
 }