Changeset 2420

Timestamp:

06/06/07 19:20:26 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Files:

• include/OgreIlluminationManager.h (modified) (1 diff)
• src/RenderingRuns/OgrePMEntryPointMapRenderingRun.cpp (modified) (2 diffs)
• src/RenderingRuns/OgrePMWeightComputeRenderingRun.cpp (modified) (3 diffs)

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

@@ -48 +48 @@
         */
         float prob;
+        int clusterID;
 };
 

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

@@ -66 +66 @@
 
         float* data = new float[clusterCount * 2];
-        unsigned int entryPointCount = 0;
+        unsigned int clusterStartEntryPoint = 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;
+                data[clusterCount + i] = clusterStartEntryPoint;
+                for(int j = 0; j < clusterSize; j++)
+                {
+                        PathMapEntryPoint* EP = &OgreIlluminationManager::getSingleton().getPathMapEntryPoints().at(clusterStartEntryPoint + j);
+                        EP->clusterID = i;
+                }
+                clusterStartEntryPoint += clusterSize;
         }
 
@@ -79 +84 @@
 
         delete[] data;
+
+        if(false)
+        {
+                SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
+                BillboardSet* bbs = sm->createBillboardSet("WEIGHT_DEBUG", 4096);
+                bbs->setDefaultDimensions(0.1, 0.1);
+                for(int i= 0; i < entryPointCnt;i++)
+                {
+                  PathMapEntryPoint* EP = &OgreIlluminationManager::getSingleton().getPathMapEntryPoints().at(i);
+                  int r = i / 256;
+                  int g = i - r * 256;
+                  float rr = (float) r / 256.0;
+                  float gg = (float) g / 256.0;
+                  
+                  ColourValue c;                  
+                  c = ColourValue(rr, gg, 0);
+                  /*c = ColourValue(
+                          Math::Ceil(Math::Floor(EP->position.x)),
+                          Math::Ceil(Math::Floor(EP->position.y)),
+                          Math::Ceil(Math::Floor(EP->position.z)));*/
+                  //c = ColourValue(0,0,1,0);
+                  bbs->createBillboard(Vector3(EP->position.x, i, EP->position.z), c);
+                }
+                bbs->setPointRenderingEnabled(true);
+                bbs->setMaterialName("GTP/PM/EPBillboards");
+                sm->getRootSceneNode()->createChildSceneNode("WEIGHT_DEBUG_SN")->attachObject(bbs);
+        }
 }
 

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

@@ -67 +67 @@
                 v->setOverlaysEnabled(false);
                 rt->setAutoUpdated(false);              
-        }
+        }       
 }
 
@@ -161 +161 @@
                         
                                 renderFullscreenQuad(mat->getName(), rt);
+
+                //rt->writeContentsToFile("allweights.dds");
                         
         }
@@ -189 +191 @@
         
         renderFullscreenQuad(mat->getName(), rt);
+
+        //rt->writeContentsToFile("clusterweights.bmp");
 }