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

Timestamp:

Jul 20, 2005, 1:41:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: states are now flow'n through

File:

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

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

@@ -70 +70 @@
       animation1->addKeyFrame(Vector(0, 0, 0), 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);
     }
   else if( this->leftRight == W_RIGHT)
@@ -100 +100 @@
   //ObjectManager::getInstance()->debug();
 
-  this->setStateDuration(WS_SHOOTING, .2);
-  this->setStateDuration(WS_RELOADING, .5);
+  this->setStateDuration(WS_SHOOTING, .4);
+  this->setStateDuration(WS_RELOADING, 1);
   //this->setStateDuration(WS_ACTIVATING, .4);
   //this->setStateDuration(WS_DEACTIVATING, .4);