Changeset 11174 for code/branches/sagerjFS16/src/orxonox/weaponsystem

Timestamp:

Apr 21, 2016, 4:47:39 PM (9 years ago)

Author:

sagerj

Message:

everything beneath weaponmode changed to push/release - wm modified only need to implement timer/ticker

Location:

code/branches/sagerjFS16/src/orxonox/weaponsystem

Files:

• Weapon.cc (modified) (2 diffs)
• Weapon.h (modified) (1 diff)
• WeaponMode.cc (modified) (1 diff)
• WeaponMode.h (modified) (2 diffs)
• WeaponPack.cc (modified) (1 diff)
• WeaponPack.h (modified) (1 diff)
• WeaponSet.cc (modified) (1 diff)
• WeaponSet.h (modified) (1 diff)
• WeaponSystem.cc (modified) (1 diff)
• WeaponSystem.h (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc

@@ -99 +99 @@
         Fire this Weapon with the the WeaponMode defined by @param mode
     */
-    void Weapon::fire(unsigned int mode)
+    void Weapon::push(unsigned int mode)
     {
         // To avoid firing with more than one mode at the same time, we lock the weapon (reloading) for
@@ -125 +125 @@
         {
             float reloading_time = 0;
-            if (it->second->fire(&reloading_time))
+            if (it->second->push(&reloading_time))
             {
                 this->bReloading_ = true;

code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.h

@@ -52 +52 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            void fire(unsigned int mode);
+            void push(unsigned int mode);
             void release(unsigned int mode);
             void reload();

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

@@ -168 +168 @@
     }
 
+    bool WeaponMode::push(float* reloadTime)
+    {
+        if( this->chargeable_)
+        {
+            // setting up a timer for knowing how long the weapon was charged 
+            // and passes the value to this->cTime_
+        } else {
+            return fire(reloadTime);
+        }
+        
+    }
+
     bool WeaponMode::release(float* reloadTime)
     {
-        this->release();
-        return false;
+        if( this->chargeable_)
+        {
+            return fire(reloadTime);
+        }
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h

@@ -57 +57 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
+            virtual bool push(float* reloadTime);
+            virtual bool release(float* reloadTime);
             virtual bool fire(float* reloadTime);
-            virtual bool release(float* reloadTime);
             bool reload();
 
@@ -165 +166 @@
 
             virtual void fire() = 0;
-            virtual void release() {};
 
             unsigned int initialMunition_;

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc

@@ -74 +74 @@
         Fire all weapons in this WeaponSet with the defined weaponmode.
     */
-    void WeaponPack::fire(unsigned int weaponmode)
+    void WeaponPack::push(unsigned int weaponmode)
     {
         for (Weapon* weapon : this->weapons_)
-            weapon->fire(weaponmode);
+            weapon->push(weaponmode);
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.h

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            void fire(unsigned int weaponmode);
+            void push(unsigned int weaponmode);
             void release(unsigned int weaponmode);
             void reload();

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc

@@ -60 +60 @@
     }
 
-    void WeaponSet::fire()
+    void WeaponSet::push()
     {
         // Fire all WeaponPacks with their defined weaponmode
         for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
-                mapEntry.first->fire(mapEntry.second);
+                mapEntry.first->push(mapEntry.second);
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.h

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            void fire();
+            void push();
             void release();
             void reload();

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -287 +287 @@
         Fires the @ref orxonox::WeaponSet with the specified firemode.
     */
-    void WeaponSystem::fire(unsigned int firemode)
+    void WeaponSystem::push(unsigned int firemode)
     {
         std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
         if (it != this->weaponSets_.end() && it->second)
-            it->second->fire();
+            it->second->push();
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h

@@ -74 +74 @@
             void changeWeaponmode(WeaponPack * wPack, WeaponSet * wSet, unsigned int weaponmode);
 
-            void fire(unsigned int firemode);
+            void push(unsigned int firemode);
             void release(unsigned int firemode);
             void reload();