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

Timestamp:

11/18/05 16:29:31 (19 years ago)

Author:

mattausch

Message:

worded on vspkdtree

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -73 +73 @@
                 mBspTree->Construct(objects);
                 break;
-        case BspTree::FROM_RAYS:
+        case BspTree::FROM_SAMPLES:
                 DeleteViewCells(); // we generate new view cells
                 mBspTree->SetGenerateViewCells(true);
@@ -490 +490 @@
                                                                                         passSampleContributions);
 
-                                                //mVspKdTree->Construct(mSampleRays, mBoundingBox);
                                         }
                                         else if (ViewCell::sHierarchy == ViewCell::VSP)
@@ -555 +554 @@
   
         //-- render simulation
-        cout << "\nevaluating bsp view cells render time before merge ... ";
-        GetRenderSimulator()->SimulateRendering();
-        
-        cout << " finished" << endl;
-
-        cout << GetRenderSimulator()->mStat << endl;
-        Debug << GetRenderSimulator()->mStat << endl;
-
+        RenderSimulator *rs = GetRenderSimulator();
+
+        if (rs)
+        {
+                cout << "\nevaluating bsp view cells render time before merge ... ";
+
+                rs->SimulateRendering();
+        
+                cout << " finished" << endl;
+
+                cout << GetRenderSimulator()->mStat << endl;
+                Debug << GetRenderSimulator()->mStat << endl;
+        }
 
         if (mBspTree)
@@ -618 +622 @@
 
                 //-- render simulation
-                cout << "\nevaluating render time after merge ... ";
-                        
-                GetRenderSimulator()->SimulateRendering();
-                cout << " finished" << endl;
-
-                cout << GetRenderSimulator()->mStat << endl;
-                Debug << GetRenderSimulator()->mStat << endl;
+                
+                RenderSimulator *rs = GetRenderSimulator();
+
+                if (rs)
+                {
+                        cout << "\nevaluating render time after merge ... ";
+                        
+                        rs->SimulateRendering();
+
+                        cout << " finished" << endl;
+
+                        cout << GetRenderSimulator()->mStat << endl;
+                        Debug << GetRenderSimulator()->mStat << endl;
+                }
 
                 if (1) // export view cells
@@ -659 +670 @@
                 exporter->SetExportRayDensity(true);
                 exporter->ExportKdTree(*mKdTree);
-
-                if (mBspTree && (ViewCell::sHierarchy == ViewCell::VSP))
-                        exporter->ExportVspKdTree(*mVspKdTree);
-
+                delete exporter;
+        }
+
+        if (mVspKdTree)
+        {
+                Exporter *exporter = Exporter::GetExporter("vspkdtree.x3d"); 
+                exporter->SetWireframe();
+                exporter->ExportVspKdTree(*mVspKdTree);
                 delete exporter;
         }
@@ -732 +747 @@
                                                                                            int &sampleContributions)
 {
-        // save rays for bsp tree construction
         if (!mVspKdTree)
         {
+                // store samples for vsp kd tree construction
                 if ((int)mVspSampleRays.size() < mVspConstructionSamples)
                 {
-                        MeshInstance *mi = dynamic_cast<MeshInstance *>(object);
-                        
                         VssRay *sRay = new VssRay(ray);
-                        mVspSampleRays.push_back(sRay);
+                
+            mVspSampleRays.push_back(sRay);
                 
                         // also add origin to sample
@@ -749 +763 @@
                         // construct VSP tree using the collected samples
                         cout << "building VSP tree from " << (int)mVspSampleRays.size() << " samples " << endl;
+                        mVspKdTree = new VspKdTree();
                         mVspKdTree->Construct(mVspSampleRays);
                 
@@ -779 +794 @@
         if (!mBspTree)
         {
-                if ((BspTree::sConstructionMethod == BspTree::FROM_RAYS) &&
+                if ((BspTree::sConstructionMethod == BspTree::FROM_SAMPLES) &&
                         ((int)mSampleRays.size() < mBspConstructionSamples))
                 {
@@ -889 +904 @@
                                         outRays.push_back(mSampleRays[i]);
                         }
-                        if (BspTree::sConstructionMethod == BspTree::FROM_RAYS)
+                        if (BspTree::sConstructionMethod == BspTree::FROM_SAMPLES)
                         {
                                 // export rays