Changeset 3744 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 7, 2005, 3:07:20 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: SimpleAnimation works again

Location:

orxonox/trunk/src

Files:

• simple_animation.cc (modified) (8 diffs)
• simple_animation.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

orxonox/trunk/src/simple_animation.cc

@@ -240 +240 @@
     }
   
-  this->localTime = 0;
+  if( this->workingAnimator == NULL)
+    {
+      PRINTF(1)("You have no target selected to start: either do this with start(target) or by prev selecting it\n");
+      return;
+    }
+  this->workingAnimator->localTime = 0.0;
+  this->workingAnimator->bRunning = true;
+  this->workingAnimator->currentFrame = this->workingAnimator->frames->firstElement();
+  this->workingAnimator->lastFrame = this->workingAnimator->frames->nextElement(this->workingAnimator->currentFrame);
 
   /*
@@ -253 +261 @@
     }
   */
-
-  this->bRunning = true;
 }
 
@@ -299 +305 @@
 void SimpleAnimation::tick(float time)
 {
-  this->localTime += time;
   tIterator<Animation>* iterator = this->animators->getIterator();
   Animation* anim = iterator->nextElement();
@@ -306 +311 @@
       if( anim->bRunning)
         { 
-          
+          anim->localTime += time;
           /* first get the current frame via time-stamps */ 
-          while( this->localTime > anim->currentFrame->time)
+          while( anim->localTime > anim->currentFrame->time)
             {
               printf("SimpleAnimation::tick(...) - changing Frame\n");
               
+              anim->localTime -= anim->currentFrame->time;
               //this->currentFrame->object->setRelCoor(*this->currentFrame->position);
               *anim->lastPosition = *anim->currentFrame->position;
@@ -331 +337 @@
               
               *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
-              *anim->tmpVect = *anim->tmpVect * this->localTime / anim->currentFrame->time;
+              *anim->tmpVect = *anim->tmpVect * anim->localTime / anim->currentFrame->time;
               anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
               *anim->lastPosition = *anim->tmpVect;
@@ -340 +346 @@
             case NEG_EXP:
               *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
-              *anim->tmpVect = *anim->tmpVect * (1 - exp(- this->localTime * anim->deltaT));     
+              *anim->tmpVect = *anim->tmpVect * (1 - exp(- anim->localTime * anim->deltaT));     
               anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
               *anim->lastPosition = *anim->tmpVect;
@@ -346 +352 @@
             case SIN:
               *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
-              *anim->tmpVect = *anim->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / anim->currentFrame->time));     
+              *anim->tmpVect = *anim->tmpVect * 0.5*(1 - cos(M_PI * anim->localTime / anim->currentFrame->time));     
               anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
               *anim->lastPosition = *anim->tmpVect;
@@ -355 +361 @@
             case QUADRATIC:
               *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
-              *anim->tmpVect = *anim->tmpVect * 1/3 * ldexpf(this->localTime, 3);
+              *anim->tmpVect = *anim->tmpVect * 1/3 * ldexpf(anim->localTime, 3);
               break;
             default:

orxonox/trunk/src/simple_animation.h

@@ -52 +52 @@
   bool bRunning;
   float deltaT;
+  float localTime;
 };
 

orxonox/trunk/src/story_entities/world.cc

@@ -495 +495 @@
             this->simpleAnimation->addKeyFrame(f1);
             this->simpleAnimation->addKeyFrame(f2);
+            this->simpleAnimation->start();
             //this->simpleAnimation->addKeyFrame(f3);
             //this->simpleAnimation->addKeyFrame(f2);
             this->simpleAnimation->animatorEnd();
 
-            this->simpleAnimation->start();
 
             /*