Changeset 6419 for code/branches/pickup3/src/orxonox/pickup/PickupInventory.cc

Timestamp:

Dec 25, 2009, 11:07:09 PM (14 years ago)

Author:

rgrieder

Message:

Merged pickup2 into pickup3.

Location:

code/branches/pickup3

Files:

• . (modified) (1 prop)
• src/orxonox/pickup/PickupInventory.cc (modified) (17 diffs)

code/branches/pickup3/src/orxonox/pickup/PickupInventory.cc

@@ -52 +52 @@
 
     PickupInventory* PickupInventory::pickupInventory_s = NULL;
+
+    //TODO: Comment.
+
+    /**
+    @brief
+        Get a Pointer to the PickupInventory Singleton.
+    @return
+        A Pointer to the PickupInventory.
+    */
+    //TODO: Make SingeltonPtr?
     PickupInventory* PickupInventory::getSingleton()
     {
@@ -60 +70 @@
     }
 
+    /**
+    @brief
+        Constructor. 
+    */
     PickupInventory::PickupInventory()
     {
-        this->bInventoryVisible_ = false;
-        this->visibleEquipmentWindows_ = this->visibleUsableWIndows_ = 0;
+        //TODO: Maybe some abstraction for the usableWindows, e.g. push and pop...
+        //RegisterObject() ? In some other Class, too. Which?
+        this->bInventoryVisible_ = false; //TODO: If OrxonoxClass, this should already be there...
+        this->visibleEquipmentWindows_ = this->visibleUsableWindows_ = 0;
 
         // Create some windows to avoid creating them while playing
@@ -77 +93 @@
         this->createdEquipmentWindows_ = this->createdUsableWindows_ = 10;
     }
+
+    /**
+    @brief
+        Destructor.
+    */
+    //TODO: Destroy something?
     PickupInventory::~PickupInventory()
     {
     }
 
-
-
-    void PickupInventory::toggleInventory()
+    /**
+    @brief
+        Toggles the visibility of the inventory.
+    */
+    /*static*/ void PickupInventory::toggleInventory()
     {
         if(PickupInventory::getSingleton()->isVisible()) {
@@ -95 +119 @@
     }
 
+    /**
+    @brief
+        
+    */
     unsigned int PickupInventory::getCurrentUsableIndex()
     {
@@ -111 +139 @@
         return 0;
     }
+
     bool PickupInventory::isCurrentUsable(const BaseItem* item)
     {
@@ -119 +148 @@
             return false;
     }
+
     void PickupInventory::selectUsable(unsigned int i)
     {
@@ -138 +168 @@
             return 0;
     }
+
     unsigned int PickupInventory::getUsableCount()
     {
@@ -146 +177 @@
             return 0;
     }
+
     unsigned int PickupInventory::getPassiveCount()
     {
@@ -154 +186 @@
             return 0;
     }
+
     BaseItem* PickupInventory::getEquipmentItem(unsigned int i)
     {
@@ -166 +199 @@
             return NULL;
     }
+
     BaseItem* PickupInventory::getUsableItem(unsigned int i)
     {
@@ -178 +212 @@
             return NULL;
     }
+
     BaseItem* PickupInventory::getPassiveItem(unsigned int i)
     {
@@ -221 +256 @@
             equipPane->removeChildWindow("orxonox/Inventory/Items/equ/" + id.str());*/
         }
-        for(unsigned int i = 0; i < this->visibleUsableWIndows_; i++)
+        for(unsigned int i = 0; i < this->visibleUsableWindows_; i++)
         {
             std::ostringstream id;
@@ -235 +270 @@
         }
     }
+
     void PickupInventory::updateTabs(CEGUI::WindowManager *winMgr, CEGUI::Window *equipWindow, CEGUI::Window *usableWindow)
     {
@@ -265 +301 @@
         }
     }
+
     void PickupInventory::updateUsable(CEGUI::WindowManager* winMgr, CEGUI::Window* target)
     {
@@ -292 +329 @@
                 PickupInventory::setWindowProperties(winMgr, target, id.str(), item, colour);
             }
-            this->visibleUsableWIndows_ = items.size();
+            this->visibleUsableWindows_ = items.size();
         }
     }
@@ -322 +359 @@
         btn->setVisible(false);
     }
+
     void PickupInventory::setWindowProperties(CEGUI::WindowManager* winMgr, CEGUI::Window* target, const std::string& id, const BaseItem* item, const std::string& textColour)
     {
@@ -346 +384 @@
         target->addChildWindow(btn);
     }
+
 }