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

Timestamp:

11/05/05 20:03:25 (19 years ago)

Author:

bittner

Message:

vsspreprocessor update

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -8 +8 @@
 #include "ViewCell.h"
 #include "VssRay.h"
+#include "VssTree.h"
 
 VssPreprocessor::VssPreprocessor():
@@ -48 +49 @@
         Intersectable *objectA, *objectB;
         Vector3 pointA, pointB;
-
+        float bsize = Magnitude(box.Size());
         if (mKdTree->CastRay(ray)) {
                 objectA = ray.intersections[0].mObject;
@@ -57 +58 @@
                 float tmin, tmax;
                 box.ComputeMinMaxT(ray, &tmin, &tmax);
+                if (tmax > bsize) {
+                        cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
+                        cerr<<"ray"<<ray<<endl;
+                }
                 pointA = ray.Extrap(tmax);
+                
         }
         
@@ -69 +75 @@
                 float tmin, tmax;
                 box.ComputeMinMaxT(ray, &tmin, &tmax);
+                if (tmax > bsize) {
+                        cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
+                        cerr<<"ray"<<ray<<endl;
+                }
+                
                 pointB = ray.Extrap(tmax);
         }
@@ -86 +97 @@
 
 Vector3
-VssPreprocessor::GetViewpoint()
-{
-        AxisAlignedBox3 box = mKdTree->GetBox();
-
+VssPreprocessor::GetViewpoint(AxisAlignedBox3 *viewSpaceBox)
+{
+        AxisAlignedBox3 box;
+        
+        if (viewSpaceBox)
+                box =*viewSpaceBox;
+        else
+                box = mKdTree->GetBox();
+        
         // shrink the box in the y direction
-        Vector3 diff(0, -box.Size().y*0.4f, 0);
-        box.Enlarge(diff);
-        
         return box.GetRandomPoint();
 }
@@ -100 +113 @@
 VssPreprocessor::GetDirection(const Vector3 &viewpoint)
 {
-        int i = RandomValue(0, mObjects.size());
+        int i = RandomValue(0, mObjects.size()-1);
         Intersectable *object = mObjects[i];
         Vector3 point, normal;
@@ -114 +127 @@
   
   mSceneGraph->CollectObjects(&mObjects);
-        
-
+        cout<<"#NUM_OBJECTS (Total numner of objects)\n"<<mObjects.size()<<endl;
+        
   long startTime = GetTime();
   
@@ -121 +134 @@
   int totalSamples = 0;
 
-
+        AxisAlignedBox3 *viewSpaceBox = NULL;
+
+        AxisAlignedBox3 box = mKdTree->GetBox();
+        box.Enlarge(box.Size()*-Vector3(0.45, 0.45, 0.45));
+
+        bool useViewSpaceBox = false;
+        if (useViewSpaceBox)
+                viewSpaceBox = &box;
+        
   while (totalSamples < mTotalSamples) {
                 int passContributingSamples = 0;
@@ -132 +153 @@
                 
                 for (int k=0; k < mSamplesPerPass; k++) {
-
-                        Vector3 viewpoint = GetViewpoint();
+                        
+                        Vector3 viewpoint = GetViewpoint(viewSpaceBox);
                         Vector3 direction = GetDirection(viewpoint);
-
+                        
                         VssRay *vssRay = CastRay(viewpoint, direction);
                         
@@ -153 +174 @@
     
                 mPass++;
-
+                
                 int pvsSize = 0;
                 float avgRayContrib = (passContributingSamples > 0) ? 
@@ -176 +197 @@
         
         cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
-        cout << "#totalRayStackSize=" << mVssRays.size() << endl;
-
+        cout << "#totalRayStackSize=" << mVssRays.size() << endl <<flush;
+
+        VssTree *vssTree = new VssTree;
+
+        vssTree->Construct(mVssRays, viewSpaceBox);
+        
   return true;
 }