Changeset 8945 in orxonox.OLD

Timestamp:

Jun 30, 2006, 3:39:07 AM (18 years ago)

Author:

patrick

Message:

repair station works now. one point less in the todo list

Location:

branches/single_player_map/src/world_entities/npcs

Files:

• repair_station.cc (modified) (6 diffs)
• repair_station.h (modified) (2 diffs)

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

@@ -47 +47 @@
 {
  // begin, end, fps, interruptable
-  {   0,  12,  30,  0 },   //!< CYCLE01
+  {   0,  12,  20,  0 },   //!< CYCLE01
   {   12, 24,  30,  0 },   //!< CYCLE02
-  {   24, 40,  30,  0 },   //!< CYCLE03
+  {   24, 40,  10,  0 },   //!< CYCLE03
   {   40, 55,  30,  0 },   //!< CYCLE04
-  {   55, 68,  30,  0 },   //!< CYCLE05
+  {   55, 68,  20,  0 },   //!< CYCLE05
   {   68, 81,  30,  0 },   //!< CYCLE06
-  {   81, 89,  30,  0 },   //!< CYCLE07
+  {   81, 89,  40,  0 },   //!< CYCLE07
   {   89, 99,  30,  0 }    //!< CYCLE08
 };
@@ -76 +76 @@
   this->toList(OM_COMMON);
 
-  this->loadMD2Texture("maps/doors.jpg");
-  this->loadModel("models/creatures/doors.md2", this->scale);
+  this->bActivated = true;
+  this->animationStep = 1;
+  this->animationCurrent = REPAIR_CYCLE01;
+
+  this->loadMD2Texture("maps/repairstation.jpg");
+  this->loadModel("models/creatures/repairstation.md2", this->scale);
 
   this->setAnimation(REPAIR_CYCLE01, MD2_ANIM_ONCE);
@@ -122 +126 @@
 {
   if( likely(this->getModel(0) != NULL))
-    ((InteractiveModel*)this->getModel(0))->getAnimation();
+    return ((InteractiveModel*)this->getModel(0))->getAnimation();
+  else
+    return -1;
 }
 
+
+
+/**
+ * @returns true if animation is finished
+ */
+bool RepairStation::isAnimationFinished()
+{
+  if( likely(this->getModel(0) != NULL))
+    return ((InteractiveModel*)this->getModel(0))->isAnimationFinished();
+  else
+    return false;
+}
 
 
@@ -133 +151 @@
 {
   this->animationStep = 1;
+  this->bActivated = true;
 }
 
@@ -142 +161 @@
 {
   this->animationStep = 0;
+  this->bActivated = false;
 }
 
@@ -163 +183 @@
     ((InteractiveModel*)this->getModel(0))->tick(time);
 
-   if( this->getAnimation() == ATTACK)
-//     ((MD2Model*)this->getModel(0))->setAnimation(ATTACK);
+  if( !this->bActivated)
+    return;
 
-
-  this->setAnimation( this->animationCurrent, MD2_ANIM_ONCE);
-  this->animationCurrent = (this->animationCurrent + this->animationStep) % REPAIR_MAX_ANIMATIONS;
+  if( this->isAnimationFinished())
+  {
+    this->animationCurrent = (this->animationCurrent + this->animationStep) % REPAIR_MAX_ANIMATIONS;
+    this->setAnimation( this->animationCurrent, MD2_ANIM_ONCE);
+  }
 }
 

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

@@ -46 +46 @@
     void setAnimation(int animNum, int playbackMode = 0);
     int getAnimation();
+    bool isAnimationFinished();
 
 
@@ -56 +57 @@
     int            animationStep;     //!< the incrementation step of the animation
 
+    bool           bActivated;        //!< true if activated
+
 };