Changeset 1615 for GTP/trunk

Timestamp:

10/12/06 19:19:04 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Intersectable.h (modified) (1 diff)
• IntersectableWrapper.h (modified) (2 diffs)
• OspTree.cpp (modified) (1 diff)

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

@@ -73 +73 @@
                  KD_INTERSECTABLE,
                  BVH_INTERSECTABLE,
-                 TRIANGLE_INTERSECTABLE
+                 TRIANGLE_INTERSECTABLE,
+                 OBJECTS_INTERSECTABLE
                 };
   
   Intersectable(): mMailbox(0), mReferences(0), mBvhLeaf(0) {}
+
+  virtual Intersectable::~Intersectable() {};
 
   void SetId(const int id) { mId = id; }

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

@@ -154 +154 @@
                 return Intersectable::KD_INTERSECTABLE;
         }
+
+        AxisAlignedBox3 GetBox() const { return mBbox; }
+        AxisAlignedBox3 mBbox;
 };
 
@@ -198 +201 @@
 
 
+
+
 }
 

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

@@ -1814 +1814 @@
 KdIntersectable *OspTree::GetOrCreateKdIntersectable(KdNode *node)
 {
+        //if (!node) return NULL;
+
         // search nodes
-        std::map<KdNode *, KdIntersectable *>::
-                const_iterator it = mKdIntersectables.find(node);
+        std::map<KdNode *, KdIntersectable *>::const_iterator it = mKdIntersectables.find(node);
 
         if (it != mKdIntersectables.end())