Changeset 2682 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

05/16/08 10:04:19 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HavranDynRayCaster.cpp (modified) (3 diffs)
• Preprocessor.cpp (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (2 diffs)
• havran/testrt.cpp (modified) (1 diff)

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

@@ -664 +664 @@
 #ifdef USE_HAVRAN_RAYCASTER
 
-  int hit_triangles[16];
-  float dist[16];
+  //int hit_triangles[16];
+  //float dist[16];
   Vector3 normals[16];
   Vector3 min = sbox.Min();
   Vector3 max = sbox.Max();
   
-  int packets = rays.size() / 16;
-  
-  int i, j, k = 0;
+  int packets = (int)rays.size() / 16;
+  
+  int i, k = 0;
   Vector3 dir;
   
@@ -724 +724 @@
   int k2 = k;
   for (; k < rays.size(); k++, i++) {
-    double normal[3];
+    //double normal[3];
     // Intersect with the static scene
     bool result = mKtbtree->FindNearestI(rays[k]);
@@ -774 +774 @@
                                const bool pruneInvalidRays )
 {
-  int buckets = rays.size()/16;
+  int buckets = (int)rays.size()/16;
   int offset = 0;
 

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

@@ -1658 +1658 @@
 bool Preprocessor::LoadDynamicGeometry(const string &filename)
 {
+#if DYNAMIC_OBJECTS_HACK
+
         const bool dynamic = true;
-#if DYNAMIC_OBJECTS_HACK
-#if USE_TRANSFORMED_MESH_INSTANCE_HACK
-
-        Mesh *mesh = LoadBinaryObjIntoMesh(filename);
-    
-        if (mesh)
-        {
-                SceneGraphLeaf *leaf = new SceneGraphLeaf(dynamic);
-
-                TransformedMeshInstance *tmi = new TransformedMeshInstance(mesh);
-                leaf->mGeometry.push_back(tmi);
-
-                mSceneGraph->GetRoot()->mChildren.push_back(leaf);
-
-                mDynamicObjects.push_back(tmi);
-                
-                return true;
-        }
-#else
-
         SceneGraphLeaf *leaf = new SceneGraphLeaf(dynamic);
+
         bool parsed = false;
 
@@ -1726 +1709 @@
         }
 
-#endif
+
 #endif
         return false;

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -568 +568 @@
 {
         EnableDrawArrays();
-        if (mUseVbos)
+
+        if (0) //mUseVbos)
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
@@ -580 +581 @@
         glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
 
-#if DYNAMIC_OBJECTS_HACK
+#if 0// DYNAMIC_OBJECTS_HACK
         // handle dynamic objects
         DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicObjects.end();

GTP/trunk/Lib/Vis/Preprocessing/src/havran/testrt.cpp

@@ -1170 +1170 @@
         float ox, oy, oz, dx, dy, dz;
         int hitA; float hitAT;
-        int hitB; float hitBT;  
+        //int hitB; float hitBT;        
         if (fscanf(fp, "%d %f %f %f %f %f %f %d %f\n",
                    &order, &ox, &oy, &oz, &dx, &dy, &dz,