Changeset 2189

Timestamp:

03/05/07 18:05:16 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule

Files:

• IllumModule/include/SharedRuns.h (modified) (1 diff)
• OgreIllumModule/include/OgreIlluminationManager.h (modified) (2 diffs)
• OgreIllumModule/include/RenderTechniques/OgrePathMapRenderTechnique.h (modified) (1 diff)
• OgreIllumModule/include/RenderingRuns/OgrePMEntryPointMapRenderingRun.h (added)
• OgreIllumModule/include/RenderingRuns/OgrePMWeightComputeRenderingRun.h (added)
• OgreIllumModule/scripts/OgreIllumModule.7.10.vcproj (modified) (2 diffs)
• OgreIllumModule/src/OgreIlluminationManager.cpp (modified) (7 diffs)
• OgreIllumModule/src/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderTechniques/OgrePathMapRenderTechnique.cpp (modified) (6 diffs)
• OgreIllumModule/src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderingRuns/OgrePMEntryPointMapRenderingRun.cpp (added)
• OgreIllumModule/src/RenderingRuns/OgrePMWeightComputeRenderingRun.cpp (added)

GTP/trunk/Lib/Illum/IllumModule/IllumModule/include/SharedRuns.h

@@ -37 +37 @@
         ILLUMRUN_FOCUSING_MAP,
         ILLUMRUN_LIGHTVOLUME_MAP,
-        ILLUMRUN_PHASE_TEXTURE
+        ILLUMRUN_PHASE_TEXTURE,
+        ILLUMRUN_PM_ENTRYPOINTMAP,
+        ILLUMRUN_PM_WEIGHTMAP
 };
 

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

@@ -84 +84 @@
         unsigned int focusingMapSize;
         unsigned int shadowMapSize;
+        float areaLightRadius;
         bool useLISPSM;
         bool useVSM;
@@ -347 +348 @@
                 this->pathMapEntryPoints.push_back(p);
         }
+        std::vector<PathMapEntryPoint>& getPathMapEntryPoints()
+        {
+                return pathMapEntryPoints;
+        }
         void addPathMapClusterLength(unsigned int l)
         {
                 this->pathMapClusterLengths.push_back(l);
         }
+        unsigned int getPathMapClusterLengthsSize()
+        {
+                return this->pathMapClusterLengths.size();
+        }
+        unsigned int getPathMapClusterLength(unsigned int index)
+        {
+                return pathMapClusterLengths.at(index);
+        }
+        float getAreaLightRadius(){return areaLightRadius;}
+        void setAreaLigtRadius(float radius){areaLightRadius = radius;}
 };
 

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

@@ -55 +55 @@
         
 protected:      
-        
+        Pass* pathMapPass;
         PathMapClusters* clusters;      
 };

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/scripts/OgreIllumModule.7.10.vcproj

@@ -205 +205 @@
                                 </File>
                                 <File
+                                        RelativePath="..\src\RenderingRuns\OgrePMEntryPointMapRenderingRun.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\RenderingRuns\OgrePMWeightComputeRenderingRun.cpp">
+                                </File>
+                                <File
                                         RelativePath="..\src\RenderingRuns\OgreReducedCubeMapRenderingRun.cpp">
                                 </File>
@@ -305 +311 @@
                                 </File>
                                 <File
+                                        RelativePath="..\include\RenderingRuns\OgrePMEntryPointMapRenderingRun.h">
+                                </File>
+                                <File
+                                        RelativePath="..\include\RenderingRuns\OgrePMWeightComputeRenderingRun.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\RenderingRuns\OgreReducedCubeMapRenderingRun.h">
                                 </File>

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

@@ -3 +3 @@
 #include "OgreBillboardParticleRenderer.h"
 #include "SpriteParticleRenderer.h"
+#include "OgrePMEntryPointMapRenderingRun.h"
+#include "OgrePMWeightComputeRenderingRun.h"
 
 OgreIlluminationManager* OgreIlluminationManager::instance = NULL;
@@ -85 +87 @@
         blurSM = false;
         focusingSM = true;
-        shadowMapMaterialName = "GameTools/ShadowMapDepth";
+        shadowMapMaterialName = "GTP/Basic/Distance_NormalizedCCW";
+        areaLightRadius = 0.1;
 
         for(int i = 0; i < RUN_TYPE_COUNT; i++)
@@ -193 +196 @@
                 OgreRenderable* rend = 0;       
                 OgreTechniqueGroup* group = 0;
-        
+
                 for(unsigned int t = 0 ; t < mat->getNumTechniques() ; t++)
                 {
@@ -203 +206 @@
 
                                 std::vector<IllumTechniqueParams*>& techniques = pass->getIllumTechniques();
-                                std::vector<IllumTechniqueParams*>::iterator i = techniques.begin(); 
-                                std::vector<IllumTechniqueParams*>::iterator iend = techniques.end();
-                                
-                                while( i != iend)
+                                if( techniques.size() > 0)
                                 {
-                                        IllumTechniqueParams* params = *i;
-                                        
                                         if(rend == 0)
                                         {
@@ -226 +224 @@
                                                 sharedruns->updateBounds();
                                         }
-                                        
+                                        String newMaterialName = mat->getName() + rend->getName() + "_clone";
+                                        Material* newMat = mat->clone(newMaterialName).getPointer();
+                                        mat = newMat;
+                                        rend->setMaterialName(newMaterialName);
+                                        break;
+                                }
+                        }
+                }
+
+        
+                for(unsigned int t = 0 ; t < mat->getNumTechniques() ; t++)
+                {
+                        Technique* tech = mat->getTechnique(t);
+
+                        for(unsigned int p = 0; p< tech->getNumPasses(); p++)
+                        {
+                                Pass* pass = tech->getPass(p);
+
+                                std::vector<IllumTechniqueParams*>& techniques = pass->getIllumTechniques();
+                                std::vector<IllumTechniqueParams*>::iterator i = techniques.begin(); 
+                                std::vector<IllumTechniqueParams*>::iterator iend = techniques.end();
+                                
+                                while( i != iend)
+                                {
+                                        IllumTechniqueParams* params = *i;
                                         createTechnique(params, pass, rend, sharedruns); 
 
@@ -545 +567 @@
                 }
                 break;
+                case ILLUMRUN_PM_ENTRYPOINTMAP:
+                if(globalSharedRuns.getRun(ILLUMRUN_PM_ENTRYPOINTMAP) == 0)
+                {
+                        OgrePMEntryPointMapRenderingRun* run  = new OgrePMEntryPointMapRenderingRun(
+                                "PM_ENTRYPOINT_MAP");
+                        globalSharedRuns.addRun(ILLUMRUN_PM_ENTRYPOINTMAP, run);                        
+                }
+                break;
         }
 }
@@ -614 +644 @@
                 }               
                 break;
+                case ILLUMRUN_PM_WEIGHTMAP:
+                if(runs->getRun(ILLUMRUN_PM_WEIGHTMAP) == 0)
+                {
+                        SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
+                        OgrePMWeightComputeRenderingRun* run  = new OgrePMWeightComputeRenderingRun(                            
+                                lightName + "PM_WEIGHT_MAP",
+                                lightName);
+                        runs->addRun(ILLUMRUN_PM_WEIGHTMAP, run);                       
+                }               
+                break;
         }       
 }

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

@@ -66 +66 @@
                 
                 TextureUnitState* st = newpass->createTextureUnitState();               
-                st->setTextureFiltering(TFO_ANISOTROPIC);
+                st->setTextureFiltering(TFO_NONE);
                 st->setTextureAddressingMode(TextureUnitState::TAM_BORDER);
                 st->setTextureBorderColour(ColourValue::White);

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

@@ -2 +2 @@
 #include "OgreTechniqueGroup.h"
 #include "OgreIlluminationManager.h"
+#include "OgrePMWeightComputeRenderingRun.h"
+
 
 
@@ -10 +12 @@
                                                         :RenderTechnique( parentRenderable, parentTechniqueGroup),
                                                         OgreRenderTechnique(pass, parentRenderable, parentTechniqueGroup)
-{               
+{       
         this->clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentRenderable->getName());
         
@@ -26 +28 @@
         }
         
-        Pass* newpass = techn->createPass();
+        Pass* newpass = pathMapPass = techn->createPass();
         
         newpass->setVertexProgram("GTP/PathMap_VS");
@@ -46 +48 @@
 
         float halfPixel[2] = {0.5 / prmxres, 0.5 / prmyres};
-        Fparams->setNamedConstant("prmAtlasTiles",prmnt,2);
-    Fparams->setNamedConstant("atlasHalfPixel", halfPixel, 2);
-                        
+        Vector4 pathMapParameters(prmnt[0],prmnt[1],halfPixel[0],halfPixel[1]);
+        Fparams->setNamedConstant("prmAtlasTilesHalfPixel",pathMapParameters);
+                
         TextureUnitState* st = newpass->createTextureUnitState();               
         st->setTextureFiltering(TFO_BILINEAR);
@@ -54 +56 @@
         st->setTextureBorderColour(ColourValue::Blue);
         st->setTextureName(clusters->pathMapTextureFilename);
-
+        
         //newpass->setSceneBlending(SBT_MODULATE);
         newpass->setSceneBlending(SBF_ONE, SBF_ZERO);
+        newpass->setDepthBias(1);
+        
 
-        newpass->setDepthBias(1);
+        
 }
 
@@ -68 +72 @@
 void OgrePathMapRenderTechnique::update(unsigned long frameNum)
 {       
-        //TODO set weights
+        LightList lights;
+        SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
+        sm->_populateLightList(Vector3(0,0,0), 1000, lights); //TODO
+//TODO set weights
+        PathMapClusters* clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentOgreRenderable->getName());
+        float *actualWeights = new float[clusters->count];//TODO = 0
+        for(int i = 0 ; i < 1; i++)
+        {
+                String lightName = lights.at(0)->getName();
+                OgreIlluminationManager::getSingleton().createPerLightRun(lightName, ILLUMRUN_PM_WEIGHTMAP);
+                OgreIlluminationManager::getSingleton().updatePerLightRun(lightName, ILLUMRUN_PM_WEIGHTMAP, frameNum);
+                OgrePMWeightComputeRenderingRun* PMWeightRun = (OgrePMWeightComputeRenderingRun*)
+                        OgreIlluminationManager::getSingleton().getPerLightRun(lightName, ILLUMRUN_PM_WEIGHTMAP)->asOgreRenderingRun();
+
+                float* weights = PMWeightRun->getWeights();
+                
+                for(int j = 0; j< clusters->count; j++)
+                        actualWeights[j] = weights[clusters->clusters[j]];
+                                
+        }
+
+        GpuProgramParameters* Fparams = pathMapPass->getFragmentProgramParameters().getPointer();
+        Fparams->setNamedConstant("weights", actualWeights, clusters->count);
 }
 

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

@@ -315 +315 @@
                                 depthMapCamera->setFOVy(lightangle);
                                 depthMapCamera->setAspectRatio(1);
-                                depthMapCamera->setNearClipDistance(0.1);
+                                depthMapCamera->setNearClipDistance(OgreIlluminationManager::getSingleton().getAreaLightRadius());
                                 depthMapCamera->setFarClipDistance(1.0);
                         }