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

Timestamp:

05/27/08 11:12:02 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (1 diff)

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

@@ -1755 +1755 @@
         {
 
-          // delete ALL dynamic stuff and rebuild using the new trafos
-          preprocessor->mRayCaster->DeleteDynamicObjects();
-          
+                // delete ALL dynamic stuff and rebuild using the new trafos
+                preprocessor->mRayCaster->DeleteDynamicObjects();
+
 #define MULTIPLE_OBJECTS 1
 
 #if MULTIPLE_OBJECTS 
-          static ObjectContainer objects;
-          
-          CLEAR_CONTAINER(objects);
-          
-          for (size_t i = 0; i < mDynamicObjects.size(); ++ i) {
-                SceneGraphLeaf *l = mDynamicObjects[i];
-                for (int j=0; j < l->mGeometry.size(); j++) {
-                  if (l->mGeometry[j]->Type() == Intersectable::TRIANGLE_INTERSECTABLE) {
-                        Triangle3 t(((TriangleIntersectable *)l->mGeometry[j])->GetItem());
-                        t.ApplyTransformation(l->GetTransformation());
-                        TriangleIntersectable *to = new TriangleIntersectable(t);
-                        to->SetId(l->GetIntersectable()->GetId());
-
-                        objects.push_back(to);
-                  }
-                }
-          }
-          mRayCaster->AddDynamicObjecs(objects, IdentityMatrix());
+                static ObjectContainer objects;
+
+                CLEAR_CONTAINER(objects);
+
+                for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
+                {
+                        SceneGraphLeaf *l = mDynamicObjects[i];
+
+                        for (size_t j=0; j < l->mGeometry.size(); j++) 
+                        {
+                                if (l->mGeometry[j]->Type() == Intersectable::TRIANGLE_INTERSECTABLE) 
+                                {
+                                        Triangle3 t(((TriangleIntersectable *)l->mGeometry[j])->GetItem());
+                                        t.ApplyTransformation(l->GetTransformation());
+                                        TriangleIntersectable *to = new TriangleIntersectable(t);
+                                        to->SetId(l->GetIntersectable()->GetId());
+                                        objects.push_back(to);
+                                }
+                        }
+                }
+
+                mRayCaster->AddDynamicObjecs(objects, IdentityMatrix());
 #endif    
 
-          SceneGraphLeaf *toUpdate = NULL;
-          
-          for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
-          {
-                  SceneGraphLeaf *l = mDynamicObjects[i];
+                SceneGraphLeaf *toUpdate = NULL;
+
+                for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
+                {
+                        SceneGraphLeaf *l = mDynamicObjects[i];
 
 #if  !MULTIPLE_OBJECTS
-                  PrepareObjectsForRayCaster(l);
+                        PrepareObjectsForRayCaster(l);
 #endif
 
-                  if (l->HasChanged())
-                  {
-                          cout<<"Updating affected PVSs..."<<endl;
-                          preprocessor->ObjectMoved(l);
-                          cout<<"done."<<endl;  
-                          l->SetHasChanged(false);
-                  }
-          }
-
-          mUpdateDynamicObjects = false;
-          
+                        if (l->HasChanged())
+                        {
+                                cout<<"Updating affected PVSs..."<<endl;
+                                preprocessor->ObjectMoved(l);
+                                cout<<"done."<<endl;    
+                                l->SetHasChanged(false);
+                        }
+                }
+                
+                mUpdateDynamicObjects = false;
         }
 }