Changeset 3964 in orxonox.OLD for orxonox/trunk/src/util/animation/animation3d.cc
- Timestamp:
- Apr 25, 2005, 11:45:57 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/util/animation/animation3d.cc
r3876 r3964 134 134 if( this->currentKeyFrame->animFunc == ANIM_NEG_EXP) 135 135 { 136 this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position; 137 this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len()); 136 138 137 } 139 138 } … … 206 205 case ANIM_NEG_EXP: 207 206 this->animFunc = &Animation3D::negExp; 207 //this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position; 208 //this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len()); 209 this->expFactor = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D); 210 //(this->currentKeyFrame->position - this->nextKeyFrame->position) 211 212 /* 213 float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value); 214 expFactor = - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X); 215 216 */ 208 217 break; 209 218 case ANIM_QUADRATIC: … … 284 293 void Animation3D::negExp(float timePassed) const 285 294 { 286 this->linear(timePassed); 287 } 295 this->object->setRelCoor( this->currentKeyFrame->position + 296 (this->nextKeyFrame->position - this->currentKeyFrame->position) * 297 (1.0 - expf(- timePassed * expFactor)) ); 298 } 299 300 /* 301 float d = this->currentKeyFrame->value - this->nextKeyFrame->value; 302 float e = d * (1.0 - expf(- timePassed * expFactor)); 303 return this->currentKeyFrame->value - e; 304 */ 305 288 306 289 307 /**
Note: See TracChangeset
for help on using the changeset viewer.