Changeset 9281

Timestamp:

Jun 9, 2012, 3:51:51 PM (12 years ago)

Author:

landauf

Message:

small cleanup in ship selection:

• renamed some functions
• moved implementation of changeStartingShip() from header to source file
• removed ShipManager which doesn't seem to be used nor compiled (and it's just a copy of LevelManager anyway)

Location:

code/branches/presentation2012merge

Files:

• data/gui/scripts/ShipSelectionMenu.lua (modified) (3 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/orxonox/LevelInfo.cc (modified) (8 diffs)
• src/orxonox/LevelInfo.h (modified) (5 diffs)
• src/orxonox/ShipManager.cc (deleted)
• src/orxonox/ShipManager.h (deleted)

code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua

@@ -19 +19 @@
    P.shipList = {}
    for line in io.lines("../levels/templates/.shipmodels") do  --checks if shipmodel is included in level file
-    if selectedlevel:hasShip(string.lower(line)) then
+    if selectedlevel:hasStartingShip(string.lower(line)) then
         P.shipList[#P.shipList+1] = string.lower(line)
     end
@@ -32 +32 @@
     for k,v in pairs(P.shipList) do
         --TODO: only add ship if is in the right filter tab
-        --if tag == nil or v:hasShip(tag) then
+        --if tag == nil or v:hasStartingShip(tag) then
             local item = CEGUI.createListboxTextItem(v)
             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
@@ -107 +107 @@
 
     if (selectedlevel ~= nil and P.ShipSelectionGetSelectedModel() ~= nil)  then
-    selectedlevel:selectShip(P.ShipSelectionGetSelectedModel())
+    selectedlevel:selectStartingShip(P.ShipSelectionGetSelectedModel())
         orxonox.execute("startGame " .. "_temp.oxw")
         hideAllMenuSheets()

code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua

@@ -48 +48 @@
         level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
         if (level ~= nil and level:getXMLFilename() ~= "_temp.oxw") then
-            --os.execute("echo " .. level:getXMLFilename() .." >> ~/outputorx")
             local levelXMLFilename = level:getXMLFilename()
             -- create an imageset for each screenshot

code/branches/presentation2012merge/src/orxonox/LevelInfo.cc

@@ -42 +42 @@
 
     // LevelInfoItem
-    
+
     //! The list of allowed tags.
     /*static*/ std::set<std::string> LevelInfoItem::possibleTags_s = std::set<std::string>();
@@ -107 +107 @@
         SubString substr = SubString(tags, ",", " "); // Split the string into tags.
         const std::vector<std::string>& strings = substr.getAllStrings();
-        for(std::vector<std::string>::const_iterator it = strings.begin(); it != strings.end(); it++)
+        for (std::vector<std::string>::const_iterator it = strings.begin(); it != strings.end(); it++)
             this->addTag(*it, false);
 
@@ -118 +118 @@
         A comma-seperated string of all the allowed ship models for the shipselection.
     */
-    void LevelInfoItem::setShips(const std::string& ships)
+    void LevelInfoItem::setStartingShips(const std::string& ships)
     {
         SubString substr = SubString(ships, ",", " "); // Split the string into tags.
         const std::vector<std::string>& strings = substr.getAllStrings();
         for(std::vector<std::string>::const_iterator it = strings.begin(); it != strings.end(); it++)
-            this->addShip(*it, false);
-
-        this->shipsUpdated();
+            this->addStartingShip(*it, false);
+
+        this->startingshipsUpdated();
     }
 
@@ -161 +161 @@
         Returns true if the ship was successfully added, if the ship was already present it returns false.
     */
-    bool LevelInfoItem::addShip(const std::string& ship, bool update)
-    {
-        bool success = this->ships_.insert(ship).second;
+    bool LevelInfoItem::addStartingShip(const std::string& ship, bool update)
+    {
+        bool success = this->startingShips_.insert(ship).second;
         if(update && success)
-            this->shipsUpdated();
-            
+            this->startingshipsUpdated();
+
         return success;
     }
@@ -195 +195 @@
         Updates the comma-seperated string of all ships, if the set of tags has changed.
     */
-    void LevelInfoItem::shipsUpdated(void)
+    void LevelInfoItem::startingshipsUpdated(void)
     {
         std::stringstream stream;
         std::set<std::string>::iterator temp;
-        for(std::set<std::string>::iterator it = this->ships_.begin(); it != this->ships_.end(); )
+        for(std::set<std::string>::iterator it = this->startingShips_.begin(); it != this->startingShips_.end(); )
         {
             temp = it;
-            if(++it == this->ships_.end()) // If this is the last ship we don't add a comma.
+            if(++it == this->startingShips_.end()) // If this is the last ship we don't add a comma.
                 stream << *temp;
             else
@@ -210 +210 @@
         this->startingShipsString_ = std::string(stream.str());
     }
+
+    void LevelInfoItem::changeStartingShip(const std::string& model)
+    {
+        static std::string shipSelectionTag = "shipselection";
+        //HACK: Read Level XML File, find "shipselection", replace with ship model
+        std::string levelPath = "../levels/";
+        levelPath.append(this->getXMLFilename());
+        std::string tempPath = "../levels/";
+        tempPath.append("_temp.oxw");
+        orxout(user_status) << levelPath << endl;
+        orxout(user_status) << tempPath << endl;
+        std::ifstream myLevel (levelPath.c_str());
+        std::ofstream tempLevel (tempPath.c_str());
+        while(!myLevel.eof())
+        {
+            std::string buff;
+            std::getline(myLevel, buff);
+            std::string pawndesignString = "pawndesign=";
+            size_t found = buff.find(pawndesignString.append(shipSelectionTag));
+            if (found!= std::string::npos)
+                buff = buff.substr(0, found + 11) + model + buff.substr(found+11+shipSelectionTag.length(), std::string::npos);
+            tempLevel.write(buff.c_str(), buff.length());
+            tempLevel << std::endl;
+        }
+        myLevel.close();
+        tempLevel.close();
+        orxout(user_status) << "done" << endl;
+    }
+
+
     // LevelInfo
 
@@ -247 +277 @@
         XMLPortParam(LevelInfo, "screenshot", setScreenshot, getScreenshot, xmlelement, mode);
         XMLPortParam(LevelInfo, "tags", setTags, getTags, xmlelement, mode);
-        XMLPortParam(LevelInfo, "startingships", setShips, getShips, xmlelement, mode);
+        XMLPortParam(LevelInfo, "startingships", setStartingShips, getStartingShips, xmlelement, mode);
     }
 
@@ -263 +293 @@
         info->setScreenshot(this->getScreenshot());
         info->setTags(this->getTags());
-        info->setShips(this->getShips());
+        info->setStartingShips(this->getStartingShips());
         return info;
     }

code/branches/presentation2012merge/src/orxonox/LevelInfo.h

@@ -118 +118 @@
             inline bool hasTag(const std::string& tag) const { return this->tags_.find(tag) != this->tags_.end(); } // tolua_export
 
-            void setShips(const std::string& ships); //!< Set the starting ship models of the level
-            bool addShip(const std::string& ship, bool update = true); //!< Add a model to shipselection
+            void setStartingShips(const std::string& ships); //!< Set the starting ship models of the level
+            bool addStartingShip(const std::string& ship, bool update = true); //!< Add a model to shipselection
             /**
             @brief Get the set of starting ship models the Level allows
             @return Returns a comma-seperated string of all the allowed ship models for the shipselection.
             */
-            inline const std::string& getShips(void) const
+            inline const std::string& getStartingShips(void) const
                 { return this->startingShipsString_; }
             /**
@@ -131 +131 @@
             @return Returns true if the Level allows the input ship model
             */
-            inline bool hasShip(const std::string& ship) const { return this->ships_.find(ship) != this->ships_.end(); } // tolua_export
+            inline bool hasStartingShip(const std::string& ship) const { return this->startingShips_.find(ship) != this->startingShips_.end(); } // tolua_export
+            inline void selectStartingShip(const std::string& ship) { this->changeStartingShip(ship); } // tolua_export
             /**
             @brief Get the XML-filename of the Level.
             @return Returns the XML-filename (including *.oxw extension) of the Level.
             */
-
             inline const std::string& getXMLFilename(void) const { return this->xmlfilename_; } // tolua_export
-            inline void selectShip (const std::string& ship) { this->changeShip(ship); } // tolua_export
 
 
@@ -152 +151 @@
 
         private:
-
-            inline void changeShip (const std::string& model) {
-                static std::string shipSelectionTag = "shipselection";
-                //HACK: Read Level XML File, find "shipselection", replace with ship model
-                std::string levelPath = "../levels/";
-                levelPath.append(this->getXMLFilename());
-                std::string tempPath = "../levels/";
-                tempPath.append("_temp.oxw");
-                orxout(user_status) << levelPath << endl;
-                orxout(user_status) << tempPath << endl;
-                std::ifstream myLevel (levelPath.c_str());
-                std::ofstream tempLevel (tempPath.c_str());
-                while(!myLevel.eof())
-                {
-                    std::string buff;
-                    std::getline(myLevel, buff);
-                    std::string pawndesignString = "pawndesign=";
-                    size_t found = buff.find(pawndesignString.append(shipSelectionTag));
-                    if (found!= std::string::npos)
-                        buff = buff.substr(0, found + 11) + model + buff.substr(found+11+shipSelectionTag.length(), std::string::npos);
-                    tempLevel.write(buff.c_str(), buff.length());
-                    tempLevel << std::endl;
-                }
-                myLevel.close();
-                tempLevel.close();
-                orxout(user_status) << "done" << endl;
-            }
+            void changeStartingShip (const std::string& model);
+            void startingshipsUpdated(void); //!< Updates the comma-seperated string of all possible starting ships.
             void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
-            void shipsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
             static void initializeTags(void); //!< Initialize the set of allowed tags.
             /**
@@ -198 +171 @@
             std::set<std::string> tags_; //!< The set of tags the Level is tagged with.
             std::string tagsString_; //!< The comma-seperated string of all the tags the Level is tagged with.
-            std::set<std::string> ships_; //!< The set of starting ship models the Level allows.
+            std::set<std::string> startingShips_; //!< The set of starting ship models the Level allows.
             std::string startingShipsString_; //!< The comma-seperated string of all the allowed ship models for the shipselection.
     }; // tolua_export
@@ -276 +249 @@
             @param A comma-seperated string of all the allowed ship models for the shipselection.
             */
-            inline void setShips(const std::string& ships)
-                { this->LevelInfoItem::setShips(ships); }
+            inline void setStartingShips(const std::string& ships)
+                { this->LevelInfoItem::setStartingShips(ships); }
             /**
             @brief Get the starting ship models of the level
             @return Returns a comma-seperated string of all the allowed ship models for the shipselection.
             */
-            inline const std::string& getShips(void) const
-                { return this->LevelInfoItem::getShips(); }
+            inline const std::string& getStartingShips(void) const
+                { return this->LevelInfoItem::getStartingShips(); }
+
             LevelInfoItem* copy(void); //!< Copies the contents of this LevelInfo object to a new LevelInfoItem object.
     };