Changeset 7365 in orxonox.OLD for branches/cd/src/subprojects

Timestamp:

Apr 25, 2006, 3:17:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/cd: merged the new collision-detection back.
merged and collissions resolved.

Location:

branches/cd/src/subprojects/collision_detection

Files:

• collision_detection.cc (modified) (2 diffs)
• collision_test_entity.cc (modified) (1 diff)

branches/cd/src/subprojects/collision_detection/collision_detection.cc

@@ -87 +87 @@
      b->loadModel(argv[1]);
    }
+
 //   a = new Terrain();
 
@@ -261 +262 @@
       entity->draw();
     entity->drawBVTree(depth, drawMode);
-    printf("%i, %i\n", depth, drawMode);
+   // printf("%i, %i\n", depth, drawMode);
     entity = iterator->nextElement();
   }

branches/cd/src/subprojects/collision_detection/collision_test_entity.cc

@@ -81 +81 @@
 void CollisionTestEntity::tick (float time) {}
 
-