Changeset 9127

Timestamp:

Apr 27, 2012, 3:56:15 PM (12 years ago)

Author:

huttemat

Message:

shipselection core works now

Location:

code/branches/shipSelection

Files:

• data/gui/scripts/ShipSelectionMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• data/levels/tutorial.oxw (modified) (2 diffs)
• src/libraries/core/Loader.cc (modified) (1 diff)
• src/orxonox/LevelInfo.h (modified) (1 diff)
• src/orxonox/LevelManager.cc (modified) (1 diff)

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

@@ -16 +16 @@
 
    P.shipList = {}
+
+  --for line in io.lines("../levels/templates/.shipmodels") do  orxonox.execute("orxout user_warning " .. line) end
+  for line in io.lines("../levels/templates/.shipmodels") do  
+        P.shipList[#P.shipList+1] = string.lower(line)
+  end 
    --[[for f in io.lines("../levels/templates/.shipmodels") do
         if selectedlevel:hasShip(f) then
@@ -151 +156 @@
     end
 end
---]]
+
 function P.ShipSelectionStartButton_clicked(e)
 
     if selectedlevel ~= nil then
-        selectedlevel:selectShip("meinModell")
-        --orxonox.execute("startGame " .. selectedlevel:getXMLFilename())
+        selectedlevel:selectShip(P.ShipSelectionGetSelectedLevel())
+        orxonox.execute("startGame " .. "_temp.oxw")
         hideAllMenuSheets()
     else

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

@@ -47 +47 @@
     while index < size do
         level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
-        if level ~= nil then
+        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/shipSelection/data/levels/tutorial.oxw

@@ -4 +4 @@
  tags = "tutorial, shipselection"
  screenshot = "codingtutorial.png"
- startingships = "spaceshipGhost, spaceshipPirate, spaceshipSpacecruiser"
+ startingships = "spaceshipghost, spaceshippirate, spaceshipspacecruiser"
 />
 
@@ -11 +11 @@
   include("stats.oxo")
   include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("templates/spaceshipSpacecruiser.oxt")
   include("templates/lodInformation.oxt")
 ?>

code/branches/shipSelection/src/libraries/core/Loader.cc

@@ -222 +222 @@
 
             orxout(verbose, context::loader) << "Namespace-tree:" << '\n' << rootNamespace->toString("  ") << endl;
-
+                        
             return true;
         }

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

@@ -152 +152 @@
 
         private:
+
             inline void changeShip (const std::string& model) {
-                //HACK: Read Level XML File, find "shipselection", replace with ship model
-                std::string text;
-                std::ifstream myLevel ("test.txt");
-                std::ofstream tempLevel ("test2.txt");
-                while(!myLevel.eof())
-                {
-                        std::string buff;
-                        std::getline(myLevel, buff);
-                        tempLevel.write(buff.c_str(), buff.length());
-                }
-                myLevel.close();
-                tempLevel.close();
-                orxout(user_status) << "done" << endl;
+                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 tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.

code/branches/shipSelection/src/orxonox/LevelManager.cc

@@ -256 +256 @@
         {
             // TODO: Replace with tag?
-            if (it->find("old/") != 0)
+            if (it->find("old/") != 0 )
             {
                 LevelInfoItem* info = NULL;