Changeset 2355 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques

Timestamp:

05/08/07 14:37:19 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreCausticCasterRenderTechnique.cpp (modified) (1 diff)
• OgreColorCubeMapRenderTechnique.cpp (modified) (2 diffs)
• OgreConvolvedCubeMapRenderTechnique.cpp (modified) (2 diffs)
• OgreCubeMapRenderTechnique.cpp (modified) (6 diffs)
• OgreDepthShadowReceiverRenderTechnique.cpp (modified) (2 diffs)
• OgreDistanceCubeMapRenderTechnique.cpp (modified) (3 diffs)

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

@@ -132 +132 @@
                                                                                 true,
                                                                                 "",
-                                                                                "GameTools/DistanceShader",
+                                                                                "GTP/Basic/Distance",
+                                                                                "ILLUM_TRIGGER_DISTANCE",
                                                                                 false,                                                                          
                                                                                 ILLUMRUN_DISTANCE_CUBEMAP);

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

@@ -21 +21 @@
                                                                                                                 String minVariableName,
                                                                                                                 String maxVariableName,
+                                                                                                                String triggerName,
                                                                                                                 Pass* pass,
                                                                                                                 OgreRenderable* parentRenderable,
                                                                                                                 OgreTechniqueGroup* parentTechniqueGroup)
-                                                                                                                :OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, layer, getMinMax, attachToTexUnit, minVariableName, maxVariableName, pass, parentRenderable, parentTechniqueGroup),
+                                                                                                                :OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, layer, getMinMax, attachToTexUnit, minVariableName, maxVariableName, triggerName, pass, parentRenderable, parentTechniqueGroup),
                                                                                                                         ColorCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, layer, parentRenderable, parentTechniqueGroup),
                                                                                                                         CubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, layer, parentRenderable, parentTechniqueGroup),
@@ -128 +129 @@
                                                                                                     minVariableName,
                                                                                                     maxVariableName,
+                                                                                                        triggerName,
                                                                                                         pass,
                                                                                                         parentRenderable,

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

@@ -22 +22 @@
                                                                                                                 String minVariableName,
                                                                                                                 String maxVariableName,
+                                                                                                                String triggerName,
                                                                                                                 Pass* pass,
                                                                                                                 OgreRenderable* parentRenderable,
                                                                                                                 OgreTechniqueGroup* parentTechniqueGroup)
                                                         :
-                                                        OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, layer, getMinMax, attachToTexUnit, minVariableName, maxVariableName, pass, parentRenderable, parentTechniqueGroup),
+                                                        OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, layer, getMinMax, attachToTexUnit, minVariableName, maxVariableName, triggerName, pass, parentRenderable, parentTechniqueGroup),
                                                         CubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, layer, parentRenderable, parentTechniqueGroup),
                                                         ConvolvedCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, reducedCubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, parentRenderable, parentTechniqueGroup),
@@ -135 +136 @@
                                                                                                 minVariableName,
                                                                                                 maxVariableName,
+                                                                                                triggerName,
                                                                                                 pass,
                                                                                                 parentRenderable,

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

@@ -21 +21 @@
                                                                                                                 String minVariableName,
                                                                                                                 String maxVariableName,
+                                                                                                                String triggerName,
                                                                                                                 Pass* pass,
                                                                                                                 OgreRenderable* parentRenderable,
@@ -92 +93 @@
                                                                                                 selfMaterial,
                                                                                                 environmentMaterial,
+                                                                                                triggerName,
                                                                                                 getMinMax,
                                                                                                 cubemapLayer);
@@ -221 +223 @@
                 OgreCubeMapRenderTechniqueFactory* f = (OgreCubeMapRenderTechniqueFactory*) factory;
                 f->attachToTexUnit =  StringConverter::parseBool(params);
+        }
+
+        void parseTriggerName(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreCubeMapRenderTechniqueFactory* f = (OgreCubeMapRenderTechniqueFactory*) factory;
+                f->triggerName =  params;
         }
 
@@ -248 +256 @@
         this->attributeParsers.insert(AttribParserList::value_type("min_var_name", (ILLUM_ATTRIBUTE_PARSER) parseMinVarName));
         this->attributeParsers.insert(AttribParserList::value_type("max_var_name", (ILLUM_ATTRIBUTE_PARSER) parseMaxVarName));
+        this->attributeParsers.insert(AttribParserList::value_type("trigger_name", (ILLUM_ATTRIBUTE_PARSER) parseTriggerName));
 
 }
@@ -271 +280 @@
         minVariableName = "";
         maxVariableName = "";
+        triggerName = "";
 
 }
@@ -302 +312 @@
                                                                                                 minVariableName,
                                                                                                 maxVariableName,
+                                                                                                triggerName,
                                                                                                 pass,
                                                                                                 parentRenderable,

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

@@ -58 +58 @@
                 Pass* newpass = techn->createPass();
                 passes.push_back(newpass);
-
-                newpass->setVertexProgram(shadowVertexProgram);
-                newpass->setFragmentProgram(shadowFragmentProgram);
-                
-                GpuProgramParameters* Vparams = newpass->getVertexProgramParameters().getPointer();
-                Vparams->setNamedAutoConstant(WorldViewProjParamName,
-                                                                        GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);        
-                Vparams->setNamedAutoConstant(WorldParamName,
-                                                                        GpuProgramParameters::ACT_WORLD_MATRIX);
-                GpuProgramParameters* Fparams = newpass->getFragmentProgramParameters().getPointer();
                 
                 TextureUnitState* st = newpass->createTextureUnitState();               
@@ -122 +112 @@
                                         depthRun->getDepthMapTextureName());
                         
-                                //TODO: set matrices
+                                //TODO: ask programs from illummanager
+                                passes.at(i)->setVertexProgram(shadowVertexProgram);
+                                passes.at(i)->setFragmentProgram(shadowFragmentProgram);
+                
                                 GpuProgramParametersSharedPtr fpParams = passes.at(i)->getFragmentProgramParameters();
                                 GpuProgramParametersSharedPtr vpParams = passes.at(i)->getVertexProgramParameters();
 
+                
+                                vpParams->setNamedAutoConstant(WorldViewProjParamName,
+                                                                        GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);        
+                                vpParams->setNamedAutoConstant(WorldParamName,
+                                                                        GpuProgramParameters::ACT_WORLD_MATRIX);
+                
                                 if(setLightViewProjMatrix)
                                         vpParams->setNamedConstant(lightViewProjParamName, depthRun->getLightViewProjMatrix());

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

@@ -21 +21 @@
                                                                                                                 String minVariableName,
                                                                                                                 String maxVariableName,
+                                                                                                                String triggerName,
                                                                                                                 Pass* pass,
                                                                                                                 OgreRenderable* parentRenderable,
                                                                                                                 OgreTechniqueGroup* parentTechniqueGroup)
                                                         :
-                                                        OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, layer, getMinMax, attachToTexUnit, minVariableName, maxVariableName, pass, parentRenderable, parentTechniqueGroup),
+                                                        OgreCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, texID, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, selfMaterial, environmentMaterial, layer, getMinMax, attachToTexUnit, minVariableName, maxVariableName, triggerName, pass, parentRenderable, parentTechniqueGroup),
                                                         CubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, layer, parentRenderable, parentTechniqueGroup),
                                                         DistanceCubeMapRenderTechnique(startFrame, cubeMapUpdateInterval, cubeMapResolution, useDistCalc, useFaceAngleCalc, distTolerance, angleTolerance, updateAllFace, renderSelf, renderEnvironment, layer, parentRenderable, parentTechniqueGroup),
@@ -107 +108 @@
         environmentMaterial = "GTP/Basic/Distance";
         selfMaterial = "GTP/Basic/Distance";
+        triggerName = "ILLUM_TRIGGER_DISTANCE";
         OgreCubeMapRenderTechniqueFactory::parseParams(params); 
         parseParams(params);
@@ -129 +131 @@
                                                                                                 minVariableName,
                                                                                                 maxVariableName,
+                                                                                                triggerName,
                                                                                                 pass,
                                                                                                 parentRenderable,