Changeset 9076 in orxonox.OLD

Timestamp:

Jul 4, 2006, 12:15:43 AM (18 years ago)

Author:

patrick

Message:

collision reaction for multiplayer works now

Location:

branches/presentation/src

Files:

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

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

@@ -209 +209 @@
 
 
-#if 0
-  if( box != NULL)
-    height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
-  else
-    height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() ;
-
-
-  if( box != NULL)
-  {
-
-
-    if(ce->getCollisionPosition().x <= 0.9 && ce->getGroundNormal().len() <= 1.4f)
-    {
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
-      return;
-    }
-    if(ce->getCollisionPosition().z <= 0.9 && ce->getGroundNormal().len() <= 1.4f)
-    {
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
-      return;
-    }
-
-    if(ce->getGroundNormal().len() <= 0.1f)
-    {
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
-      return;
-    }
-
-
-    if(ce->getGroundNormal().len() >= 1.4f)
-    {
-      downspeed++;
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
-      return;
-    }
-
-
-    if(height.y > box->halfLength[1] + 0.0f ) // Above ground
-    {
-      if(height.y < box->halfLength[1] + 2.3f) // Snap in
-      {
-        downspeed = 0;
-        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() - Vector(0.0,height.y  - box->halfLength[1] - 0.0f,0.0));
-      } else
-      {
-        downspeed++;
-        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
-      }
-
-    }
-    else
-    {
-      if(height.y <  box->halfLength[1] + 0.0f   /* && height.y  >  - 55.0f*/) // below ground
-      {
-        //if(downspeed <= 0) downspeed =1;
-        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0, -height.y  +  box->halfLength[1] + 2.0f,0.0));
-        //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));
-        downspeed = 0;
-      }
-
-    }
-
-  }// if(box!= NULL)
-#endif
-  /*
-  PRINTF(0)("Collision with Ground: \n");
-  collision->getEntityB()->getAbsCoor().debug();
-  collision->getEntityB()->setVelocity(Vector());
-  collision->getEntityB()->setAbsCoor(this->lastPositions[1]);
-
-  */
 
 }

branches/presentation/src/story_entities/multi_player_world.cc

@@ -129 +129 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
     this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
+
+
+
+    // ground collision detection: BSP Model
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_PLAYERS));
 }
 
@@ -153 +160 @@
 
   State::setOnline( false );
-  
+
   return ErrorMessage();
 }