Changeset 9217 in orxonox.OLD

Timestamp:

Jul 5, 2006, 12:32:30 PM (18 years ago)

Author:

bensch

Message:

added boomerang gun

Location:

branches/presentation/src

Files:

• defs/class_id.h (modified) (2 diffs)
• world_entities/WorldEntities.am (modified) (4 diffs)
• world_entities/projectiles/boomerang_projectile.cc (copied) (copied from branches/presentation/src/world_entities/projectiles/guided_missile.cc) (9 diffs)
• world_entities/projectiles/boomerang_projectile.h (copied) (copied from branches/presentation/src/world_entities/projectiles/guided_missile.h) (3 diffs)
• world_entities/weapons/boomerang_gun.cc (copied) (copied from branches/presentation/src/world_entities/weapons/turret.cc) (7 diffs)
• world_entities/weapons/boomerang_gun.h (copied) (copied from branches/presentation/src/world_entities/weapons/turret.h) (2 diffs)

branches/presentation/src/defs/class_id.h

@@ -222 +222 @@
   CL_FPS_SNIPER_RIFLE           =    0x000003a7,
   CL_FPS_LASER_RIFLE            =    0x000003a8,
+  CL_BOOMERANG_GUN              =    0x00000309,
 
   // Projectiles
@@ -233 +234 @@
   CL_GUIDED_MISSILE             =    0x000003e7,
   CL_HYPERBLAST                 =    0x000003e8,
+  CL_BOOMERANG_PROJECTILE       =    0x00000309,
 
   // NPC's

branches/presentation/src/world_entities/WorldEntities.am

@@ -33 +33 @@
                 world_entities/weapons/aiming_system.cc \
                 world_entities/weapons/fps_sniper_rifle.cc \
+                world_entities/weapons/boomerang_gun.cc \
                 \
                 world_entities/projectiles/bomb.cc \
@@ -40 +41 @@
                 world_entities/projectiles/rocket.cc \
                 world_entities/projectiles/guided_missile.cc \
+                world_entities/projectiles/boomerang_projectile.cc \
                 world_entities/projectiles/hyperblast.cc \
                 \
@@ -100 +102 @@
                 weapons/aiming_turret.h \
                 weapons/targeting_turret.h \
+                weapons/boomerang_gun.h \
                 weapons/aim.h \
                 weapons/aiming_system.h \
@@ -110 +113 @@
                 projectiles/rocket.h \
                 projectiles/guided_missile.h \
+                projectiles/boomerang_projectile.h \
                 projectiles/hyperblast.h \
                 \

branches/presentation/src/world_entities/projectiles/boomerang_projectile.cc

@@ +1 @@
+
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -16 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "guided_missile.h"
+#include "boomerang_projectile.h"
 
 #include "state.h"
@@ -26 +27 @@
 #include "debug.h"
 
-CREATE_FAST_FACTORY_STATIC(GuidedMissile, CL_GUIDED_MISSILE);
+CREATE_FAST_FACTORY_STATIC(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
 
 /**
  *  standard constructor
 */
-GuidedMissile::GuidedMissile () : Projectile()
-{
-  this->setClassID(CL_GUIDED_MISSILE, "GuidedMissile");
+BoomerangProjectile::BoomerangProjectile () : Projectile()
+{
+  this->setClassID(CL_BOOMERANG_PROJECTILE, "BoomerangProjectile");
 
   this->loadModel("models/projectiles/orx-rocket.obj", 2.0);
@@ -54 +55 @@
  *  standard deconstructor
 */
-GuidedMissile::~GuidedMissile ()
+BoomerangProjectile::~BoomerangProjectile ()
 {
   // delete this->emitter;
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (GuidedMissile::trailParticles != NULL && ClassList::getList(CL_GUIDED_MISSILE)->size() <= 1)
-  {
-    if (ClassList::exists(GuidedMissile::trailParticles, CL_PARTICLE_SYSTEM))
-      delete GuidedMissile::trailParticles;
-    GuidedMissile::trailParticles = NULL;
-  }
-  if (GuidedMissile::explosionParticles != NULL && ClassList::getList(CL_GUIDED_MISSILE)->size() <= 1)
-  {
-    if (ClassList::exists(GuidedMissile::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete GuidedMissile::explosionParticles;
-    GuidedMissile::explosionParticles = NULL;
-  }
-
-}
-
-SpriteParticles* GuidedMissile::trailParticles = NULL;
-SpriteParticles* GuidedMissile::explosionParticles = NULL;
-
-
-
-void GuidedMissile::activate()
-{
-  if (unlikely(GuidedMissile::trailParticles == NULL))
-  {
-    GuidedMissile::trailParticles = new SpriteParticles(2000);
-    GuidedMissile::trailParticles->setName("GuidedMissileTrailParticles");
-    GuidedMissile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
-    GuidedMissile::trailParticles->setRadius(0.0, .5);
-    GuidedMissile::trailParticles->setRadius(0.2, 4.0);
-    GuidedMissile::trailParticles->setRadius(.5, 1.5);
-    GuidedMissile::trailParticles->setRadius(1.0, 1.5);
-    GuidedMissile::trailParticles->setColor(0.0, 1,0,0,.7);
-    GuidedMissile::trailParticles->setColor(0.2, .8,.8,0,.5);
-    GuidedMissile::trailParticles->setColor(0.5, .8,.8,.8,.8);
-    GuidedMissile::trailParticles->setColor(1.0, .8,.8,.8,.0);
-  }
-  if (unlikely(GuidedMissile::explosionParticles == NULL))
-  {
-    GuidedMissile::explosionParticles = new SpriteParticles(200);
-    GuidedMissile::explosionParticles->setName("GuidedMissileExplosionParticles");
-    GuidedMissile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    GuidedMissile::explosionParticles->setLifeSpan(.5, .3);
-    GuidedMissile::explosionParticles->setRadius(0.0, 10);
-    GuidedMissile::explosionParticles->setRadius(.5, 15.0);
-    GuidedMissile::explosionParticles->setRadius(1.0, 10.0);
-    GuidedMissile::explosionParticles->setColor(0.0, 0,1,0,1);
-    GuidedMissile::explosionParticles->setColor(0.5, .8,.8,0,.8);
-    GuidedMissile::explosionParticles->setColor(0.8, .8,.8,.3,.8);
-    GuidedMissile::explosionParticles->setColor(1.0, 1,1,1,.0);
-  }
-
-  this->emitter->setSystem(GuidedMissile::trailParticles);
+  if (BoomerangProjectile::trailParticles != NULL && ClassList::getList(CL_BOOMERANG_PROJECTILE)->size() <= 1)
+  {
+    if (ClassList::exists(BoomerangProjectile::trailParticles, CL_PARTICLE_SYSTEM))
+      delete BoomerangProjectile::trailParticles;
+    BoomerangProjectile::trailParticles = NULL;
+  }
+  if (BoomerangProjectile::explosionParticles != NULL && ClassList::getList(CL_BOOMERANG_PROJECTILE)->size() <= 1)
+  {
+    if (ClassList::exists(BoomerangProjectile::explosionParticles, CL_PARTICLE_SYSTEM))
+      delete BoomerangProjectile::explosionParticles;
+    BoomerangProjectile::explosionParticles = NULL;
+  }
+
+}
+
+SpriteParticles* BoomerangProjectile::trailParticles = NULL;
+SpriteParticles* BoomerangProjectile::explosionParticles = NULL;
+
+
+
+void BoomerangProjectile::activate()
+{
+  if (unlikely(BoomerangProjectile::trailParticles == NULL))
+  {
+    BoomerangProjectile::trailParticles = new SpriteParticles(2000);
+    BoomerangProjectile::trailParticles->setName("BoomerangProjectileTrailParticles");
+    BoomerangProjectile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    BoomerangProjectile::trailParticles->setLifeSpan(1.0, .3);
+    BoomerangProjectile::trailParticles->setRadius(0.0, .5);
+    BoomerangProjectile::trailParticles->setRadius(0.2, 4.0);
+    BoomerangProjectile::trailParticles->setRadius(.5, 1.5);
+    BoomerangProjectile::trailParticles->setRadius(1.0, 1.5);
+    BoomerangProjectile::trailParticles->setColor(0.0, 1,0,0,.7);
+    BoomerangProjectile::trailParticles->setColor(0.2, .8,.8,0,.5);
+    BoomerangProjectile::trailParticles->setColor(0.5, .8,.8,.8,.8);
+    BoomerangProjectile::trailParticles->setColor(1.0, .8,.8,.8,.0);
+  }
+  if (unlikely(BoomerangProjectile::explosionParticles == NULL))
+  {
+    BoomerangProjectile::explosionParticles = new SpriteParticles(200);
+    BoomerangProjectile::explosionParticles->setName("BoomerangProjectileExplosionParticles");
+    BoomerangProjectile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    BoomerangProjectile::explosionParticles->setLifeSpan(.5, .3);
+    BoomerangProjectile::explosionParticles->setRadius(0.0, 10);
+    BoomerangProjectile::explosionParticles->setRadius(.5, 15.0);
+    BoomerangProjectile::explosionParticles->setRadius(1.0, 10.0);
+    BoomerangProjectile::explosionParticles->setColor(0.0, 0,1,0,1);
+    BoomerangProjectile::explosionParticles->setColor(0.5, .8,.8,0,.8);
+    BoomerangProjectile::explosionParticles->setColor(0.8, .8,.8,.3,.8);
+    BoomerangProjectile::explosionParticles->setColor(1.0, 1,1,1,.0);
+  }
+
+  this->emitter->setSystem(BoomerangProjectile::trailParticles);
 
   this->updateNode(0);
@@ -121 +122 @@
 
 
-void GuidedMissile::deactivate()
+void BoomerangProjectile::deactivate()
 {
   this->emitter->setSystem(NULL);
@@ -128 +129 @@
   this->toList(OM_DEAD);
   this->removeNode();
-  GuidedMissile::fastFactory->kill(this);
-}
-
-
-void GuidedMissile::collidesWith(WorldEntity* entity, const Vector& location)
+  BoomerangProjectile::fastFactory->kill(this);
+}
+
+
+void BoomerangProjectile::collidesWith(WorldEntity* entity, const Vector& location)
 {
   if (this->hitEntity != entity)
@@ -143 +144 @@
  * @param time since last tick
 */
-void GuidedMissile::tick (float time)
-{
-
-
-if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
-   {
+void BoomerangProjectile::tick (float time)
+{
+
+  Vector targetFarFarAway = this->getAbsCoor() + Vector(100000, 0, 0);
+
+  {
     speed = velocity.len();
-    diffVector = ((target->getAbsCoor() - this->getAbsCoor()).getNormalized());
+    diffVector = ((targetFarFarAway - this->getAbsCoor()).getNormalized());
 
     if(velocity.dot(diffVector) != 0)
-     {
-     correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
+    {
+      correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
 
       if( (diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) -velocity).len() < agility )
-       velocity = ((diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )).getNormalized())*agility;
+        velocity = ((diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )).getNormalized())*agility;
       else if(velocity.dot(diffVector) > 0)
         velocity += correctionVector;
       else if (velocity.dot(diffVector) < 0)
         velocity -= correctionVector;
-     }
+    }
     else
       velocity += diffVector * agility;
 
-     this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
-   }
+    this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
+  }
 
   velocity *= maxVelocity/velocity.len();
@@ -180 +181 @@
  *  the function gets called, when the projectile is destroyed
  */
-void GuidedMissile::destroy (WorldEntity* killer)
+void BoomerangProjectile::destroy (WorldEntity* killer)
 {
 
@@ -186 +187 @@
 
   Projectile::destroy( killer );
-  PRINTF(5)("DESTROY GuidedMissile\n");
+  PRINTF(5)("DESTROY BoomerangProjectile\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  this->emitter->setSystem(GuidedMissile::explosionParticles);
+  this->emitter->setSystem(BoomerangProjectile::explosionParticles);
 
   this->emitter->setEmissionRate(1000.0);
   this->emitter->setEmissionVelocity(50.0);
-//  this->deactivate();
-
-}
-
-
-void GuidedMissile::draw () const
+  //  this->deactivate();
+
+}
+
+
+void BoomerangProjectile::draw () const
 {
   glMatrixMode(GL_MODELVIEW);

branches/presentation/src/world_entities/projectiles/boomerang_projectile.h

@@ -1 +1 @@
 /*!
- * @file guided_missile.h
- * @brief a GuidedMissile Projectile
+ * @file boomerang_projectile.h
+ * @brief a BoomerangProjectile Projectile
 */
 
-#ifndef _GUIDED_MISSILE_H
-#define _GUIDED_MISSILE_H
+#ifndef _BOOMERANG_PROJECTILE_H
+#define _BOOMERANG_PROJECTILE_H
 
 #include "projectile.h"
@@ -15 +15 @@
 class Aim;
 
-class GuidedMissile : public Projectile
+class BoomerangProjectile : public Projectile
 {
   public:
-    GuidedMissile ();
-    virtual ~GuidedMissile ();
+    BoomerangProjectile ();
+    virtual ~BoomerangProjectile ();
 
     virtual void activate();
@@ -48 +48 @@
 };
 
-#endif /* _GUIDED_MISSILE_H */
+#endif /* _BOOMERANG_PROJECTILE_H */

branches/presentation/src/world_entities/weapons/boomerang_gun.cc

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "turret.h"
+#include "boomerang_gun.h"
 
 #include "weapon_manager.h"
@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-CREATE_FACTORY(Turret, CL_TURRET);
+CREATE_FACTORY(BoomerangGun, CL_BOOMERANG_GUN);
 
-using namespace std;
 
 /**
  *  standard constructor
  *
- * creates a new Turret
+ * creates a new BoomerangGun
  */
-Turret::Turret ()
+BoomerangGun::BoomerangGun ()
   : Weapon()
 {
@@ -43 +42 @@
 
 /**
- * creates a new Turret from a TiXmlElement
+ * creates a new BoomerangGun from a TiXmlElement
  */
-Turret::Turret(const TiXmlElement* root)
+BoomerangGun::BoomerangGun(const TiXmlElement* root)
 {
   this->init();
@@ -55 +54 @@
  *  standard deconstructor
 */
-Turret::~Turret ()
+BoomerangGun::~BoomerangGun ()
 {
   // model will be deleted from WorldEntity-destructor
 }
 
-void Turret::init()
+void BoomerangGun::init()
 {
-  this->setClassID(CL_TURRET, "Turret");
+  this->setClassID(CL_BOOMERANG_GUN, "BoomerangGun");
 
 
@@ -85 +84 @@
   //this->minCharge = 2;
 
-  this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_ROCKET);
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_BOMMERANG_GUN);
+  this->setProjectileType(CL_BOOMERANG_PROJECTILE);
 
-  this->loadModel("models/guns/turret1.obj");
+  this->loadModel("models/guns/turret1.obj", 5.0);
 
   this->setEmissionPoint(1.684, 0.472, 0);
@@ -99 +98 @@
 }
 
-void Turret::loadParams(const TiXmlElement* root)
+void BoomerangGun::loadParams(const TiXmlElement* root)
 {
   Weapon::loadParams(root);
 }
 
-void Turret::activate()
+void BoomerangGun::activate()
 {
 }
 
-void Turret::deactivate()
+void BoomerangGun::deactivate()
 {
 }
 
-void Turret::tick(float dt)
+void BoomerangGun::tick(float dt)
 {
   if (!Weapon::tickW(dt))
@@ -134 +133 @@
 }
 
-void Turret::fire()
+void BoomerangGun::fire()
 {
   Projectile* pj = this->getProjectile();

branches/presentation/src/world_entities/weapons/boomerang_gun.h

@@ -4 +4 @@
 
 
-#ifndef _TURRET_H
-#define _TURRET_H
+#ifndef _BOOMERANG_GUN_H
+#define _BOOMERANG_GUN_H
 
 #include "weapon.h"
 
-class Turret : public Weapon
+class BoomerangGun : public Weapon
   {
   public:
-    Turret ();
-    Turret(const TiXmlElement* root);
-    virtual ~Turret ();
+    BoomerangGun ();
+    BoomerangGun(const TiXmlElement* root);
+    virtual ~BoomerangGun ();
 
     void init();
@@ -29 +29 @@
   };
 
-#endif /* _TURRET_H */
+#endif /* _BOOMERANG_GUN_H */