Changeset 9103 in orxonox.OLD

Timestamp:

Jul 4, 2006, 4:54:36 AM (18 years ago)

Author:

patrick

Message:

animations

Location:

branches/presentation/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (4 diffs)

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

@@ -118 +118 @@
         back = collPos.len() - box->halfLength[0];
 
-        PRINTF(0)("backward: back = %f\n", back);
-
         // object is beneath the plane (ground)
         if( back <= 0.0f)

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

@@ -21 +21 @@
 
 #include "src/lib/util/loading/factory.h"
+
+#include "md2/md2Model.h"
 
 #include "weapons/weapon_manager.h"
@@ -273 +275 @@
   velocity *= 100;
 
+  if(velocity.len() != 0.0f)
+  {
+    if( ((InteractiveModel*)this->getModel(0))->getAnimation() != RUN)
+      ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
+  }
+  else
+  {
+    if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
+      ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
+  }
+
+
 
   // physical falling of the player
@@ -297 +311 @@
   {
     ((InteractiveModel*)this->getModel(0))->tick(time);
-//
-//     // handle animations differently
-//     if( this->bJump && likely(this->getModel(0) != NULL))
-//     {
-//       ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
-//     }
+
+    // handle animations differently
+
+
+
+    if( this->bJump && likely(this->getModel(0) != NULL))
+    {
+      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
+        ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+    }
+
 //     else if( this->bFire && likely(this->getModel(0) != NULL))
 //     {
@@ -330 +349 @@
 {
   // only draw if this entity is not the player since the player nevers sees himself
-  if( this->getCurrentPlayer() == NULL)
+//   if( this->getCurrentPlayer() == NULL)
     WorldEntity::draw();
 }