Changeset 8943 in orxonox.OLD for branches/single_player_map/src/lib

Timestamp:

Jun 30, 2006, 3:21:44 AM (18 years ago)

Author:

patrick

Message:

model sticks to ground. no wall cd yet

Location:

branches/single_player_map/src/lib

Files:

• collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• graphics/importer/interactive_model.h (modified) (1 diff)
• graphics/importer/md2/md2Model.h (modified) (1 diff)

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

@@ -121 +121 @@
         {
           entity->shiftCoor(Vector(0.0f, -height, 0.0f));
-//           entity->setOnGround(true);
+          entity->setOnGround(true);
         }
         // object is already in the wall
@@ -131 +131 @@
         {
           // entity is not on ground
-//           entity->setOnGround(false);
+          entity->setOnGround(false);
         }
         break;

branches/single_player_map/src/lib/graphics/importer/interactive_model.h

@@ -40 +40 @@
     virtual int getAnimation() = 0;
 
+    virtual bool isAnimationFinished() { return false; }
+
     virtual void setAnimationSpeed(float speed) {}
 };

branches/single_player_map/src/lib/graphics/importer/md2/md2Model.h

@@ -161 +161 @@
   inline int MD2Model::getAnimation() { return this->animationState.type; }
   virtual void setAnimationSpeed(float speed) { this->animationSpeed = speed; }
+  virtual bool isAnimationFinished() { return (this->animationState.currentFrame == this->animationState.endFrame )?true:false; }
   /**  scales the current model @param scaleFactor: the factor [0..1] to use for scaling */
   void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}