Changeset 6431 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 8, 2006, 12:52:23 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: projectile inherits Energies from WorldEntity

Location:

trunk/src/world_entities/weapons

Files:

• bomb.cc (modified) (1 diff)
• guided_missile.cc (modified) (2 diffs)
• laser.cc (modified) (1 diff)
• projectile.cc (modified) (1 diff)
• projectile.h (modified) (2 diffs)
• rocket.cc (modified) (1 diff)
• test_bullet.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)

trunk/src/world_entities/weapons/bomb.cc

@@ -46 +46 @@
   this->loadModel("models/projectiles/RadioActiveBomb.obj", 1.0);
 
-  this->energyMin = 1;
-  this->energyMax = 1;
+  this->setMinEnergy(1);
+  this->setMaxEnergy(10);
+
   this->lifeSpan = 15;
 

trunk/src/world_entities/weapons/guided_missile.cc

@@ -41 +41 @@
   this->loadModel("models/projectiles/orx-rocket.obj", .3);
 
-  this->energyMin = 1;
-  this->energyMax = 10;
+  this->setMinEnergy(1);
+  this->setMaxEnergy(10);
   this->lifeSpan = 10.0;
   this->agility = 500;
@@ -146 +146 @@
 {
 
-  
+
 if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
    {

trunk/src/world_entities/weapons/laser.cc

@@ -42 +42 @@
   this->loadModel("models/projectiles/laser.obj");
 
-  this->energyMin = 1;
-  this->energyMax = 10;
+  this->setMinEnergy(1);
+  this->setMaxEnergy(10);
   this->lifeSpan = 5.0;
 

trunk/src/world_entities/weapons/projectile.cc

@@ -53 +53 @@
 
 
-void Projectile::setEnergies(float energyMin, float energyMax)
+void Projectile::setMinEnergy(float energyMin)
 {
   this->energyMin = energyMin;
-  if (energyMax <= energyMin)
-  {
-    this->bChargeable = false;
-    this->energyMax = energyMin;
-  }
-  else
-  {
-    this->bChargeable = true;
-    this->energyMax = energyMax;
-  }
 }
 

trunk/src/world_entities/weapons/projectile.h

@@ -23 +23 @@
 
 
-    void setEnergies(float energyMin, float energyMax);
+    void setMinEnergy(float energyMin);
     /** @returns the minimal charched energy */
-    inline float getEnergyMin() { return this->energyMin; };
-    /** @returns the maximal charched energy */
-    inline float getEnergyMax() { return this->energyMax; };
+    inline float getMinEnergy() { return this->energyMin; };
     /** @returns if the Projectile can be charged */
     inline bool isChageable() { return this->bChargeable; };
@@ -50 +48 @@
     // energy
     float                 energyMin;                 //!< The minimal Energy a Projectile needs to be emitted.
-    float                 energyMax;                 //!< The maximal Energy a Projectile can take, before being emitted.
     bool                  bChargeable;               //!< if the Projectile is Charegeable
 

trunk/src/world_entities/weapons/rocket.cc

@@ -42 +42 @@
   this->loadModel("models/projectiles/orx-rocket.obj", .3);
 
-  this->energyMin = 1;
-  this->energyMax = 10;
+  this->setMinEnergy(1);
+  this->setMaxEnergy(10);
   this->lifeSpan = 5;
 

trunk/src/world_entities/weapons/test_bullet.cc

@@ -42 +42 @@
   this->loadModel("models/projectiles/orx-rocket.obj", .3);
 
-  this->energyMin = 1;
-  this->energyMax = 10;
+  this->setMinEnergy(1);
+  this->setMaxEnergy(10);
   this->lifeSpan = 2;
 

trunk/src/world_entities/weapons/weapon.cc

@@ -144 +144 @@
     // grabbing Parameters from the Projectile to have them at hand here.
     Projectile* pj = dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
-    this->minCharge = pj->getEnergyMin();
-    this->maxCharge = pj->getEnergyMax();
+    this->minCharge = pj->getMinEnergy();
+    this->maxCharge = pj->getMaxEnergy();
     this->chargeable = pj->isChageable();
     this->projectileFactory->kill(pj);