Changeset 11353 for code/trunk/src/orxonox

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)
• 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/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.