Added repro case for GameScreen state generating invalid Variant code.

vchelaru · Feb 25, 2024 · 0c902e2 · 0c902e2
1 parent 99e2e17
commit 0c902e2
Show file tree

Hide file tree

Showing 10 changed files with 582 additions and 0 deletions.
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/GumProject.gumx b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/GumProject.gumx
@@ -36,6 +36,11 @@
     <ElementType>Screen</ElementType>
     <LinkType>ReferenceOriginal</LinkType>
   </ScreenReference>
+  <ScreenReference>
+    <Name>GameScreenGum</Name>
+    <ElementType>Screen</ElementType>
+    <LinkType>ReferenceOriginal</LinkType>
+  </ScreenReference>
   <ScreenReference>
     <Name>GumScreenLayeredGum</Name>
     <ElementType>Screen</ElementType>
@@ -51,6 +56,11 @@
     <ElementType>Screen</ElementType>
     <LinkType>ReferenceOriginal</LinkType>
   </ScreenReference>
+  <ScreenReference>
+    <Name>Level1Gum</Name>
+    <ElementType>Screen</ElementType>
+    <LinkType>ReferenceOriginal</LinkType>
+  </ScreenReference>
   <ScreenReference>
     <Name>RenderTargetScreenGum</Name>
     <ElementType>Screen</ElementType>

diff --git a/...stProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/GameScreenGum.gusx b/...stProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/GameScreenGum.gusx
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScreenSave xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>GameScreenGum</Name>
+  <State>
+    <Name>Default</Name>
+  </State>
+  <Behaviors />
+</ScreenSave>
diff --git a/...ueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/Level1Gum.gusx b/...ueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/Level1Gum.gusx
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScreenSave xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Level1Gum</Name>
+  <State>
+    <Name>Default</Name>
+  </State>
+  <Behaviors />
+</ScreenSave>
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/Screens/Level1/Level1Map.tmx b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/Screens/Level1/Level1Map.tmx
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<map xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.0" orientation="orthogonal" width="32" height="32" tilewidth="16" tileheight="16" infinite="0">
+  <tileset tilecount="0" columns="0" source="../../StandardTileset.tsx" firstgid="1">
+    <wangsets />
+  </tileset>
+  <layer name="GameplayLayer" id="0" tintcolor="#ffffff" opacity="1" visible="1" parallaxx="1" parallaxy="1" offsetx="0" offsety="0" width="32" height="32">
+    <properties />
+    <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAACuzXwQkAAAhCUd1/6bbIyws8B1H5bZKOtSr9zd/+uT//x//lP/wXf+Av/Im/5Q/56zN/LnUAAAD//wMAQZZTxQAQAAA=
+<length>1024</length></data>
+  </layer>
+</map>
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj
@@ -829,6 +829,7 @@
     <Compile Include="Forms\Screens\FormsScreenGumForms.Generated.cs">
       <DependentUpon>FormsScreenGumForms.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\Screens\GameScreenGumForms.Generated.cs" />
     <Compile Include="Forms\Screens\GumScreenLayeredGumForms.cs" />
     <Compile Include="Forms\Screens\GumScreenLayeredGumForms.Generated.cs">
       <DependentUpon>GumScreenLayeredGumForms.cs</DependentUpon>
@@ -841,6 +842,7 @@
     <Compile Include="Forms\Screens\InputScreenGumForms.Generated.cs">
       <DependentUpon>InputScreenGumForms.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\Screens\Level1GumForms.Generated.cs" />
     <Compile Include="Forms\Screens\RenderTargetScreenGumForms.cs" />
     <Compile Include="Forms\Screens\RenderTargetScreenGumForms.Generated.cs">
       <DependentUpon>RenderTargetScreenGumForms.cs</DependentUpon>
@@ -1011,6 +1013,10 @@
     <Compile Include="GumRuntimes\FormsScreenGumRuntime.Generated.cs">
       <DependentUpon>FormsScreenGumRuntime.cs</DependentUpon>
     </Compile>
+    <Compile Include="GumRuntimes\GameScreenGumRuntime.cs" />
+    <Compile Include="GumRuntimes\GameScreenGumRuntime.Generated.cs">
+      <DependentUpon>GameScreenGumRuntime.cs</DependentUpon>
+    </Compile>
     <Compile Include="GumRuntimes\GumIdb.Generated.cs" />
     <Compile Include="GumRuntimes\GumScreenLayeredGumRuntime.cs" />
     <Compile Include="GumRuntimes\GumScreenLayeredGumRuntime.Generated.cs">
@@ -1028,6 +1034,10 @@
     <Compile Include="GumRuntimes\InputScreenGumRuntime.Generated.cs">
       <DependentUpon>InputScreenGumRuntime.cs</DependentUpon>
     </Compile>
+    <Compile Include="GumRuntimes\Level1GumRuntime.cs" />
+    <Compile Include="GumRuntimes\Level1GumRuntime.Generated.cs">
+      <DependentUpon>Level1GumRuntime.cs</DependentUpon>
+    </Compile>
     <Compile Include="GumRuntimes\NineSliceButtonRuntime.cs" />
     <Compile Include="GumRuntimes\NineSliceButtonRuntime.Generated.cs">
       <DependentUpon>NineSliceButtonRuntime.cs</DependentUpon>
@@ -1218,6 +1228,10 @@
     <Compile Include="Screens\FormsScreen.Generated.cs">
       <DependentUpon>FormsScreen.cs</DependentUpon>
     </Compile>
+    <Compile Include="Screens\GameScreen.cs" />
+    <Compile Include="Screens\GameScreen.Generated.cs">
+      <DependentUpon>GameScreen.cs</DependentUpon>
+    </Compile>
     <Compile Include="Screens\GlobalContentScreen.cs" />
     <Compile Include="Screens\GlobalContentScreen.Generated.cs">
       <DependentUpon>GlobalContentScreen.cs</DependentUpon>
@@ -1258,6 +1272,10 @@
     <Compile Include="Screens\LayerScreen.Generated.cs">
       <DependentUpon>LayerScreen.cs</DependentUpon>
     </Compile>
+    <Compile Include="Screens\Level1.cs" />
+    <Compile Include="Screens\Level1.Generated.cs">
+      <DependentUpon>Level1.cs</DependentUpon>
+    </Compile>
     <Compile Include="Screens\ListScreen.cs" />
     <Compile Include="Screens\ListScreen.Generated.cs">
       <DependentUpon>ListScreen.cs</DependentUpon>
@@ -2108,6 +2126,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Name>FormsScreenGum</Name>
     </None>
+    <None Include="content\gumproject\screens\gamescreengum.gusx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Name>GameScreenGum</Name>
+    </None>
     <None Include="content\gumproject\screens\gumscreenlayeredgum.gusx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Name>gumscreenlayeredgum</Name>
@@ -2120,6 +2142,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Name>inputscreengum</Name>
     </None>
+    <None Include="content\gumproject\screens\level1gum.gusx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Name>Level1Gum</Name>
+    </None>
     <None Include="content\gumproject\screens\rendertargetscreengum.gusx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Name>rendertargetscreengum</Name>
@@ -2364,6 +2390,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Name>SceneFile</Name>
     </None>
+    <None Include="content\screens\level1\level1map.tmx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Name>Level1Map</Name>
+    </None>
     <None Include="content\screens\localizationscreen\scenefile.scnx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Name>SceneFile</Name>