Changeset 4837 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jul 12, 2005, 3:11:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: derivation of superclasses is more clear now. lets see, if this will hold out for some time (about 115 classes long)

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (4 diffs)
• weapon_manager.h (modified) (3 diffs)

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

@@ -25 +25 @@
 #include "vector.h"
 #include "list.h"
+#include "t_animation.h"
 
 using namespace std;
@@ -76 +77 @@
   this->currConfID = W_CONFIG0;
   this->crosshair = new Crosshair();
-}
-
-/**
- *
+
+  this->crossHairSizeAnim = new tAnimation<Crosshair>(this->crosshair, &Crosshair::setSize);
+  this->crossHairSizeAnim->setInfinity(ANIM_INF_REWIND);
+  this->crossHairSizeAnim->addKeyFrame(50, .1, ANIM_LINEAR);
+  this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
+  this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
+}
+
+/**
+ * loads the settings of the WeaponManager
  * @param root the XML-element to load from
  */
@@ -207 +214 @@
 
 
-
 /**
  * triggers fire of all weapons in the current weaponconfig
@@ -219 +225 @@
     if( firingWeapon != NULL) firingWeapon->fire();
   }
-  this->crosshair->setRotationSpeed(-500);
+  this->crosshair->setRotationSpeed(500);
+  this->crossHairSizeAnim->replay();
 }
 

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

@@ -33 +33 @@
 class Weapon;
 class Crosshair;
+template <class T> class tAnimation;
 
 #define    W_MAX_SLOTS       8
@@ -57 +58 @@
 
 //! this is a weapon Configuration: it has up to 8 slots
-typedef struct weaponConfig
+typedef struct
 {
   bool           bUsed;                       //!< is set to true, if this configuration is
   Weapon*        slots[8];
-};
+} weaponConfig;
 
 
@@ -85 +86 @@
 
   private:
-    Crosshair*            crosshair;               //!< an aim.
+    int getNextFreeSlot(int configID);
 
-    int                   nrOfSlots;               //<! number of weapon slots a ship has
-    int                   currConfID;              //<! the currently selected config
-    weaponConfig          configs[4];              //<! a list of four configurations
+  private:
+    Crosshair*              crosshair;               //!< an aim.
+    tAnimation<Crosshair>*  crossHairSizeAnim;
 
-    int getNextFreeSlot(int configID);
+    int                     nrOfSlots;               //<! number of weapon slots a ship has
+    int                     currConfID;              //<! the currently selected config
+    weaponConfig            configs[4];              //<! a list of four configurations
+
 };