Changeset 1696 for GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

Timestamp:

10/29/06 18:17:38 (18 years ago)

Author:

mattausch

Message:

removed memory leaks

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

@@ -48 +48 @@
   BvhLeaf *mBvhLeaf;
 //BvhNode *mBvhLeaf;
-  /// some rays piercing this intersectable
-  VssRayContainer mVssRays;
-
+  
   /// # of references to this instance
   int mReferences;
 
   //////////////////
-  // note matt: delete these, they are only taking memory+
+  // note matt: delete these, they are only taking memory
 
 
@@ -77 +75 @@
                 };
   
-  Intersectable(): mMailbox(0), mReferences(0), mBvhLeaf(0) {}
+  Intersectable(): mMailbox(0), mReferences(0), mBvhLeaf(0), mVssRays(NULL) {}
 
   virtual Intersectable::~Intersectable() {};
@@ -114 +112 @@
 
   virtual int GetRandomVisibleSurfacePoint(Vector3 &point,
-          Vector3 &normal,
-          const Vector3 &viewpoint,
-          const int maxTries) = 0;
+                                                                                   Vector3 &normal,
+                                                                                   const Vector3 &viewpoint,
+                                           const int maxTries) = 0;
 
   virtual ostream &Describe(ostream &s) = 0;
@@ -160 +158 @@
   }
 
-  /** returns normal from the face with the specified index.
-  PROBLEM: Does not fit to all intersectable types (e.g., spheres)
+  /** Returns normal from the face with the specified index.
+          PROBLEM: Does not fit to all intersectable types (e.g., spheres)
   */
   virtual Vector3 GetNormal(const int idx) const { return Vector3(0, 0, 0); }
+
+  VssRayContainer *GetOrCreateRays() 
+  { 
+          if (!mVssRays)
+                mVssRays = new VssRayContainer();
+          return mVssRays;
+  }
+
+  void DelRayRefs()
+  {
+          DEL_PTR(mVssRays);
+  }
+
+protected:
+
+  /// some rays piercing this intersectable
+  VssRayContainer *mVssRays;
 };