Changeset 9104 in orxonox.OLD for branches/presentation

Timestamp:

Jul 4, 2006, 5:06:02 AM (19 years ago)

Author:

patrick

Message:

jump animation and debugs

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (5 diffs)
• playable.cc (modified) (1 diff)

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

@@ -149 +149 @@
   registerVar( new SynchronizeableFloat( &heading, &heading, "heading", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &attitude, &attitude, "attitude", PERMISSION_OWNER ) );
-
-
-  // collision reaction registration
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -225 +221 @@
   {
     this->bPosBut = false;
-    printf("mechanic:walkTo( %f, mheight, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
+    printf("mechanic:walkTo( %f, %f, %f)\n",this->getAbsCoorX(),this->getAbsCoorY(),this->getAbsCoorZ());
   }
 
@@ -275 +271 @@
   velocity *= 100;
 
-  if(velocity.len() != 0.0f)
+  if( this->bJump && likely(this->getModel(0) != NULL))
+  {
+    if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
+      ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+  }
+  else if(velocity.len() != 0.0f)
   {
     if( ((InteractiveModel*)this->getModel(0))->getAnimation() != RUN)
@@ -316 +317 @@
 
 
-    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))
@@ -376 +373 @@
   }
   else if( event.type == KeyMapper::PEV_JUMP)
+    this->bJump = event.bPressed;
     this->bPosBut = event.bPressed;
 }

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);