Changeset 7335 in orxonox.OLD for trunk

Timestamp:

Apr 18, 2006, 9:03:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: adding the same Key with the same Position multiple times does not work anymore (as it should)

Location:

trunk/src/lib/particles

Files:

• quick_animation.cc (modified) (1 diff)
• quick_animation.h (modified) (3 diffs)

trunk/src/lib/particles/quick_animation.cc

@@ -48 +48 @@
   {
     printf("QuickAnimation::Position MUST BE between 0.0f and 1.0f\n");
+    return false;
+  }
+  if(std::find(this->keyFrames.begin(), this->keyFrames.end(), position) != this->keyFrames.end())
+  {
+    printf("QuickAnimation:: key at position %f already added. Use changeValue instead\n", position);
     return false;
   }

trunk/src/lib/particles/quick_animation.h

@@ -43 +43 @@
    * @param position The position to get the Value from.
    */
-  void QuickAnimation::getValue(float& value, float position) const
+  void getValue(float& value, float position) const
   {
     value = this->lookupValues[int(position*this->lookupValues.size())];
@@ -53 +53 @@
    * @returns the calculated Value.
    */
-  float QuickAnimation::getValue(float position) const
+  float getValue(float position) const
   {
     return this->lookupValues[int(position*this->lookupValues.size())];
@@ -69 +69 @@
     //! Creates a new QuickKeyFrame with @param position position @param value value */
     QuickKeyFrame(float position, float value) :  position(position), value(value) {};
+    //! compares this->position with position @param position pos to compare, @returns true on match.
+    bool operator==(float position) { return this->position == position; };
     float            value;             //!< The value of this KeyFrame
     float            position;          //!< The position of thies KeyFrame