Changeset 426 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

11/22/05 17:43:29 (19 years ago)

Author:

mattausch

Message:

fixed ray bug in vspkdtree
added visualizations

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -591 +591 @@
                                 //exporter->ExportBspViewCellPartition(*mBspTree, 0);
                                 
-                                if (1) // export scene geometry
-                                {
-                                        Material m;//= RandomMaterial();
-                                        m.mDiffuseColor = RgbColor(0, 1, 0);
-                                        exporter->SetForcedMaterial(m);
-                                        exporter->SetWireframe();
-        
-                                        for (int j = 0; j < objects.size(); ++ j)
-                                                exporter->ExportIntersectable(objects[j]);
-                                }
+                                if (1)
+                                        ExportSceneGeometry(exporter, objects);
                                         
                                 delete exporter;
@@ -676 +668 @@
         {
                 Exporter *exporter = Exporter::GetExporter("vspkdtree.x3d"); 
-                exporter->SetWireframe();
-                exporter->ExportVspKdTree(*mVspKdTree, 300);
+                //exporter->SetWireframe();
+                exporter->ExportVspKdTree(*mVspKdTree, mVspKdTree->GetStatistics().maxPvsSize);
+
+                Debug << "average PVS size: " << mVspKdTree->GetAvgPvsSize() << endl;
+
+                if (1) ExportSceneGeometry(exporter, objects);
+
+                bool exportRays = false;
+
+                if (exportRays) 
+                {
+                        int raysSize = 500;
+                        float prob = raysSize / (float)mVspSampleRays.size();
+                
+                        exporter->SetWireframe();
+                        
+                        VssRayContainer rays;
+                        for (int i = 0; i < mVspSampleRays.size(); ++ i)
+                        {
+                                if (RandomValue(0,1) < prob)
+                                        rays.push_back(mVspSampleRays[i]);
+                        }
+
+                        exporter->ExportRays(rays, RgbColor(1, 0, 0));
+                }
+
                 delete exporter;
         }
@@ -758 +774 @@
                         // also add origin to sample
                         sRay->mOriginObject = object;
+                        sRay->mOrigin = ray.GetLoc();
                 }
                 else
@@ -872 +889 @@
 
         return merged;
+}
+
+// export scene geometry
+void SamplingPreprocessor::ExportSceneGeometry(Exporter *exporter, const ObjectContainer &objects)
+{
+        Material m;//= RandomMaterial();
+        m.mDiffuseColor = RgbColor(0, 1, 0);
+        exporter->SetForcedMaterial(m);
+        exporter->SetWireframe();
+
+        for (int j = 0; j < objects.size(); ++ j)
+                exporter->ExportIntersectable(objects[j]);
 }
 
@@ -911 +940 @@
                 }
 
-                // export scene geometry
                 if (1)
-                {
-                        Material m;//= RandomMaterial();
-                        m.mDiffuseColor = RgbColor(0, 1, 0);
-                        exporter->SetForcedMaterial(m);
-            exporter->SetWireframe();
-
-                        for (int j = 0; j < objects.size(); ++ j)
-                                exporter->ExportIntersectable(objects[j]);
-                }
+                        ExportSceneGeometry(exporter, objects);
 
                 delete exporter;