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

Timestamp:

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

Author:

bensch

Message:

trunk: added hyperblaster

Location:

trunk/src/world_entities/weapons

Files:

• hyperblaster.cc (copied) (copied from trunk/src/world_entities/weapons/cannon.cc) (11 diffs)
• hyperblaster.h (copied) (copied from trunk/src/world_entities/weapons/cannon.h) (2 diffs)

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 */