Changeset 8825 in orxonox.OLD for branches/single_player_map/src/world_entities
- Timestamp:
- Jun 27, 2006, 2:32:43 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/single_player_map/src/world_entities/npcs/generic_npc.cc
r8824 r8825 161 161 162 162 this->currentAnim = new Animation3D(this); 163 this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f, ANIM_LINEAR, ANIM_LINEAR); 164 this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(),time, ANIM_LINEAR, ANIM_LINEAR); 163 this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR); 165 164 this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR); 166 // this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR); 167 // this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR); 165 168 166 169 167 this->currentAnim->setInfinity(ANIM_INF_CONSTANT); … … 257 255 258 256 this->currentAnim = new Animation3D(this); 259 this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.1f, ANIM_LINEAR, ANIM_LINEAR);260 this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);261 257 this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR); 262 258 this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR); 259 263 260 264 261 this->currentAnim->setInfinity(ANIM_INF_CONSTANT); … … 427 424 this->currentAnim->play(); 428 425 429 this->setAnimation( CROUCH_STAND, MD2_ANIM_LOOP);426 this->setAnimation(STAND, MD2_ANIM_LOOP); 430 427 } 431 428
Note: See TracChangeset
for help on using the changeset viewer.