Changeset 3964 in orxonox.OLD

Timestamp:

Apr 25, 2005, 11:45:57 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented neg_exp function again. better than ever

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (3 diffs)
• util/animation/animation3d.cc (modified) (3 diffs)
• util/animation/animation3d.h (modified) (2 diffs)
• world_entities/environment.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -44 +44 @@
 #include "list.h"
 
+#include "animation3d.h"
 
 
@@ -465 +466 @@
 
             
-            
-
-            WorldEntity* b = new Environment();
-            this->localPlayer->addChild(b);
-            b->setRelCoor(Vector(10.0, 1.0, 1.0));
-            this->spawn(b);
-
-           
+   
             WorldEntity* c = new Environment();
             this->localPlayer->addChild(c);
@@ -478 +472 @@
             this->spawn(c);
             
+            
+            Animation3D* animation = new Animation3D(c);
+            animation->setInfinity(ANIM_INF_REPLAY);
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_NEG_EXP); 
+            animation->addKeyFrame(Vector(5, 5, -5), Quaternion(), 1.0, ANIM_NEG_EXP); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_NEG_EXP); 
+
+
             /*     
                   KeyFrame* f1 = new KeyFrame;

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

@@ -134 +134 @@
           if( this->currentKeyFrame->animFunc == ANIM_NEG_EXP)
             {
-              this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position;
-              this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len());
+
             }
         }
@@ -206 +205 @@
     case ANIM_NEG_EXP:
       this->animFunc = &Animation3D::negExp;
+      //this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position;
+      //this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len());
+      this->expFactor = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
+        //(this->currentKeyFrame->position - this->nextKeyFrame->position)
+
+      /*
+        float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value);
+        expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
+
+      */
       break;
     case ANIM_QUADRATIC:
@@ -284 +293 @@
 void Animation3D::negExp(float timePassed) const
 {
-  this->linear(timePassed);
-}
+  this->object->setRelCoor( this->currentKeyFrame->position +
+                            (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
+                            (1.0 - expf(- timePassed * expFactor)) );
+}
+
+/*
+  float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
+  float e = d * (1.0 - expf(- timePassed * expFactor));
+  return  this->currentKeyFrame->value - e;
+*/
+
 
 /**

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

@@ -8 +8 @@
 #include "vector.h"
 class PNode;
+
+#define DELTA_X_3D 0.05  //!< the percentag of the distance that doesnt have to be done by neg_exp (asymptotical) ~ maschinendelta
 
 //! KeyFrame3D Struct
@@ -60 +62 @@
   Vector tmpVect;        //!< what for??
   float deltaT;          //!< ??
+  float expFactor;
 };

orxonox/trunk/src/world_entities/environment.cc

@@ -50 +50 @@
 void Environment::draw () 
 {
+  //this->getRelCoor()->debug();
+
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();