Changeset 11153 for code/branches/sagerjFS16

Timestamp:

Mar 24, 2016, 3:56:35 PM (9 years ago)

Author:

sagerj

Message:

added release functions in various classes: weaponmode, weaponsystem, humancontroller, newhumancontroller, discharger

Location:

code/branches/sagerjFS16

Files:

• data/defaultConfig/keybindings.ini (modified) (4 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/Discharger.h (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (3 diffs)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/controllers/NewHumanController.cc (modified) (2 diffs)
• src/orxonox/controllers/NewHumanController.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSystem.h (modified) (1 diff)

code/branches/sagerjFS16/data/defaultConfig/keybindings.ini

@@ -122 +122 @@
 KeyStop=
 KeySystemRequest="printScreen"
-KeyT="onpress fire 3"
+KeyT= onpress fire 3 | onrelease release 3
 KeyTab="NewHumanController changeMode"
 KeyU=""
@@ -132 +132 @@
 KeyVolumeDown=
 KeyVolumeUp=
-KeyW="scale 1 moveFrontBack"
+KeyW="scale 1 moveFrontBack "
 KeyWake=
 KeyWebBack=
@@ -142 +142 @@
 KeyWebStop=
 KeyX="selectClosest"
-KeyY="onpress fire 4"
+KeyY= onpress fire 4 | onrelease release 4
 KeyYen=
 KeyZ="selectNext"
@@ -152 +152 @@
 Button6=
 Button7=
-Left="fire 0"
-Middle="fire 2"
-Right= fire 1 | unfire
+Left= fire 0 | release 0
+Middle= fire 2 | release 2
+Right= fire 1 | release 1
 Wheel1Down="NewHumanController decelerate"
 Wheel1Up="NewHumanController accelerate"

code/branches/sagerjFS16/data/gui/scripts/KeyBindMenu.lua

@@ -7 +7 @@
 
     commandList = {}
-    table.insert(commandList, "fire 0")
-    table.insert(commandList, "fire 1 | unfire")
-    table.insert(commandList, "onpress fire 2")
-    table.insert(commandList, "onpress fire 3")
+    table.insert(commandList, "fire 0" | "release 0")
+    table.insert(commandList, "fire 1" | "release 1")
+    table.insert(commandList, "onpress fire 2" | "onrelease release 2")
+    table.insert(commandList, "onpress fire 3" | "onrelease release 3")
     table.insert(commandList, "scale 1 moveFrontBack")
     table.insert(commandList, "scale -1 moveFrontBack")

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc

@@ -52 +52 @@
 
         this->reloadTime_ = 0.1f;
-        this->damage_ = 9000.1f;
-        this->speed_ = 9000.1f;
+        this->damage_ = 9000.1f*loaded_;
+        this->speed_ = 9000.1f*loaded_;
 
         this->setMunitionName("dEnergy");
@@ -68 +68 @@
     void Discharger::fire()
     {
-
-    }
-    void Discharger::unfire()
-    {
-        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
+        /*BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
@@ -82 +78 @@
         projectile->setDamage(this->getDamage());
         projectile->setShieldDamage(this->getShieldDamage());
-        projectile->setHealthDamage(this->getHealthDamage());
+        projectile->setHealthDamage(this->getHealthDamage());*/
+        extern unsigned int beginLoad_ = time;
+    }
+    void Discharger::release()
+    {
+        extern unsigned int endLoad_ = time;
+        extern unsigned int loaded_ = endLoad_ - beginLoad_;
+
     }
 }

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h

@@ -55 +55 @@
 
             virtual void fire() override;
-            virtual void unfire() override;
+            virtual void release() override;
 
         private:
             float speed_; //!< The speed of the fired projectile.
+            float loaded_; // The time how long the weapon charged
+            float beginLoad_;
+            float endLoad_;
     };
 }

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

@@ -42 +42 @@
     extern const std::string __CC_fire_name = "fire";
     extern const std::string __CC_suicide_name = "suicide";
+    extern const std::string __CC_release_name = "release";
 
     SetConsoleCommand("HumanController", "moveFrontBack",          &HumanController::moveFrontBack ).addShortcut().setAsInputCommand();
@@ -52 +53 @@
     SetConsoleCommand("HumanController", "FFChangeMode",           &HumanController::FFChangeMode).addShortcut().keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("HumanController", __CC_fire_name,           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
+    SetConsoleCommand("HumanController", __CC_release_name,        &HumanController::release       ).addShortcut().keybindMode(KeybindMode::OnRelease);
     SetConsoleCommand("HumanController", "reload",                 &HumanController::reload        ).addShortcut();
     SetConsoleCommand("HumanController", "boost",                  &HumanController::boost         ).addShortcut().setAsInputCommand().keybindMode(KeybindMode::OnPressAndRelease);
@@ -167 +169 @@
             HumanController::localController_s->controllableEntity_->fire(firemode);
             //if human fires, set slaves free. See FormationController::forceFreeSlaves()
+            if (HumanController::localController_s->state_==MASTER && HumanController::localController_s->formationMode_ == NORMAL)
+            {
+                HumanController::localController_s->forceFreeSlaves();
+            }
+        }
+    }
+
+    void HumanController::release(unsigned int firemode)
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->doRelease(firemode);
+    }
+
+    void HumanController::doRelease(unsigned int firemode)
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        {
+            HumanController::localController_s->controllableEntity_->release(firemode);
+            //if human releases, 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

@@ -64 +64 @@
             virtual void doFire(unsigned int firemode);
             static void reload();
+            static void release(unsigned int firemode);
+            virtual void doRelease(unsigned int firemode);
 
             static void boost(const Vector2& value); // Static method, controls boosting.

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

@@ -54 +54 @@
     SetConsoleCommand("NewHumanController", "accelerate", &NewHumanController::accelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand("NewHumanController", "unfire",     &NewHumanController::unfire    ).keybindMode(KeybindMode::OnRelease).addShortcut();
+    SetConsoleCommand("NewHumanController", "release",    &NewHumanController::release    ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
     RegisterUnloadableClass(NewHumanController);
@@ -344 +344 @@
     }
 
-    void NewHumanController::unfire()
+    void NewHumanController::release(unsigned int firemode)
     {
         if (NewHumanController::localController_s)
-            NewHumanController::localController_s->doUnfire();
-        orxout() << "unfire" << endl;
-    }
-
-    void NewHumanController::doUnfire()
-    {
-        this->firemode_ = -1;
-        hideArrows();
+            NewHumanController::localController_s->doRelease();
+        orxout() << "Trigger" << endl;
+    }
+
+    void NewHumanController::doRelease(unsigned int firemode)
+    {
+        // this->firemode_ = -1; (outdated code from unfire)
+        // hideArrows();
+        if (!this->controllableEntity_)
+            return;
+
+        this->firemode_ = firemode;
+
+        HumanController::doRelease(firemode); //call for formationflight
     }
 

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

@@ -58 +58 @@
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
 
-            static void unfire();
-            virtual void doUnfire();
+            static void release(unsigned int firemode);
+            virtual void doRelease(unsigned int firemode);
 
             void centerCursor();

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

@@ -169 +169 @@
     }
 
+    void WeaponMode::release()
+
     bool WeaponMode::reload()
     {

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

@@ -294 +294 @@
     }
 
+    void WeaponSystem::release(unsigned int firemode)
+    {
+        std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
+        if (it != this->weaponSets_.end() && it->second)
+            it->second->release();
+    }
+
     void WeaponSystem::reload()
     {

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

@@ -76 +76 @@
             void fire(unsigned int firemode);
             void reload();
+            void release(unsigned int firemode);
 
             Munition * getMunition(SubclassIdentifier<Munition> * identifier);