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

Timestamp:

Apr 4, 2007, 12:13:53 PM (18 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)
• src/world_entities/weapons/acid_launcher.h (modified) (1 diff)
• src/world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• src/world_entities/weapons/boomerang_gun.cc (modified) (1 diff)
• src/world_entities/weapons/heavy_blaster.cc (modified) (1 diff)
• src/world_entities/weapons/light_blaster.cc (modified) (5 diffs)
• src/world_entities/weapons/medium_blaster.cc (modified) (1 diff)
• src/world_entities/weapons/spike_launcher.cc (deleted)
• src/world_entities/weapons/spike_launcher.h (deleted)
• src/world_entities/weapons/spike_thrower.cc (modified) (3 diffs)
• src/world_entities/weapons/swarm_launcher.cc (modified) (2 diffs)
• src/world_entities/weapons/targeting_turret.cc (modified) (1 diff)
• src/world_entities/weapons/turret.cc (modified) (1 diff)

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();
   }
 }

trunk/src/world_entities/weapons/acid_launcher.h

@@ -12 +12 @@
 
 class AcidLauncher : public Weapon
-  {
-  ObjectListDeclaration(AcidLauncher);
+{
+    ObjectListDeclaration ( AcidLauncher );
   public:
     AcidLauncher ();
-    AcidLauncher(const TiXmlElement* root);
+    AcidLauncher ( const TiXmlElement* root );
     virtual ~AcidLauncher ();
 
     void init();
-    virtual void loadParams(const TiXmlElement* root);
+    virtual void loadParams ( const TiXmlElement* root );
 
     virtual void activate();
     virtual void deactivate();
 
-    virtual void tick(float dt);
+    virtual void tick ( float dt );
     virtual void fire();
 
 
   private:
-  };
+};
 
 #endif /* _ACID_LAUNCHER_H */

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -100 +100 @@
   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
   this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
+//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
 
 }

trunk/src/world_entities/weapons/boomerang_gun.cc

@@ -96 +96 @@
   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
   this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
+//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
 
 }

trunk/src/world_entities/weapons/heavy_blaster.cc

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004-2006 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   ### File Specific
+   main-programmer: Marc Schaerrer, Nicolas Schlumberger
+   co-programmer:
+
+*/
+
 #include "heavy_blaster.h"
 #include "world_entities/projectiles/projectile.h"

trunk/src/world_entities/weapons/light_blaster.cc

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004-2006 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   ### File Specific
+   main-programmer: Marc Schaerrer, Nicolas Schlumberger
+   co-programmer:
+
+*/
+
 #include "light_blaster.h"
 #include "world_entities/projectiles/projectile.h"
@@ -39 +55 @@
   for (int i = 0; i < this->getBarrels(); i++)
   {
-   delete [] this->shootAnim[i];
+   //delete [] this->shootAnim[i];
    delete [] this->objComp[i];
   }
   delete [] this->emissionPoint;
-   delete [] this->shootAnim;
+   //delete [] this->shootAnim;
    delete [] this->objComp;
 
@@ -82 +98 @@
   this->objComp = new PNode**[this->getBarrels()];
   this->emissionPoint = new PNode*[this->getBarrels()];
-  this->shootAnim = new Animation3D**[this->getBarrels()];
+//   this->shootAnim = new Animation3D**[this->getBarrels()];
   for (int i = 0; i < this->getBarrels(); i++)
   {
     this->objComp[i] = new PNode* [this->getSegs()];
     this->emissionPoint[i] = new PNode;
-    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+    this->emissionPoint[i]->setParent(this);
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-    this->shootAnim[i] = new Animation3D* [this->getSegs()];
+//     this->shootAnim[i] = new Animation3D* [this->getSegs()];
     for(int j = 0; j < this->getSegs(); j++)
     {
       this->objComp[i][j] = new PNode;
-      this->shootAnim[i][j] = new Animation3D(this->objComp[i][j]);
-      this->shootAnim[i][j]->setInfinity(ANIM_INF_CONSTANT);
+//       this->shootAnim[i][j] = new Animation3D(this->objComp[i][j]);
+//       this->shootAnim[i][j]->setInfinity(ANIM_INF_CONSTANT);
     }
   }
-
-  for (int i = 0; i < this->getBarrels(); i++ )
-    this->emissionPoint[i]->setRelCoor(Vector(1.19, 0.0, 0.1));
+/*
+  this->emissionPoint[0]->setRelCoor(Vector(1.19, 0.0, 0.1));
+  this->emissionPoint[1]->setRelCoor(Vector(1.19, -0.07, -0.05));
+  this->emissionPoint[2]->setRelCoor(Vector(1.19, 0.07, -0.05));*/
+
+  this->emissionPoint[0]->setRelCoor(Vector(2.2, 0.0, 0.1));
+  this->emissionPoint[1]->setRelCoor(Vector(2.2, -0.07, -0.05));
+  this->emissionPoint[2]->setRelCoor(Vector(2.2, 0.07, -0.05));
 
 //   Animation3D* animation1 = this->getAnimation(WS_SHOOTING, this);
@@ -112 +133 @@
 //   this->setEmissionPoint(3.8, 1.2, 0);
 
-  for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(i * 120, Vector(1.0, 0.0, 0.0)), 0.049, ANIM_NULL, ANIM_LINEAR);
-    this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion((i+1)*120, Vector(1.0, 0.0, 0.0)), 0.001, ANIM_NULL, ANIM_LINEAR);
-  }
+//   for (int i = 0; i < this->getBarrels(); i++){
+//     this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(i * 120, Vector(1.0, 0.0, 0.0)), 0.049, ANIM_NULL, ANIM_LINEAR);
+//     this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion((i+1)*120, Vector(1.0, 0.0, 0.0)), 0.001, ANIM_NULL, ANIM_LINEAR);
+//   }
 
 
@@ -144 +165 @@
   pj->activate();
 
-  for (int i = 0; i < this->getSegs(); i++)
-    this->shootAnim[this->activeBarrel][i]->replay();
+//   for (int i = 0; i < this->getSegs(); i++)
+//     this->shootAnim[this->activeBarrel][i]->replay();
 
   // switch barrel

trunk/src/world_entities/weapons/medium_blaster.cc

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004-2006 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   ### File Specific
+   main-programmer: Marc Schaerrer, Nicolas Schlumberger
+   co-programmer:
+
+*/
+
 #include "medium_blaster.h"
 #include "world_entities/projectiles/projectile.h"

trunk/src/world_entities/weapons/spike_thrower.cc

@@ -10 +10 @@
 
    ### File Specific
-   main-programmer: Marc Schaerrer
+   main-programmer: Marc Schaerrer, Nicolas Schlumberger
    co-programmer:
 */
@@ -28 +28 @@
 
 #include <list>
-#include <iterator>
 #include "util/state.h"
-
-#include "math/quaternion.h"
 
 #include "util/loading/factory.h"
@@ -108 +105 @@
   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_RELOAD, "sounds/voices/reload.wav");
 
 }

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -30 +30 @@
 #include <iterator>
 #include "util/state.h"
-
-#include "math/quaternion.h"
 
 #include "util/loading/factory.h"
@@ -100 +98 @@
   this->setProjectileTypeC("SwarmProjectile");
 
-  this->loadModel("models/guns/turret1.obj", 1.0);
+//   this->loadModel("models/guns/turret1.obj", 1.0);
 
   this->setEmissionPoint(1.684, 0.472, 0);
-  this->getProjectileFactory()->prepare(50);
+  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_ACTIVATE, "sounds/voices/rockets.wav");
+//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
 
 }

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -94 +94 @@
   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
   this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
+//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
 }
 

trunk/src/world_entities/weapons/turret.cc

@@ -95 +95 @@
   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
   this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
+//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
 
 }

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