Changeset 8842 in orxonox.OLD

Timestamp:

Jun 28, 2006, 11:11:55 AM (18 years ago)

Author:

patrick

Message:

mulitplayer distances

Location:

branches/multi_player_map/src

Files:

• lib/collision_detection/bounding_volume.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)

branches/multi_player_map/src/lib/collision_detection/bounding_volume.h

@@ -38 +38 @@
     const int*          triangleIndexes;            //!< Array with the triangle indexes in modelInfo
     int                 triangleIndexesLength;      //!< length of the indexes array
+
+    float               radius;                     //!< the radius of the box (longest axis)
 };
 

branches/multi_player_map/src/lib/collision_detection/obb_tree_node.cc

@@ -364 +364 @@
     }
   }
+  this->bvElement->radius = longestAxis;
   PRINTF(4)("\nLongest Axis is: Nr %i with a half-length of:%11.2f\n", longestAxisIndex, longestAxis);
 
@@ -453 +454 @@
   if( unlikely(treeNode == NULL || nodeA == NULL || nodeB == NULL))
     return;
+
+
+  float distanceMax = nodeA->radius + nodeB->radius;
+  float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
+
+
 
   PRINTF(4)("collideWith\n");

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -81 +81 @@
 
   subscribeEvent( ES_GAME, SDLK_o );
-  subscribeEvent( ES_GAME, SDLK_TAB );
+  subscribeEvent( ES_GAME, SDLK_t );
   subscribeEvent( ES_GAME, SDLK_F1 );
   subscribeEvent( ES_MENU, SDLK_F1 );
@@ -102 +102 @@
 {
   unsubscribeEvent( ES_GAME, SDLK_o );
-  unsubscribeEvent( ES_GAME, SDLK_TAB );
+  unsubscribeEvent( ES_GAME, SDLK_t );
   unsubscribeEvent( ES_GAME, SDLK_F1 );
   unsubscribeEvent( ES_MENU, SDLK_F1 );
@@ -558 +558 @@
     }
   }
-  else if ( event.type == SDLK_TAB )
+  else if ( event.type == SDLK_t )
   {
     if ( !event.bPressed )