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

Timestamp:

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

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreCausticCasterRenderTechnique.cpp (modified) (1 diff)
• OgrePathMapRenderTechnique.cpp (modified) (4 diffs)

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

@@ -30 +30 @@
         this->blurCauCubeMap = blurCauCubeMap;
         
-        String newMaterialName = causticMapMaterialName + parentRenderable->getName() + "_clone";
+        String newMaterialName = causticMapMaterialName + "_clone_" + parentRenderable->getName();
         Material* mat = (Material*) MaterialManager::getSingleton().getByName(causticMapMaterialName).getPointer();
         Material* newMat = mat->clone(newMaterialName).getPointer();

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

@@ -50 +50 @@
         Vector4 pathMapParameters(prmnt[0],prmnt[1],halfPixel[0],halfPixel[1]);
         Fparams->setNamedConstant("prmAtlasTilesHalfPixel",pathMapParameters);
-                
+    unsigned int clustercount = OgreIlluminationManager::getSingleton().getPathMapClusterLengthsSize();
+        Fparams->setNamedConstant("allClusterCount", (float) clustercount);
+        PathMapClusters* clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentOgreRenderable->getName());
+        Fparams->setNamedConstant("clusterCount", (float) clusters->count);
+        
         TextureUnitState* st = newpass->createTextureUnitState();               
         st->setTextureFiltering(TFO_BILINEAR);
         st->setTextureAddressingMode(TextureUnitState::TAM_BORDER);
+        st->setTextureBorderColour(ColourValue::Green);
+        st->setTextureName(clusters->pathMapTextureFilename);
+
+        createWeightIndexTexture();
+        
+        st = newpass->createTextureUnitState();         
+        st->setTextureFiltering(TFO_NONE);
+        st->setTextureAddressingMode(TextureUnitState::TAM_BORDER);
+        st->setTextureBorderColour(ColourValue::Red);
+        st->setTextureName(weightIndexTexture->getName());
+
+        st = newpass->createTextureUnitState();         
+        st->setTextureFiltering(TFO_NONE);
+        st->setTextureAddressingMode(TextureUnitState::TAM_BORDER);
         st->setTextureBorderColour(ColourValue::Blue);
-        st->setTextureName(clusters->pathMapTextureFilename);
         
         //newpass->setSceneBlending(SBT_MODULATE);
@@ -70 +87 @@
 }
 
+void OgrePathMapRenderTechnique::createWeightIndexTexture()
+{
+        PathMapClusters* clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentOgreRenderable->getName());
+        int width = clusters->count / 4;
+        TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual(this->parentOgreRenderable->getName() + "_PMWeightIndexTexture", 
+                                                                                                                                                "default",
+                                                                                                                                                TEX_TYPE_1D,
+                                                                                                                                                width,
+                                                                                                                                                1,
+                                                                                                                                                0,
+                                                                                                                                                0,
+                                                                                                                                                PF_FLOAT32_RGBA,
+                                                                                                                                                TU_DYNAMIC_WRITE_ONLY);
+        weightIndexTexture = texPtr.getPointer();
+
+        float *weightIndices = new float[clusters->count];
+        PixelBox lockBox(width, 1, 1, PF_FLOAT32_RGBA, weightIndices);
+        for(int j = 0; j< clusters->count; j++)
+                        weightIndices[j] = clusters->clusters[j];
+        weightIndexTexture->getBuffer()->blitFromMemory(lockBox);
+        delete[] weightIndices;
+}
+
 void OgrePathMapRenderTechnique::update(unsigned long frameNum)
 {       
@@ -76 +116 @@
         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++)
         {
@@ -86 +126 @@
                         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]];
-                                
+                TextureUnitState* st =pathMapPass->getTextureUnitState(2);
+                st->setTextureName(PMWeightRun->getPMWeightTetureName());                               
         }
-
-        GpuProgramParameters* Fparams = pathMapPass->getFragmentProgramParameters().getPointer();
-        Fparams->setNamedConstant("weights", actualWeights, clusters->count);
 }