Changeset 10152 in orxonox.OLD for branches/playability/src/world_entities/weapons/weapon.h

Timestamp:

Dec 27, 2006, 12:03:36 PM (18 years ago)

Author:

nicolasc

Message:

finished animation on heavy blaster, started light blaster
code needs some cleanup

File:

• branches/playability/src/world_entities/weapons/weapon.h (modified) (5 diffs)

branches/playability/src/world_entities/weapons/weapon.h

@@ -55 +55 @@
   WS_STATE_COUNT  =     8     //!< This must match the count of enumerations-members.
 } WeaponState;
-
-typedef enum
-{
-  WS_SHOOTING0    = 0x00000001, //!< Fireing 1st Barrel
-  WS_SHOOTING1    = 0x00000002, //!< Fireing 2nd Barrel
-  WS_SHOOTING2    = 0x00000004, //!< Fireing 3rd Barrel
-  WS_SHOOTING3    = 0x00000008, //!< Fireing 4st Barrel
-  WS_SHOOTING4    = 0x00000010, //!< Fireing 5st Barrel
-  WS_SHOOTING5    = 0x00000020, //!< Fireing 6st Barrel
-  WS_SHOOTING6    = 0x00000040, //!< Fireing 7st Barrel
-  WS_SHOOTING7    = 0x00000080, //!< Fireing 8st Barrel
-
-  WS_SS_MAX       = 0x000000ff
-}ShootingStates;
 
 //! an enumerator defining capabilities of a WeaponSlot
@@ -177 +163 @@
 
     Animation3D* getAnimation(WeaponState state, PNode* node = NULL);
-    Animation3D* getAnimation(ShootingStates state, PNode* node = NULL);
+    Animation3D* getAnimation(int barrel, int seg, PNode* node);
     Animation3D* copyAnimation(WeaponState from, WeaponState to);
 
@@ -190 +176 @@
     void debug() const;
 
-    
+    inline int getBarrels() {return this->barrels; };
+    inline int getSegs() { return this->segs; };
+    inline void setBarrels(int barrels) { this->barrels = barrels; };
+    inline void setSegs(int segs) { this->segs = segs; };
+
+    inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
+    inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
+
+    void init2();
+    void deconstr();
 
   protected:
@@ -208 +203 @@
 
 
-    inline int getBarrels() {return this->barrels; };
-    inline int getSeg() {return this->segs; };
-    inline void setBarrels(int barrels) { this->barrels = barrels; };
-    inline void setSegs(int segs) { this->segs = segs; };
 
   private:
@@ -268 +259 @@
     int                    barrels;                         //!< # of barrels
     int                    segs;                             //!< # of segments, one barrel has
+    Animation3D***         shootAnim;
+
   };