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

Timestamp:

Jul 19, 2005, 6:27:06 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: messed things up a bit, try fixing

File:

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

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -53 +53 @@
 
   this->objectComponent1 = new PNode();
-  Animation3D* animation1 = this->createAnimation(WS_SHOOTING, this->objectComponent1);
-  Animation3D* animation2 = this->createAnimation(WS_ACTIVATING, this);
-  Animation3D* animation3 = this->createAnimation(WS_DEACTIVATING, this);
+  Animation3D* animation1 = this->getAnimation(WS_SHOOTING, this->objectComponent1);
+  Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
+  Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
   //parent->addChild(this->objectComponent1, PNODE_ALL);
   this->addChild(this->objectComponent1, PNODE_ALL);
@@ -85 +85 @@
       animation1->addKeyFrame(Vector(0, 0, .5), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
 
-      animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
-      animation2->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
-
-      animation3->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
-      animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+      animation2->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+
+      animation3->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+      animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
     }
 /*
@@ -102 +102 @@
   this->setStateDuration(WS_SHOOTING, .2);
   this->setStateDuration(WS_RELOADING, .5);
+  //this->setStateDuration(WS_ACTIVATING, .4);
+  //this->setStateDuration(WS_DEACTIVATING, .4);
 
   this->energy = 100;
@@ -181 +183 @@
 void TestGun::destroy ()
 {}
-
-
-/**
- *  is called, when there is no fire button pressed
-*/
-void TestGun::weaponIdle()
-{}
-
 
 /**