Changeset 7504 for code/trunk/src/orxonox/interfaces

Timestamp:

Oct 6, 2010, 8:00:40 AM (14 years ago)

Author:

dafrick

Message:

Pickups module is now (from what I can tell after some basic testing) fully functional over the network.
However it's still a little messy, needs some cleanup and documentation.
I introduced a new class, the PickupListener, which allows reacting to pickups becoming used, unused, picked up or dropped.

Location:

code/trunk/src/orxonox/interfaces

Files:

• CMakeLists.txt (modified) (1 diff)
• PickupListener.cc (added)
• PickupListener.h (added)
• Pickupable.cc (modified) (5 diffs)
• Pickupable.h (modified) (7 diffs)

code/trunk/src/orxonox/interfaces/CMakeLists.txt

@@ -3 +3 @@
   Pickupable.cc
   PickupCarrier.cc
+  PickupListener.cc
   RadarViewable.cc
 )

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

@@ -34 +34 @@
 #include "Pickupable.h"
 
-#include "core/LuaState.h"
-#include "core/GUIManager.h"
 #include "core/Identifier.h"
 #include "core/CoreIncludes.h"
@@ -45 +43 @@
 
 #include "PickupCarrier.h"
+#include "PickupListener.h"
 
 namespace orxonox
@@ -130 +129 @@
 
         this->used_ = used;
+
+        // Notify all the PickupListeners of the change.
+        PickupListener::broadcastPickupChangedUsed(this, used);
+
         this->changedUsed();
 
-        //TODO: Synchronize & make safe for dedicated server.
-        GUIManager::getInstance().getLuaState()->doString("PickupInventory.update()");
+
         return true;
     }
@@ -222 +224 @@
             return false;
         }
-        
+
         this->setPickedUp(true);
         COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
@@ -277 +279 @@
 
         this->pickedUp_ = pickedUp;
+
+        // Notify all the PickupListeners of the change.
+        PickupListener::broadcastPickupChangedPickedUp(this, pickedUp);
+
         if(!pickedUp) // if the Pickupable has been dropped it unregisters itself with its PickupCarrier.
             this->getCarrier()->removePickup(this);
         this->changedPickedUp();
 
-        //TODO: Synchronize & make safe for dedicated server.
-        GUIManager::getInstance().getLuaState()->doString("PickupInventory.update()");
         return true;
     }

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

@@ -44 +44 @@
 #include "Rewardable.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+namespace orxonox
+{
 
     /**
@@ -58 +58 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport Pickupable  // tolua_export
-        : virtual public OrxonoxClass, public Rewardable
-    {  // tolua_export
+    class _OrxonoxExport Pickupable : virtual public OrxonoxClass, public Rewardable
+    {
         protected:
             Pickupable(); //!< Default constructor.
@@ -71 +70 @@
             @return Returns true if the Pickupable is currently in use.
             */
-            inline bool isUsed(void) { return this->used_; }  // tolua_export
+            inline bool isUsed(void)
+                { return this->used_; }
             /**
             @brief  Should be called when the Pickupable has transited from used to unused or the other way around.
@@ -94 +94 @@
             @return Returns true if the Pickupable is currently picked up, false if not.
             */
-            inline bool isPickedUp(void) { return this->pickedUp_; }  // tolua_export
+            inline bool isPickedUp(void)
+                { return this->pickedUp_; }
             /**
             @brief  Should be called when the Pickupable has transited from picked up to dropped or the other way around.
@@ -105 +106 @@
             @return Returns true if it can be used.
             */
-            inline bool isUsable(void) { return this->enabled_; } // tolua_export
-            
+            inline bool isUsable(void)
+                { return this->enabled_; }
+
             /**
             @brief Returns whether the Pickupable can be unused.
             @return Returns true if it can be unused.
             */
-            inline bool isUnusable(void) { return this->enabled_; } // tolua_export
+            inline bool isUnusable(void)
+                { return this->enabled_; }
 
             /**
@@ -190 +193 @@
             virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
 
-    };  // tolua_export
+    };
 
     //! SUPER functions.
@@ -196 +199 @@
     SUPER_FUNCTION(12, Pickupable, changedCarrier, false);
     SUPER_FUNCTION(13, Pickupable, changedPickedUp, false);
-}  // tolua_export
+}
 
 #endif /* _Pickupable_H__ */