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

Timestamp:

07/02/07 04:12:36 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreCausticReceiverRenderTechnique.cpp (modified) (10 diffs)
• OgreDepthShadowReceiverRenderTechnique.cpp (modified) (10 diffs)
• OgrePathMapRenderTechnique.cpp (modified) (1 diff)

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

@@ -15 +15 @@
                                                                                                 String casterCenterVariableName,
                                                                                                 String attenuationVariableName,
+                                                                                                bool bindDistanceMap,
                                                                                                 Pass* pass,
                                                                                                 OgreRenderable* parentRenderable,
@@ -31 +32 @@
         this->casterCenterVariableName = casterCenterVariableName;
         this->attenuationVariableName = attenuationVariableName;
+        this->bindDistanceMap = bindDistanceMap;
+        bindAttenuation = false;
+        if(attenuationVariableName != "")
+                bindAttenuation = true;
         
         if(createNewPasses)
@@ -66 +71 @@
 
                         TextureUnitState* st = newpass->createTextureUnitState();
-                        TextureUnitState* st2 = newpass->createTextureUnitState();
-
                         st->setTextureFiltering(TFO_BILINEAR);
-                        st2->setTextureFiltering(TFO_BILINEAR);
+                        if(bindDistanceMap)
+                        {
+                                TextureUnitState* st2 = newpass->createTextureUnitState();
+                                st2->setTextureFiltering(TFO_BILINEAR);
+                        }
 
                         newpass->setSceneBlending(passBlendingSRC, passBlendingDEST);
@@ -109 +116 @@
                         
                         Pass* passToSet = this->pass;
-                        int textureUnit = startTextureUnitID + i;
+                        int p = bindDistanceMap?i*2:i;
+                        int textureUnit = startTextureUnitID + p;
                         if(createNewPasses)
                         {
@@ -119 +127 @@
                         passToSet->getTextureUnitState(textureUnit)->setTextureName(
                                 cauCubeRun->getCausticCubeMapTextureName());
+                        if(bindDistanceMap)
+                        {
+                                OgreCubeMapRenderingRun* distCubeRun = 
+                                (OgreCubeMapRenderingRun*) causticCasters.at(i)->
+                                        getRun(ILLUMRUN_DISTANCE_CUBEMAP)->asOgreRenderingRun();
+                                if(distCubeRun)
+                                passToSet->getTextureUnitState(textureUnit + 1)->setTextureName(
+                                        distCubeRun->getCubeMapTextureName());
+                        }
         
                         //set caster position nad caustic attenuation
@@ -126 +143 @@
                         if(!createNewPasses)
                         {
-                                centerVarName += String("[") + StringConverter::toString(i) + String("]");
-                                attenuationVarName += String("[") + StringConverter::toString(i) + String("]");
+                                centerVarName += StringConverter::toString(i+1);
+                                attenuationVarName += StringConverter::toString(i+1);
                         }
                         Fparams->setNamedConstant(centerVarName,
                                                                                 causticCasters.at(i)->getRootPosition(ILLUMRUN_CAUSTIC_CUBEMAP));
+                        if(bindAttenuation)
                         Fparams->setNamedConstant(attenuationVarName,
                                                                                 cauCubeRun->getAttenuation());                  
@@ -247 +265 @@
                 f->attenuationVariableName =  params;
         }
+
+        void parseBindDistanceMap(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreCausticReceiverRenderTechniqueFactory* f = (OgreCausticReceiverRenderTechniqueFactory*) factory;
+                f->bindDistanceMap =  StringConverter::parseBool(params);
+        }
 }
 
@@ -263 +287 @@
         this->attributeParsers.insert(AttribParserList::value_type("center_var_name", (ILLUM_ATTRIBUTE_PARSER) parseCenterVarName));
         this->attributeParsers.insert(AttribParserList::value_type("attenuation_var_name", (ILLUM_ATTRIBUTE_PARSER) parseAttenuationVarName));  
+        this->attributeParsers.insert(AttribParserList::value_type("bind_distance_map", (ILLUM_ATTRIBUTE_PARSER) parseBindDistanceMap));        
 }
 
@@ -280 +305 @@
         startTextureUnitID = 0;
         casterCenterVariableName = "cubeMapCameraPosition";
-        String attenuationVariableName = "attenuation";
+        attenuationVariableName = "";
+        bindDistanceMap = false;
 
         parseParams(params);
@@ -294 +320 @@
                                                                                                 casterCenterVariableName,
                                                                                                 attenuationVariableName,
+                                                                                                bindDistanceMap,
                                                                                                 pass,
                                                                                                 parentRenderable,

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

@@ -21 +21 @@
                                                                                                 int startTextureUnitID,
                                                                                                 bool nearestLightsFromCamera,
+                                                                                                bool bindToVertexShader,
                                                                                                 Pass* pass,
                                                                                                 OgreRenderable* parentRenderable,
@@ -28 +29 @@
                                                         DepthShadowReceiverRenderTechnique(parentRenderable, parentTechniqueGroup)
 {
+        this->bindToVertexShader = bindToVertexShader;
         this->passBlendingSRC = passBlendingSRC;
         this->passBlendingDEST = passBlendingDEST;
@@ -99 +101 @@
         Vector3 center = OgreIlluminationManager::getSingleton().getMainCamera()->getWorldPosition();
         if(!nearestLightsFromCamera)
-                center = ((OgreSharedRuns*) sharedRuns)->getRootPosition();
+                center = ((OgreSharedRuns*) sharedRuns)->getRootRenderable()->getParentSceneNode()->_getDerivedPosition();
+                //center = ((OgreSharedRuns*) sharedRuns)->getRootPosition();
         Root::getSingleton()._getCurrentSceneManager()->_populateLightList(
                                                         center,
@@ -149 +152 @@
                                 GpuProgramParametersSharedPtr fpParams = passToSet->getFragmentProgramParameters();
                                 GpuProgramParametersSharedPtr vpParams = passToSet->getVertexProgramParameters();
+                                GpuProgramParametersSharedPtr variableSetParams = fpParams;
+                                if(bindToVertexShader)
+                                        variableSetParams = vpParams;
 
                                 String LightViewProjParamName = lightViewProjParamName;
@@ -165 +171 @@
                                         vpParams->setNamedConstant(LightViewProjParamName, depthRun->getLightViewProjMatrix());
                                         else
-                                        fpParams->setNamedConstant(LightViewProjParamName, depthRun->getLightViewProjMatrix());
+                                        variableSetParams->setNamedConstant(LightViewProjParamName, depthRun->getLightViewProjMatrix());
                                 }
                                 if(setLightViewMatrix)
@@ -172 +178 @@
                                         vpParams->setNamedConstant(LightViewParamName, depthRun->getLightViewMatrix());
                                         else
-                                        fpParams->setNamedConstant(LightViewParamName, depthRun->getLightViewMatrix());
+                                        variableSetParams->setNamedConstant(LightViewParamName, depthRun->getLightViewMatrix());
                                 }
                                 if(setLightProjFarPlane)
@@ -347 +353 @@
                 f->nearestLightsFromCamera = StringConverter::parseBool(params);
         }
+        void parseBindToVertexShader(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreDepthShadowReceiverRenderTechniqueFactory* f = (OgreDepthShadowReceiverRenderTechniqueFactory*) factory;
+                f->bindToVertexShader = StringConverter::parseBool(params);
+        }
 }
 
@@ -370 +381 @@
         this->attributeParsers.insert(AttribParserList::value_type("start_tex_id", (ILLUM_ATTRIBUTE_PARSER) parseStartTexID));  
         this->attributeParsers.insert(AttribParserList::value_type("nearest_from_camera", (ILLUM_ATTRIBUTE_PARSER) parseNearestFromCamera));    
+        this->attributeParsers.insert(AttribParserList::value_type("bind_to_vertex_shader", (ILLUM_ATTRIBUTE_PARSER) parseBindToVertexShader)); 
 }
 
@@ -394 +406 @@
         createNewPasses = true;
         startTextureUnitID = 0;
-        nearestLightsFromCamera = true;
-        
+        nearestLightsFromCamera = false;
+        bindToVertexShader = false;
+
         parseParams(params);
 
@@ -415 +428 @@
                                                                                                 startTextureUnitID,
                                                                                                 nearestLightsFromCamera,
+                                                                                                bindToVertexShader,
                                                                                                 pass,
                                                                                                 parentRenderable,

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

@@ -144 +144 @@
         LightList lights;
         SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
-        sm->_populateLightList(OgreIlluminationManager::getSingleton().getMainCamera()->getPosition(), 1000, lights);
+        sm->_populateLightList(OgreIlluminationManager::getSingleton().getMainCamera()->getWorldPosition(), 1000, lights);
 
         int found = 0;
-        for(int i = 0 ; found < 5 && i < lights.size(); i++)
+        for(int i = 0 ; found < 2 && i < lights.size(); i++)
         {
                 if(lights.at(i)->isAttached())