Changeset 11353

Timestamp:

Mar 9, 2017, 2:46:20 PM (8 years ago)

Author:

patricwi

Message:

merged HUD branch to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• README (modified) (1 diff)
• data/defaultConfig/keybindings.ini (modified) (2 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (2 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDPickupItem.cc (copied) (copied from code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc)
• src/modules/overlays/hud/HUDPickupItem.h (copied) (copied from code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h)
• src/modules/overlays/hud/HUDPickupSystem.cc (copied) (copied from code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc)
• src/modules/overlays/hud/HUDPickupSystem.h (copied) (copied from code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h)
• src/modules/pickup/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/PickupManager.cc (modified) (10 diffs)
• src/modules/pickup/PickupManager.h (modified) (4 diffs)
• src/modules/pickup/items/SpeedPickup.h (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/interfaces/Pickupable.h (modified) (2 diffs)

code/trunk/README

@@ -20 +20 @@
 Cheers,
 The Orxonox Development Team
+

code/trunk/data/defaultConfig/keybindings.ini

@@ -70 +70 @@
 KeyNoConvert=
 KeyNumLock=
-KeyNumRow0=
-KeyNumRow1="toggleFormationFlight"
-KeyNumRow2="FFChangeMode"
-KeyNumRow3=
-KeyNumRow4=
-KeyNumRow5=
-KeyNumRow6=
-KeyNumRow7=
-KeyNumRow8=
-KeyNumRow9=
-KeyNumpad0=
-KeyNumpad1=
-KeyNumpad2=
-KeyNumpad3=
-KeyNumpad4=
-KeyNumpad5=
-KeyNumpad6=
-KeyNumpad7=
-KeyNumpad8=
-KeyNumpad9=
+KeyNumRow0="useUnusePickup 0"
+KeyNumRow1="useUnusePickup 1"
+KeyNumRow2="useUnusePickup 2"
+KeyNumRow3="useUnusePickup 3"
+KeyNumRow4="useUnusePickup 4"
+KeyNumRow5="useUnusePickup 5"
+KeyNumRow6="useUnusePickup 6"
+KeyNumRow7="useUnusePickup 7"
+KeyNumRow8="useUnusePickup 8"
+KeyNumRow9="useUnusePickup 9"
+KeyNumpad0="useUnusePickup 0"
+KeyNumpad1="useUnusePickup 1"
+KeyNumpad2="useUnusePickup 2"
+KeyNumpad3="useUnusePickup 3"
+KeyNumpad4="useUnusePickup 4"
+KeyNumpad5="useUnusePickup 5"
+KeyNumpad6="useUnusePickup 6"
+KeyNumpad7="useUnusePickup 7"
+KeyNumpad8="useUnusePickup 8"
+KeyNumpad9="useUnusePickup 9"
 KeyNumpadAdd=
 KeyNumpadComma=
@@ -96 +96 @@
 KeyNumpadPeriod=
 KeyNumpadSubtract=
-KeyO=
-KeyP=
+KeyO="toggleFormationFlight"
+KeyP="FFChangeMode"
 KeyPageDown="scale -1 rotateRoll"
 KeyPageUp=

code/trunk/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/trunk/data/overlays/HUDTemplates3.oxo

@@ -185 +185 @@
     />
     
+    <HUDPickupSystem
+     name                   = "PickupSystem"
+     correctaspect          = true
+     position               = "0.32, 0.81"
+     pickpoint              = "0.0, 0.0"
+     visible                = "true"
+    />
+
     <HUDTimer
      name     = "Timer"
-     position = "0.5, 0.85"
+     position = "0.5, 0.25"
      font     = "VeraMono"
      textsize = 0.1

code/trunk/data/overlays/HUDTemplatesFPS.oxo

@@ -104 +104 @@
     />
 
+    <HUDPickupSystem
+     name                   = "PickupSystem"
+     correctaspect          = true
+     position               = "0.45, 0.95"
+     pickpoint              = "0.0, 0.0"
+     visible                = "true"
+    />
+
     <HUDTimer
      name     = "Timer"

code/trunk/src/modules/overlays/OverlaysPrereqs.h

@@ -104 +104 @@
     class PauseNotice;
     class TeamBaseMatchScore;
+    class HUDPickupSystem;
+    class HUDPickupItem;
 
     // stats

code/trunk/src/modules/overlays/hud/CMakeLists.txt

@@ -14 +14 @@
   HUDWeapon.cc
   HUDWeaponSystem.cc
+  HUDPickupItem.cc
+  HUDPickupSystem.cc
   ChatOverlay.cc
   AnnounceMessage.cc

code/trunk/src/modules/pickup/CMakeLists.txt

@@ -19 +19 @@
     PickupPrecompiledHeaders.h
   LINK_LIBRARIES
+    overlays
     orxonox
   SOURCE_FILES ${PICKUP_SRC_FILES}

code/trunk/src/modules/pickup/PickupManager.cc

@@ -41 +41 @@
 #include "network/Host.h"
 #include "network/NetworkFunctionIncludes.h"
+#include "core/input/KeyBinderManager.h"    //for keybinding
+#include "core/input/KeyBinder.h"           //for keybinding
+#include "core/command/ConsoleCommandIncludes.h"
 
 #include "infos/PlayerInfo.h"
@@ -48 +51 @@
 #include "CollectiblePickup.h"
 #include "PickupRepresentation.h"
+#include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -63 +67 @@
 
     RegisterAbstractClass(PickupManager).inheritsFrom<PickupListener>();
+
+    SetConsoleCommand("useUnusePickup", &PickupManager::useUnusePickup).addShortcut().setActive(true);
 
     /**
@@ -260 +266 @@
         assert(pickup);
 
+        for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
+            pickupSystem = hud;
+        
         if(!GameMode::isMaster()) // If this is neither standalone nor the server.
             return;
@@ -283 +292 @@
         if(pickedUp) // If the Pickupable has changed to picked up, it is added to the required lists.
         {
-            index = this->getPickupIndex(); // Ge a new identifier (index) for the Pickupable.
+            index = this->getPickupIndex(); // Get a new identifier (index) for the Pickupable.
             // Add the Pickupable to the indexes_ and pickups_ lists.
             this->indexes_[pickup] = index;
             this->pickups_[index] = pickup;
+
+            this->picks.push_back(pickup);
+
+            if(pickupSystem)
+                pickupSystem->updatePickupList(picks, indexes_);
+            
         }
         else // If it was dropped, it is removed from the required lists.
@@ -294 +309 @@
             index = it->second;
 
-            // Remove the Pickupable from the indexes_ and pickups_ list.
-            this->indexes_.erase(it);
-            this->pickups_.erase(index);
+            this->indexes_.erase(pickup);
+            this->pickups_.erase(index); //set to null, so that can be identified as free slot by getPickupIndex()
+
+
+            this->picks.erase(std::remove(this->picks.begin(), this->picks.end(), pickup), this->picks.end()); //remove pickup from vector
+
+            if(pickupSystem)
+                pickupSystem->removePickup(pickup);
         }
 
@@ -323 +343 @@
 
     }
+
+    //This function is called by the command line or by the key binding
+    //it uses or unuses the pickup, depending on its current state
+    //or drops it (depends what you comment/uncomment)
+    void PickupManager::useUnusePickup(uint32_t index) 
+    {
+        PickupManager& manager = PickupManager::getInstance();
+
+        if(!manager.pickups_.count(index)) return; //if pickup is no longer here, dont do anything
+
+        Pickupable* pickup=manager.pickups_.find(index)->second;
+        if(pickup==nullptr)
+        {
+            return;                       //pickup does not exist
+        }
+
+        //if the pickup should be dropped upon key press
+        manager.dropPickup(index);
+
+        //if the pickup should be used/unused upon key press
+
+        // if(pickup->isUsed())
+        //     manager.usePickup(index, false);
+        // else
+        //     manager.usePickup(index, true);
+    }
+
 
     /**
@@ -402 +449 @@
             Pickupable* pickupable = this->pickups_.find(pickup)->second;
             if(pickupable != nullptr)
+            {
                 pickupable->drop();
+
+            }
         }
         // If we're neither server nor standalone we drop the pickup by calling dropPickupNetworked() of the PickupManager on the server.
@@ -495 +545 @@
     /**
     @brief
-        Get a new index for a Pickupable.
-        This will work as long as the number of Pickupables that are picked up is sufficiently small and as long as they don't exist forever.
+        Get a new index between 0 and 9 for a Pickupable.
+        If all slots are occupied, the Pickupable in the first slot will be dropped.
     @return
         Returns the new index.
@@ -502 +552 @@
     uint32_t PickupManager::getPickupIndex(void)
     {
-        if(this->pickupHighestIndex_ == uint32_t(~0x0)-1) // If we've reached the highest possible number, we wrap around.
-            this->pickupHighestIndex_ = 0;
-        return this->pickupHighestIndex_++;
+        //check if there are free slots available
+
+        for(uint32_t i=0; i<10; i++)
+        {
+            if(!pickups_.count(i)) return i;
+        }
+        //all slots are full and we have to drop sth
+        orxout(internal_info, context::pickups) << "everything was full and we have now dropped the first element" << endl;
+        this->dropPickup(0);
+        return 0;
     }
 

code/trunk/src/modules/pickup/PickupManager.h

@@ -42 +42 @@
 
 #include "PickupRepresentation.h"
-
+#include "interfaces/Pickupable.h"
 #include "util/Singleton.h"
 #include "interfaces/PickupListener.h"
+#include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox // tolua_export
@@ -135 +136 @@
 
             void dropPickup(uint32_t pickup); //!< Drop the input Pickupable.
+            static void useUnusePickup(uint32_t index); //tolua_export
             void usePickup(uint32_t pickup, bool use); //!< Use (or unuse) the input Pickupable.
              /**
@@ -147 +149 @@
             static void dropPickupNetworked(uint32_t pickup); //!< Helper method to drop the input pickup on the server.
             static void usePickupNetworked(uint32_t pickup, bool use); //!< Helper method to use (or unuse) the input Pickupable on the server.
+            void setPickupSystem(HUDPickupSystem* system);
 
         private:
+            HUDPickupSystem* pickupSystem;
+            std::vector<Pickupable*> picks;
+
             static PickupManager* singletonPtr_s;
             static const std::string guiName_s; //!< The name of the PickupInventory
@@ -166 +172 @@
             void updateGUI(void); //!< Updates the PickupInventory GUI.
             uint32_t getPickupIndex(void); //!< Get a new index for a Pickupable.
-
+            
     }; // tolua_export
 

code/trunk/src/modules/pickup/items/SpeedPickup.h

@@ -48 +48 @@
         A Pickup which can manipulate the Speed of a Pawn.
 
-        There are 5 parameters that can be cosen:
+        There are 5 parameters that can be chosen:
         - The @b speedMultiply, specifies a factor by which the Spaceships speed is multiplied. The default is 1.
         - The @b speedAdd, specifies a value that is added to the speed of the Spaceship. The default is 0.

code/trunk/src/orxonox/CMakeLists.txt

@@ -20 +20 @@
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/libraries
+  ${CMAKE_SOURCE_DIR}/src/modules
   ${CMAKE_CURRENT_SOURCE_DIR}
 )

code/trunk/src/orxonox/controllers/HumanController.h

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

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -50 +50 @@
 #include "PlayerManager.h"
 #include "GSRoot.h"
+// #include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -126 +127 @@
             InputManager::getInstance().leaveState("game");
 
+        // HUDPickupSystem* pickupSystem;
+
+        // for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
+        //     pickupSystem = hud;
+
+        // pickupSystem->repaint=false;
+
         // disconnect all HumanPlayers
         PlayerManager::getInstance().disconnectAllClients();

code/trunk/src/orxonox/gamestates/GSLevel.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+// #include "overlays/OverlaysPrereqs.h"
 
 #include <string>

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -96 +96 @@
 
             /**
+            @brief Check whether the Pickupable is in the process of being destroyed.
+            @return Returns true if so.
+            */
+            inline bool isBeingDestroyed(void)
+                { return this->beingDestroyed_; }
+                
+            /**
             @brief Returns whether the Pickupable is currently picked up.
             @return Returns true if the Pickupable is currently picked up, false if not.
@@ -155 +162 @@
 
             /**
-            @brief Check whether the Pickupable is in the process of being destroyed.
-            @return Returns true if so.
-            */
-            inline bool isBeingDestroyed(void)
-                { return this->beingDestroyed_; }
-
-            /**
             @brief Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
                    This method must be implemented by any class directly inheriting from Pickupable.