Changeset 7075 in orxonox.OLD

Timestamp:

Feb 7, 2006, 3:24:02 PM (18 years ago)

Author:

patrick

Message:

trunk: the test entities are now killable with the specific animation

File:

• trunk/src/lib/graphics/importer/md2Model.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/md2Model.cc

@@ -308 +308 @@
       this->animationState.nextFrame++;
 
-      if( this->animationState.nextFrame > this->animationState.endFrame)
+      if( this->animationState.nextFrame > this->animationState.endFrame )
       {
-        this->animationState.nextFrame = this->animationState.startFrame;
-        this->animationState.numPlays++;
+        if( this->animationState.animPlaybackMode == MD2_ANIM_LOOP)
+        {
+          this->animationState.nextFrame = this->animationState.startFrame;
+          this->animationState.numPlays++;
+        }
+        else
+        {
+          this->animationState.nextFrame = this->animationState.endFrame;
+        }
       }
       this->animationState.lastTime = this->animationState.localTime;
     }
 
-  if( this->animationState.currentFrame > (this->data->numFrames - 1) && this->animationState.animPlaybackMode == MD2_ANIM_LOOP)
-    this->animationState.currentFrame = 0;
-  if( this->animationState.nextFrame > (this->data->numFrames - 1) )
-    this->animationState.nextFrame = 0;
+//     if( this->animationState.currentFrame > (this->data->numFrames - 1) )
+//       this->animationState.currentFrame = 0;
+
+//     if( (this->animationState.nextFrame > (this->data->numFrames - 1)) && this->animationState.animPlaybackMode == MD2_ANIM_LOOP)
+//     this->animationState.nextFrame = 0;
 
   this->animationState.interpolationState = this->animationState.fps *