Changeset 2710 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

05/26/08 04:01:24 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -36 +36 @@
 
 
+static int sCurrentDynamicId = 0;
+
+
 inline static bool ilt(Intersectable *obj1, Intersectable *obj2)
 {
@@ -329 +332 @@
 
 
-Intersectable *Preprocessor::GetParentObject(const int index) const
+Intersectable *Preprocessor::GetParentObject(int index) const
 {
         if (index < 0)
@@ -351 +354 @@
         else
         {
-                  if (index >= (int)mObjects.size()) 
-                  {
-                          cerr<<"Warning: triangle index out of range! " << index << " of " << (int)mObjects.size() << endl;
-                          return NULL;
-                  }
-                  else
-                  {
-                          return mObjects[index];
-                  }
+                return mObjects[index];
         }
 }
@@ -733 +728 @@
                 }
         }
+
 
         ////////
@@ -1594 +1590 @@
         mDynamicObjects.push_back(leaf);
 
+        const int currentId = (int)mObjects.size() + sCurrentDynamicId;
+
+        leaf->GetIntersectable()->SetId(currentId);
+
+        for (size_t i = 0; i < leaf->mGeometry.size(); ++ i)
+        {
+                leaf->mGeometry[i]->SetId(currentId);
+        }
+
+        cout << "\**************\n******* new object has id " << currentId << endl;
+
+        ++ sCurrentDynamicId;
+
         // tell ray caster to update
         ScheduleUpdateDynamicObjects();