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

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

Files:

• controllers/HumanController.cc (modified) (3 diffs)
• controllers/HumanController.h (modified) (1 diff)
• controllers/NewHumanController.cc (modified) (2 diffs)
• controllers/NewHumanController.h (modified) (1 diff)
• weaponsystem/Weapon.cc (modified) (2 diffs)
• weaponsystem/Weapon.h (modified) (1 diff)
• weaponsystem/WeaponMode.cc (modified) (1 diff)
• weaponsystem/WeaponMode.h (modified) (2 diffs)
• weaponsystem/WeaponPack.cc (modified) (1 diff)
• weaponsystem/WeaponPack.h (modified) (1 diff)
• weaponsystem/WeaponSet.cc (modified) (1 diff)
• weaponsystem/WeaponSet.h (modified) (1 diff)
• weaponsystem/WeaponSystem.cc (modified) (1 diff)
• weaponsystem/WeaponSystem.h (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (1 diff)
• worldentities/ControllableEntity.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    extern const std::string __CC_fire_name = "fire";
+    extern const std::string __CC_push_name = "push";
     extern const std::string __CC_suicide_name = "suicide";
     extern const std::string __CC_release_name = "release";
@@ -52 +52 @@
     SetConsoleCommand("HumanController", "toggleFormationFlight",  &HumanController::toggleFormationFlight).addShortcut().keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("HumanController", "FFChangeMode",           &HumanController::FFChangeMode).addShortcut().keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand("HumanController", __CC_fire_name,           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
+    SetConsoleCommand("HumanController", __CC_push_name,           &HumanController::push          ).addShortcut().keybindMode(KeybindMode::OnHold);
     SetConsoleCommand("HumanController", __CC_release_name,        &HumanController::release       ).addShortcut().keybindMode(KeybindMode::OnRelease);
     SetConsoleCommand("HumanController", "reload",                 &HumanController::reload        ).addShortcut();
@@ -157 +157 @@
     }
 
-    void HumanController::fire(unsigned int firemode)
-    {
-        if (HumanController::localController_s)
-            HumanController::localController_s->doFire(firemode);
-    }
-
-    void HumanController::doFire(unsigned int firemode)
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-        {
-            HumanController::localController_s->controllableEntity_->fire(firemode);
+    void HumanController::push(unsigned int firemode)
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->doPush(firemode);
+    }
+
+    void HumanController::doPush(unsigned int firemode)
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        {
+            HumanController::localController_s->controllableEntity_->push(firemode);
             //if human fires, set slaves free. See FormationController::forceFreeSlaves()
             if (HumanController::localController_s->state_==MASTER && HumanController::localController_s->formationMode_ == NORMAL)

code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h

@@ -61 +61 @@
             virtual void pitch(const Vector2& value);
 
-            static void fire(unsigned int firemode);
-            virtual void doFire(unsigned int firemode);
+            static void push(unsigned int firemode);
+            virtual void doPush(unsigned int firemode);
             static void release(unsigned int firemode);
             virtual void doRelease(unsigned int firemode);

code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc

@@ -276 +276 @@
     }
 
-    void NewHumanController::doFire(unsigned int firemode)
+    void NewHumanController::doPush(unsigned int firemode)
     {
         if (!this->controllableEntity_)
@@ -291 +291 @@
         else
         {
-            HumanController::doFire(firemode); //call for formationflight
+            HumanController::doPush(firemode); //call for formationflight
         }
     }

code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h

@@ -54 +54 @@
             static void decelerate();
 
-            virtual void doFire(unsigned int firemode) override;
+            virtual void doPush(unsigned int firemode) override;
             virtual void doRelease(unsigned int firemode) override;
 

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();

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

@@ -299 +299 @@
     }
 
-    void ControllableEntity::fire(unsigned int firemode)
+    void ControllableEntity::push(unsigned int firemode)
     {
         if(GameMode::isMaster())
         {
-            this->fired(firemode);
+            this->pushed(firemode);
         }
         else

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h

@@ -96 +96 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            void fire(unsigned int firemode);
+            void push(unsigned int firemode);
             void release(unsigned int firemode);
-            virtual void fired(unsigned int firemode) {}
+            virtual void pushed(unsigned int firemode) {}
             virtual void released(unsigned int firemode) {}
             virtual void reload() {}

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc

@@ -428 +428 @@
     */
 
-    void Pawn::fired(unsigned int firemode)
-    {
-        if (this->weaponSystem_)
-            this->weaponSystem_->fire(firemode);
+    void Pawn::pushed(unsigned int firemode)
+    {
+        if (this->weaponSystem_)
+            this->weaponSystem_->push(firemode);
     }
 

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h

@@ -157 +157 @@
             virtual void kill();
 
-            virtual void fired(unsigned int firemode) override;
+            virtual void pushed(unsigned int firemode) override;
             virtual void released(unsigned int firemode) override;
             virtual void postSpawn();