Changeset 9003 in orxonox.OLD for trunk/src/lib/graphics/importer/md2

Timestamp:

Jul 2, 2006, 1:36:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

Location:

trunk/src/lib/graphics/importer/md2

Files:

• md2Model.cc (modified) (2 diffs)
• md2Model.h (modified) (1 diff)

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

@@ -85 +85 @@
 
   this->scaleFactor = scale;
+  this->animationSpeed = 1.0f;
 
   shadeDots = MD2Model::anormsDots[0];
@@ -103 +104 @@
   this->pModelInfo.pTexCoor = (float*)this->data->pTexCoor;
 
-  this->animationSpeed = 1.0f;
 
   // triangle conversion

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