Changeset 10771 in orxonox.OLD for branches/presentation/src/world_entities/weapons/weapon.h

Timestamp:

Jun 27, 2007, 7:01:08 PM (17 years ago)

Author:

nicolasc

Message:

huge diff
cleaned the individual weapons, moved stuff to weapon.{cc,h}
and some minor fixes which popped up then and when

File:

• branches/presentation/src/world_entities/weapons/weapon.h (modified) (6 diffs)

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

@@ -20 +20 @@
 
 #include "sound_buffer.h"
+
+#define MAX_SEGMENTS 3
+#define MAX_BARRELS 4
+
+#define    W_LEFT        0
+#define    W_RIGHT       1
 
 // FORWARD DECLARATION
@@ -129 +135 @@
     // EMISSION
     /** keeping old functions*/
-    void setEmissionPoint(const Vector& point, int barrel);
-    void setEmissionPoint(const Vector& point);
+    void setEmissionPoint(const Vector& point, int barrel = 0);
+//     void setEmissionPoint(const Vector& point);
     /** @see void setEmissionPoint(const Vector& point); */
-    inline void setEmissionPoint(float x, float y, float z, int barrel) { this->setEmissionPoint(Vector(x, y, z), barrel); };
-    inline void setEmissionPoint(float x, float y, float z) { this->setEmissionPoint(Vector(x, y, z)); };
+    inline void setEmissionPoint(float x, float y, float z, int barrel = 0) { this->setEmissionPoint(Vector(x, y, z), barrel); };
+//     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(int barrel) const { return this->emissionPoint[barrel]->getAbsCoor(); };
-    inline const Vector& getEmissionPoint() const { return this->emissionPoint[0]->getAbsCoor(); };
+    inline const Vector& getEmissionPoint() const { return this->emissionPoint[this->activeBarrel]->getAbsCoor(); };
 
 
@@ -182 +188 @@
     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); };
+    inline void setActiveBarrel(int ab) {this->activeBarrel = ab; };
+    inline int getActiveBarrel() { return this->activeBarrel; };
+    inline void cycleBarrel() { this->activeBarrel = (this->activeBarrel + 1) % this->barrels; };
+
+    Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
+//     void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
 
 //     void init2();
-    void deconstr();
+//     void deconstr();
 
     inline int getPreferedSide() { return this->preferedSide; }
@@ -194 +203 @@
     inline void setEnergyWidgetInitialized(bool b) {this->isEnergyWidgetInitialized = b;};
 
+    inline const Vector& getObjComp(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor(); };
+    inline const float getObjCompx(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor().x; };
+    inline const float getObjCompy(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor().y; };
+    inline const float getObjCompz(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor().z; };
 
   protected:
@@ -264 +277 @@
     OrxSound::SoundBuffer  soundBuffers[WA_ACTION_COUNT];   //!< SoundBuffers for all actions @see WeaponAction.
 
-    PNode**                emissionPoint;                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
+    PNode*                 emissionPoint[MAX_BARRELS];                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
 
     bool                   hideInactive;                    //!< Hides the Weapon if it is inactive
@@ -272 +285 @@
     FastFactory*           projectileFactory;               //!< A factory, that produces and handles the projectiles.
 
-    int                    barrels;                         //!< # of barrels
-    int                    segs;                             //!< # of segments, one barrel has
-    Animation3D***         shootAnim;
+    int                    barrels;                         //!< # of barrels (max 4)
+    int                    segs;                            //!< # of segments, one barrel has (max 3)
+    int                    activeBarrel;
+    Animation3D*           shootAnim[MAX_BARRELS][MAX_SEGMENTS];
+    PNode*                 objComp[MAX_BARRELS][MAX_SEGMENTS];
 
     int                    preferedSlot;                    //!< prefered slot to add
     int                    preferedSide;                    //!< prefered side (left/right) to be added
+    int                    side;                            //!< describes left/right orientation of the weapon.
 
   };