Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/world_entities/weapon.h

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/world_entities/weapon.h (modified) (6 diffs)

orxonox/branches/physics/src/world_entities/weapon.h

@@ -34 +34 @@
 
 #define W_MAX_SLOTS 8
-#define W_MAX_CONFS 4
+#define W_MAX_CONFIGS 4
 
 class Projectile;
 class Weapon;
+class Animation3D;
 
 typedef enum {
@@ -48 +49 @@
 } weaponSoundType;
 
+
 //! this is an identifier for the slot. there are up to 8 weapon slots -> this means there can't be more than 8 weapons at the same time
-typedef enum slotID {W_SLOT0=0, W_SLOT1, W_SLOT2, W_SLOT3, 
-                     W_SLOT4, W_SLOT5, W_SLOT6, W_SLOT7};
+#define W_SLOT0 0
+#define W_SLOT1 1
+#define W_SLOT2 2
+#define W_SLOT3 3
+#define W_SLOT4 4
+#define W_SLOT5 5
+#define W_SLOT6 6
+#define W_SLOT7 7
+#define W_FREE_SLOT 99
+
 
 //! this is an identifier for the weapon config
-typedef enum configID {W_CONFIG0=0, W_CONFIG1, 
-                       W_CONFIG2, W_CONFIG3};
+#define W_CONFIG0 0
+#define W_CONFIG1 1
+#define W_CONFIG2 2
+#define W_CONFIG3 3
+
+//! a weapon can be left or right sided
+#define W_LEFT 0
+#define W_RIGHT 1
 
 //! this is a weapon Configuration: it has up to 8 slots
 typedef struct weaponConfig {
-  Weapon* slot1;                    //<! standard right side weapon
-  Weapon* slot2;                    //<! standard left side weapon
-  Weapon* slot3;                    //<! custom
-  Weapon* slot4;                    //<! custom
-  Weapon* slot5;                    //<! custom
-  Weapon* slot6;                    //<! custom
-  Weapon* slot7;                    //<! custom
-  Weapon* slot8;                    //<! custom
+  bool bUsed;                       //<! is set to true, if this configuration is 
+  Weapon* slots[8];
 };
 
@@ -74 +84 @@
   ~WeaponManager();
   
-  void addWeapon(Weapon* weapon, slotID slot, configID config = W_CONFIG0);
-  void addWeaponConfig(weaponConfig* config);
+  void addWeapon(Weapon* weapon, int configID = W_CONFIG0, int slotID = W_FREE_SLOT);
+  void removeWeapon(Weapon* weapon, int configID = W_CONFIG0);
+  void nextWeaponConf();
 
-  void nextWeaponConf();
-  void prevWeaponConf();
-  void selectConfig(configID config);
+  void fire();
+  void tick(float sec);
+  void draw();
 
  private:
-  int nrOfConfigs;                      //<! number of configurations defined
   int nrOfSlots;                        //<! number of weapon slots a ship has
-  weaponConfig* currentConfig;          //<! the currently selected config
-  weaponConfig* configs[4];             //<! a list of four configurations
+  int currConfID;                       //<! the currently selected config
+  weaponConfig configs[4];              //<! a list of four configurations
+  
+  int getNextFreeSlot(int configID);
 };
 
@@ -93 +105 @@
 
  public:
-  Weapon (PNode* parent, Vector* coordinate, Quaternion* direction);
+  Weapon (PNode* parent, const Vector& coordinate, const Quaternion& direction);
   virtual ~Weapon ();
   
@@ -107 +119 @@
   bool isActive(void);
 
-  void setWeaponIdleTime(float time);
-  float getWeaponIdleTime(void);
-  bool hasWeaponIdleTimeElapsed(void);
 
+  /**
+     \brief sets a weapon idle time
+     \param idle time in ms
+     
+     a weapon idle time is the time spend after a shoot until the weapon can
+     shoot again
+  */
+  inline void setWeaponIdleTime(float time) { this->idleTime = time; }
+  /**
+     \brief gets the weapon idle time
+     \returns idle time in ms
+     
+     a weapon idle time is the time spend after a shoot until the weapon can
+     shoot again
+  */
+  inline float getWeaponIdleTime(void) const { return this->idleTime;}
+  /**
+     \brief checks if the idle time is elapsed
+     \return true if time is elapsed
+     
+     a weapon idle time is the time spend after a shoot until the weapon can
+   shoot again
+  */
+  inline bool hasWeaponIdleTimeElapsed(void) const { return (this->localTime>this->idleTime)?true:false; }
+
+  /**
+     \brief fires the weapon
+     
+     this is called from the player.cc, when fire-button is been pushed
+  */
   virtual void fire(void) = 0;
   virtual void hit (WorldEntity* weapon, Vector* loc);
@@ -121 +160 @@
  protected:
   tList<WorldEntity>* worldEntities;
-  float localTime;
-  float idleTime;
-  float slowDownFactor;
+  float localTime;                 //<! this is the local time. important for shooting attributes like frequency
+  float idleTime;                  //<! the time a weapon needs before it can shoot again. eg. shooting frequency or actication/deactivateion delay
+  float slowDownFactor;            //<! if the shooting frequency is a linear function of time...
+
+  PNode* objectComponent1;         //<! the gun is made of multiple parts, these PNodes represent their location and orientation
+  PNode* objectComponent2;
+  PNode* objectComponent3;
+
+  Animation3D* animation1;
+  Animation3D* animation2;
+  Animation3D* animation3;
+
+  Vector projectileOffset;
+  int leftRight;   // this will become an enum
 
  private:
-  bool enabled;
-  Projectile* projectile;
+  bool enabled;                    //<! states if the weapon is enabled or not
+  Projectile* projectile;          //<! the projectile used for this weapon
   //WeaponSound sound;
 };