Changeset 1670 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Timestamp:

10/23/06 23:26:11 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Files:

• include/OgreIlluminationManager.h (modified) (2 diffs)
• include/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.h (modified) (3 diffs)
• include/RenderingRuns/OgreDepthShadowMapRenderingRun.h (modified) (2 diffs)
• src/OgreIlluminationManager.cpp (modified) (2 diffs)
• src/OgreRenderingRun.cpp (modified) (3 diffs)
• src/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.cpp (modified) (8 diffs)
• src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (3 diffs)
• src/RenderingRuns/OgreSceneCameraDepthRenderingRun.cpp (modified) (1 diff)

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/OgreIlluminationManager.h

@@ -74 +74 @@
         bool blurSM;
         bool focusingSM;
+        String shadowMapMaterialName;
         unsigned int phaseTextureSize;
         std::map<RenderingRunType,float> maxRads;
@@ -315 +316 @@
         void setFocusingSM(bool use){focusingSM = use;}
         void setBlurShadowMap(bool use){blurSM = use;}
+        void setShadowMapMaterialName(String name){shadowMapMaterialName = name;}
 };
 

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

@@ -47 +47 @@
                                                         String shadowVertexProgram,
                                                         String shadowFragmentProgram,
+                                                        bool setLightViewMatrix,
+                                                        bool setLightViewProjMatrix,
+                                                        bool setLightProjFarPlane,
+                                                        String lightViewProjParamName,
+                                                        String lightViewParamName,
+                                                        String lightFarPlaneParamName,
                                                         Pass* pass,
                                                         OgreRenderable* parentRenderable,
@@ -79 +85 @@
                 @breif new passes created by this technique
         */
-        std::vector<Pass*> passes;      
+        std::vector<Pass*> passes;
+        bool setLightViewMatrix;
+        bool setLightViewProjMatrix;
+        bool setLightProjFarPlane;
+        String lightViewProjParamName;
+        String lightViewParamName;
+        String lightFarPlaneParamName;
 };
 
@@ -98 +110 @@
         String shadowVertexProgram;
         String shadowFragmentProgram;
+        bool setLightViewMatrix;
+        bool setLightViewProjMatrix;
+        bool setLightProjFarPlane;
+        String lightViewProjParamName;
+        String lightViewParamName;
+        String lightFarPlaneParamName;
 
 };

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderingRuns/OgreDepthShadowMapRenderingRun.h

@@ -56 +56 @@
         */
         Matrix4 getLightViewProjMatrix();
+        Real getLightFarPlane(){return lightFarPlane;}
 
 protected:      
@@ -84 +85 @@
         Texture* depthMapTexture;
         Texture* blurredDepthMapTexture;
+        Real lightFarPlane;
         
         //inherited

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

@@ -86 +86 @@
         blurSM = false;
         focusingSM = true;
-        
+        shadowMapMaterialName = "GameTools/ShadowMapDepth";
+
         for(int i = 0; i < RUN_TYPE_COUNT; i++)
         {
@@ -605 +606 @@
                                 shadowMapSize,
                                 shadowMapSize,
-                                "GameTools/ShadowMapDepth" //TODO
+                                shadowMapMaterialName //TODO
                                 );
                         runs->addRun(ILLUMRUN_DEPTH_SHADOWMAP, run);

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

@@ -1 +1 @@
 #include "OgreRenderingrun.h"
 #include "OgreIlluminationManager.h"
-#include "OgreTerrainSceneManager.h"
 
 MovablePlane* OgreRenderingRun::fullScreenQuad = NULL;
@@ -163 +162 @@
         SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
         
-        if(sm->getTypeName() == "TerrainSceneManager")
-        {
-                terrainMaterial = ((TerrainSceneManager*)sm)->getTerrainMaterial()->getName();
-                ((TerrainSceneManager*)sm)->setCustomMaterial(materialName);
-        }
-
         RenderQueue* rq = sm->getRenderQueue();
         rq->clear();
@@ -187 +180 @@
 {
         SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
-        if(sm->getTypeName()== "TerrainSceneManager")
-                ((TerrainSceneManager*)sm)->setCustomMaterial(terrainMaterial);
-        
-
+        
         std::map<Renderable*, String>::iterator it = visibleObjects.begin();
         std::map<Renderable*, String>::iterator itend = visibleObjects.end();

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

@@ -8 +8 @@
                                                                                                 String shadowVertexProgram,
                                                                                                 String shadowFragmentProgram,
+                                                                                                bool setLightViewMatrix,
+                                                                                                bool setLightViewProjMatrix,
+                                                                                                bool setLightProjFarPlane,
+                                                                                                String lightViewProjParamName,
+                                                                                                String lightViewParamName,
+                                                                                                String lightFarPlaneParamName,
                                                                                                 Pass* pass,
                                                                                                 OgreRenderable* parentRenderable,
@@ -18 +24 @@
         this->shadowVertexProgram = shadowVertexProgram ;
         this->shadowFragmentProgram = shadowFragmentProgram;
-
+        this->setLightViewMatrix = setLightViewMatrix;
+        this->setLightViewProjMatrix = setLightViewProjMatrix;
+        this->setLightProjFarPlane = setLightProjFarPlane;
+        this->lightViewProjParamName = lightViewProjParamName;
+        this->lightViewParamName = lightViewParamName;
+        this->lightFarPlaneParamName = lightFarPlaneParamName;
                 
         //insert new passes
@@ -57 +68 @@
                 newpass->setSceneBlending(SBT_MODULATE);
                 //newpass->setSceneBlending(SBF_ONE, SBF_ZERO);
+
                 newpass->setDepthBias(1);
                 techn->movePass(lastpass, index);                       
@@ -108 +120 @@
                         
                                 //fpParams->setNamedConstant("lightViewProj", depthRun->getLightViewProjMatrix()); 
-                                vpParams->setNamedConstant("lightViewProj", depthRun->getLightViewProjMatrix());
+                                if(setLightViewProjMatrix)
+                                        vpParams->setNamedConstant(lightViewProjParamName, depthRun->getLightViewProjMatrix());
+                                if(setLightViewMatrix)
+                                        vpParams->setNamedConstant(lightViewParamName, depthRun->getLightViewMatrix());
+                                if(setLightProjFarPlane)
+                                        fpParams->setNamedConstant(lightFarPlaneParamName, depthRun->getLightFarPlane());
+                                
                                 
                                 passes.at(i)->setActive(true);
@@ -139 +157 @@
                 OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
                 f->shadowFragmentProgram =  params;
+        }
+
+        void parseSetLightViewProj(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                StringVector vecparams = StringUtil::split(params, " \t");
+                f->setLightViewProjMatrix = StringConverter::parseBool(vecparams[0]);
+                if(f->setLightViewProjMatrix && vecparams.size() > 1)
+                        f->lightViewProjParamName =  vecparams[1];
+        }
+
+        void parseSetLightView(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                StringVector vecparams = StringUtil::split(params, " \t");
+                f->setLightViewMatrix = StringConverter::parseBool(vecparams[0]);
+                if(f->setLightViewMatrix && vecparams.size() > 1)
+                        f->lightViewParamName =  vecparams[1];
+        }
+
+        void parseSetLightFarPlane(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowRecieverRenderTechniqueFactory* f = (OgreDepthShadowRecieverRenderTechniqueFactory*) factory;
+                StringVector vecparams = StringUtil::split(params, " \t");
+                f->setLightProjFarPlane = StringConverter::parseBool(vecparams[0]);
+                if(f->setLightProjFarPlane && vecparams.size() > 1)
+                        f->lightFarPlaneParamName =  vecparams[1];
         }
 }
@@ -151 +196 @@
         this->attributeParsers.insert(AttribParserList::value_type("vertex_program_name", (ILLUM_ATTRIBUTE_PARSER) parseVertexProgram));
         this->attributeParsers.insert(AttribParserList::value_type("fragment_program_name", (ILLUM_ATTRIBUTE_PARSER) parseFragmentProgram));
+        this->attributeParsers.insert(AttribParserList::value_type("set_light_viewproj", (ILLUM_ATTRIBUTE_PARSER) parseSetLightViewProj));
+        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));
 }
 
@@ -163 +211 @@
         shadowVertexProgram = "GameTools/ShadowMap/ShadowVS";
         shadowFragmentProgram = "GameTools/ShadowMap/ShadowPS";
+        setLightViewMatrix = false;
+        setLightViewProjMatrix = true;
+        setLightProjFarPlane = false;
+        lightViewProjParamName = "lightViewProj";
+        lightViewParamName = "lightView";
+        lightFarPlaneParamName = "lightFarPlane";
 
         parseParams(params);
@@ -170 +224 @@
                                                                                                 shadowVertexProgram,
                                                                                                 shadowFragmentProgram,
+                                                                                                setLightViewMatrix ,
+                                                                                                setLightViewProjMatrix,
+                                                                                                setLightProjFarPlane,
+                                                                                                lightViewProjParamName,
+                                                                                                lightViewParamName,
+                                                                                                lightFarPlaneParamName,
                                                                                                 pass,
                                                                                                 parentRenderable,

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

@@ -20 +20 @@
         
         this->materialName = materialName;
-
+        lightFarPlane = 0;
         createDepthMap();       
 }
@@ -320 +320 @@
                         if(!usefocusing)
                         {
-                                depthMapCamera->setFarClipDistance(light->getAttenuationRange() );
+                                lightFarPlane = light->getAttenuationRange();
+                                depthMapCamera->setFarClipDistance(lightFarPlane);
+                                
                         }
                         else
@@ -336 +338 @@
                                         float farP= -1.5 * min.z;
                                         if(farP < 0.2) farP = 0.2;
-                                        depthMapCamera->setFarClipDistance(farP);
-
+                                                depthMapCamera->setFarClipDistance(farP);
+                                        lightFarPlane = farP;
+                                
                                         Vector3 scale = (max - min);
                                         scale *= 1.5; // just for safety

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

@@ -58 +58 @@
         rt->update();   
 
-        //rt->writeContentsToFile("cameraDepth.dds");
+        //rt->writeContentsToFile("cameraDepth.bmp");
         
         restoreMaterials();