Changeset 8943 in orxonox.OLD for branches

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

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• lib/graphics/importer/interactive_model.h (modified) (1 diff)
• lib/graphics/importer/md2/md2Model.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/npcs/repair_station.cc (modified) (3 diffs)
• world_entities/npcs/repair_station.h (modified) (2 diffs)

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

branches/single_player_map/src/world_entities/WorldEntities.am

@@ -6 +6 @@
                 world_entities/npcs/generic_npc.cc \
                 world_entities/npcs/door.cc \
+                world_entities/npcs/repair_station.cc \
                 \
                 world_entities/environment.cc \
@@ -67 +68 @@
                 npcs/ground_turret.h \
                 npcs/door.cc \
+                npcs/repair_station.cc \
                 \
                 environment.h \

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

@@ -259 +259 @@
   if( !this->isOnGround())
   {
-    this->fallVelocity += 10.0f * time;
+    this->fallVelocity += 100.0f * time;
     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
   }

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

@@ -75 +75 @@
 
   this->toList(OM_COMMON);
-  this->bLocked = false;
 
   this->loadMD2Texture("maps/doors.jpg");
   this->loadModel("models/creatures/doors.md2", this->scale);
 
-  this->setAnimation(REPAIR_CYCLE00, MD2_ANIM_ONCE);
+  this->setAnimation(REPAIR_CYCLE01, MD2_ANIM_ONCE);
 }
 
@@ -116 +115 @@
 }
 
+
+/**
+ * @returns the current animation number
+ */
+int RepairStation::getAnimation()
+{
+  if( likely(this->getModel(0) != NULL))
+    ((InteractiveModel*)this->getModel(0))->getAnimation();
+}
 
 
@@ -155 +163 @@
     ((InteractiveModel*)this->getModel(0))->tick(time);
 
-//   if( ((MD2Model*)this->getModel(0))->getAnimation() != ATTACK)
+   if( this->getAnimation() == ATTACK)
 //     ((MD2Model*)this->getModel(0))->setAnimation(ATTACK);
 
 
   this->setAnimation( this->animationCurrent, MD2_ANIM_ONCE);
-  this->animationCurrent = (this->animationCurrent + this->animationStep)%RAPAIR_MAX_ANIMATION;
+  this->animationCurrent = (this->animationCurrent + this->animationStep) % REPAIR_MAX_ANIMATIONS;
 }
 

branches/single_player_map/src/world_entities/npcs/repair_station.h

@@ -34 +34 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    void setActionRadius(float radius) { this->actionRadius = radius; }
     void setScale(float scale) { this->scale = scale; }
 
@@ -46 +45 @@
   private:
     void setAnimation(int animNum, int playbackMode = 0);
+    int getAnimation();