Changeset 3993 in orxonox.OLD for orxonox/trunk/src/world_entities/test_gun.cc

Timestamp:

Apr 27, 2005, 12:12:28 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: patch to use relative coordinates again, some smaller changes in the preLoading/loading mechanisms

File:

• orxonox/trunk/src/world_entities/test_gun.cc (modified) (6 diffs)

orxonox/trunk/src/world_entities/test_gun.cc

@@ -49 +49 @@
   this->objectComponent1 = new PNode();
   this->animation1 = new Animation3D(this->objectComponent1);
-  //this->animation2 = new Animation3D(this);
+  this->animation2 = new Animation3D(this);
+  this->animation3 = new Animation3D(this);
   //parent->addChild(this->objectComponent1, PNODE_ALL);
   this->addChild(this->objectComponent1, PNODE_ALL);
 
   this->animation1->setInfinity(ANIM_INF_CONSTANT);
-  //this->animation2->setInfinity(ANIM_INF_CONSTANT);
+  this->animation2->setInfinity(ANIM_INF_CONSTANT);
+  this->animation3->setInfinity(ANIM_INF_CONSTANT);
   if( this->leftRight == W_LEFT)
     {
@@ -67 +69 @@
       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);
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
     }
   else if( this->leftRight == W_RIGHT)
@@ -86 +89 @@
 
 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, 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);
@@ -112 +120 @@
 void TestGun::activate()
 {
-  printf("ACTIVATE \n");
-  //this->animation2->replay();
+  if( this->leftRight == W_RIGHT) printf("ACTIVATE right weapon\n");
+  else printf("ACTIVATE left weapon\n");
+  
+  this->animation2->replay();
 }
 
@@ -127 +137 @@
 {
   printf("DEACTIVATE\n");
+  this->animation3->replay();
 }
 
@@ -200 +211 @@
   //this->getRelCoor().debug();
   //this->getAbsCoor().debug();
-
-  this->objectComponent1->getRelCoor().debug();
+  //this->objectComponent1->getRelCoor().debug();
   //this->objectComponent1->getAbsCoor().debug();