Changeset 4948 in orxonox.OLD for orxonox

Timestamp:

Jul 23, 2005, 11:50:51 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: small cleanup

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• projectile.cc (modified) (1 diff)
• projectile.h (modified) (3 diffs)
• test_bullet.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)
• weapon.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/weapons/projectile.cc

@@ -52 +52 @@
   */
   //delete this->projectileModel;
+}
+
+
+void Projectile::setEnergies(float energyMin, float energyMax)
+{
+  this->energyMin = energyMin;
+  if (energyMax <= energyMin)
+  {
+    this->bChargeable = false;
+    this->energyMax = energyMin;
+  }
+  else
+  {
+    this->bChargeable = true;
+    this->energyMax = energyMax;
+  }
 }
 

orxonox/trunk/src/world_entities/weapons/projectile.h

@@ -24 +24 @@
 #include "vector.h"
 
-class Vector;
 class ParticleEmitter;
 
@@ -38 +37 @@
 
 
+    void setEnergies(float energyMin, float energyMax);
+    /** @returns the minimal charched energy */
+    inline float getEnergyMin() { return this->energyMin; };
+    /** @returns the maximal charched energy */
+    inline float getEnergyMax() { return this->energyMax; };
+    /** @returns if the Projectile can be charged */
+    inline bool isChageable() { return this->bChargeable; };
+
 
 
@@ -50 +57 @@
     float                 energyMin;
     float                 energyMax;
-
+    bool                  bChargeable;               //!< if the Projectile is Charegeable
 
     float                 lifeCycle;                 //!< The percentage of the Lifetime done [0-1]
     float                 lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
 
-    Vector                flightDirection;           //!< direction in which the shoot flighs
+    Vector                flightDirection;           //!< DOF direction in which the shoot flighs
 
     Vector                velocity;                  //!< velocity of the projectile.

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

@@ -35 +35 @@
   this->setClassID(CL_TEST_BULLET, "TestBullet");
 
-  float modelSize = .5;
+  float modelSize = .3;
   this->model = (Model*)ResourceManager::getInstance()->load("models/orx-rocket.obj", OBJ, RP_LEVEL, (void*) &modelSize);
+
+  this->energyMin = 1;
+  this->energyMax = 10;
 }
 

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -113 +113 @@
 
   this->setProjectile(CL_TEST_BULLET);
-  this->getProjectileFactory()->prepare(100);
+  //this->getProjectileFactory()->prepare(100);
 }
 

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -25 +25 @@
 #include "class_list.h"
 #include "load_param.h"
+#include "state.h"
+#include "sound_engine.h"
+#include "animation3d.h"
 #include "vector.h"
-#include "list.h"
-#include "state.h"
-#include "animation3d.h"
-#include "sound_engine.h"
 
 ////////////////////
@@ -108 +107 @@
   if (this->projectileFactory == NULL)
     return false;
+  else
+  {
+    // grabbing Parameters from the Projectile to have them at hand here.
+    this->projectileFactory->prepare(1);
+    Projectile* pj = dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
+    this->minCharge = pj->getEnergyMin();
+    this->maxCharge = pj->getEnergyMax();
+    this->chargeable = pj->isChageable();
+  }
 };