Changeset 4882 in orxonox.OLD for orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

Timestamp:

Jul 17, 2005, 2:37:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the energy system works

File:

• orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h (modified) (3 diffs)

orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

@@ -99 +99 @@
     inline WeaponState getCurrentState() const { return this->currentState; };
 
-
+    inline void setMaximumEnergy(float energyMax, float energyLoadedMax = 0.0) { this->energyMax = energyMax; this->energyLoadedMax = energyLoadedMax; };
 
     virtual void destroy();
 
 
-
+    // FLOW
     virtual void tick(float dt);
     virtual void draw();
 
+    void debug() const;
+
   protected:
+    // utility:
     static WeaponAction  charToAction(const char* action);
+    static const char*   actionToChar(WeaponAction action);
     static WeaponState   charToState(const char* state);
+    static const char*   stateToChar(WeaponState state);
 
-
+    //! ACTION: these functions are handled by the Weapon itself, and must be called by requestAction(WeaponAction);
     bool execute();
     virtual void activate();
@@ -125 +130 @@
   protected:
     SoundSource*         weaponSource;
+    // it is all about energy
     float                energy;
-    int                  energyI;
+    float                energyLoaded;
+    float                energyMax;
+    float                energyLoadedMax;
+    float                minCharge;
+    float                maxCharge;
 
     ////////////
@@ -138 +148 @@
     Animation3D*         animation[WS_STATE_COUNT];        //!< Animations for all the States (you can say yourself on what part of the gun this animation acts).
 
-    float                minCharge;
-    float                maxCharge;
 
     bool                 hideInactive;                    //!< Hides the Weapon if it is inactive