From 0c902e2ff5fb455ab5803309ed0276a9235aa97e Mon Sep 17 00:00:00 2001
From: Victor Chelaru <VicChelaru@gmail.com>
Date: Sun, 25 Feb 2024 08:09:13 -0700
Subject: [PATCH] Added repro case for GameScreen state generating invalid
 Variant code.

---
 .../Content/GumProject/GumProject.gumx        |  10 +
 .../GumProject/Screens/GameScreenGum.gusx     |   8 +
 .../Content/GumProject/Screens/Level1Gum.gusx |   8 +
 .../Content/Screens/Level1/Level1Map.tmx      |  12 +
 .../GlueTestProjectDesktopGl.csproj           |  30 ++
 .../GlueTestProjectDesktopGl.glux             | 388 ++++++++++++++++++
 .../GumRuntimes/GameScreenGumRuntime.cs       |  13 +
 .../GumRuntimes/Level1GumRuntime.cs           |  13 +
 .../Screens/GameScreen.cs                     |  50 +++
 .../Screens/Level1.cs                         |  50 +++
 10 files changed, 582 insertions(+)
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/GameScreenGum.gusx
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/Level1Gum.gusx
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/Screens/Level1/Level1Map.tmx
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/GameScreenGumRuntime.cs
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/Level1GumRuntime.cs
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/GameScreen.cs
 create mode 100644 Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/Level1.cs

diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/GumProject.gumx b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/GumProject.gumx
index 2175f1f69..9cc7873ef 100644
--- 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/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/GameScreenGum.gusx b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/GameScreenGum.gusx
new file mode 100644
index 000000000..73819b549
--- /dev/null
+++ b/Tests/GlueTestProjectDesktopGl/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>
\ No newline at end of file
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/Level1Gum.gusx b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/GumProject/Screens/Level1Gum.gusx
new file mode 100644
index 000000000..d7502261f
--- /dev/null
+++ b/Tests/GlueTestProjectDesktopGl/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>
\ No newline at end of file
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/Screens/Level1/Level1Map.tmx b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Content/Screens/Level1/Level1Map.tmx
new file mode 100644
index 000000000..f2ce5a1f4
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj
index 8aaa7b7dd..f513e91a8 100644
--- 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>
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.glux b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.glux
index 6973d6cbc..88c1019b1 100644
--- a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.glux
+++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.glux
@@ -2955,6 +2955,201 @@
       <CustomClassesForExport />
       <NextScreen>Screens\FileScreen</NextScreen>
     </ScreenSave>
+    <ScreenSave>
+      <Tags>
+        <string>GLUE</string>
+      </Tags>
+      <Source>GLUE</Source>
+      <UseGlobalContent>false</UseGlobalContent>
+      <ReferencedFiles>
+        <ReferencedFileSave>
+          <Name>gumproject/Screens/GameScreenGum.gusx</Name>
+          <IsSharedStatic>true</IsSharedStatic>
+          <RuntimeType>GlueTestProject.GumRuntimes.GameScreenGumRuntime</RuntimeType>
+          <ProjectsToExcludeFrom />
+          <IsCreatedByWildcard>false</IsCreatedByWildcard>
+        </ReferencedFileSave>
+      </ReferencedFiles>
+      <IsHiddenInTreeView>false</IsHiddenInTreeView>
+      <CustomVariables>
+        <CustomVariable>
+          <Properties>
+            <PropertySave>
+              <Name>Type</Name>
+              <ValueAsString>GameScreenCategory</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+          </Properties>
+          <Name>CurrentGameScreenCategoryState</Name>
+          <SetByDerived>true</SetByDerived>
+        </CustomVariable>
+      </CustomVariables>
+      <NamedObjects>
+        <NamedObjectSave>
+          <InstanceName>Map</InstanceName>
+          <SourceClassType>FlatRedBall.TileGraphics.LayeredTileMap</SourceClassType>
+          <Properties>
+            <PropertySave>
+              <Name>AssociateWithFactory</Name>
+              <ValueAsBool>true</ValueAsBool>
+              <Type>bool</Type>
+            </PropertySave>
+          </Properties>
+          <CustomProperty>
+            <Type>bool</Type>
+            <Member>CreateEntitiesFromTiles</Member>
+            <ValueAsBool>true</ValueAsBool>
+          </CustomProperty>
+          <CustomProperty>
+            <Type>bool</Type>
+            <Member>ShiftMapToMoveGameplayLayerToZ0</Member>
+            <ValueAsBool>true</ValueAsBool>
+          </CustomProperty>
+          <SourceType>FlatRedBallType</SourceType>
+          <SourceFile>FlatRedBall.TileGraphics.LayeredTileMap</SourceFile>
+          <SetByDerived>true</SetByDerived>
+          <AttachToContainer>true</AttachToContainer>
+          <GenerateTimedEmit>true</GenerateTimedEmit>
+          <IndependentOfCamera>false</IndependentOfCamera>
+        </NamedObjectSave>
+        <NamedObjectSave>
+          <InstanceName>SolidCollision</InstanceName>
+          <SourceClassType>FlatRedBall.TileCollisions.TileShapeCollection</SourceClassType>
+          <Properties>
+            <PropertySave>
+              <Name>AssociateWithFactory</Name>
+              <ValueAsBool>true</ValueAsBool>
+              <Type>bool</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionCreationOptions</Name>
+              <ValueAsInt>4</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileSize</Name>
+              <ValueAsFloat>16</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillWidth</Name>
+              <ValueAsInt>32</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillHeight</Name>
+              <ValueAsInt>1</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeWidth</Name>
+              <ValueAsFloat>800</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeHeight</Name>
+              <ValueAsFloat>600</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>SourceTmxName</Name>
+              <ValueAsString>Map</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileTypeName</Name>
+              <ValueAsString>SolidCollision</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+          </Properties>
+          <SourceType>FlatRedBallType</SourceType>
+          <SourceFile>FlatRedBall.TileCollisions.TileShapeCollection</SourceFile>
+          <HasPublicProperty>true</HasPublicProperty>
+          <SetByDerived>true</SetByDerived>
+          <AttachToContainer>true</AttachToContainer>
+          <GenerateTimedEmit>true</GenerateTimedEmit>
+          <IndependentOfCamera>false</IndependentOfCamera>
+        </NamedObjectSave>
+        <NamedObjectSave>
+          <InstanceName>CloudCollision</InstanceName>
+          <SourceClassType>FlatRedBall.TileCollisions.TileShapeCollection</SourceClassType>
+          <Properties>
+            <PropertySave>
+              <Name>AssociateWithFactory</Name>
+              <ValueAsBool>true</ValueAsBool>
+              <Type>bool</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionCreationOptions</Name>
+              <ValueAsInt>4</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileSize</Name>
+              <ValueAsFloat>16</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillWidth</Name>
+              <ValueAsInt>32</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillHeight</Name>
+              <ValueAsInt>1</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeWidth</Name>
+              <ValueAsFloat>800</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeHeight</Name>
+              <ValueAsFloat>600</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>SourceTmxName</Name>
+              <ValueAsString>Map</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileTypeName</Name>
+              <ValueAsString>CloudCollision</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+          </Properties>
+          <SourceType>FlatRedBallType</SourceType>
+          <SourceFile>FlatRedBall.TileCollisions.TileShapeCollection</SourceFile>
+          <HasPublicProperty>true</HasPublicProperty>
+          <SetByDerived>true</SetByDerived>
+          <AttachToContainer>true</AttachToContainer>
+          <GenerateTimedEmit>true</GenerateTimedEmit>
+          <IndependentOfCamera>false</IndependentOfCamera>
+        </NamedObjectSave>
+      </NamedObjects>
+      <StateCategoryList>
+        <StateSaveCategory>
+          <Name>GameScreenCategory</Name>
+          <States>
+            <StateSave>
+              <Name>State1</Name>
+              <InstructionSaves />
+            </StateSave>
+            <StateSave>
+              <Name>State2</Name>
+              <InstructionSaves />
+            </StateSave>
+          </States>
+          <ExcludedVariables>
+            <string>CurrentGameScreenCategoryState</string>
+          </ExcludedVariables>
+        </StateSaveCategory>
+      </StateCategoryList>
+      <Name>Screens\GameScreen</Name>
+      <CustomClassesForExport />
+    </ScreenSave>
     <ScreenSave>
       <Tags>
         <string>GLUE</string>
@@ -3920,6 +4115,199 @@
       <CustomClassesForExport />
       <NextScreen>Screens\LocalizationScreen</NextScreen>
     </ScreenSave>
+    <ScreenSave>
+      <Tags>
+        <string>GLUE</string>
+      </Tags>
+      <Source>GLUE</Source>
+      <UseGlobalContent>false</UseGlobalContent>
+      <ReferencedFiles>
+        <ReferencedFileSave>
+          <Name>GumProject/Screens/Level1Gum.gusx</Name>
+          <IsSharedStatic>true</IsSharedStatic>
+          <RuntimeType>GlueTestProject.GumRuntimes.Level1GumRuntime</RuntimeType>
+          <ProjectsToExcludeFrom />
+          <IsCreatedByWildcard>false</IsCreatedByWildcard>
+        </ReferencedFileSave>
+        <ReferencedFileSave>
+          <Name>Screens/Level1/Level1Map.tmx</Name>
+          <Properties>
+            <PropertySave>
+              <Name>CreationOptions</Name>
+              <ValueAsString>{"IncludeDefaultTileset":true,"IncludeGameplayLayer":true,"SolidCollisionCheckBoxVisibility":0,"IsSolidCollisionBorderChecked":true,"ShouldAddCollisionBorder":true}</ValueAsString>
+            </PropertySave>
+          </Properties>
+          <IsSharedStatic>true</IsSharedStatic>
+          <RuntimeType>FlatRedBall.TileGraphics.LayeredTileMap</RuntimeType>
+          <ProjectsToExcludeFrom />
+          <IsCreatedByWildcard>false</IsCreatedByWildcard>
+        </ReferencedFileSave>
+      </ReferencedFiles>
+      <IsHiddenInTreeView>false</IsHiddenInTreeView>
+      <CustomVariables>
+        <CustomVariable>
+          <Properties>
+            <PropertySave>
+              <Name>Type</Name>
+              <ValueAsString>GameScreenCategory</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+          </Properties>
+          <Name>CurrentGameScreenCategoryState</Name>
+          <SetByDerived>true</SetByDerived>
+          <DefinedByBase>true</DefinedByBase>
+        </CustomVariable>
+      </CustomVariables>
+      <NamedObjects>
+        <NamedObjectSave>
+          <InstanceName>Map</InstanceName>
+          <SourceClassType>FlatRedBall.TileGraphics.LayeredTileMap</SourceClassType>
+          <Properties>
+            <PropertySave>
+              <Name>AssociateWithFactory</Name>
+              <ValueAsBool>true</ValueAsBool>
+              <Type>bool</Type>
+            </PropertySave>
+          </Properties>
+          <CustomProperty>
+            <Type>bool</Type>
+            <Member>CreateEntitiesFromTiles</Member>
+            <ValueAsBool>true</ValueAsBool>
+          </CustomProperty>
+          <CustomProperty>
+            <Type>bool</Type>
+            <Member>ShiftMapToMoveGameplayLayerToZ0</Member>
+            <ValueAsBool>true</ValueAsBool>
+          </CustomProperty>
+          <SourceType>File</SourceType>
+          <SourceFile>Screens/Level1/Level1Map.tmx</SourceFile>
+          <SourceName>Entire File (LayeredTileMap)</SourceName>
+          <AttachToContainer>true</AttachToContainer>
+          <GenerateTimedEmit>true</GenerateTimedEmit>
+          <DefinedByBase>true</DefinedByBase>
+          <IndependentOfCamera>false</IndependentOfCamera>
+        </NamedObjectSave>
+        <NamedObjectSave>
+          <InstanceName>SolidCollision</InstanceName>
+          <SourceClassType>FlatRedBall.TileCollisions.TileShapeCollection</SourceClassType>
+          <Properties>
+            <PropertySave>
+              <Name>AssociateWithFactory</Name>
+              <ValueAsBool>true</ValueAsBool>
+              <Type>bool</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionCreationOptions</Name>
+              <ValueAsInt>4</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileSize</Name>
+              <ValueAsFloat>16</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillWidth</Name>
+              <ValueAsInt>32</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillHeight</Name>
+              <ValueAsInt>1</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeWidth</Name>
+              <ValueAsFloat>800</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeHeight</Name>
+              <ValueAsFloat>600</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>SourceTmxName</Name>
+              <ValueAsString>Map</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileTypeName</Name>
+              <ValueAsString>SolidCollision</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+          </Properties>
+          <SourceType>FlatRedBallType</SourceType>
+          <SourceFile>FlatRedBall.TileCollisions.TileShapeCollection</SourceFile>
+          <HasPublicProperty>true</HasPublicProperty>
+          <AttachToContainer>true</AttachToContainer>
+          <GenerateTimedEmit>true</GenerateTimedEmit>
+          <DefinedByBase>true</DefinedByBase>
+          <IndependentOfCamera>false</IndependentOfCamera>
+        </NamedObjectSave>
+        <NamedObjectSave>
+          <InstanceName>CloudCollision</InstanceName>
+          <SourceClassType>FlatRedBall.TileCollisions.TileShapeCollection</SourceClassType>
+          <Properties>
+            <PropertySave>
+              <Name>AssociateWithFactory</Name>
+              <ValueAsBool>true</ValueAsBool>
+              <Type>bool</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionCreationOptions</Name>
+              <ValueAsInt>4</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileSize</Name>
+              <ValueAsFloat>16</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillWidth</Name>
+              <ValueAsInt>32</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionFillHeight</Name>
+              <ValueAsInt>1</ValueAsInt>
+              <Type>int</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeWidth</Name>
+              <ValueAsFloat>800</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>InnerSizeHeight</Name>
+              <ValueAsFloat>600</ValueAsFloat>
+              <Type>float</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>SourceTmxName</Name>
+              <ValueAsString>Map</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+            <PropertySave>
+              <Name>CollisionTileTypeName</Name>
+              <ValueAsString>CloudCollision</ValueAsString>
+              <Type>String</Type>
+            </PropertySave>
+          </Properties>
+          <SourceType>FlatRedBallType</SourceType>
+          <SourceFile>FlatRedBall.TileCollisions.TileShapeCollection</SourceFile>
+          <HasPublicProperty>true</HasPublicProperty>
+          <AttachToContainer>true</AttachToContainer>
+          <GenerateTimedEmit>true</GenerateTimedEmit>
+          <DefinedByBase>true</DefinedByBase>
+          <IndependentOfCamera>false</IndependentOfCamera>
+        </NamedObjectSave>
+      </NamedObjects>
+      <Name>Screens\Level1</Name>
+      <CustomClassesForExport />
+      <BaseScreen>Screens\GameScreen</BaseScreen>
+    </ScreenSave>
     <ScreenSave>
       <Tags>
         <string>GLUE</string>
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/GameScreenGumRuntime.cs b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/GameScreenGumRuntime.cs
new file mode 100644
index 000000000..2c43de481
--- /dev/null
+++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/GameScreenGumRuntime.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace GlueTestProject.GumRuntimes
+{
+    public partial class GameScreenGumRuntime
+    {
+        partial void CustomInitialize () 
+        {
+        }
+    }
+}
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/Level1GumRuntime.cs b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/Level1GumRuntime.cs
new file mode 100644
index 000000000..dcf1b15ae
--- /dev/null
+++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GumRuntimes/Level1GumRuntime.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace GlueTestProject.GumRuntimes
+{
+    public partial class Level1GumRuntime
+    {
+        partial void CustomInitialize () 
+        {
+        }
+    }
+}
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/GameScreen.cs b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/GameScreen.cs
new file mode 100644
index 000000000..531e43d8c
--- /dev/null
+++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/GameScreen.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+using FlatRedBall;
+using FlatRedBall.Input;
+using FlatRedBall.Instructions;
+using FlatRedBall.AI.Pathfinding;
+using FlatRedBall.Graphics.Animation;
+using FlatRedBall.Gui;
+using FlatRedBall.Math;
+using FlatRedBall.Math.Geometry;
+using FlatRedBall.Localization;
+using Microsoft.Xna.Framework;
+
+using GlueTestProject.Entities;
+
+
+namespace GlueTestProject.Screens
+{
+    public partial class GameScreen
+    {
+
+        void CustomInitialize()
+        {
+
+
+        }
+
+        void CustomActivity(bool firstTimeCalled)
+        {
+
+
+        }
+
+        void CustomDestroy()
+        {
+
+
+        }
+
+        static void CustomLoadStaticContent(string contentManagerName)
+        {
+
+
+        }
+
+    }
+}
diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/Level1.cs b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/Level1.cs
new file mode 100644
index 000000000..46f505424
--- /dev/null
+++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/Level1.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+using FlatRedBall;
+using FlatRedBall.Input;
+using FlatRedBall.Instructions;
+using FlatRedBall.AI.Pathfinding;
+using FlatRedBall.Graphics.Animation;
+using FlatRedBall.Gui;
+using FlatRedBall.Math;
+using FlatRedBall.Math.Geometry;
+using FlatRedBall.Localization;
+using Microsoft.Xna.Framework;
+
+using GlueTestProject.Entities;
+
+
+namespace GlueTestProject.Screens
+{
+    public partial class Level1
+    {
+
+        void CustomInitialize()
+        {
+
+
+        }
+
+        void CustomActivity(bool firstTimeCalled)
+        {
+
+
+        }
+
+        void CustomDestroy()
+        {
+
+
+        }
+
+        static void CustomLoadStaticContent(string contentManagerName)
+        {
+
+
+        }
+
+    }
+}