Changeset 3876 in orxonox.OLD

Timestamp:

Apr 18, 2005, 5:18:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: rearanged keyFrame-addition

Location:

orxonox/trunk/src/util/animation

Files:

• animation.cc (modified) (1 diff)
• animation.h (modified) (1 diff)
• animation3d.cc (modified) (2 diffs)
• t_animation.h (modified) (2 diffs)

orxonox/trunk/src/util/animation/animation.cc

@@ -28 +28 @@
 {  
   // initialize a beginning KeyFrame, that will be deleted afterwards
-  this->bHasKeys = false;
+  this->keyFrameCount = 0;
   this->bHandled = true;
   this->bDelete = false;

orxonox/trunk/src/util/animation/animation.h

@@ -94 +94 @@
 
   BaseObject* baseObject;         //!< The same as object in the derived classes, but with reference to BaseObject
-  bool bHasKeys;                  //!< If the animation has any keys at all. Needed to add the first keyframe (and delete the dummy).
+  unsigned int keyFrameCount;     //!< The Count of KeyFrames.
   bool bHandled;                  //!< If this Animation is handled by the AnimationPlayer.
   bool bRunning;                  //!< If the animation is running

orxonox/trunk/src/util/animation/animation3d.cc

@@ -90 +90 @@
   KeyFrame3D* tmpKeyFrame;
     
-  if (bHasKeys)
+  // when adding the first frame
+  if (this->keyFrameCount == 0)
+    {
+      tmpKeyFrame = this->keyFrameList->firstElement();
+      this->setAnimFunc(animFunc);
+    }
+  else
     {
       tmpKeyFrame = new KeyFrame3D;
+      // when adding the second frame
       if (this->currentKeyFrame == this->nextKeyFrame)
         this->nextKeyFrame = tmpKeyFrame;
       this->keyFrameList->add(tmpKeyFrame);
-
-    }
-  else
-    {
-      tmpKeyFrame = this->keyFrameList->firstElement();
-      bHasKeys = true;
-      this->setAnimFunc(animFunc);
     }
 
@@ -109 +109 @@
   tmpKeyFrame->duration = duration;
   tmpKeyFrame->animFunc = animFunc;
-
+  this->keyFrameCount++;
 }
 

orxonox/trunk/src/util/animation/t_animation.h

@@ -157 +157 @@
   KeyFrameF* tmpKeyFrame;
     
-  if (bHasKeys)
+  // when adding the first frame
+  if (this->keyFrameCount == 0)
+    {
+      tmpKeyFrame = this->keyFrameList->firstElement();
+      this->setAnimFunc(animFunc);
+    }
+  else
     {
       tmpKeyFrame = new KeyFrameF;
@@ -165 +171 @@
       this->keyFrameList->add(tmpKeyFrame);
     }
-  // when adding the first frame
-  else
-    {
-      tmpKeyFrame = this->keyFrameList->firstElement();
-      this->bHasKeys = true;
-      this->setAnimFunc(animFunc);
-    }
 
   tmpKeyFrame->value = value;
   tmpKeyFrame->duration = duration;
   tmpKeyFrame->animFunc = animFunc;
+  this->keyFrameCount++;
 }