Changeset 429 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

Timestamp:

11/24/05 03:42:19 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -24 +24 @@
   environment->GetIntValue("VssPreprocessor.vssSamples", mVssSamples);
   environment->GetIntValue("VssPreprocessor.vssSamplesPerPass", mVssSamplesPerPass);
-        environment->GetBoolValue("VssPreprocessor.useImportanceSampling", mUseImportanceSampling);
+  environment->GetBoolValue("VssPreprocessor.useImportanceSampling", mUseImportanceSampling);
+  environment->GetIntValue("BspTree.Construction.samples", mBspConstructionSamples);
         
   mStats.open("stats.log");
@@ -353 +354 @@
         VssTree *vssTree = NULL;
 
+        RayContainer bspRays;
+
   while (totalSamples < mInitialSamples) {
                 int passContributingSamples = 0;
@@ -422 +425 @@
 
 
-
         vssTree = new VssTree;
         
+        const int bspSamples = min((int)mVssRays.size(), mBspConstructionSamples);
+        
+        for (int i = 0; i < bspSamples; ++ i)
+                bspRays.push_back(new Ray(*mVssRays[i]));
+
+        mBspTree = new BspTree(&mUnbounded);    
+
+        mBspTree->SetGenerateViewCells(true);
+        mBspTree->Construct(bspRays);
+
+        for (int i = bspSamples; i < (int)mVssRays.size(); ++ i)
+        {
+                CastRay(*mBspTree, *mVssRays[i]);
+        }
+
         vssTree->Construct(mVssRays, mViewSpaceBox);
 
@@ -469 +486 @@
                 }
 
+                
+                for (int i = 0; i < (int)vssRays.size(); ++ i)
+                {
+                        CastRay(*mBspTree, *mVssRays[i]);
+                }
                 
                 samples+=num;
@@ -482 +504 @@
 
         delete vssTree;
-        
-  return true;
-}
-
+
+        ObjectContainer objects;
+        ExportSplits(objects, bspRays, 10000);
+        ExportBspPvs(objects, bspRays, 10000);
+
+        CLEAR_CONTAINER(bspRays);
+
+        return true;
+}
+
+void VssPreprocessor::CastRay(const BspTree &tree, const VssRay & vssRay)
+{
+        //-- cast ray to BSP tree to get intersection with view cells
+        Ray ray(vssRay);
+
+        mBspTree->CastRay(ray);
+                                
+        if (ray.sourceObject.mObject)
+                //sampleContributions += 
+                AddObjectSamples(ray.sourceObject.mObject, ray);
+                        
+                if (!ray.intersections.empty()) // second intersection found
+                {
+                        //sampleContributions += 
+                                AddObjectSamples(ray.intersections[0].mObject, ray);
+                }
+}
+
+int VssPreprocessor::AddObjectSamples(Intersectable *obj, const Ray &ray)
+{
+        int contributingSamples = 0;
+        int j;
+ 
+        // object can be seen from the view cell => add to view cell pvs
+        for (j=0; j < ray.bspIntersections.size(); ++ j)
+        {       
+                BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
+                // if ray not in unbounded space
+                if (leaf->GetViewCell() != &mUnbounded)
+                        contributingSamples += 
+                                leaf->GetViewCell()->GetPvs().AddSample(obj);
+        }
+ 
+        // rays passing through this viewcell
+        if (mPass > 1)
+                for (j=1; j < ((int)ray.bspIntersections.size() - 1); ++ j) 
+                {
+                        BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
+
+                        if (leaf->GetViewCell() != &mUnbounded)
+                                leaf->GetViewCell()->
+                                        AddPassingRay(ray, contributingSamples ? 1 : 0);
+                }
+ 
+        return contributingSamples;
+}