Changeset 10648 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons/disruptor.cc

Timestamp:

May 4, 2007, 9:53:07 AM (18 years ago)

Author:

nicolasc

Message:

some additional weapons, started weapons cleanup

File:

• branches/vs-enhencements/src/world_entities/weapons/disruptor.cc (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/heavy_blaster.cc) (13 diffs)

branches/vs-enhencements/src/world_entities/weapons/disruptor.cc

@@ -15 +15 @@
 */
 
-#include "heavy_blaster.h"
+#include "disruptor.h"
 #include "world_entities/projectiles/projectile.h"
 
@@ -29 +29 @@
 #include "elements/glgui_energywidgetvertical.h"
 
-CREATE_FACTORY(HeavyBlaster);
-// ObjectListDefinition(HeavyBlaster);
+CREATE_FACTORY(Disruptor);
+// ObjectListDefinition(Disruptor);
 
 
@@ -37 +37 @@
  * Standard constructor
  */
-HeavyBlaster::HeavyBlaster (int leftRight)
+Disruptor::Disruptor ()
  : Weapon()
 {
-//     this->registerObject(this, HeavyBlaster::_objectList);
-
-    this->init(leftRight);
-}
-
-HeavyBlaster::HeavyBlaster (const TiXmlElement* root = NULL)
+//     this->registerObject(this, Disruptor::_objectList);
+
+    this->init();
+}
+
+Disruptor::Disruptor (const TiXmlElement* root = NULL)
  : Weapon()
 {
-//     this->registerObject(this, HeavyBlaster::_objectList);
+//     this->registerObject(this, Disruptor::_objectList);
 
     // TODO add leftRight to params
-    this->init(0);
+    this->init();
     if (root != NULL)
       this->loadParams(root);
@@ -59 +59 @@
  * Default destructor
  */
-HeavyBlaster::~HeavyBlaster()
+Disruptor::~Disruptor()
 {
   for (int i = 0; i < this->getBarrels(); i++)
@@ -85 +85 @@
 }
 
-void HeavyBlaster::loadParams(const TiXmlElement* root)
+void Disruptor::loadParams(const TiXmlElement* root)
 {
   Weapon::loadParams(root);
 }
 
-void HeavyBlaster::init(int leftRight)
-{
-
-  this->leftRight = leftRight;
-  //this->registerObject(this, HeavyBlaster::_objectList);
-
-//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
-
-  this->loadModel("models/guns/frag_cannon2.obj", .4);
-
-
-  this->setStateDuration(WS_SHOOTING, 0.5);   // 2 Schuss pro Sekunde
+void Disruptor::init()
+{
+
+  this->setScaling(.5);
+
+  this->loadModel("models/guns/disruptor.obj", this->getScaling());
+
+
+  this->setStateDuration(WS_SHOOTING, 0.3333);  // 3 Shots per Second
   this->setStateDuration(WS_RELOADING, 0);
   this->setStateDuration(WS_ACTIVATING, .5);
@@ -118 +115 @@
   this->prepareProjectiles(5);
 
-  this->setBarrels(3);
-  this->setSegs(2);
+  this->setBarrels(1);
+  this->setSegs(1);
   this->activeBarrel = 0;
 
@@ -131 +128 @@
     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);  //Parenting emissionPoint to Weapon
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
@@ -143 +140 @@
   }
 
-  if (this->leftRight == W_RIGHT)
-  {
-    this->emissionPoint[0]->setRelCoor(Vector(1.1, 0.14, 0.06));
-    this->emissionPoint[1]->setRelCoor(Vector(1.1, -.06, 0.14));
-    this->emissionPoint[2]->setRelCoor(Vector(1.1, 0.06, -.14));
-  }
-  else {
-    this->emissionPoint[0]->setRelCoor(Vector(1.1, 0.14, -.06));
-    this->emissionPoint[1]->setRelCoor(Vector(1.1, -.06, -.14));
-    this->emissionPoint[2]->setRelCoor(Vector(1.1, 0.06, 0.14));
-  }
-
-
-  for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][0]->addKeyFrame(Vector(-0.3, 0.0, 0.0), Quaternion(), 0.9, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.55, ANIM_LINEAR, ANIM_NULL);
-
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][1]->addKeyFrame(Vector(-0.4, 0.0, 0.0), Quaternion(), 1.2, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.25, ANIM_LINEAR, ANIM_NULL);
-  }
+  this->emissionPoint[0]->setRelCoor(Vector(1.672, 0.0, 0.0) * this->getScaling());
+
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
@@ -180 +157 @@
 
 
-void HeavyBlaster::fire()
+void Disruptor::fire()
 {
   Projectile* pj =  this->getProjectile();
@@ -197 +174 @@
 
   // initiate animation
-  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
-  this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
+//   this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
 }
 
@@ -207 +184 @@
  *  this activates the weapon
 */
-void HeavyBlaster::activate()
+void Disruptor::activate()
 {
 }
@@ -214 +191 @@
  *  this deactivates the weapon
 */
-void HeavyBlaster::deactivate()
-{
-}
-
-
-void HeavyBlaster::draw() const
+void Disruptor::deactivate()
+{
+}
+
+
+void Disruptor::draw() const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -229 +206 @@
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  if (this->leftRight == W_LEFT)
-    glScalef(1.0, 1.0, -1.0);
-
-  static_cast<StaticModel*>(this->getModel())->draw(6);
-
-  glPushMatrix();
-    glTranslatef (this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(2);
+  static_cast<StaticModel*>(this->getModel())->draw();
+
   glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(3);
-  glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[2][0]->getAbsCoor().x, this->objComp[2][0]->getAbsCoor().y, this->objComp[2][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(1);
-  glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(4);
-  glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[1][1]->getAbsCoor().x, this->objComp[1][1]->getAbsCoor().y, this->objComp[1][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(5);
-  glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[2][1]->getAbsCoor().x, this->objComp[2][1]->getAbsCoor().y, this->objComp[2][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
-  glPopMatrix();
-
-  glPopMatrix();
-}
-
-void HeavyBlaster::tick(float dt)
+}
+
+void Disruptor::tick(float dt)
 {
   if (!Weapon::tickW(dt))