Changeset 2714 for GTP

Timestamp:

05/26/08 16:41:12 (17 years ago)

Author:

bittner

Message:

dynamic object changes in preprocessor.cpp

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• Triangle3.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: po 26. V 10:26:06 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: po 26. V 14:55:33 2008
 # Project:  preprocessor.pro
 # Template: app

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

@@ -1765 +1765 @@
         if (mUpdateDynamicObjects) 
         {
-                // delete ALL dynamic stuff and rebuild using the new trafos
-                preprocessor->mRayCaster->DeleteDynamicObjects();
-
-                
-
-                for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
-                {
-                        SceneGraphLeaf *l = mDynamicObjects[i];
-
-                        
-
-                        if (l->HasChanged())
+
+          // delete ALL dynamic stuff and rebuild using the new trafos
+          preprocessor->mRayCaster->DeleteDynamicObjects();
+          
+#define MULTIPLE_OBJECTS 0
+#define CREATE_TRANSF_COPIES_OF_DYN_OBJECTS      1
+
+#if MULTIPLE_OBJECTS 
+#if CREATE_TRANSF_COPIES_OF_DYN_OBJECTS 
+          static ObjectContainer objects;
+          
+          if (objects.size()) {
+                for (size_t i = 0; i < objects.size(); ++ i) {
+                  delete objects[i];
+                }
+                objects.clear();
+          }
+          
+          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());
+                        objects.push_back(new TriangleIntersectable(t));
+                  }
+                }
+          }
+          mRayCaster->AddDynamicObjecs(objects, IdentityMatrix());
+#else
+          mRayCaster->AddDynamicObjecs(objects, IdentityMatrix());
+#endif
+#endif    
+
+          SceneGraphLeaf *toUpdate = NULL;
+          
+          for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
+                {
+                  SceneGraphLeaf *l = mDynamicObjects[i];
+
+#if  !MULTIPLE_OBJECTS
+                  UpdateObjectInRayCaster(l);
+#endif
+
+                  if (l->HasChanged())
                         {
-                          UpdateObjectInRayCaster(l);
                           
                           cout<<"Updating affected PVSs..."<<endl;
@@ -1786 +1818 @@
                         }
                 }
-        
-                mUpdateDynamicObjects = false;
+
+
+          mUpdateDynamicObjects = false;
+          
         }
 }

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

@@ -23 +23 @@
         Vector3 GetCenter() const;
 
-        float GetSpatialAngle(const Vector3 &point) const;
+  void ApplyTransformation(const Matrix4x4 &m) {
+        for (int i = 0; i < 3; i++)
+          mVertices[i] = m*mVertices[i];
+  }
+  
+  float GetSpatialAngle(const Vector3 &point) const;
 
         float GetArea() const;