Changeset 6810 in orxonox.OLD

Timestamp:

Jan 28, 2006, 3:30:54 PM (18 years ago)

Author:

bensch

Message:

trunk: added hyperblaster

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/projectiles/hyperblast.cc (copied) (copied from trunk/src/world_entities/projectiles/rocket.cc) (8 diffs)
• world_entities/projectiles/hyperblast.h (copied) (copied from trunk/src/world_entities/projectiles/rocket.h) (3 diffs)
• world_entities/weapons/hyperblaster.cc (copied) (copied from trunk/src/world_entities/weapons/cannon.cc) (11 diffs)
• world_entities/weapons/hyperblaster.h (copied) (copied from trunk/src/world_entities/weapons/cannon.h) (2 diffs)

trunk/src/defs/class_id.h

@@ -196 +196 @@
   CL_CANNON                     =    0x00000233,
   CL_TARGETING_TURRET           =    0x00000234,
+  CL_HYPERBLASTER               =    0x00000235,
 
   CL_TEST_BULLET                =    0x00000240,
@@ -203 +204 @@
   CL_GROUND_TURRET              =    0x00000244,
   CL_GUIDED_MISSILE             =    0x00000245,
+  CL_HYPERBLAST                 =    0x00000246,
 
   CL_NPC_TEST1                  =    0x00000301,

trunk/src/world_entities/Makefile.am

@@ -35 +35 @@
                   world_entities/weapons/targeting_turret.cc \
                   world_entities/weapons/cannon.cc \
+                  world_entities/weapons/hyperblaster.cc \
                   world_entities/weapons/aim.cc \
                   world_entities/weapons/crosshair.cc \
@@ -44 +45 @@
                   world_entities/projectiles/rocket.cc \
                   world_entities/projectiles/guided_missile.cc \
+                  world_entities/projectiles/hyperblast.cc \
                   \
                   world_entities/power_ups/power_up.cc \

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -10 +10 @@
 
    ### File Specific
-   main-programmer: Patrick Boenzli
-   co-programmer: Benjamin Grauer
+   main-programmer: Benjamin Grauer
+   co-programmer: ...
 
 */
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "rocket.h"
+#include "hyperblast.h"
 
 #include "fast_factory.h"
@@ -25 +25 @@
 #include "particle_emitter.h"
 #include "sprite_particles.h"
+#include "spark_particles.h"
 
 
 using namespace std;
 
-CREATE_FAST_FACTORY_STATIC(Rocket, CL_ROCKET);
+CREATE_FAST_FACTORY_STATIC(Hyperblast, CL_HYPERBLAST);
 
 /**
  *  standard constructor
 */
-Rocket::Rocket () : Projectile()
+Hyperblast::Hyperblast () : Projectile()
 {
-  this->setClassID(CL_ROCKET, "Rocket");
+  this->setClassID(CL_HYPERBLAST, "Hyperblast");
 
   float modelSize = .3;
-  this->loadModel("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-hyperblast.obj", .3);
 
   this->setMinEnergy(1);
@@ -54 +55 @@
  *  standard deconstructor
 */
-Rocket::~Rocket ()
+Hyperblast::~Hyperblast ()
 {
-  // delete this->emitter;
-
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Rocket::trailParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
+  if (Hyperblast::extParticles != NULL && ClassList::getList(CL_HYPERBLAST)->size() <= 1)
   {
-/*    if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
-      delete Rocket::trailParticles;*/
-    Rocket::trailParticles = NULL;
+    Hyperblast::extParticles = NULL;
   }
-  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
+  if (Hyperblast::explosionParticles != NULL && ClassList::getList(CL_HYPERBLAST)->size() <= 1)
   {
-/*    if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete Rocket::explosionParticles;*/
-    Rocket::explosionParticles = NULL;
+    Hyperblast::explosionParticles = NULL;
   }
 
 }
 
-SpriteParticles* Rocket::trailParticles = NULL;
-SpriteParticles* Rocket::explosionParticles = NULL;
+SpriteParticles* Hyperblast::extParticles = NULL;
+SparkParticles* Hyperblast::explosionParticles = NULL;
 
-void Rocket::activate()
+void Hyperblast::activate()
 {
-  if (unlikely(Rocket::trailParticles == NULL))
+  if (unlikely(Hyperblast::extParticles == NULL))
   {
-    Rocket::trailParticles = new SpriteParticles(2000);
-    Rocket::trailParticles->setName("RocketTrailParticles");
-    Rocket::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    Rocket::trailParticles->setLifeSpan(1.0, .3);
-    Rocket::trailParticles->setRadius(0.0, .5);
-    Rocket::trailParticles->setRadius(0.2, 2.0);
-    Rocket::trailParticles->setRadius(.5, .8);
-    Rocket::trailParticles->setRadius(1.0, .8);
-    Rocket::trailParticles->setColor(0.0, 1,0,0,.7);
-    Rocket::trailParticles->setColor(0.2, .8,.8,0,.5);
-    Rocket::trailParticles->setColor(0.5, .8,.8,.8,.8);
-    Rocket::trailParticles->setColor(1.0, .8,.8,.8,.0);
+    Hyperblast::extParticles = new SpriteParticles(2000);
+    Hyperblast::extParticles->setName("HyperblastTrailParticles");
+    Hyperblast::extParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Hyperblast::extParticles->setLifeSpan(1.0, .3);
+    Hyperblast::extParticles->setRadius(0.0, .5);
+    Hyperblast::extParticles->setRadius(0.2, 2.0);
+    Hyperblast::extParticles->setRadius(.5, .8);
+    Hyperblast::extParticles->setRadius(1.0, .8);
+    Hyperblast::extParticles->setColor(0.0, 1,0,0,.7);
+    Hyperblast::extParticles->setColor(0.2, .8,.8,0,.5);
+    Hyperblast::extParticles->setColor(0.5, .8,.8,.8,.8);
+    Hyperblast::extParticles->setColor(1.0, .8,.8,.8,.0);
   }
-  if (unlikely(Rocket::explosionParticles == NULL))
+  if (unlikely(Hyperblast::explosionParticles == NULL))
   {
-    Rocket::explosionParticles = new SpriteParticles(200);
-    Rocket::explosionParticles->setName("RocketExplosionParticles");
-    Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    Rocket::explosionParticles->setLifeSpan(.5, .3);
-    Rocket::explosionParticles->setRadius(0.0, 10);
-    Rocket::explosionParticles->setRadius(.5, 15.0);
-    Rocket::explosionParticles->setRadius(1.0, 10.0);
-    Rocket::explosionParticles->setColor(0.0, 0,1,0,1);
-    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.8);
-    Rocket::explosionParticles->setColor(0.8, .8,.8,.3,.8);
-    Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
+    Hyperblast::explosionParticles = new SparkParticles(200);
+    Hyperblast::explosionParticles->setName("HyperblastExplosionParticles");
+    Hyperblast::explosionParticles->setLifeSpan(.5, .3);
+    Hyperblast::explosionParticles->setRadius(0.0, 10);
+    Hyperblast::explosionParticles->setRadius(.5, 15.0);
+    Hyperblast::explosionParticles->setRadius(1.0, 10.0);
+    Hyperblast::explosionParticles->setColor(0.0, 0,1,0,1);
+    Hyperblast::explosionParticles->setColor(0.5, .8,.8,0,.8);
+    Hyperblast::explosionParticles->setColor(0.8, .8,.8,.3,.8);
+    Hyperblast::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
 
-  this->emitter->setSystem(Rocket::trailParticles);
+  this->emitter->setSystem(Hyperblast::extParticles);
 
   this->updateNode(0);
@@ -117 +111 @@
 
 
-void Rocket::deactivate()
+void Hyperblast::deactivate()
 {
   this->emitter->setSystem(NULL);
@@ -125 +119 @@
 //  GarbageCollector::getInstance()->collect(this);
   this->toList(OM_DEAD);
-  Rocket::fastFactory->kill(this);
+  Hyperblast::fastFactory->kill(this);
 }
 
 
-void Rocket::collidesWith(WorldEntity* entity, const Vector& location)
+void Hyperblast::collidesWith(WorldEntity* entity, const Vector& location)
 {
   if (this->hitEntity != entity)
@@ -140 +134 @@
  * @param time since last tick
 */
-void Rocket::tick (float dt)
+void Hyperblast::tick (float dt)
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
@@ -153 +147 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Rocket::destroy ()
+void Hyperblast::destroy ()
 {
-  PRINTF(5)("DESTROY Rocket\n");
+  PRINTF(5)("DESTROY Hyperblast\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  this->emitter->setSystem(Rocket::explosionParticles);
+  this->emitter->setSystem(Hyperblast::explosionParticles);
 
   this->emitter->setEmissionRate(1000.0);
@@ -166 +160 @@
 
 
-void Rocket::draw () const
+void Hyperblast::draw () const
 {
   glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/projectiles/hyperblast.h

@@ -1 +1 @@
 /*!
- * @file rocket.h
- * @brief a Rocket Projectile
+ * @file hyperblast.h
+ * @brief a Hyperblast Projectile
 */
 
-#ifndef _ROCKET_H
-#define _ROCKET_H
+#ifndef _HYPERBLAST_H
+#define _HYPERBLAST_H
 
 #include "projectile.h"
@@ -12 +12 @@
 class Weapon;
 class SpriteParticles;
+class SparkParticles;
 class ParticleEmitter;
 class FastFactory;
 
-class Rocket : public Projectile
+class Hyperblast : public Projectile
 {
   public:
-    Rocket ();
-    virtual ~Rocket ();
+    Hyperblast ();
+    virtual ~Hyperblast ();
 
 
@@ -35 +36 @@
   private:
     static FastFactory*               fastFactory;
-    static SpriteParticles*           trailParticles;
-    static SpriteParticles*           explosionParticles;
+    static SpriteParticles*           extParticles;
+    static SparkParticles*            explosionParticles;
 
     ParticleEmitter*                  emitter;
 
-
     WorldEntity* hitEntity; // FIXME TEMPORARY
-
 };
 
-#endif /* _ROCKET_H */
+#endif /* _HYPERBLAST_H */

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -12 +12 @@
 
    ### File Specific
-   main-programmer: Patrick Boenzli
+   main-programmer: Benjamin Grauer
    co-programmer:
 
@@ -21 +21 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "cannon.h"
+#include "hyperblaster.h"
 
 #include "world_entity.h"
@@ -38 +38 @@
 using namespace std;
 
-CREATE_FACTORY(Cannon, CL_CANNON);
+CREATE_FACTORY(Hyperblaster, CL_HYPERBLASTER);
 
-/**
- *  standard constructor
-
-   creates a new weapon
-*/
-Cannon::Cannon ()
-  : Weapon()
-{
-  this->init();
-}
-
-
-Cannon::Cannon(const TiXmlElement* root)
+Hyperblaster::Hyperblaster(const TiXmlElement* root)
 {
   this->init();
@@ -62 +50 @@
  *  standard deconstructor
 */
-Cannon::~Cannon ()
+Hyperblaster::~Hyperblaster ()
 {
   // model will be deleted from WorldEntity-destructor
@@ -68 +56 @@
 
 
-void Cannon::init()
+void Hyperblaster::init()
 {
-  this->setClassID(CL_CANNON, "Cannon");
+  this->setClassID(CL_HYPERBLASTER, "Hyperblaster");
 
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
@@ -77 +65 @@
 
   this->setStateDuration(WS_SHOOTING, 2.0);
-  this->setStateDuration(WS_RELOADING, .1);
+  this->setStateDuration(WS_RELOADING, 5.0);
   this->setStateDuration(WS_ACTIVATING, .1);
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setEnergyMax(100);
-  this->increaseEnergy(100);
+  this->setEnergyMax(10);
+  this->increaseEnergy(10);
   //this->minCharge = 2;
 
   this->setActionSound(WA_SHOOT, "sound/explo.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/hyperblaster.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_HEAVY);
-  this->setProjectileType(CL_BOMB);
-  this->prepareProjectiles(5);
+  this->setProjectileType(CL_HYPERBLAST);
+  this->prepareProjectiles(2);
 
 //  this->objectComponent1 = new PNode();
@@ -109 +97 @@
 //     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(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(1.0, 0.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);
+  animation3->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
 }
 
 
-void Cannon::loadParams(const TiXmlElement* root)
+void Hyperblaster::loadParams(const TiXmlElement* root)
 {
   Weapon::loadParams(root);
@@ -130 +120 @@
    been armed out.
 */
-void Cannon::activate()
+void Hyperblaster::activate()
 {
 }
@@ -142 +132 @@
    been armed out.
 */
-void Cannon::deactivate()
+void Hyperblaster::deactivate()
 {
 }
@@ -153 +143 @@
    @todo: the ObjectManager deliveres Projectiles not TestBullets! this should be diffrent
 */
-void Cannon::fire()
+void Hyperblaster::fire()
 {
   Projectile* pj =  this->getProjectile();
@@ -174 +164 @@
  * hit, it can also be destoryed.
 */
-void Cannon::destroy ()
+void Hyperblaster::destroy ()
 {}
-
-/**
- *  this will draw the weapon
-*/
-void Cannon::draw () const
-{
-  /* draw gun body */
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-  this->getModel()->draw();
-  glPopMatrix();
-
-  /* draw objectComponent1: gun coil - animated stuff */
-/*  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glTranslatef (this->objectComponent1->getAbsCoor ().x,
-                this->objectComponent1->getAbsCoor ().y,
-                this->objectComponent1->getAbsCoor ().z);
-  tmpRot = this->objectComponent1->getAbsDir().getSpacialAxis();
-  glRotatef (this->objectComponent1->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->model->draw(0);
-
-  glPopMatrix();*/
-}
-

trunk/src/world_entities/weapons/hyperblaster.h

@@ -1 +1 @@
 /*!
- * @file cannon.h
- * a weapon that is fix on top of the player to fire heavy weaponary.
+ * @file hyperblaster.h
+ * a weapon that to fire heavy weaponary Hyperblasts.
 */
 
 
-#ifndef _CANNON_H
-#define _CANNON_H
+#ifndef _HYPERBLASTER_H
+#define _HYPERBLASTER_H
 
 #include "weapon.h"
 
-class Cannon : public Weapon
+class Hyperblaster : public Weapon
   {
   public:
-    Cannon ();
-    Cannon (const TiXmlElement* root);
-    virtual ~Cannon ();
+    Hyperblaster (const TiXmlElement* root = NULL);
+    virtual ~Hyperblaster ();
 
     void init();
@@ -26 +25 @@
     virtual void destroy();
 
-    virtual void draw() const;
-
   private:
 //     PNode* objectComponent1;         //<! the gun is made of multiple parts, these PNodes represent their location and orientation
   };
-#endif /* _CANNON_H */
+#endif /* _HYPERBLASTER_H */