Changeset 8834 in orxonox.OLD for branches/single_player_map

Timestamp:

Jun 27, 2006, 4:39:15 PM (18 years ago)

Author:

patrick

Message:

collision reaction rebwork

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• story_entities/multi_player_world.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -69 +69 @@
   AABB* box = collision->getEntityB()->getModelAABB();
 
+  if( box != NULL)
+  {
 
+    Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+    PRINTF(0)("height: %f          , model height: %f\n", collPos.y, box->halfLength[1]);
+
+  }
+
+#if 0
   if( box != NULL)
     height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
@@ -126 +134 @@
 
   }// if(box!= NULL)
-
+#endif
   /*
   PRINTF(0)("Collision with Ground: \n");

branches/single_player_map/src/story_entities/multi_player_world.cc

@@ -98 +98 @@
     this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));

branches/single_player_map/src/world_entities/world_entity.cc

@@ -193 +193 @@
         PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
 
-      if( modelNumber == 0)
+      if( modelNumber == 0 && !this->isA(CL_WEAPON))
         this->buildObbTree(obbTreeDepth);
     }