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

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

@@ -54 +54 @@
 NadionLaser::~NadionLaser()
 {
-  // model will be deleted from WorldEntity-destructor
-  for (int i = 0; i < this->getBarrels(); i++)
-  {
-   delete [] this->shootAnim[i];
-  }
-  delete [] this->shootAnim;
 }
 
@@ -92 +86 @@
 
 
-  this->setBarrels(1);
-  this->setSegs(1);
-  this->activeBarrel = 0;
+  this->setBarrels(1); // could be left out
+  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);  //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.680, 0.0, 0.0) * this->getScaling());
+  this->setEmissionPoint(Vector(1.680, 0.0, 0.0) * this->getScaling());
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
@@ -143 +117 @@
 
   Vector dir = (this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor()).getNormalized();
+  //FIXME direction calculation is a mess, needs to be cleaned up
   // HACK direction AbsDir calulation 
   Vector up = dir.cross(VECTOR_RAND(1));