Changeset 1722 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreConvolvedCubeMapRenderTechnique.cpp

Timestamp:

11/07/06 14:29:38 (18 years ago)

Author:

szirmay

Message:

 

File:

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

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

@@ -2 +2 @@
 #include "OgreTechniqueGroup.h"
 #include "OgreReducedCubeMapRenderingRun.h"
-#include "OgreColorCubeMapRenderingRun.h"
+#include "OgreCubeMapRenderingRun.h"
 
 OgreConvolvedCubeMapRenderTechnique::OgreConvolvedCubeMapRenderTechnique(unsigned long startFrame,
@@ -15 +15 @@
                                                                                                                 bool updateAllFace,
                                                                                                                 bool renderSelf,
+                                                                                                                bool renderEnvironment,
+                                                                                                                String selfMaterial,
+                                                                                                                String environmentMaterial,
                                                                                                                 Pass* pass,
                                                                                                                 OgreRenderable* parentRenderable,
                                                                                                                 OgreTechniqueGroup* parentTechniqueGroup)
                                                         :
-                                                        OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, pass, parentRenderable, parentTechniqueGroup),
-                                                        CubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, parentRenderable, parentTechniqueGroup),
-                                                        ConvolvedCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, reducedCubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, parentRenderable, parentTechniqueGroup),
+                                                        OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, pass, parentRenderable, parentTechniqueGroup),
+                                                        CubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, parentRenderable, parentTechniqueGroup),
+                                                        ConvolvedCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, reducedCubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, parentRenderable, parentTechniqueGroup),
                                                         RenderTechnique(parentRenderable, parentTechniqueGroup) 
 {       
+        texturePostFix = "_COLORCUBEMAP";
+
         if(sharedRuns->getRun(ILLUMRUN_COLOR_CUBEMAP) == 0)
-                sharedRuns->addRun(ILLUMRUN_COLOR_CUBEMAP, createColorCubeMapRun());
+                sharedRuns->addRun(ILLUMRUN_COLOR_CUBEMAP, createCubeMapRun());
 
         if(sharedRuns->getRun(ILLUMRUN_REDUCED_CUBEMAP) == 0)
@@ -55 +60 @@
 void OgreConvolvedCubeMapRenderTechnique::colorCubeMapRunChanged(RenderingRun* run)
 {
-        
-        OgreColorCubeMapRenderingRun* cuberun =(OgreColorCubeMapRenderingRun*) (run->asOgreRenderingRun());
-        String cubemapname = cuberun->getColorCubeMapTextureName();
+        OgreCubeMapRenderingRun* cuberun =(OgreCubeMapRenderingRun*) (run->asOgreRenderingRun());
+        String cubemapname = cuberun->getCubeMapTextureName();
         
         OgreReducedCubeMapRenderingRun* rr = (OgreReducedCubeMapRenderingRun*) sharedRuns->getRun(ILLUMRUN_REDUCED_CUBEMAP)->asOgreRenderingRun();
         rr->colorCubeMapChanged(cubemapname);
 
-}
-
-RenderingRun* OgreConvolvedCubeMapRenderTechnique::createColorCubeMapRun()
-{
-        return new OgreColorCubeMapRenderingRun( (OgreSharedRuns*) parentTechniqueGroup->getSharedRuns(), 
-                                                                                                parentOgreRenderable->getName()  + "_COLORCUBEMAP",
-                                                                                                startFrame,
-                                                                                                cubeMapUpdateInterval,
-                                                                                                cubeMapResolution,
-                                                                                                useDistCalc,
-                                                                                                useFaceAngleCalc,
-                                                                                                distTolerance,
-                                                                                                angleTolerance,
-                                                                                                updateAllFace);
 }
 
@@ -134 +124 @@
                                                                                                 updateAllFace,
                                                                                                 renderSelf,
+                                                                                                renderEnvironment,
+                                                                                                selfMaterial,
+                                                                                                environmentMaterial,
                                                                                                 pass,
                                                                                                 parentRenderable,