Changeset 8915 in orxonox.OLD

Timestamp:

Jun 29, 2006, 5:30:10 PM (18 years ago)

Author:

snellen

Message:

events get grabed now

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (3 diffs)
• lib/event/event_handler.cc (modified) (1 diff)
• lib/script_engine/script_manager.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)

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

@@ -64 +64 @@
 
   // put it back
-     PRINTF(0)("putting it back to lastPos: \n");
+    // PRINTF(0)("putting it back to lastPos: \n");
      //this->lastPositions[0].debug();
-      PRINTF(0)("current pos:\n");
+    //  PRINTF(0)("current pos:\n");
      collision->getEntityB()->getAbsCoor().debug();
      
@@ -97 +97 @@
     
     case COLLISION_TYPE_AXIS_X:
-      PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-      PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
-      PRINTF(0)("COLLISION_TYPE_AXIS_X \n");
+     // PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
+     // PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
+     // PRINTF(0)("COLLISION_TYPE_AXIS_X \n");
       break;
    case COLLISION_TYPE_AXIS_Y:
 
       height = collPos.y - box->halfLength[1];
-      PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-       PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
-       PRINTF(0)("COLLISION_TYPE_AXIS_Y \n");
+     // PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
+     //  PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
+     //  PRINTF(0)("COLLISION_TYPE_AXIS_Y \n");
 //       // object is beneath the plane (ground)
 //       if( height <= 0.0f )
@@ -122 +122 @@
     
     case COLLISION_TYPE_AXIS_Z:
-      PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-      PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
-      PRINTF(0)("COLLISION_TYPE_AXIS_Z \n");
+    //  PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
+    //  PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
+    //  PRINTF(0)("COLLISION_TYPE_AXIS_Z \n");
      break;
 

branches/single_player_map/src/lib/event/event_handler.cc

@@ -357 +357 @@
   else
   {
-//     SDL_WM_GrabInput(SDL_GRAB_ON);
-//     SDL_ShowCursor(SDL_DISABLE);
+    SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_ShowCursor(SDL_DISABLE);
   }
 }

branches/single_player_map/src/lib/script_engine/script_manager.cc

@@ -74 +74 @@
     while(!scripts->empty())
       delete scripts->front();
+  //Delete all triggers
+  if(this->getTriggers())
+    while(!triggers->empty())
+      delete triggers->front();
+  
 }
 

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -184 +184 @@
 void GenericNPC::walkTo(const Vector& coordinate)
 {
+  
   GenericNPC::Anim anim;
   anim.v = coordinate;
@@ -193 +194 @@
 void GenericNPC::walkTo(float x, float y, float z)
 {
+  printf("Walking to %f, %f, %f \n",x,y,z);
   this->walkTo(Vector(x,y,z));