Changeset 3752 in orxonox.OLD for orxonox/trunk/src/simple_animation.cc

Timestamp:

Apr 7, 2005, 10:13:42 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: weapon now works perfectly: it shoots and moves to it. now i will have to change the projectile model itself….

File:

• orxonox/trunk/src/simple_animation.cc (modified) (6 diffs)

orxonox/trunk/src/simple_animation.cc

@@ -73 +73 @@
   delete iterator;
   delete this->frames;
+  singletonRef = NULL;
 }
 
@@ -118 +119 @@
 void SimpleAnimation::selectObject(WorldEntity* entity)
 {
-  printf("SimpleAnimation::selectObject() - selecing active object\n");
   Animation* anim = getAnimationFromWorldEntity(entity);
   if( anim == NULL)
     {
-      printf("SimpleAnimation::selectObject() - object not found, creating one\n");
       anim = new Animation;
       anim->object = entity;
@@ -128 +127 @@
       anim->tmpVect = new Vector();
       anim->frames = new tList<KeyFrame>();
+      anim->animMode = LOOP;
       bRunning = false;
       deltaT = 0.0;
       this->animators->add(anim);
     }
-  else 
-    printf("SimpleAnimation::selectObject() - animation already existent, using it\n");
   this->workingAnimator = anim;
-  printf("SimpleAnimation::selectObject() - selection completed\n");
 }
 
@@ -203 +200 @@
 }
 
+
+void SimpleAnimation::setAnimationMode(animationMode mode)
+{
+  if( !this->bDescriptive || this->workingAnimator == NULL)
+    {
+      PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
+      return;
+    }
+  this->workingAnimator->animMode = mode;
+}
 
 /**
@@ -323 +330 @@
               anim->lastFrame = anim->currentFrame;
               anim->currentFrame = anim->frames->nextElement(anim->currentFrame);
+              if( anim->currentFrame == anim->frames->firstElement() && anim->animMode == SINGLE)
+                {
+                  anim->bRunning = false;
+                  return;
+                }
               anim->movMode = anim->currentFrame->mode;
               if( anim->movMode == NEG_EXP)
@@ -335 +347 @@
             {
             case LINEAR:
-              
               *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
               *anim->tmpVect = *anim->tmpVect * anim->localTime / anim->currentFrame->time;