Changeset 2200 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns

Timestamp:

03/07/07 17:34:13 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgrePMEntryPointMapRenderingRun.cpp (modified) (1 diff)
• OgrePMWeightComputeRenderingRun.cpp (modified) (3 diffs)

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

@@ -43 +43 @@
                 tm[i].dir[1] = EP->normal.y;
                 tm[i].dir[2] = EP->normal.z;
-                tm[i].dir[3] = 1.0;
+                tm[i].dir[3] = EP->prob;
         }       
 
         PixelBox lockBox(width, height, 1, PF_FLOAT32_RGBA, tm);
         entryPointTexture->getBuffer()->blitFromMemory(lockBox);
+
+        delete[] tm;
+
+        int clusterCount = OgreIlluminationManager::getSingleton().getPathMapClusterLengthsSize();
+        width = clusterCount;
+        height = 2;
+        texPtr = Ogre::TextureManager::getSingleton().createManual(name + "_CL", 
+                                                                                                                                                "default",
+                                                                                                                                                TEX_TYPE_2D,
+                                                                                                                                                width,
+                                                                                                                                                height,
+                                                                                                                                                0,
+                                                                                                                                                0,
+                                                                                                                                                PF_FLOAT32_R,
+                                                                                                                                                TU_RENDERTARGET);
+        clusterLengthTexture = texPtr.getPointer();
+
+        float* data = new float[clusterCount * 2];
+        unsigned int entryPointCount = 0;
+        for(int i = 0; i < clusterCount; i++)
+        {
+                unsigned int clusterSize = OgreIlluminationManager::getSingleton().getPathMapClusterLength(i);
+                data[i] = clusterSize;//clustercount
+                data[clusterCount + i] = entryPointCount;
+                entryPointCount += clusterSize;
+        }
+
+        PixelBox lockBox2(width, height, 1, PF_FLOAT32_R, data);
+        clusterLengthTexture->getBuffer()->blitFromMemory(lockBox2);
+
+        delete[] data;
 }
 

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

@@ -22 +22 @@
         int width = entryPointCnt / 4096;
         int height = 4096;
-        TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual(name, 
+        TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual(name + "_ALL", 
                                                                                                                                                 "default",
                                                                                                                                                 TEX_TYPE_2D,
@@ -29 +29 @@
                                                                                                                                                 0,
                                                                                                                                                 0,
-                                                                                                                                                PF_FLOAT32_R,
+                                                                                                                                                PF_FLOAT32_RGBA,
                                                                                                                                                 TU_RENDERTARGET);
+         allWeightsTexture = texPtr.getPointer();
+         //add viewport to rendertarget
+         HardwarePixelBuffer* hpb = (allWeightsTexture->getBuffer()).getPointer();
+         RenderTarget* rt = hpb->getRenderTarget();
+         Camera* wc = Root::getSingleton()._getCurrentSceneManager()->createCamera(name + "_ALL_CAMERA"); 
+         Viewport* v = rt->addViewport(wc);
+         v->setOverlaysEnabled(false);
+         rt->setAutoUpdated(false);
+
+        unsigned int clustercount = OgreIlluminationManager::getSingleton().getPathMapClusterLengthsSize();
+        width = clustercount;
+        height = 1;
+        texPtr = Ogre::TextureManager::getSingleton().createManual(name, 
+                                                                                                                                "default",
+                                                                                                                                TEX_TYPE_2D,
+                                                                                                                                width,
+                                                                                                                                height,
+                                                                                                                                0,
+                                                                                                                                0,
+                                                                                                                                PF_FLOAT32_RGBA,
+                                                                                                                                TU_RENDERTARGET);
          weightTexture = texPtr.getPointer();
          //add viewport to rendertarget
-         HardwarePixelBuffer* hpb = (weightTexture->getBuffer()).getPointer();
-         RenderTarget* rt = hpb->getRenderTarget();
-         Camera* wc = Root::getSingleton()._getCurrentSceneManager()->createCamera(name + "_CAMERA"); 
-         Viewport* v = rt->addViewport(wc);
+         hpb = (weightTexture->getBuffer()).getPointer();
+         rt = hpb->getRenderTarget();
+         wc = Root::getSingleton()._getCurrentSceneManager()->createCamera(name + "_CAMERA"); 
+         v = rt->addViewport(wc);
          v->setOverlaysEnabled(false);
          rt->setAutoUpdated(false);
@@ -45 +66 @@
 void OgrePMWeightComputeRenderingRun::updateFrame(unsigned long frameNum)
 {
-        switch(light->getType())
+        OgreIlluminationManager::getSingleton().updateGlobalRun(ILLUMRUN_PM_ENTRYPOINTMAP, frameNum);
+        OgrePMEntryPointMapRenderingRun* PMEPrun = (OgrePMEntryPointMapRenderingRun*)
+                OgreIlluminationManager::getSingleton().getGlobalRun(ILLUMRUN_PM_ENTRYPOINTMAP)->asOgreRenderingRun();
+        unsigned int entryPointCnt = OgreIlluminationManager::getSingleton().getPathMapEntryPoints().size();
+        int col = entryPointCnt / 4096; 
+                
+        if(light->getType() == Light::LT_SPOTLIGHT)
         {
-                case Light::LT_SPOTLIGHT:
+                MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/PathMap_ComputeWeights");
 
-                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/PathMap_ComputeWeights");
-
-                        GpuProgramParameters* Fparams = mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters().getPointer();
+                GpuProgramParameters* Fparams = mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters().getPointer();
                         
                         Vector3 lightPos = light->getPosition();
                         Vector3 lightDir = light->getDirection();
                 //      Radian lightAngle = light->getSpotlightOuterAngle();
-                        unsigned int entryPointCnt = OgreIlluminationManager::getSingleton().getPathMapEntryPoints().size();
-                        int col = entryPointCnt / 4096; 
-
+                        
                         //Fparams->setNamedConstant("lightTransform", lightMatrix);
                         Fparams->setNamedConstant("nRadionColumns", col);
                         Fparams->setNamedConstant("lightPos", lightPos);
                         Fparams->setNamedConstant("lightDir", lightDir);
-
-                        OgrePMEntryPointMapRenderingRun* PMEPrun = (OgrePMEntryPointMapRenderingRun*)
-                                        OgreIlluminationManager::getSingleton().getGlobalRun(ILLUMRUN_PM_ENTRYPOINTMAP)->asOgreRenderingRun();
+                        
                         mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(
                                                 PMEPrun->getEntryPointTextureName());
                                 
-                        RenderTarget* rt = weightTexture->getBuffer().getPointer()->getRenderTarget();
+                        RenderTarget* rt = allWeightsTexture->getBuffer().getPointer()->getRenderTarget();
                         renderFullscreenQuad(mat->getName(), rt);
 
-                        //rt->writeContentsToFile("focusingmap.dds");
-                
-                
-                        break;          
+                        rt->writeContentsToFile("allweights.bmp");                      
+                        rt->writeContentsToFile("allweights.dds");
+        }
+        else
+        {
+                ///not implemented
         }
 
         unsigned int clustercount = OgreIlluminationManager::getSingleton().getPathMapClusterLengthsSize();
-        if(weights == 0)
-                weights = new float[clustercount];
+
+        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/PathMap_SumWeights");
+        GpuProgramParameters* Fparams = mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters().getPointer();
+        Fparams->setNamedConstant("nRadionColumns", col);
+        Fparams->setNamedConstant("clusterCount", (float) clustercount);
+        mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(
+                                                PMEPrun->getEntryPointTextureName());
+        mat->getTechnique(0)->getPass(0)->getTextureUnitState(1)->setTextureName(
+                                                PMEPrun->getClusterLengthTextureName());
+        mat->getTechnique(0)->getPass(0)->getTextureUnitState(2)->setTextureName(
+                                                allWeightsTexture->getName());
         
-        unsigned int entryPointCnt = OgreIlluminationManager::getSingleton().getPathMapEntryPoints().size();
-        int width = entryPointCnt / 4096;
-        int height = 4096;
-        unsigned int buffersize = width * height;
-        float* allEntryWeights = new float[buffersize];
-        PixelBox lockBox(width, height, 1, PF_FLOAT32_R, allEntryWeights);
-        weightTexture->getBuffer()->blitToMemory(lockBox);      
+        RenderTarget* rt = weightTexture->getBuffer().getPointer()->getRenderTarget();
+        renderFullscreenQuad(mat->getName(), rt);
 
-        int iRadion = 0;
-        for(int iCluster=0; iCluster < clustercount; iCluster++)
-        {
-                weights[iCluster] = 0.0;
-                for(int clusterSummer=0;
-                        clusterSummer < OgreIlluminationManager::getSingleton().getPathMapClusterLength(iCluster);
-                        clusterSummer++, iRadion++)
-                {
-                        weights[iCluster] += allEntryWeights[iRadion];                  
-                }
-                if(weights[iCluster] <= 0)
-                        weights[iCluster] /= OgreIlluminationManager::getSingleton().getPathMapClusterLength(iCluster); //(double)clusterLenghts[iCluster];
-                else
-                        weights[iCluster] = 0.0f;               
-        }
+        rt->writeContentsToFile("weights.bmp"); 
+        rt->writeContentsToFile("weights.dds"); 
 }