Changeset 9126 in orxonox.OLD

Timestamp:

Jul 4, 2006, 2:23:01 PM (18 years ago)

Author:

patrick

Message:

different collision reactions for npcs and full walk ability

Location:

branches/presentation/src

Files:

• lib/collision_reaction/cr_engine.h (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)

branches/presentation/src/lib/collision_reaction/cr_engine.h

@@ -30 +30 @@
     CR_PHYSICS_MOMENTUM   = 0,    //!< physical reaction: conservervation of momentum
     CR_PHYSICS_STEP_BACK,         //!< physical reaction: just go to the last position without collisions
-    CR_PHYSICS_GROUND,            //!< physical reaction: stand on the ground, no movement: simulating simple normal force away from the gravity force
-    CR_PHYSICS_GROUND_WALK,       //!< physical reaction: walking on the ground (inkl. hills etc)
+    CR_PHYSICS_GROUND_WALK,       //!< physical reaction: stand on the ground, no movement: simulating simple normal force away from the gravity force
+    CR_PHYSICS_FULL_WALK,         //!< physical reaction: walking on the ground (inkl. hills etc)
     CR_PHYSICS_DAMAGE,            //!< physical reaction: daling damage according to the object energy and their structural stability
 

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -150 +150 @@
   registerVar( new SynchronizeableFloat( &heading, &heading, "heading", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &attitude, &attitude, "attitude", PERMISSION_OWNER ) );
+
+    //subscribe to collision reaction
+  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, CL_BSP_ENTITY);
 }
 

branches/presentation/src/world_entities/playable.cc

@@ -67 +67 @@
   this->bDead = false;
 
-  //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );