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

Timestamp:

Jun 27, 2007, 7:01:08 PM (18 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/light_blaster.cc (modified) (3 diffs)

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

@@ -53 +53 @@
 {
 
-  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;
-
 }
 
@@ -93 +84 @@
 
   this->setBarrels(3);
-  this->setSegs(1);
-  this->activeBarrel = 0;
+  this->setSegs(1); //could be left out
 
-  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);
-    this->emissionPoint[i]->setName("EmissionPoint");
-    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-    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(2.2, 0.0, 0.1));
-  this->emissionPoint[1]->setRelCoor(Vector(2.2, -0.07, -0.05));
-  this->emissionPoint[2]->setRelCoor(Vector(2.2, 0.07, -0.05));
+  this->setEmissionPoint(Vector(2.2, 0.0, 0.1), 0);
+  this->setEmissionPoint(Vector(2.2, -0.07, -0.05), 1);
+  this->setEmissionPoint(Vector(2.2, 0.07, -0.05), 2);
 
 //   Animation3D* animation1 = this->getAnimation(WS_SHOOTING, this);
@@ -148 +120 @@
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*180);
 
-  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
+  pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
 //   pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 
-//   for (int i = 0; i < this->getSegs(); i++)
-//     this->shootAnim[this->activeBarrel][i]->replay();
-
-  // switch barrel
-  this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
+  this->cycleBarrel();
 }