Changeset 11252 for code/branches

Timestamp:

Oct 31, 2016, 1:02:46 PM (8 years ago)

Author:

patricwi

Message:

setCommand vorbereitet und keybindings optimiert

Location:

code/branches/HUD_HS16

Files:

• data/defaultConfig/keybindings.ini (modified) (3 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (2 diffs)
• src/modules/pickup/PickupManager.cc (modified) (5 diffs)
• src/modules/pickup/PickupManager.h (modified) (1 diff)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)

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

@@ -70 +70 @@
 KeyNoConvert=
 KeyNumLock=
-KeyNumRow0=
-KeyNumRow1="toggleFormationFlight"
-KeyNumRow2="FFChangeMode"
+KeyNumRow0="useUnusePickup"
+KeyNumRow1=
+KeyNumRow2=
 KeyNumRow3=
 KeyNumRow4=
@@ -80 +80 @@
 KeyNumRow8=
 KeyNumRow9=
-KeyNumpad0=
+KeyNumpad0="useUnusePickup"
 KeyNumpad1=
 KeyNumpad2=
@@ -96 +96 @@
 KeyNumpadPeriod=
 KeyNumpadSubtract=
-KeyO=
-KeyP=
+KeyO="toggleFormationFlight"
+KeyP="FFChangeMode"
 KeyPageDown="scale -1 rotateRoll"
 KeyPageUp=

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

@@ -36 +36 @@
     table.insert(commandList, "pause")
     table.insert(commandList, "printScreen")
+    table.insert(commandList, "useUnusePickup")
     if orxonox.GUIManager:inDevMode() then
         table.insert(commandList, "printScreenHD")
@@ -71 +72 @@
     table.insert(nameList, "Pause")
     table.insert(nameList, "Screenshot")
+    table.insert(nameList, "Pickup 0")
     if orxonox.GUIManager:inDevMode() then
         table.insert(nameList, "HD screenshot")

code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc

@@ -43 +43 @@
 #include "core/input/KeyBinderManager.h"    //for keybinding
 #include "core/input/KeyBinder.h"           //for keybinding
+#include "core/command/ConsoleCommandIncludes.h"
 
 #include "infos/PlayerInfo.h"
@@ -66 +67 @@
     RegisterAbstractClass(PickupManager).inheritsFrom<PickupListener>();
 
+    SetConsoleCommand2("useUnusePickup", &PickupManager::useUnusePickup).addShortcut().setActive(true);
+
+   // SetConsoleCommand("HumanController", "fire",           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
     /**
     @brief
@@ -290 +294 @@
             this->pickups_[index] = pickup;
 
-             //Add pickup keybinding
-            if( KeyBinderManager::exists() )
-                addKeyBindingForNewPickup(pickup, index);
-            else
-                orxout() << "Could not create new keybinding because KeyBinderManager doesn't exist." << endl;
+            //  //Add pickup keybinding
+            // if( KeyBinderManager::exists() )
+            //     addKeyBindingForNewPickup(pickup, index);
+            // else
+            //     orxout() << "Could not create new keybinding because KeyBinderManager doesn't exist." << endl;
         }
         else // If it was dropped, it is removed from the required lists.
@@ -302 +306 @@
             index = it->second;
 
-            //Remove pickup keybinding
-            if( KeyBinderManager::exists() )
-                  removeKeyBindingForOldPickup(pickup, index);
-            else
-                orxout() << "Could not delete old keybinding because KeyBinderManager doesn't exist." << endl;
+            // //Remove pickup keybinding
+            // if( KeyBinderManager::exists() )
+            //       removeKeyBindingForOldPickup(pickup, index);
+            // else
+            //     orxout() << "Could not delete old keybinding because KeyBinderManager doesn't exist." << endl;
 
             // Remove the Pickupable from the indexes_ and pickups_ list.
             this->indexes_.erase(pickup);
-            this->pickups_.find(index)->second=nullptr; //set to null, so that can be indentified as free slot by getPickupIndex()
+            this->pickups_.find(index)->second=nullptr; //set to null, so that can be identified as free slot by getPickupIndex()
         }
 
@@ -339 +343 @@
 
     //PRECONDITION: KeyBinderManager exists, pickup is not NULL, 0 < index < 9
-    //FUNCTION: Adds a keybinding for the new pickup using its index
-    void PickupManager::addKeyBindingForNewPickup(Pickupable* pickup, uint32_t index)
-    {
-        std::string name="Keys.KeyNumpad";
-        std::string binding="";
-
-        name.append(std::to_string(index));
-
-        KeyBinderManager::getInstance().getCurrent()->setBinding("KeyESC", name, true); // TODO do not set all bindings to ESC
-
-        orxout() << "Keybinding for item " << index << " has been added on keybinding " << name << endl;
-
-
-    }
+    //FUNCTION: Adds a keybinding for the new pickup using its index and sets a console command
+    // void PickupManager::addKeyBindingForNewPickup(Pickupable* pickup, uint32_t index)
+    // {
+    //     std::string name="Keys.KeyNumpad";
+    //     std::string binding="useOrUnusePickup";
+
+    //     name.append(std::to_string(index));
+    //     binding.append(std::to_string(index));
+
+    //     SetConsoleCommand(binding, &PickupManager::useUnusePickup(pickup, index));
+    //     KeyBinderManager::getInstance().getCurrent()->setBinding(binding, name, true); 
+
+    //     orxout() << "Keybinding for item " << index << " has been added on keybinding " << name << endl;
+
+
+    // }
 
     //PRECONDITION: KeyBinderManager exists, pickup is not NULL, 0 < index < 9
     //FUNCTION: Removes the keybinding of the pickup using its index
-    void PickupManager::removeKeyBindingForOldPickup(Pickupable* pickup, uint32_t index)
-    {
-        std::string name="Keys.KeyNumpad";
-        std::string binding="";
-
-        name.append(std::to_string(index));
-
-        KeyBinderManager::getInstance().getCurrent()->setBinding("", name, true); 
-
-        orxout() << "Keybinding for item " << index << " has been removed on keybinding " << name << endl;
-
-    }
+    // void PickupManager::removeKeyBindingForOldPickup(Pickupable* pickup, uint32_t index)
+    // {
+    //     std::string name="Keys.KeyNumpad";
+    //     std::string binding="";
+
+    //     name.append(std::to_string(index));
+
+    //     SetConsoleCommand(binding, nullptr);
+    //     KeyBinderManager::getInstance().getCurrent()->setBinding("", name, true); 
+
+    //     orxout() << "Keybinding for item " << index << " has been removed on keybinding " << name << endl;
+
+    // }
+
+    //This function is called by the command line or by the key binding
+    //it uses or unuses the pickup, depending on its current state
+    void PickupManager::useUnusePickup() //uint32_t index
+    {
+        // orxout() << "Hello there i was here " << index << endl;  
+        orxout() << "Hello there i was here " << endl; 
+        // Pickupable* pickup=pickups_.find(index)->second;
+        // if(pickup==nullptr) return;                       //pickup does not exist
+      
+        // if(pickup->used)
+        //     usePickup(pickup, false);
+        // else
+        //     usePickup(pickup, true);
+    }
+
 
     /**

code/branches/HUD_HS16/src/modules/pickup/PickupManager.h

@@ -135 +135 @@
 
             void dropPickup(uint32_t pickup); //!< Drop the input Pickupable.
+            //void useUnusePickup(uint32_t index);
+            void useUnusePickup(); //tolua_export
             void usePickup(uint32_t pickup, bool use); //!< Use (or unuse) the input Pickupable.
              /**

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

@@ -69 +69 @@
             void stopBoosting(void);
 
-
             static void greet();
             static void switchCamera();