Changeset 10771 in orxonox.OLD for branches/presentation/src/world_entities/weapons/disruptor.cc

Timestamp:

Jun 27, 2007, 7:01:08 PM (17 years ago)

Author:

nicolasc

Message:

huge diff
cleaned the individual weapons, moved stuff to weapon.{cc,h}
and some minor fixes which popped up then and when

File:

• branches/presentation/src/world_entities/weapons/disruptor.cc (modified) (4 diffs)

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

@@ -55 +55 @@
 Disruptor::~Disruptor()
 {
-  for (int i = 0; i < this->getBarrels(); i++)
-  {
-   delete [] this->shootAnim[i];
-   delete [] this->objComp[i];
-  }
-  delete [] this->emissionPoint;
-
-   delete [] this->shootAnim;
-   delete [] this->objComp;
-
 }
 
@@ -99 +89 @@
   this->setBarrels(1);
   this->setSegs(1);
-  this->activeBarrel = 0;
 
+  this->setEmissionPoint(Vector(1.672, 0.0, 0.0) * this->getScaling());
 
-
-  this->objComp = new PNode**[this->getBarrels()];
-  this->emissionPoint = new PNode*[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);  //Parenting emissionPoint to Weapon
-    this->emissionPoint[i]->setName("EmissionPoint");
-    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-    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->emissionPoint[0]->setRelCoor(Vector(1.672, 0.0, 0.0) * this->getScaling());
-
-
-  this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  this->shootAnim[0][0]->addKeyFrame(Vector(-0.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  this->getShootAnim(0, 0)->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
+  this->getShootAnim(0, 0)->addKeyFrame(Vector(-0.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
 //   this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
 
@@ -158 +125 @@
   pj->setVelocity((tmp.getNormalized())*130 + VECTOR_RAND(1));
 
-  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
+  pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
 
 
-  this->shootAnim[0][0]->replay();
+  this->getShootAnim(0, 0)->replay();
 }
 
@@ -196 +163 @@
     // Barrel
     glPushMatrix();
-      glTranslatef(this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
+      glTranslatef(this->getObjCompx(0,0), this->getObjCompy(0,0), this->getObjCompz(0,0));
       static_cast<StaticModel*>(this->getModel())->draw(0);
     glPopMatrix();
+
   glPopMatrix();
 }