Changeset 1052 for GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp

Timestamp:

06/25/06 06:54:53 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp

@@ -564 +564 @@
         box.SetMax(1, box.Min(1));
 
-  cout<<"mUseViewSpaceBox="<<mUseViewSpaceBox<<endl;
+  cout << "use view space box=" << mUseViewSpaceBox<<endl;
 
 
@@ -575 +575 @@
           else
           {
-                  // HACK: enlarge in y directon
                   mViewSpaceBox = new AxisAlignedBox3(mKdTree->GetBox());
 
-                  if (1) 
+                  if (0) 
                   {
-                          //Vector3 pmin = mViewSpaceBox->Min();
+                          // HACK: enlarge in y directon
                           Vector3 size = mViewSpaceBox->Size();
-                          //size[1] *= 1.25;
-                          //Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
-                          Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
-
-                          //mViewSpaceBox->Enlarge(enlarge);
+                        
+                          size[1] *= 1.25;
+                          Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
+                          //Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
+
+                          mViewSpaceBox->Enlarge(enlarge);
                           mViewSpaceBox->SetMax(mViewSpaceBox->Max() + enlarge);
                   } 
                   else 
                   {
+                          AxisAlignedBox3 tbox(*mViewSpaceBox);
+
+                          Vector3 size = mViewSpaceBox->Size();
+                          tbox.SetMax(0, mViewSpaceBox->Max(0) + size[0] * 0.5);
+                          tbox.SetMin(0, mViewSpaceBox->Min(0) + size[0]);
+                          *mViewSpaceBox = tbox;
+
                           // $$ JB temporary
-                          AxisAlignedBox3 tempbox = *mViewSpaceBox;
+                          /*AxisAlignedBox3 tempbox = *mViewSpaceBox;
                           
                           float s = tempbox.Size(0);
@@ -599 +606 @@
                           tempbox.SetMax(0, box.Max(0) + s*0.8f);
                           tempbox.SetMin(0, box.Min(0) + s*0.8f);
-                          *mViewSpaceBox = tempbox;
+                          *mViewSpaceBox = tempbox;*/
                   }             
           }