Changeset 4927 in orxonox.OLD for orxonox/trunk

Timestamp:

Jul 21, 2005, 5:33:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some smaller fixes, to make Weapon more local

Location:

orxonox/trunk/src/world_entities/weapons

Files:

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

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

@@ -61 +61 @@
    tick function
 */
-void Projectile::setFlightDirection(Quaternion flightDirection)
+void Projectile::setFlightDirection(const Quaternion& flightDirection)
 {
   Vector v(1, 0, 0);
@@ -79 +79 @@
 }
 
-
 /**
- *  signal tick, time dependent things will be handled here
+ * signal tick, time dependent things will be handled here
  * @param time since last tick
 */

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

@@ -34 +34 @@
     virtual ~Projectile ();
 
-    void setFlightDirection(Quaternion flightDirection);
+    void setFlightDirection(const Quaternion& flightDirection);
     void setVelocity(const Vector &velocity);
     void setLifeSpan(float lifeSpan);
@@ -54 +54 @@
 
     float                 lifeCycle;                 //!< The percentage of the Lifetime done [0-1]
-    float                 lifeSpan;                  //!< The entire lifespan of the Shoot.
+    float                 lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
 
     Vector                flightDirection;           //!< direction in which the shoot flighs

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

@@ -64 +64 @@
   if( this->leftRight == W_LEFT)
     {
-      this->projectileOffset = Vector(1.0, 0.0, -0.35);
+      this->setEmissionPoint(1.0, 0.0, -0.35);
 
       animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
@@ -78 +78 @@
   else if( this->leftRight == W_RIGHT)
     {
-      this->projectileOffset = Vector(1.0, 0.0, 0.5);
+      this->setEmissionPoint(1.0, 0.0, 0.5);
 
       this->objectComponent1->setRelCoor(Vector(0,0,0.35));
@@ -105 +105 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->energy = 100;
-  this->minCharge = 2;
+  this->increaseEnergy(100);
+  //this->minCharge = 2;
 
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
@@ -156 +156 @@
 //  weaponSource->play();
 
-  pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
+  pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
   pj->setVelocity(this->getVelocity());

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

@@ -52 +52 @@
     PNode* objectComponent3;
 
-    Vector projectileOffset;
     int leftRight;   // this will become an enum
 

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

@@ -86 +86 @@
   this->minCharge = 1.0;
   this->maxCharge = 1.0;
+
   this->energyLoaded = .0;
   this->energyLoadedMax = 10.0;
@@ -248 +249 @@
 }
 
-
 /**
  * checks and activates the Weapon.
@@ -268 +268 @@
 }
 
-
 /**
  * checks and deactivates the Weapon
@@ -308 +307 @@
     this->requestAction(WA_RELOAD);
   }
-
 }
 
@@ -370 +368 @@
 }
 
-
 /**
  * enters the requested State, plays back animations updates the timing.
@@ -386 +383 @@
 
 
+
+///////////////////
+//  WORLD-ENTITY //
+// FUNCTIONALITY //
+///////////////////
 /**
  * tick signal for time dependent/driven stuff

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

@@ -95 +95 @@
     /** @see void setEmissionPoint(const Vector& point); */
     inline void setEmissionPoint(float x, float y, float z) { this->setEmissionPoint(Vector(x,y,z)); };
+    /** @returns the absolute Position of the EmissionPoint */
+    inline const Vector& getEmissionPoint() const { return this->emissionPoint.getAbsCoor(); };
 
     /** @param state the State to time @param duration the duration of the State */
@@ -158 +160 @@
 
 
-  protected:
+  private:
     // it is all about energy
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
@@ -171 +173 @@
     // PHASES //
     ////////////
-  private:
     SoundSource*         soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)