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

Timestamp:

06/07/06 10:59:55 (18 years ago)

Author:

mattausch

Message:

debug run: fixing memory holes

File:

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

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

@@ -22 +22 @@
 VssPreprocessor::VssPreprocessor():
   mPass(0),
-  mVssRays()
+  mVssRays(),
+  mViewSpaceBox(NULL)
 {
   // this should increase coherence of the samples
@@ -543 +544 @@
 
 
-  AxisAlignedBox3 *box = new AxisAlignedBox3(mKdTree->GetBox());
+  AxisAlignedBox3 box(mKdTree->GetBox());
   
   if (!useViewspacePlane) {
         float size = 0.05f;
         float s = 0.5f - size;
-        float olds = Magnitude(box->Size());
-        box->Enlarge(box->Size()*Vector3(-s));
+        float olds = Magnitude(box.Size());
+        box.Enlarge(box.Size()*Vector3(-s));
         Vector3 translation = Vector3(-olds*0.1f, 0, 0);
-        box->SetMin(box->Min() + translation);
-        box->SetMax(box->Max() + translation);
+        box.SetMin(box.Min() + translation);
+        box.SetMax(box.Max() + translation);
   } else {
 
         // sample city like heights
-        box->SetMin(1, box->Min(1) + box->Size(1)*0.2f);
-        box->SetMax(1, box->Min(1) + box->Size(1)*0.3f);
+        box.SetMin(1, box.Min(1) + box.Size(1)*0.2f);
+        box.SetMax(1, box.Min(1) + box.Size(1)*0.3f);
   }
 
   if (use2dSampling)
-        box->SetMax(1, box->Min(1));
+        box.SetMax(1, box.Min(1));
 
   cout<<"mUseViewSpaceBox="<<mUseViewSpaceBox<<endl;
@@ -570 +571 @@
           if (!mEnlargeViewSpace)
           {
-                  mViewSpaceBox = box;
+                  mViewSpaceBox = new AxisAlignedBox3(box);
           }
           else
@@ -591 +592 @@
                   {
                           // $$ JB temporary
-                          AxisAlignedBox3 box = *mViewSpaceBox;
+                          AxisAlignedBox3 tempbox = *mViewSpaceBox;
                           
-                          float s = box.Size(0);
+                          float s = tempbox.Size(0);
                           
-                          box.Scale(0.8f);
-                          box.SetMax(0, box.Max(0) + s*0.8f);
-                          box.SetMin(0, box.Min(0) + s*0.8f);
-                          *mViewSpaceBox = box;
+                          tempbox.Scale(0.8f);
+                          tempbox.SetMax(0, box.Max(0) + s*0.8f);
+                          tempbox.SetMin(0, box.Min(0) + s*0.8f);
+                          *mViewSpaceBox = tempbox;
                   }             
           }