Changeset 9045

Timestamp:

Mar 16, 2012, 4:54:46 PM (13 years ago)

Author:

huttemat

Message:

added wip ship selection menu

Location:

code/branches/shipSelection

Files:

• data/gui/layouts/ShipSelectionMenu.layout (modified) (5 diffs)
• data/gui/scripts/ShipSelectionMenu.lua (added)
• data/gui/scripts/SingleplayerMenu.lua (modified) (2 diffs)
• src/orxonox/LevelInfo.cc (modified) (1 diff)

code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerBackground" >
+
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8 +9 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerWindow" >
-            <Property Name="Text" Value="Singleplayer" />
+        <!-- --> 
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionWindow" >
+            <Property Name="Text" Value="ShipSelection" />
             <Property Name="Alpha" Value="0.8" />
             <Property Name="InheritsAlpha" Value="False" />
@@ -16 +18 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
-            <Window Type="MenuWidgets/TabControl" Name="orxonox/SingleplayerTabControl" >
+                <!--
+            <Window Type="MenuWidgets/TabControl" Name="orxonox/ShipSelectionTabControl" >
                 <Property Name="TabHeight" Value="{0,26.4388}" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22 +25 @@
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerLevelImage" >
+                -->
+            <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionLevelImage" >
                 <Property Name="AlwaysOnTop" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionLevelDescription" >
                 <Property Name="AlwaysOnTop" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -34 +38 @@
                 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
             </Window>
+                 
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerStartButton" >
+        <!-- -->
+        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionStartButton" >
             <Property Name="Text" Value="Start" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
+            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionStartButton_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerConfigButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionConfigButton" >
             <Property Name="Text" Value="Configure" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.425,0},{0.725,0},{0.575,0},{0.775,0}}" />
             <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerConfigButton_clicked"/>
+            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionConfigButton_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
+            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionBackButton_clicked"/>
         </Window>
     </Window>

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

@@ -2 +2 @@
 
 local P = createMenuSheet("SingleplayerMenu")
-P.loadAlong = { "ShipSelectionMenu"}
+P.loadAlong = {"ShipSelectionMenu"}
 P.levelList = {}
 P.activeTabIndexes = {}
@@ -143 +143 @@
     local level = P.SingleplayerGetSelectedLevel()
     if level ~= nil then
-        if level:hasTag("shipselection") then
-            showMenuSheet("ShipSelectionMenu", true)
+
+        if level:hasTag("shipselection") then
+            showMenuSheet("ShipSelectionMenu", true)
+        else
+            orxonox.execute("startGame " .. level:getXMLFilename())
+            hideAllMenuSheets()
         end
-        orxonox.execute("startGame " .. level:getXMLFilename())
-        hideAllMenuSheets()
     end
 end

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

@@ -93 +93 @@
             LevelInfoItem::possibleTags_s.insert("gametype");
             LevelInfoItem::possibleTags_s.insert("minigame");
+            LevelInfoItem::possibleTags_s.insert("shipselection");
         }
     }