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

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

@@ -62 +62 @@
   if (OrxSound::SoundSource::objectList().exists(this->soundSource))
     delete this->soundSource;
+
+//   for (int i = 0; i < MAX_BARRELS; i++)
+//   {
+//    delete [] this->shootAnim[i];
+//    delete [] this->objComp[i];
+//   }
+//   delete [] this->emissionPoint;
+//   delete [] this->shootAnim;
+//   delete [] this->objComp;
+
 }
 
@@ -121 +131 @@
   this->soundSource = new OrxSound::SoundSource(this);       //< Every Weapon has exacty one SoundSource
 
-  this->barrels = 1;
+  this->barrels = 1;  // just to have an initial value
   this->segs = 1;
+  this->activeBarrel = 0;
 
   this->preferedSide = -1;
   this->preferedSlot = -1;
-
-  this->shootAnim = new Animation3D**[this->getBarrels()];
-  for (int i = 0; i < this->getBarrels(); i++)
-    this->shootAnim[i] = new Animation3D* [this->getSegs()];
-
-  this->emissionPoint = new PNode*[this->barrels];
-  for(int i = 0; i < this->barrels; i++){
+  this->side = -1;
+
+  //!< forward initialisation of animation and emissionpoints
+  for (int i = 0; i < MAX_BARRELS; i++){
     this->emissionPoint[i] = new PNode;
     this->emissionPoint[i]->setParent(this);  //Parenting emissionPoint to Weapons
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+    for(int j = 0; j < MAX_SEGMENTS; 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);
+    }
   }
 
@@ -149 +163 @@
   this->maxCharge = 1.0;                           //< The maximum charge is also one unit.
 
-  this->energy = 10;                               //< The secondary Buffer (before we have to reload)
+  this->energy = 10.0;                               //< The secondary Buffer (before we have to reload)
   this->energyMax = 10.0;                          //< How much energy can be carried
   this->capability = WTYPE_ALL;                    //< The Weapon has all capabilities @see W_Capability.
@@ -176 +190 @@
   LoadParam(root, "slot", this, Weapon, setPreferedSlot)
   .describe("slot this weapon will be added");
-/*
-  LoadParam(root, "emission-point", this, Weapon, setEmissionPoint)
-  .describe("Sets the Point of emission of this weapon (1: EmmsionVector; 2: EmissionPoint)");*/
 
   LoadParam(root, "state-duration", this, Weapon, setStateDuration)
@@ -274 +285 @@
  * sets the emissionPoint's relative position from the Weapon
  * @param point the Point relative to the mass-point of the Weapon
+ * @param barrel (optional) define a specific barrel, default = 0
  */
 void Weapon::setEmissionPoint(const Vector& point, int barrel)
@@ -280 +292 @@
 }
 
-void Weapon::setEmissionPoint(const Vector& point)
-{
-  this->emissionPoint[0]->setRelCoor(point);
-}
+// void Weapon::setEmissionPoint(const Vector& point)
+// {
+//   this->emissionPoint[0]->setRelCoor(point);
+// }
 
 /**