Changeset 7071 in orxonox.OLD for trunk/src/lib

Timestamp:

Feb 7, 2006, 2:58:08 PM (19 years ago)

Author:

patrick

Message:

patches: network load level and md2 death

Location:

trunk/src/lib

Files:

• graphics/importer/md2Model.cc (modified) (3 diffs)
• graphics/importer/md2Model.h (modified) (3 diffs)
• network/network_game_manager.cc (modified) (1 diff)

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

@@ -157 +157 @@
   the animation types can be looked up in the animationType table
 */
-void MD2Model::setAnim(int type)
+void MD2Model::setAnim(int type, int animPlayback)
 {
   if( (type < 0) || (type > MAX_ANIMATIONS) )
@@ -174 +174 @@
   this->animationState.type = type;
   this->animationState.numPlays = 0;
+  this->animationState.animPlaybackMode = animPlayback;
 
   this->animationState.interpolationState = 0.0f;
@@ -315 +316 @@
     }
 
-  if( this->animationState.currentFrame > (this->data->numFrames - 1) )
+  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) )

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

@@ -136 +136 @@
   int              nextFrame;            //!< the next frame in the list
   int              numPlays;             //!< the number of times, this has been played in series
+
+  int              animPlaybackMode;     //!< the playback mode
 } sAnimState;
 
@@ -168 +170 @@
 
 
+typedef enum animPlayback
+{
+  MD2_ANIM_LOOP = 0,
+  MD2_ANIM_ONCE,
+
+  MD2_ANIM_NUM
+};
+
+
 
 /* forward definitions */
@@ -219 +230 @@
 
 
-  void setAnim(int type);
+  void setAnim(int type, int animPlayback = MD2_ANIM_LOOP);
   /**  returns the current animation @returns animation type */
   inline int MD2Model::getAnim() { return this->animationState.type; }

trunk/src/lib/network/network_game_manager.cc

@@ -558 +558 @@
       {
 
-        ss->loadModel("models/ships/reap_#.obj");
+        ss->loadModel("models/ships/reap_0.obj");
         ss->toList(OM_GROUP_00);
       }