Changeset 3986 in orxonox.OLD

Timestamp:

Apr 26, 2005, 12:38:20 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed two major bugs in the animation3d framework (addKeyFrame, tick issues), added shoot animation again. one of both animation is still placed at the wrong place, since the weapons are not symmetrical

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/animation/animation3d.cc (modified) (9 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (5 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -478 +478 @@
 
 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_SINE, ANIM_LINEAR); 
-            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_SINE, ANIM_LINEAR); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_SINE, ANIM_SINE); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
+            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
 
 

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

@@ -46 +46 @@
   this->animFuncMov = &Animation3D::mLinear;
   this->animFuncRot = &Animation3D::rLinear;
+
+  this->bRunning = false;
 }
 
@@ -172 +174 @@
   switch (animFuncMov)
     {
-    default:
     case ANIM_CONSTANT:
       this->animFuncMov = &Animation3D::mConstant;
@@ -197 +198 @@
       this->animFuncMov = &Animation3D::mNegExp;
       this->expFactorMov = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
+      this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_QUADRATIC:
@@ -204 +206 @@
       this->animFuncMov = &Animation3D::mRandom;
       break;
+    default:
+      break;
     }
 }
@@ -215 +219 @@
 void Animation3D::mConstant(float timePassed) const
 {
-  this->object->setRelCoor(this->currentKeyFrame->position);
+  //this->object->setRelCoor(this->currentKeyFrame->position);
 
   /*
@@ -296 +300 @@
 void Animation3D::mNegExp(float timePassed) const
 {
+  Vector v;
+  v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (1.0 - expf(- timePassed * expFactorMov));
+  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
+  this->currentKeyFrame->lastPosition = v;
+
+  /*
   this->object->setRelCoor( this->currentKeyFrame->position +
                             (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
                             (1.0 - expf(- timePassed * expFactorMov)) );
+  */
 }
 
@@ -320 +331 @@
 void Animation3D::mRandom(float timePassed) const
 {
+  /*
   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);
+  */
 }
 
@@ -338 +351 @@
   switch (animFuncRot)
     {
-   default:
+    default:
     case ANIM_CONSTANT:
       this->animFuncRot = &Animation3D::rConstant;
+      printf("a;sdlfkja;lskdjf;alskjdf;lasjdf;lasjdf;lasjdf;lajsdf\n");
       break;
     case ANIM_LINEAR:
@@ -364 +378 @@
       this->animFuncRot = &Animation3D::rRandom;
       break;
+
     }
 }

orxonox/trunk/src/world_entities/environment.cc

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

orxonox/trunk/src/world_entities/test_gun.cc

@@ -50 +50 @@
   this->animation1 = new Animation3D(this->objectComponent1);
   //this->animation2 = new Animation3D(this);
-  parent->addChild(this->objectComponent1, PNODE_ALL);
+  //parent->addChild(this->objectComponent1, PNODE_ALL);
+  this->addChild(this->objectComponent1, PNODE_ALL);
 
   this->animation1->setInfinity(ANIM_INF_CONSTANT);
@@ -58 +59 @@
       this->projectileOffset = Vector(1.0, 0.0, -0.35);
 
-      this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR); 
-      this->animation1->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.5, ANIM_LINEAR);
-      this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR);
-
-      //this->animation2->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR); 
-      //this->animation2->addKeyFrame(Vector(-2.6, 0.1, 1.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
+      //this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR); 
+      //this->animation1->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.5, ANIM_LINEAR);
+      //this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR);
+
+      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation1->addKeyFrame(Vector(-0.4, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
+
+
+      //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR); 
+      //this->animation2->addKeyFrame(Vector(0, 0, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
+      //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
     }
   else if( this->leftRight == W_RIGHT)
@@ -69 +76 @@
       this->projectileOffset = Vector(1.0, 0.0, 0.5);
 
-      this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_NEG_EXP);
-      this->animation1->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.5, ANIM_NEG_EXP);
-      this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_NEG_EXP);
+      //this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
+      //this->animation1->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.5, ANIM_LINEAR);
+      //this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
+
+      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation1->addKeyFrame(Vector(-0.4, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
+
+
+      //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR); 
+      //this->animation2->addKeyFrame(Vector(0, 0, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
+      //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
     }
+
 }
 
@@ -95 +112 @@
 {
   printf("ACTIVATE \n");
-  this->animation2->replay();
+  //this->animation2->replay();
 }
 
@@ -180 +197 @@
 void TestGun::draw () 
 {
+  //this->getRelCoor().debug();
+  //this->getAbsCoor().debug();
+
+  this->objectComponent1->getRelCoor().debug();
+  //this->objectComponent1->getAbsCoor().debug();
+
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);