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

Timestamp:

11/15/05 01:32:10 (19 years ago)

Author:

mattausch

Message:

worked on view space partition kd tree

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -9 +9 @@
 #include "RenderSimulator.h"
 
-SamplingPreprocessor::SamplingPreprocessor(): mPass(0), mSampleRays(NULL)
+SamplingPreprocessor::SamplingPreprocessor(): mPass(0)
 {
   // this should increase coherence of the samples
@@ -15 +15 @@
   environment->GetIntValue("Sampling.totalSamples", mTotalSamples);
   environment->GetIntValue("BspTree.Construction.samples", mBspConstructionSamples);
+  environment->GetIntValue("VspTree.Construction.samples", mVspConstructionSamples);
+
   environment->GetIntValue("ViewCells.PostProcessing.samples", mPostProcessSamples);
   environment->GetIntValue("BspTree.Visualization.samples", mVisualizationSamples);
@@ -25 +27 @@
 {
         CLEAR_CONTAINER(mSampleRays);
+        CLEAR_CONTAINER(mVspSampleRays);
 }
 
@@ -198 +201 @@
                 }
         }
-        else
-                {
-                        if (ray.kdLeaves.size()) {
-                                Intersectable *terminator =
-                                        ray.intersections.size() ? ray.intersections[0].mObject: NULL;
-
-                                sampleContributions += AddNodeSamples(ray,
-                                                                                                                                                                                        object,
-                                                                                                                                                                                        terminator);
-                        }
-                }
+        else {
+                if (ray.kdLeaves.size()) {
+                        Intersectable *terminator =
+                                ray.intersections.size() ? ray.intersections[0].mObject: NULL;
+
+                        sampleContributions += AddNodeSamples(ray,
+                                                                                                                                                                                object,
+                                                                                                                                                                                terminator);
+                }
+        }
         
         return sampleContributions;
@@ -482 +484 @@
                                                 //mVspKdTree->Construct(mSampleRays, mBoundingBox);
                                         }
-                                        /*else if (ViewCell::sHierarchy == ViewCell::VSPKD)
+                                        else if (ViewCell::sHierarchy == ViewCell::VSP)
                                         {
-                                                ProcessVspKdViewCells(ray,
-                                                                                          reverseSample ? NULL : object,
-                                                                                          faceIndex,
-                                                                                          passContributingSamples,
-                                                                                          passSampleContributions);
-                                        }*/
+                                                ProcessVspViewCells(ray,
+                                                                                        reverseSample ? NULL : object,
+                                                                                        faceIndex,
+                                                                                        passContributingSamples,
+                                                                                        passSampleContributions);
+                                        }
                                 }
                         } else {
@@ -709 +711 @@
 }
 
+
+void SamplingPreprocessor::ProcessVspViewCells(const Ray &ray,
+                                               Intersectable *object,
+                                                                                           const int faceIndex,
+                                                                                           int &contributingSamples,
+                                                                                           int &sampleContributions)
+{
+        // save rays for bsp tree construction
+        if (!mVspKdTree)
+        {
+                if ((int)mVspSampleRays.size() < mVspConstructionSamples)
+                {
+                        MeshInstance *mi = dynamic_cast<MeshInstance *>(object);
+                        
+                        VssRay *sRay = new VssRay(ray);
+                        mVspSampleRays.push_back(sRay);
+                
+                        // also add origin to sample
+                        sRay->mOriginObject = object;
+                }
+                else
+                {
+                        // construct VSP tree using the collected samples
+                        cout << "building VSP tree from " << (int)mVspSampleRays.size() << " samples " << endl;
+                        mVspKdTree->Construct(mVspSampleRays);
+                
+                        // add contributions of saved samples to PVS
+                        //contributingSamples += mBspTree->GetStat().contributingSamples;
+                        //sampleContributions += mBspTree->GetStat().sampleContributions;
+
+                        // throw away samples because BSP leaves not stored in order 
+                        // Need ordered rays for post processing => collect new rays
+                        //CLEAR_CONTAINER(mVspSampleRays);
+                }
+        }
+        // save rays for post processing
+        /*else if (((int)mVspSampleRays.size() < mPostProcessSamples) ||
+                         ((int)mVspSampleRays.size() < mVisualizationSamples))
+        {
+                mVspSampleRays.push_back(new Ray(ray));
+        }*/
+}
+
 void SamplingPreprocessor::ProcessBspViewCells(const Ray &ray,
                                                Intersectable *object,