Changeset 10618 in orxonox.OLD for trunk/src/world_entities/weapons/acid_launcher.cc

Timestamp:

Apr 4, 2007, 12:13:53 PM (17 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/world_entities/weapons/acid_launcher.cc (modified) (6 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/world_entities/weapons/acid_launcher.cc

@@ -29 +29 @@
 #include "util/state.h"
 
-#include "math/quaternion.h"
-
 #include "util/loading/factory.h"
 
@@ -39 +37 @@
 using namespace std;
 
-ObjectListDefinition(AcidLauncher);
-CREATE_FACTORY(AcidLauncher);
+ObjectListDefinition ( AcidLauncher );
+CREATE_FACTORY ( AcidLauncher );
 
 /**
@@ -48 +46 @@
  */
 AcidLauncher::AcidLauncher()
-  : Weapon()
+    : Weapon()
 {
   this->init();
@@ -56 +54 @@
  * creates a new AcidLauncher from a TiXmlElement
  */
-AcidLauncher::AcidLauncher(const TiXmlElement* root)
+AcidLauncher::AcidLauncher ( const TiXmlElement* root )
 {
   this->init();
-  if (root != NULL)
-    this->loadParams(root);
+  if ( root != NULL )
+    this->loadParams ( root );
 }
 
@@ -73 +71 @@
 void AcidLauncher::init()
 {
-  this->registerObject(this, AcidLauncher::_objectList);
-/*
-  Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
-  Animation3D* animation2 = this->getAnimation(WS_DEACTIVATING, this);
+  this->registerObject ( this, AcidLauncher::_objectList );
+  /*
+    Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
+    Animation3D* animation2 = this->getAnimation(WS_DEACTIVATING, this);
 
-  animation1->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
-  animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
-  animation2->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
-  animation2->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+    animation1->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+    animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+    animation2->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+    animation2->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
 
-  animation1->setInfinity(ANIM_INF_CONSTANT);
-  animation2->setInfinity(ANIM_INF_CONSTANT);
-*/
-  this->setStateDuration(WS_SHOOTING, 1.0f);
+    animation1->setInfinity(ANIM_INF_CONSTANT);
+    animation2->setInfinity(ANIM_INF_CONSTANT);
+  */
+  this->setStateDuration ( WS_SHOOTING, 1.0f );
 
-  this->setStateDuration(WS_RELOADING, 1.0f);
-  this->setStateDuration(WS_ACTIVATING, .4);
-  this->setStateDuration(WS_DEACTIVATING, .4);
+  this->setStateDuration ( WS_RELOADING, 1.0f );
+  this->setStateDuration ( WS_ACTIVATING, .4 );
+  this->setStateDuration ( WS_DEACTIVATING, .4 );
 
-  this->setEnergyMax(100);
-  this->increaseEnergy(100);
+  this->setEnergyMax ( 100 );
+  this->increaseEnergy ( 100 );
   //this->minCharge = 2;
 
-  this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("AcidSplash");
+  this->setCapability ( WTYPE_ALLDIRS | WTYPE_TURRET | WTYPE_DIRECTIONAL | WTYPE_LIGHT );
+  this->setProjectileTypeC ( "AcidSplash" );
 //   this->loadModel("models/guns/turret1.obj", 1.0);
 
-  this->setEmissionPoint(2.0, 0, 0);
-  this->getProjectileFactory()->prepare(10);
+  this->setEmissionPoint ( 2.0, 0, 0 );
+  this->getProjectileFactory()->prepare ( 10 );
 
-  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
+  this->setActionSound ( WA_SHOOT, "sounds/explosions/explosion_1.wav" );
+  this->setActionSound ( WA_ACTIVATE, "sounds/voices/rockets.wav" );
+//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
 
 }
 
-void AcidLauncher::loadParams(const TiXmlElement* root)
+void AcidLauncher::loadParams ( const TiXmlElement* root )
 {
-  Weapon::loadParams(root);
+  Weapon::loadParams ( root );
 }
 
 void AcidLauncher::activate()
-{
-}
+{}
 
 void AcidLauncher::deactivate()
+{}
+
+void AcidLauncher::tick ( float dt )
 {
-}
-
-void AcidLauncher::tick(float dt)
-{
-  if (!Weapon::tickW(dt))
+  if ( !Weapon::tickW ( dt ) )
     return;
-  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
-  {
-    this->energyWidget->setDisplayedImage("textures/gui/gui_acid.png");
+  if ( this->energyWidget != NULL && !this->isEnergyWidgetInitialized ) {
+    this->energyWidget->setDisplayedImage ( "textures/gui/gui_acid.png" );
     this->isEnergyWidgetInitialized = true;
   }
@@ -157 +152 @@
 
   Projectile* pj = NULL;
-  for( int i=0; i < 1; i++)
-  {
-      pj  = this->getProjectile();
-      if (pj == NULL)
-        return;
+  for ( int i=0; i < 1; i++ ) {
+    pj  = this->getProjectile();
+    if ( pj == NULL )
+      return;
 
-      fired = true;
-      pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*165.0 + VECTOR_RAND(10)));
+    fired = true;
+    pj->setVelocity ( this->getVelocity() + ( this->getAbsDir().apply ( Vector ( 1,0,0 ) ) *165.0 + VECTOR_RAND ( 10 ) ) );
 
-      pj->setParent(PNode::getNullParent());
-      pj->setAbsCoor(this->getEmissionPoint() + VECTOR_RAND(.1));
-      pj->setAbsDir(this->getAbsDir()+Quaternion(0,VECTOR_RAND(5)));
-      pj->activate();
+    pj->setParent ( PNode::getNullParent() );
+    pj->setAbsCoor ( this->getEmissionPoint() + VECTOR_RAND ( .1 ) );
+    pj->setAbsDir ( this->getAbsDir() +Quaternion ( 0,VECTOR_RAND ( 5 ) ) );
+    pj->activate();
   }
 }

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs