Changeset 6675 for code/branches

Timestamp:

Apr 2, 2010, 5:35:14 PM (15 years ago)

Author:

dafrick

Message:

Lua bugs fixed.
Renamed name and description in PickupRepresentation to pickupName and pickupDescription to avoid problems.
More work on PickupInventory.

Location:

code/branches/pickup4

Files:

• data/gui/schemes/OrxonoxGUIScheme.scheme (modified) (1 diff)
• data/gui/scripts/InitialiseGUI.lua (modified) (1 diff)
• data/gui/scripts/PickupInventory.lua (modified) (3 diffs)
• data/levels/includes/pickups.oxi (modified) (5 diffs)
• data/levels/pickup.oxw (modified) (1 diff)
• src/modules/pickup/PickupManager.cc (modified) (4 diffs)
• src/modules/pickup/PickupManager.h (modified) (1 diff)
• src/modules/pickup/PickupRepresentation.cc (modified) (2 diffs)
• src/modules/pickup/PickupRepresentation.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/pickup4/data/gui/schemes/OrxonoxGUIScheme.scheme

@@ -2 +2 @@
 <GUIScheme Name="OrxonoxGUI">
     <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset"/>
+    <Imageset Name="PickupInventory" Filename="PickupInventory.imageset"/>
 </GUIScheme>

code/branches/pickup4/data/gui/scripts/InitialiseGUI.lua

@@ -223 +223 @@
 end
 
+--TODO: Needed?
 function test(e)
     debug(0, "Blubb")

code/branches/pickup4/data/gui/scripts/PickupInventory.lua

@@ -23 +23 @@
     P.visible = true
     
-    table.insert(P.carrierList, 4)
-    
     local pickupManager = orxonox.PickupManager:getInstance()
     local carrier = pickupManager:getPawn()
-    P.getCarrierList(carrier)
     
+    local root = winMgr:getWindow("orxonox/PickupInventory/Inventory")
+    
+    P.getCarrierList(carrier)    
     for k,v in pairs(P.carrierList) do
-        local args = {}
-        table.insert(args, v)
-        table.insert(args, k)
-        local window = P.createCarrierBox(args)
+        local window = P.createCarrierBox(v,k)
+        root:addChildWindow(window);
     end
+
 end
 
@@ -59 +58 @@
 end
 
-function P.createCarrierBox(args)
-    local carrier = args[1]
-    local index = args[2]
-    
+function P.createCarrierBox(carrier, index)
+
     local name = "orxonox/PickupInventory/Carrier" .. index
     local window = winMgr:createWindow("TaharezLook/StaticText", name .. "/Title")
+    --TODO: Align text to the top
     window:setText(carrier:getCarrierName())
-    -- TODO: Does this exist?
-    local height = window:getHeight()
     
     local box = winMgr:createWindow("TaharezLook/ScrollablePane", name .. "/Box")
-    box:setPosition(CEGUI.UVector2(CEGUI.UDim(0.05, 0), CEGUI.UDim(0, height)))
-    box:setWidth(CEGUI.UDim(0.9, 0))
+    box:setPosition(CEGUI.UVector2(CEGUI.UDim(0.05, 0), CEGUI.UDim(0, 35)))
+    box:setSize(CEGUI.UVector2(CEGUI.UDim(0.9, 0), CEGUI.UDim(1, 0)))
+    window:addChildWindow(box)
     
-    local numPickups = orxonox.PickupManager.getInstance():getNumPickups(carrier)
+    --Design parameters:
+    imageHeight = 50
+    textHeight = 30
+    
+    local numPickups = orxonox.PickupManager:getInstance():getNumPickups(carrier)
     for i=0,numPickups-1,1 do
+        local pickup = orxonox.PickupManager:getInstance():getPickupRepresentation(i, carrier)
         
+        local item = winMgr:createWindow("TaharezLook/StaticText", name .. "/Box/Pickup" .. i)
+        item:setSize(CEGUI.UVector2(CEGUI.UDim(1, 0), CEGUI.UDim(0, imageHeight)))
+        item:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, (imageHeight+5)*i)))
+        box:addChildWindow(item)
+        
+        local image = winMgr:createWindow("TaharezLook/StaticImage", name .. "/Box/Pickup" .. i .. "/Image")
+        image:setProperty("Image", "set:PickupInventory image:" .. pickup:getInventoryRepresentation())
+        image:setProperty("BackgroundEnabled", "set:False")
+        image:setProperty("FrameEnabled", "set:True")
+        image:setSize(CEGUI.UVector2(CEGUI.UDim(0, imageHeight), CEGUI.UDim(0, imageHeight)))
+        item:addChildWindow(image)
+        
+        local title = winMgr:createWindow("TaharezLook/StaticText", name .. "/Box/Pickup" .. i .. "/Title")
+        title:setPosition(CEGUI.UVector2(CEGUI.UDim(0, imageHeight+5), CEGUI.UDim(0, (imageHeight-textHeight)/2)))
+        title:setSize(CEGUI.UVector2(CEGUI.UDim(0.4, 0), CEGUI.UDim(0, textHeight)))
+        title:setText(pickup:getPickupName())
+        item:addChildWindow(title)
+        
+        local useButton = winMgr:createWindow("TaharezLook/Button", name .. "/Box/Pickup" .. i .. "/UseButton")
+        useButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.4, imageHeight+10),CEGUI.UDim(0, (imageHeight-textHeight)/2)))
+        useButton:setSize(CEGUI.UVector2(CEGUI.UDim(0.2, 0), CEGUI.UDim(0, textHeight)))
+        useButton:setText("use")
+        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.filename .. ".InventoryUseButton_clicked")
+        item:addChildWindow(useButton)
+        
+        local dropButton = winMgr:createWindow("TaharezLook/Button", name .. "/Box/Pickup" .. i .. "/DropButton")
+        dropButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.6, imageHeight+15),CEGUI.UDim(0, (imageHeight-textHeight)/2)))
+        dropButton:setSize(CEGUI.UVector2(CEGUI.UDim(0.2, 0), CEGUI.UDim(0, textHeight)))
+        dropButton:setText("drop")
+        orxonox.GUIManager:subscribeEventHelper(dropButton, "Clicked", P.filename .. ".InventoryDropButton_clicked")
+        item:addChildWindow(dropButton)
     end
     
@@ -81 +114 @@
 end
 
+function P.windowToCarrierHelper(e)
+    local we = CEGUI.toWindowEventArgs(e)
+    local name = we.window:getName()
+    debug(0, "Name: " .. name)
+
+    local match = string.gmatch(name, "%d+")
+    local carrierNr = tonumber(match())
+    local pickupNr = tonumber(match())
+
+    local arguments = {}
+    arguments[1] = carrierNr
+    arguments[2] = pickupNr
+    return arguments
+end
+
 function P.InventoryUseButton_clicked(e)
-
+    local arguments = P.windowToCarrierHelper(e)
+    debug(0, "(Buh: " .. arguments[1] .. "|" .. arguments[2] .. ")")
+    orxonox.PickupManager:getInstance():usePickup(arguments[2], P.carrierList[arguments[1]], 1)
 end
 
 function P.InventoryDropButton_clicked(e)
-
+    local arguments = P.windowToCarierHelper(e)
+    orxonox.PickupManager:getInstance():dropPickup(arguments[2], P.carrierList[arguments[1]])
 end
 

code/branches/pickup4/data/levels/includes/pickups.oxi

@@ -1 +1 @@
 <PickupRepresentation
-    name = "Small Health Boost"
-    description = "Adds a small amout of health to the ship."
+    pickupName = "Small Health Boost"
+    pickupDescription = "Adds a small amout of health to the ship."
     spawnerTemplate = "smallhealthpickupRepresentation"
 >
@@ -10 +10 @@
 
 <PickupRepresentation
-    name = "Medium Health Boost"
-    description = "Adds a medium amout of health to the ship."
+    pickupName = "Medium Health Boost"
+    pickupDescription = "Adds a medium amout of health to the ship."
     spawnerTemplate = "mediumhealthpickupRepresentation"
 >
@@ -20 +20 @@
 
 <PickupRepresentation
-    name = "Huge Health Boost"
-    description = "Adds a huge amout of health to the ship."
+    pickupName = "Huge Health Boost"
+    pickupDescription = "Adds a huge amout of health to the ship."
     spawnerTemplate = "hugehealthpickupRepresentation"
 >
@@ -30 +30 @@
 
 <PickupRepresentation
-    name = "Crazy Madness Health Boost"
-    description = "Adds a crazy amout of health to the ship."
+    pickupName = "Crazy Madness Health Boost"
+    pickupDescription = "Adds a crazy amout of health to the ship."
     spawnerTemplate = "crazyhealthpickupRepresentation"
 >
@@ -40 +40 @@
 
 <PickupRepresentation
-    name = "Double Pickup"
-    description = "Does stuff."
+    pickupName = "Double Pickup"
+    pickupDescription = "Does stuff."
     spawnerTemplate = "crazyhealthpickupRepresentation"
 >

code/branches/pickup4/data/levels/pickup.oxw

@@ -37 +37 @@
     <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
         <pickup>
-            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=permanent />
+            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
+        </pickup>
+    </PickupSpawner>
+    
+    <PickupSpawner position="-50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+        <pickup>
+            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
         </pickup>
     </PickupSpawner>

code/branches/pickup4/src/modules/pickup/PickupManager.cc

@@ -127 +127 @@
     }
     
-    unsigned int PickupManager::getNumCarrierChildren(PickupCarrier* carrier)
+    int PickupManager::getNumCarrierChildren(PickupCarrier* carrier)
     {
         if(carrier == NULL)
@@ -134 +134 @@
     }
             
-    PickupCarrier* PickupManager::getCarrierChild(unsigned int index, PickupCarrier* carrier)
+    PickupCarrier* PickupManager::getCarrierChild(int index, PickupCarrier* carrier)
     {
+        if(carrier == NULL)
+            return NULL;
         return carrier->getCarrierChild(index);
     }
     
-    PickupRepresentation* PickupManager::getPickupRepresentation(unsigned int index, PickupCarrier* carrier)
+    const std::string& PickupManager::getCarrierName(orxonox::PickupCarrier* carrier)
+    {
+        if(carrier == NULL)
+            return BLANKSTRING;
+        return carrier->getCarrierName();
+    }
+    
+    PickupRepresentation* PickupManager::getPickupRepresentation(int index, PickupCarrier* carrier)
     {
         Pickupable* pickup = carrier->getPickup(index);
@@ -149 +158 @@
     
 
-    unsigned int PickupManager::getNumPickups(PickupCarrier* carrier)
+    int PickupManager::getNumPickups(PickupCarrier* carrier)
     {
+        if(carrier == NULL)
+            return 0;
         return carrier->getNumPickups();
     }
     
-    void PickupManager::dropPickup(unsigned int index, PickupCarrier* carrier)
+    void PickupManager::dropPickup(int index, PickupCarrier* carrier)
     {
         Pickupable* pickup = carrier->getPickup(index);
@@ -160 +171 @@
     }
     
-    void PickupManager::usePickup(unsigned int index, PickupCarrier* carrier, bool use)
+    void PickupManager::usePickup(int index, PickupCarrier* carrier, bool use)
     {
         Pickupable* pickup = carrier->getPickup(index);

code/branches/pickup4/src/modules/pickup/PickupManager.h

@@ -72 +72 @@
             orxonox::PickupCarrier* getPawn(void);
             
-            unsigned int getNumCarrierChildren(orxonox::PickupCarrier* carrier);
-            orxonox::PickupCarrier* getCarrierChild(unsigned int index, orxonox::PickupCarrier* carrier);
+            int getNumCarrierChildren(orxonox::PickupCarrier* carrier);
+            orxonox::PickupCarrier* getCarrierChild(int index, orxonox::PickupCarrier* carrier);
             
-            unsigned int getNumPickups(orxonox::PickupCarrier* carrier);
-            PickupRepresentation* getPickupRepresentation(unsigned int index, orxonox::PickupCarrier* carrier);
-            void dropPickup(unsigned int index, orxonox::PickupCarrier* carrier);
-            void usePickup(unsigned int index, orxonox::PickupCarrier* carrier, bool use);
+            const std::string& getCarrierName(orxonox::PickupCarrier* carrier);
+            
+            int getNumPickups(orxonox::PickupCarrier* carrier);
+            PickupRepresentation* getPickupRepresentation(int index, orxonox::PickupCarrier* carrier);
+            void dropPickup(int index, orxonox::PickupCarrier* carrier);
+            void usePickup(int index, orxonox::PickupCarrier* carrier, bool use);
             // tolua_end
             

code/branches/pickup4/src/modules/pickup/PickupRepresentation.cc

@@ -86 +86 @@
         this->name_ = "Pickup";
         this->spawnerTemplate_ = "";
-        this->inventoryRepresentation_ = "";
+        this->inventoryRepresentation_ = "Default";
         this->pickup_ = NULL;
     }
@@ -98 +98 @@
         SUPER(PickupRepresentation, XMLPort, xmlelement, mode);
         
-        XMLPortParam(PickupRepresentation, "name", setName, getName, xmlelement, mode);
-        XMLPortParam(PickupRepresentation, "description", setDescription, getDescription, xmlelement, mode);
+        XMLPortParam(PickupRepresentation, "pickupName", setPickupName, getPickupName, xmlelement, mode);
+        XMLPortParam(PickupRepresentation, "pickupDescription", setPickupDescription, getPickupDescription, xmlelement, mode);
         XMLPortParam(PickupRepresentation, "spawnerTemplate", setSpawnerTemplate, getSpawnerTemplate, xmlelement, mode);
         XMLPortParam(PickupRepresentation, "inventoryRepresentation", setInventoryRepresentation, getInventoryRepresentation, xmlelement, mode);

code/branches/pickup4/src/modules/pickup/PickupRepresentation.h

@@ -68 +68 @@
             @param name The name.
             */
-            inline void setName(const std::string& name)
+            inline void setPickupName(const std::string& name)
                 { this->name_ = name; }
             /**
@@ -74 +74 @@
             @param description The Description.
             */
-            inline void setDescription(const std::string& description)
+            inline void setPickupDescription(const std::string& description)
                 { this->description_ = description; }
             /**
@@ -107 +107 @@
             @return Returns the name.
             */
-            inline const std::string& getName(void) { return this->name_; } // tolua_export
+            inline const std::string& getPickupName(void) { return this->name_; } // tolua_export
             /**
             @brief Get the description of the Pickupable represented by this PickupRepresentation.
             @return Returns the description.
             */
-            inline const std::string& getDescription(void) { return this->description_; } // tolua_export
+            inline const std::string& getPickupDescription(void) { return this->description_; } // tolua_export
             /**
             @brief Get the name of spawnerTemplate the Pickupable represented by this PickupRepresentation.

code/branches/pickup4/src/orxonox/worldentities/pawns/Pawn.cc

@@ -78 +78 @@
         else
             this->weaponSystem_ = 0;
+        
+        this->setCarrierName("Pawn");
 
         this->setRadarObjectColour(ColourValue::Red);