Changeset 2972 for code/branches/pickups2

Timestamp:

May 11, 2009, 6:03:40 PM (16 years ago)

Author:

danielh

Message:

Update

• Minor changes in BaseItem
• Updated to NotificationQueue from trunk (compile error with old)
• Added PickupInventory for GUI handling
• Added basic support for toLua++ methods

Location:

code/branches/pickups2/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/controllers/HumanController.h (modified) (1 diff)
• objects/pickup/BaseItem.cc (modified) (2 diffs)
• objects/pickup/BaseItem.h (modified) (4 diffs)
• objects/pickup/CMakeLists.txt (modified) (1 diff)
• objects/pickup/DroppedItem.cc (modified) (1 diff)
• objects/pickup/PickupCollection.cc (modified) (7 diffs)
• objects/pickup/PickupCollection.h (modified) (3 diffs)
• objects/pickup/PickupInventory.cc (added)
• objects/pickup/PickupInventory.h (added)
• objects/pickup/UsableItem.cc (modified) (1 diff)
• overlays/notifications/NotificationQueue.cc (modified) (2 diffs)
• overlays/notifications/NotificationQueue.h (modified) (1 diff)

code/branches/pickups2/src/orxonox/CMakeLists.txt

@@ -35 +35 @@
 
 GENERATE_SOURCE_GROUPS(${ORXONOX_FILES})
-GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h)
+GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h objects/pickup/PickupInventory.h objects/pickup/BaseItem.h objects/pickup/EquipmentItem.h objects/pickup/UsableItem.h objects/pickup/PassiveItem.h)
 
 # Not using precompiled header files: Avoid dependencies

code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h

@@ -66 +66 @@
             static void killBots(unsigned int amount = 0);
 
+            static inline HumanController* getLocalControllerSingleton()
+                { return HumanController::localController_s; }
+
         private:
             static HumanController* localController_s;

code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc

@@ -35 +35 @@
 
 #include "PickupCollection.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "objects/worldentities/pawns/Pawn.h"
 
@@ -54 +57 @@
     {
     }
+
+    /**
+        @brief XMLPort for BaseItem.
+        @param xmlelement Element of the XML-file.
+        @param mode XMLPort mode to use.
+    */
+    void BaseItem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(BaseItem, XMLPort, xmlelement, mode);
+
+        XMLPortParam(BaseItem, "guiText", setGUIText, getGUIText, xmlelement, mode);
+        XMLPortParam(BaseItem, "guiTooltip", setGUITooltip, getGUITooltip, xmlelement, mode);
+        XMLPortParam(BaseItem, "guiImage", setGUIImage, getGUIImage, xmlelement, mode);
+    }
+
     /**
         @brief Method to add the item to a pawn.

code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h

@@ -39 +39 @@
 #include "core/BaseObject.h"
 
+// tolua_begin
 namespace orxonox
 {
@@ -51 +52 @@
     class _OrxonoxExport BaseItem : public BaseObject
     {
+// tolua_end
     public:
         BaseItem(BaseObject* creator);
         virtual ~BaseItem();
+
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< XMLPort
 
         /**
@@ -116 +120 @@
         inline void setPickupIdentifier(const std::string& identifier)
             { this->pickupIdentifier_ = identifier; }
+
+        // GUI stuff
+        virtual const std::string& getGUIText()
+            { return this->guiText_; }
+        inline void setGUIText(const std::string& text)
+            { this->guiText_ = text; }
+
+        virtual const std::string& getGUITooltip()
+            { return this->guiTooltip_; }
+        inline void setGUITooltip(const std::string& tooltip)
+            { this->guiTooltip_ = tooltip; }
+
+        virtual const std::string& getGUIImage()
+            { return this->guiImage_; }
+        inline void setGUIImage(const std::string& image)
+            { this->guiImage_ = image; }
     private:
         Pawn* owner_;   //!< The current owner of the item.
@@ -127 +147 @@
         */
         std::string pickupIdentifier_;
+
+        std::string guiText_;
+        std::string guiTooltip_;
+        std::string guiImage_;
     };
 }

code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt

@@ -7 +7 @@
   PassiveItem.cc
   PickupCollection.cc
+  PickupInventory.cc
   PickupSpawner.cc
   UsableItem.cc

code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc

@@ -55 +55 @@
     {
         if (this->item_)
+        {
+            COUT(3) << "Delete DroppedItem with '" << this->item_->getPickupIdentifier() << "'" << std::endl;
             delete this->item_;
+        }
 
         delete this;

code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc

@@ -38 +38 @@
 #include "PassiveItem.h"
 #include "UsableItem.h"
+
+#include "core/CoreIncludes.h"
 
 #include "objects/worldentities/pawns/Pawn.h"
@@ -312 +314 @@
         @return Returns a list of all the equipment-type items in the collection.
     */
-    std::set<BaseItem*> PickupCollection::getEquipmentItems()
-    {
-        std::set<BaseItem*> ret;
+    std::deque<EquipmentItem*> PickupCollection::getEquipmentItems()
+    {
+        std::deque<EquipmentItem*> ret;
         Identifier* ident = Class(EquipmentItem);
 
@@ -320 +322 @@
         {
             if ((*it).second->isA(ident))
-                ret.insert((*it).second);
+                ret.push_back(dynamic_cast<EquipmentItem*>((*it).second));
         }
 
@@ -329 +331 @@
         @return Returns a list of all the passive items in the collection.
     */
-    std::set<BaseItem*> PickupCollection::getPassiveItems()
-    {
-        std::set<BaseItem*> ret;
+    std::deque<PassiveItem*> PickupCollection::getPassiveItems()
+    {
+        std::deque<PassiveItem*> ret;
         Identifier* ident = Class(PassiveItem);
 
@@ -337 +339 @@
         {
             if ((*it).second->isA(ident))
-                ret.insert((*it).second);
+                ret.push_back(dynamic_cast<PassiveItem*>((*it).second));
         }
 
@@ -346 +348 @@
         @return Returns a list of all the usable items in the collection.
     */
-    std::set<BaseItem*> PickupCollection::getUsableItems()
-    {
-        std::set<BaseItem*> ret;
+    std::deque<UsableItem*> PickupCollection::getUsableItems()
+    {
+        std::deque<UsableItem*> ret;
         Identifier* ident = Class(UsableItem);
 
@@ -354 +356 @@
         {
             if ((*it).second->isA(ident))
-                ret.insert((*it).second);
+                ret.push_back(dynamic_cast<UsableItem*>((*it).second));
         }
 

code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h

@@ -38 +38 @@
 
 #include <map>
-#include <set>
+#include <deque>
 #include <string>
 
@@ -48 +48 @@
 {
     class BaseItem;
+    class EquipmentItem;
+    class PassiveItem;
     class UsableItem;
     class Pawn;
@@ -104 +106 @@
             { this->owner_ = owner; }
 
-        std::set<BaseItem*> getEquipmentItems();   //!< Get a list of equipment-type items.
-        std::set<BaseItem*> getPassiveItems();     //!< Get a list of passive items.
-        std::set<BaseItem*> getUsableItems();      //!< Get a list of usable items.
+        std::deque<EquipmentItem*> getEquipmentItems();   //!< Get a list of equipment-type items.
+        std::deque<PassiveItem*> getPassiveItems();     //!< Get a list of passive items.
+        std::deque<UsableItem*> getUsableItems();      //!< Get a list of usable items.
     private:
         Pawn* owner_;           //!< The owner of the PickupCollection.

code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc

@@ -26 +26 @@
  *
  */
-
+        
 /**
     @file

code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -54 +54 @@
     const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
     const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
+    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025;
 
     /**
@@ -273 +274 @@
         string->clear();
         bool first = true;
-        for(std::set<std::string>::iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
+        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
         {
             if(!first)

code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h

@@ -166 +166 @@
             static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
             static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
-            static const float DEFAULT_FONT_SIZE = 0.025; //!< The default font size.
+            static const float DEFAULT_FONT_SIZE; //!< The default font size.
 
             static const std::string DEFAULT_FONT; //!< The default font.