Changeset 6914 in orxonox.OLD

Timestamp:

Jan 31, 2006, 9:30:33 PM (18 years ago)

Author:

patrick

Message:

collsion: subproj compile error fixed. more to go

Location:

branches/current_cd/src/subprojects/collision_detection

Files:

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

branches/current_cd/src/subprojects/collision_detection/collision_detection.cc

@@ -95 +95 @@
 //   entityList->add(b);
 
-  CDEngine::getInstance()->setEntityList(entityList);
+  //CDEngine::getInstance()->setEntityList(entityList);
 
   LightManager* lightMan = LightManager::getInstance();
@@ -232 +232 @@
 {
 
-  CDEngine::getInstance()->checkCollisions();
+  //  CDEngine::getInstance()->checkCollisions();
 
 

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

@@ -96 +96 @@
   glMultMatrixf((float*)matrix);
 
-  this->model->draw();
+  WorldEntity::draw();
 
   glPopMatrix();