Changeset 2715 for GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.cpp

Timestamp:

05/27/08 10:57:05 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.cpp (modified) (5 diffs)

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

@@ -39 +39 @@
 SceneGraphLeaf::~SceneGraphLeaf()
 {
-    CLEAR_CONTAINER(mGeometry);
+        if (mDeleteGeometry)
+                CLEAR_CONTAINER(mGeometry);
 }
 
@@ -278 +279 @@
 
 
-SceneGraphLeaf::SceneGraphLeaf(): mIsDynamic(false), mHasChanged(true)
+SceneGraphLeaf::SceneGraphLeaf(): 
+mIsDynamic(false), mHasChanged(true), mDeleteGeometry(true)
 {
         mTrafo = IdentityMatrix();
@@ -285 +287 @@
 
 
-SceneGraphLeaf::SceneGraphLeaf(bool isDynamic): mIsDynamic(isDynamic), mHasChanged(true)
+SceneGraphLeaf::SceneGraphLeaf(bool isDynamic): 
+mIsDynamic(isDynamic), mHasChanged(true), mDeleteGeometry(true)
 {
     mTrafo = IdentityMatrix();
@@ -327 +330 @@
 {
         // hack: should just pass a IntersectableGroup as a whole
-        // instead we duplicate the object container and create a new
-        // leaf
+        // instead we duplicate the geometry vector
         mGeometry = copy.mGeometry;
-        //for (size_t i = 0; i < copy.mGeometry->size(); ++ i)
-        //      mGeometry.push_back(copy.mGeometry[i]);
 
         mBox = copy.mBox;
@@ -339 +339 @@
         mIntersectable = new SceneGraphLeafIntersectable(this, mBox);
         mHasChanged = true;
-}
-
-}
+
+        // hack: the geometry should not be deleted here because this
+        // is just a copy
+        mDeleteGeometry = false;
+}
+
+}