Changeset 8878 in orxonox.OLD for branches/single_player_map/src
- Timestamp:
- Jun 28, 2006, 5:46:39 PM (18 years ago)
- Location:
- branches/single_player_map/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/single_player_map/src/lib/graphics/importer/interactive_model.h
r8724 r8878 37 37 38 38 virtual void setAnimation(int animNum, int playbackMode = 0) = 0; 39 virtual void setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable) {} 39 40 virtual int getAnimation() = 0; 41 42 virtual void setAnimationSpeed(float speed) {} 40 43 }; 41 44 -
branches/single_player_map/src/lib/graphics/importer/md2/md2Model.cc
r8490 r8878 103 103 this->pModelInfo.pTexCoor = (float*)this->data->pTexCoor; 104 104 105 this->animationSpeed = 1.0f; 106 105 107 // triangle conversion 106 108 this->pModelInfo.pTriangles = new sTriangleExt[this->data->numTriangles]; … … 196 198 void MD2Model::tick(float time) 197 199 { 198 this->animate(time );200 this->animate(time * this->animationSpeed); 199 201 this->processLighting(); 200 202 this->interpolate(/*this->verticesList*/); -
branches/single_player_map/src/lib/graphics/importer/md2/md2Model.h
r8724 r8878 156 156 void renderFrameTriangles() const; 157 157 158 159 158 virtual void setAnimation(int type, int animPlayback = MD2_ANIM_LOOP); 159 virtual void setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable); 160 160 /** returns the current animation @returns animation type */ 161 161 inline int MD2Model::getAnimation() { return this->animationState.type; } 162 virtual void setAnimationSpeed(float speed) { this->animationSpeed = speed; } 162 163 /** scales the current model @param scaleFactor: the factor [0..1] to use for scaling */ 163 164 void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;} … … 186 187 private: 187 188 float scaleFactor; //!< the scale factor (individual) 189 float animationSpeed; //!< the speed of the animation (factor for the time) 188 190 sAnimState animationState; //!< animation state of the model 189 191 sVec3D verticesList[MD2_MAX_VERTICES]; //!< place to temp sav the vert -
branches/single_player_map/src/world_entities/door.cc
r8876 r8878 74 74 75 75 76 /** 77 * sets the animatin of this entity 78 */ 76 79 void Door::setAnimation(int animationIndex, int animPlaybackMode) 77 80 { … … 81 84 82 85 86 /** 87 * ticks the door 88 * @param time: time since last tick 89 */ 83 90 void Door::tick (float time) 84 91 { … … 86 93 ((InteractiveModel*)this->getModel(0))->tick(time); 87 94 88 95 this->checkOpen(); 89 96 } 90 97
Note: See TracChangeset
for help on using the changeset viewer.