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

Timestamp:

03/09/07 10:32:11 (18 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgrePathMapRenderTechnique.cpp (modified) (5 diffs)

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();
+    
+        unsigned int clustercount = OgreIlluminationManager::getSingleton().getPathMapClusterLengthsSize();
         Fparams->setNamedConstant("allClusterCount", (float) clustercount);
         PathMapClusters* clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentOgreRenderable->getName());
@@ -74 +75 @@
         st->setTextureBorderColour(ColourValue::Blue);
         
-        //newpass->setSceneBlending(SBT_MODULATE);
-        newpass->setSceneBlending(SBF_ONE, SBF_ZERO);
+        newpass->setSceneBlending(SBT_MODULATE);
+        //newpass->setSceneBlending(SBF_ONE, SBF_ZERO);
         newpass->setDepthBias(1);
         
@@ -90 +91 @@
 {
         PathMapClusters* clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentOgreRenderable->getName());
-        int width = clusters->count / 4;
+        int width = clusters->count;
         TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual(this->parentOgreRenderable->getName() + "_PMWeightIndexTexture", 
                                                                                                                                                 "default",
-                                                                                                                                                TEX_TYPE_1D,
+                                                                                                                                                TEX_TYPE_2D,
                                                                                                                                                 width,
                                                                                                                                                 1,
                                                                                                                                                 0,
                                                                                                                                                 0,
-                                                                                                                                                PF_FLOAT32_RGBA,
+                                                                                                                                                PF_FLOAT32_R,
                                                                                                                                                 TU_DYNAMIC_WRITE_ONLY);
         weightIndexTexture = texPtr.getPointer();
 
-        float *weightIndices = new float[clusters->count];
-        PixelBox lockBox(width, 1, 1, PF_FLOAT32_RGBA, weightIndices);
+        float *weightIndices = new float[width];
+        PixelBox lockBox(width, 1, 1, PF_FLOAT32_R, weightIndices);
         for(int j = 0; j< clusters->count; j++)
                         weightIndices[j] = clusters->clusters[j];
@@ -116 +117 @@
         sm->_populateLightList(Vector3(0,0,0), 1000, lights); //TODO
 //TODO set weights
-        
-        
+        /*
+        unsigned int entryPointCount = OgreIlluminationManager::getSingleton().getPathMapEntryPoints().size();
+        PathMapClusters* clusters = OgreIlluminationManager::getSingleton().getPathMapClusters(parentOgreRenderable->getName());
+        int weightTextureWidth = clusters->count / 4;
+        */
         for(int i = 0 ; i < 1; i++)
         {
@@ -126 +130 @@
                         OgreIlluminationManager::getSingleton().getPerLightRun(lightName, ILLUMRUN_PM_WEIGHTMAP)->asOgreRenderingRun();
 
-                TextureUnitState* st =pathMapPass->getTextureUnitState(2);
-                st->setTextureName(PMWeightRun->getPMWeightTetureName());                               
+                TextureUnitState* st = pathMapPass->getTextureUnitState(2);
+                st->setTextureName(PMWeightRun->getPMWeightTetureName());
+
+                /*
+                TexturePtr tex = TextureManager::getSingleton().getByName(PMWeightRun->getPMWeightTetureName());
+                float *allClusterWeights = new float[entryPointCount];
+                PixelBox lockBox(entryPointCount, 1, 1, PF_FLOAT32_R, allClusterWeights);
+                tex->getBuffer()->blitToMemory(lockBox);
+
+                float *weightIndices = new float[clusters->count];
+                for(int j = 0; j< clusters->count; j++)
+                        weightIndices[j] = allClusterWeights[clusters->clusters[j]];
+                
+                PixelBox lockBox2(weightTextureWidth, 1, 1, PF_FLOAT32_RGBA, weightIndices);
+                weightIndexTexture->getBuffer()->blitFromMemory(lockBox2);
+
+                TextureUnitState* st = pathMapPass->getTextureUnitState(1);
+                st->setTextureName(weightIndexTexture->getName());      */                      
         }
 }