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

Timestamp:

02/06/06 19:09:53 (18 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -77 +77 @@
     int hits = 0;
   static Ray ray;
-  AxisAlignedBox3 box = mKdTree->GetBox();
+  AxisAlignedBox3 box =  mViewSpaceBox ? *mViewSpaceBox : mKdTree->GetBox();
 
   AxisAlignedBox3 sbox = box;
@@ -203 +203 @@
 {
   Vector3 point;
-  if (!use2dSampling) {
-        if (0) {
-          Vector3 normal;
-          int i = Random((int)mObjects.size());
-          Intersectable *object = mObjects[i];
-          object->GetRandomSurfacePoint(point, normal);
-        } else
-          point = mKdTree->GetBox().GetRandomPoint();
+  if (!use2dSampling) 
+  {
+          if (0) 
+          {
+                  Vector3 normal;
+                  int i = Random((int)mObjects.size());
+                  Intersectable *object = mObjects[i];
+                  object->GetRandomSurfacePoint(point, normal);
+          } 
+          else
+                  point = mKdTree->GetBox().GetRandomPoint();
         //        point = viewpoint + UniformRandomVector();
-
-  } else {
-        AxisAlignedBox3 box;
-
-        if (viewSpaceBox)
-          box =*viewSpaceBox;
-        else
-          box = mKdTree->GetBox();
-
-        point = box.GetRandomPoint();
-        point.y = viewpoint.y;
+  } 
+  else 
+  {
+          AxisAlignedBox3 box;
+
+          if (viewSpaceBox)
+                  box =*viewSpaceBox;
+          else
+                  box = mKdTree->GetBox();
+
+          point = box.GetRandomPoint();
+          point.y = viewpoint.y;
   }
 
@@ -528 +532 @@
   {
           if (0)
-                mViewSpaceBox = box;
+                  mViewSpaceBox = box;
           else
           {
@@ -536 +540 @@
                 Vector3 size = mViewSpaceBox->Size();
                 //size[1] *= 1.25;
-                Vector3 enlarge(size[0] * 0.1f, size[1] * 0.0f, size[2] * 0.1);
+                Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
 
                 mViewSpaceBox->Enlarge(enlarge);