Changeset 3874 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: reimplemented the random funtions to behave between boundrarties

Location:

orxonox/trunk/src/util/animation

Files:

• animation3d.cc (modified) (1 diff)
• t_animation.h (modified) (1 diff)

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

@@ -304 +304 @@
 void Animation3D::random(float timePassed) const
 {
-  this->object->setRelCoor(this->currentKeyFrame->position * (float)rand()/(float)RAND_MAX);
-  this->object->setRelDir(this->currentKeyFrame->direction * (float)rand()/(float)RAND_MAX);
-}
+  this->object->setRelCoor(this->currentKeyFrame->position + 
+                           (this->nextKeyFrame->position - this->currentKeyFrame->position) * (float)rand()/(float)RAND_MAX);
+  this->object->setRelDir(this->currentKeyFrame->direction +
+                          (this->nextKeyFrame->direction - this->currentKeyFrame->direction)* (float)rand()/(float)RAND_MAX);
+}

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

@@ -342 +342 @@
 float tAnimation<T>::random(float timePassed) const
 {
-  return this->currentKeyFrame->value * (float)rand()/(float)RAND_MAX;
+  return this->currentKeyFrame->value + 
+    (this->nextKeyFrame->value - this->currentKeyFrame->value) *
+    (float)rand()/(float)RAND_MAX;
 }