Changeset 2180 for GTP/trunk/Lib/Illum

Timestamp:

03/01/07 18:05:03 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Files:

• include/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.h (modified) (3 diffs)
• src/OgreIlluminationManager.cpp (modified) (1 diff)
• src/OgreRenderingRun.cpp (modified) (1 diff)
• src/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.cpp (modified) (7 diffs)
• src/RenderingRuns/OgreChildParticlesystemRenderingRun.cpp (modified) (1 diff)
• src/RenderingRuns/OgreCubeMapRenderingRun.cpp (modified) (1 diff)
• src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (1 diff)

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

@@ -47 +47 @@
                                                         String shadowVertexProgram,
                                                         String shadowFragmentProgram,
+                                                        String WorldViewProjParamName,
+                                                        String WorldParamName,
                                                         bool setLightViewMatrix,
                                                         bool setLightViewProjMatrix,
@@ -92 +94 @@
         String lightViewParamName;
         String lightFarPlaneParamName;
+        String WorldViewProjParamName;
+        String WorldParamName;
+                                                                                                
 };
 
@@ -116 +121 @@
         String lightViewParamName;
         String lightFarPlaneParamName;
-
+        String WorldViewProjParamName;
+        String WorldParamName;
 };
 

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

@@ -401 +401 @@
                 }
                 
-                //sceneManager->_findVisibleObjectsOC(rt->getViewport(i)->getCamera(), rt->getViewport(i), false, true, false);
+                //sceneManager->_findVisibleObjectsOC(rt->getViewport(i)->getCamera(), rt->getViewport(i), false, false, false);
                 sceneManager->_findVisibleObjects(rt->getViewport(i)->getCamera(), false);
                 

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

@@ -173 +173 @@
         }
 
-        //sm->_findVisibleObjectsOC(cam, cam->getViewport(), false, true, shadowcastersonly);
+        //sm->_findVisibleObjectsOC(cam, cam->getViewport(), false, false, shadowcastersonly);
         sm->_findVisibleObjects(cam, shadowcastersonly);
         

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

@@ -8 +8 @@
                                                                                                 String shadowVertexProgram,
                                                                                                 String shadowFragmentProgram,
+                                                                                                String WorldViewProjParamName,
+                                                                                                String WorldParamName,
                                                                                                 bool setLightViewMatrix,
                                                                                                 bool setLightViewProjMatrix,
@@ -30 +32 @@
         this->lightViewParamName = lightViewParamName;
         this->lightFarPlaneParamName = lightFarPlaneParamName;
+        this->WorldParamName = WorldParamName;
+        this->WorldViewProjParamName = WorldViewProjParamName;
                 
         //insert new passes
@@ -55 +59 @@
                 
                 GpuProgramParameters* Vparams = newpass->getVertexProgramParameters().getPointer();
-                Vparams->setNamedAutoConstant("worldViewProj",
+                Vparams->setNamedAutoConstant(WorldViewProjParamName,
                                                                         GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);        
-                Vparams->setNamedAutoConstant("world",
+                Vparams->setNamedAutoConstant(WorldParamName,
                                                                         GpuProgramParameters::ACT_WORLD_MATRIX);
                 GpuProgramParameters* Fparams = newpass->getFragmentProgramParameters().getPointer();
@@ -185 +189 @@
                         f->lightFarPlaneParamName =  vecparams[1];
         }
+
+        void parseLightProjParamName(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                f->lightViewProjParamName =  params;
+        }
+
+        void parseLightViewParamName(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                f->lightViewParamName =  params;
+        }
+
+        void parseWorldViewProjParamName(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                f->WorldViewProjParamName =  params;
+        }
+
+        void parseWorldParamName(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                f->WorldParamName =  params;
+        }
+
+        void parseLightFarPlaneParamName(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                f->lightFarPlaneParamName =  params;
+        }
 }
 
@@ -199 +233 @@
         this->attributeParsers.insert(AttribParserList::value_type("set_light_view", (ILLUM_ATTRIBUTE_PARSER) parseSetLightView));
         this->attributeParsers.insert(AttribParserList::value_type("set_light_farplane", (ILLUM_ATTRIBUTE_PARSER) parseSetLightFarPlane));
+        this->attributeParsers.insert(AttribParserList::value_type("light_viewproj_param_name", (ILLUM_ATTRIBUTE_PARSER) parseLightProjParamName));
+        this->attributeParsers.insert(AttribParserList::value_type("light_view_param_name", (ILLUM_ATTRIBUTE_PARSER) parseLightViewParamName));
+        this->attributeParsers.insert(AttribParserList::value_type("world_view_proj_param_name", (ILLUM_ATTRIBUTE_PARSER) parseWorldViewProjParamName));
+        this->attributeParsers.insert(AttribParserList::value_type("world_param_name", (ILLUM_ATTRIBUTE_PARSER) parseWorldParamName));
+        this->attributeParsers.insert(AttribParserList::value_type("light_farplane_param_name", (ILLUM_ATTRIBUTE_PARSER) parseLightFarPlaneParamName));
 }
 
@@ -209 +248 @@
         //reset parameters
         maxlights = 1;
-        shadowVertexProgram = "GameTools/ShadowMap/ShadowVS";
-        shadowFragmentProgram = "GameTools/ShadowMap/ShadowPS";
+        shadowVertexProgram = "GTP/Basic/LightCPos_VS";
+        shadowFragmentProgram = "GTP/Basic/SM/Dist_PS";
         setLightViewMatrix = false;
         setLightViewProjMatrix = true;
         setLightProjFarPlane = false;
-        lightViewProjParamName = "lightViewProj";
-        lightViewParamName = "lightView";
+        lightViewProjParamName = "LightViewProj";
+        lightViewParamName = "LightView";
         lightFarPlaneParamName = "lightFarPlane";
+        WorldViewProjParamName = "WorldViewProj";
+        WorldParamName = "World";
 
         parseParams(params);
@@ -224 +265 @@
                                                                                                 shadowVertexProgram,
                                                                                                 shadowFragmentProgram,
+                                                                                                WorldViewProjParamName,
+                                                                                                WorldParamName,
                                                                                                 setLightViewMatrix ,
                                                                                                 setLightViewProjMatrix,

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

@@ -125 +125 @@
         //filename.append(StringConverter::toString(framecount));
         filename.append(".bmp");
-        //rt->writeContentsToFile(filename);
+        rt->writeContentsToFile(filename);
         framecount++;   
         

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

@@ -118 +118 @@
                         else
                         {
-                                //sm->_findVisibleObjectsOC(cam, rt->getViewport(0), false, true, false);
+                                //sm->_findVisibleObjectsOC(cam, rt->getViewport(0), false, false, false);
                                 sm->_findVisibleObjects(cam, false);
                                 sm->_queueSkiesForRendering(cam);

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

@@ -101 +101 @@
         }       
         
-        //rt->writeContentsToFile("shadowmap1.dds");
+        rt->writeContentsToFile("shadowmap1.dds");
 
         //depthMapTexture->();