Changeset 10771 in orxonox.OLD for branches/presentation/src/world_entities/weapons/rf_cannon.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/rf_cannon.cc (modified) (4 diffs)

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

@@ -55 +55 @@
 RFCannon::~RFCannon()
 {
-  for (int i = 0; i < this->getBarrels(); i++)
-    delete [] this->objComp[i];
-
-  delete [] this->emissionPoint;
-  delete [] this->objComp;
 }
 
@@ -91 +86 @@
   this->setBarrels(4);
   this->setSegs(1);
-  this->activeBarrel = (rand() % 4);
+  this->setActiveBarrel(rand() % 4);
 
-  this->objComp = new PNode**[this->getBarrels()];
-  this->emissionPoint = new PNode*[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->emissionPoint[0]->setRelCoor(Vector(4.1, 0.0, 0.75) * this->getScaling());
-  this->emissionPoint[1]->setRelCoor(Vector(4.1, 0.45, 0.0) * this->getScaling());
-  this->emissionPoint[2]->setRelCoor(Vector(4.1, 0.0, -0.75) * this->getScaling());
-  this->emissionPoint[3]->setRelCoor(Vector(4.1, -0.45, 0.0) * this->getScaling());
+  this->setEmissionPoint(Vector(4.1, 0.0, 0.75) * this->getScaling(), 0);
+  this->setEmissionPoint(Vector(4.1, 0.45, 0.0) * this->getScaling(), 1);
+  this->setEmissionPoint(Vector(4.1, 0.0, -0.75) * this->getScaling(), 2);
+  this->setEmissionPoint(Vector(4.1, -0.45, 0.0) * this->getScaling(), 3);
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
@@ -140 +123 @@
   pj->setVelocity(this->getParent()->getVelocity() + (tmp.getNormalized())*190);
 
-  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
+  pj->setAbsCoor(this->getEmissionPoint());
+  //FIXME pj needs a absDir
 //   pj->setAbsDir(this->getAbsDir());
 //   pj->setAbsDir(Quaternion(tmp.getNormalized(), this->getParent()->getAbsDir().apply(Vector(0,1,0))));
@@ -146 +130 @@
   pj->activate();
 
-  this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
+  this->cycleBarrel();
 }