Changeset 5623 in orxonox.OLD for branches

Timestamp:

Nov 17, 2005, 1:22:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: cannon has again animations

File:

• branches/world_entities/src/world_entities/weapons/cannon.cc (modified) (3 diffs)

branches/world_entities/src/world_entities/weapons/cannon.cc

@@ -52 +52 @@
 {
   this->init();
+}
+
+
+Cannon::Cannon(const TiXmlElement* root)
+{
+  this->init();
+  this->loadParams(root);
+}
+
+/**
+ *  standard deconstructor
+*/
+Cannon::~Cannon ()
+{
+  // model will be deleted from WorldEntity-destructor
+}
+
+
+void Cannon::init()
+{
+  this->setClassID(CL_CANNON, "Cannon");
+
+//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
+
+  this->loadModel("models/guns/cannon.obj");
+
+  this->setStateDuration(WS_SHOOTING, .1);
+  this->setStateDuration(WS_RELOADING, .1);
+  this->setStateDuration(WS_ACTIVATING, .4);
+  this->setStateDuration(WS_DEACTIVATING, .4);
+
+  this->setMaximumEnergy(1000, 100);
+  this->increaseEnergy(1000);
+  //this->minCharge = 2;
+
+  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->setProjectileType(CL_LASER);
+  this->prepareProjectiles(20);
 
 //  this->objectComponent1 = new PNode();
@@ -64 +104 @@
   animation3->setInfinity(ANIM_INF_CONSTANT);
 
-    this->setEmissionPoint(3.8, 1.2, 0);
+  this->setEmissionPoint(3.8, 1.2, 0);
 
 //     animation1->addKeyFrame(Vector(0, -1.5, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
@@ -70 +110 @@
 //     animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
 
-    animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-    animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-
-    animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-    animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-}
-
-
-Cannon::Cannon(const TiXmlElement* root)
-{
-  this->init();
-  this->loadParams(root);
-}
-
-/**
- *  standard deconstructor
-*/
-Cannon::~Cannon ()
-{
-  // model will be deleted from WorldEntity-destructor
-}
-
-
-void Cannon::init()
-{
-  this->setClassID(CL_CANNON, "Cannon");
-
-//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
-
-  this->loadModel("models/guns/cannon.obj");
-
-  this->setStateDuration(WS_SHOOTING, .1);
-  this->setStateDuration(WS_RELOADING, .1);
-  this->setStateDuration(WS_ACTIVATING, .4);
-  this->setStateDuration(WS_DEACTIVATING, .4);
-
-  this->setMaximumEnergy(1000, 100);
-  this->increaseEnergy(1000);
-  //this->minCharge = 2;
-
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
-
-  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->setProjectileType(CL_LASER);
-  this->prepareProjectiles(20);
-
+  animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+
+  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
 }