Support SwapChainPanel on W8.1 / WP8.1 and update tempates to use Swa…

…pChainPanel
MonoGame · Sep 3, 2017 · 2d28307 · 2d28307
1 parent 2cae3c4
commit 2d28307
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 36 deletions.
diff --git a/MonoGame.Framework/Windows8/XamlGame.cs b/MonoGame.Framework/Windows8/XamlGame.cs
@@ -29,10 +29,23 @@ public static class XamlGame<T>
         /// <param name="window">The core window object.</param>
         /// <param name="swapChainBackgroundPanel">The XAML SwapChainBackgroundPanel to which we render the scene and recieve input events.</param>
         /// <returns></returns>
+        [Obsolete("Use Create(string launchParameters, CoreWindow window, SwapChainPanel swapChainPanel) instead. In future versions this method can be removed.")]
         static public T Create(string launchParameters, CoreWindow window, SwapChainBackgroundPanel swapChainBackgroundPanel)
         {
             return Create(launchParameters, window, new GenericSwapChainPanel(swapChainBackgroundPanel));
         }
+
+        /// <summary>
+        /// Creates your Game class initializing it to work within a XAML application window.
+        /// </summary>
+        /// <param name="launchParameters">The command line arguments from launch.</param>
+        /// <param name="window">The core window object.</param>
+        /// <param name="swapChainPanel">The XAML SwapChainPanel to which we render the scene and receive input events.</param>
+        /// <returns></returns>
+        static public T Create(string launchParameters, CoreWindow window, SwapChainPanel swapChainPanel)
+        {
+            return Create(launchParameters, window, new GenericSwapChainPanel(swapChainPanel));
+        }
 
         static private T Create(string launchParameters, CoreWindow window, GenericSwapChainPanel swapChainPanel)
         {

diff --git a/ProjectTemplates/VisualStudio2012/WindowsStoreXaml/GamePage.xaml b/ProjectTemplates/VisualStudio2012/WindowsStoreXaml/GamePage.xaml
@@ -1,4 +1,4 @@
-<SwapChainBackgroundPanel
+<Page
     x:Class="$safeprojectname$.GamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
-    </Grid>
+    <SwapChainPanel x:Name="swapChainPanel" />
 
-</SwapChainBackgroundPanel>
+</Page>
diff --git a/ProjectTemplates/VisualStudio2012/WindowsStoreXaml/GamePage.xaml.cs b/ProjectTemplates/VisualStudio2012/WindowsStoreXaml/GamePage.xaml.cs
@@ -9,7 +9,7 @@ namespace $safeprojectname$
     /// <summary>
     /// The root page used to display the game.
     /// </summary>
-    public sealed partial class GamePage : SwapChainBackgroundPanel
+    public sealed partial class GamePage : Page
     {
         readonly Game1 _game;
 
@@ -18,7 +18,7 @@ public GamePage(LaunchActivatedEventArgs args)
             this.InitializeComponent();
 
             // Create the game.
-            _game = XamlGame<Game1>.Create(args, Window.Current.CoreWindow, this);
+            _game = XamlGame<Game1>.Create(args, Window.Current.CoreWindow, swapChainPanel);
         }
     }
 }
diff --git a/ProjectTemplates/VisualStudio2012/WindowsStoreXaml/MonoGameWindowsStoreXaml.vstemplate b/ProjectTemplates/VisualStudio2012/WindowsStoreXaml/MonoGameWindowsStoreXaml.vstemplate
@@ -16,7 +16,7 @@
     <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
     <TargetPlatformName>Windows</TargetPlatformName>
-    <RequiredPlatformVersion>8</RequiredPlatformVersion>
+    <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
     <CreateInPlace>true</CreateInPlace>
   </TemplateData>
   <TemplateContent>

diff --git a/ProjectTemplates/VisualStudio2013/WindowsPhone8.1/GamePage.xaml b/ProjectTemplates/VisualStudio2013/WindowsPhone8.1/GamePage.xaml
@@ -1,4 +1,4 @@
-<SwapChainBackgroundPanel
+<Page
     x:Class="$safeprojectname$.GamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
+    <SwapChainPanel x:Name="swapChainPanel" />
 
-    </Grid>
-</SwapChainBackgroundPanel>
+</Page>
diff --git a/ProjectTemplates/VisualStudio2013/WindowsPhone8.1/GamePage.xaml.cs b/ProjectTemplates/VisualStudio2013/WindowsPhone8.1/GamePage.xaml.cs
@@ -20,15 +20,15 @@ namespace $safeprojectname$
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class GamePage : SwapChainBackgroundPanel
+    public sealed partial class GamePage : Page
     {
         readonly Game1 _game;
 
         public GamePage(string launchArguments)
         {
             this.InitializeComponent();
 
-            _game = XamlGame<Game1>.Create(launchArguments, Window.Current.CoreWindow, this);
+            _game = XamlGame<Game1>.Create(launchArguments, Window.Current.CoreWindow, swapChainPanel);
         }
     }
 }
diff --git a/ProjectTemplates/VisualStudio2013/WindowsStoreXaml/GamePage.xaml b/ProjectTemplates/VisualStudio2013/WindowsStoreXaml/GamePage.xaml
@@ -1,4 +1,4 @@
-<SwapChainBackgroundPanel
+<Page
     x:Class="$safeprojectname$.GamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
-    </Grid>
+    <SwapChainPanel x:Name="swapChainPanel" />
 
-</SwapChainBackgroundPanel>
+</Page>
diff --git a/ProjectTemplates/VisualStudio2013/WindowsStoreXaml/GamePage.xaml.cs b/ProjectTemplates/VisualStudio2013/WindowsStoreXaml/GamePage.xaml.cs
@@ -9,7 +9,7 @@ namespace $safeprojectname$
     /// <summary>
     /// The root page used to display the game.
     /// </summary>
-    public sealed partial class GamePage : SwapChainBackgroundPanel
+    public sealed partial class GamePage : Page
     {
         readonly Game1 _game;
 
@@ -18,7 +18,7 @@ public GamePage(LaunchActivatedEventArgs args)
             this.InitializeComponent();
 
             // Create the game.
-            _game = XamlGame<Game1>.Create(args, Window.Current.CoreWindow, this);
+            _game = XamlGame<Game1>.Create(args, Window.Current.CoreWindow, swapChainPanel);
         }
     }
 }
diff --git a/ProjectTemplates/VisualStudio2013/WindowsUniversal/Shared/GamePage.xaml b/ProjectTemplates/VisualStudio2013/WindowsUniversal/Shared/GamePage.xaml
@@ -1,4 +1,4 @@
-<SwapChainBackgroundPanel
+<Page
     x:Class="$ext_safeprojectname$.GamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid >
+    <SwapChainPanel x:Name="swapChainPanel" />
 
-    </Grid>
-</SwapChainBackgroundPanel>
+</Page>
diff --git a/ProjectTemplates/VisualStudio2013/WindowsUniversal/Shared/GamePage.xaml.cs b/ProjectTemplates/VisualStudio2013/WindowsUniversal/Shared/GamePage.xaml.cs
@@ -20,7 +20,7 @@ namespace $ext_safeprojectname$
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class GamePage : SwapChainBackgroundPanel
+    public sealed partial class GamePage : Page
     {
         readonly Game1 _game;
 
@@ -30,7 +30,7 @@ public GamePage(string launchArguments)
 
             // Create the game.
 
-            _game = XamlGame<Game1>.Create(launchArguments, Window.Current.CoreWindow, this);
+            _game = XamlGame<Game1>.Create(launchArguments, Window.Current.CoreWindow, swapChainPanel);
         }
     }
 }
diff --git a/...ectTemplates/VisualStudio2013/WindowsUniversal/Windows/Windows.Application.Windows.csproj b/...ectTemplates/VisualStudio2013/WindowsUniversal/Windows/Windows.Application.Windows.csproj
@@ -20,6 +20,7 @@
     <PackageCertificateKeyFile>$ext_safeprojectname$.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
     $endif$
     <MonoGamePlatform>WindowsStoreApp</MonoGamePlatform>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/ProjectTemplates/VisualStudio2015/WindowsStoreXaml/GamePage.xaml b/ProjectTemplates/VisualStudio2015/WindowsStoreXaml/GamePage.xaml
@@ -1,4 +1,4 @@
-<SwapChainBackgroundPanel
+<Page
     x:Class="$safeprojectname$.GamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
-    </Grid>
+    <SwapChainPanel x:Name="swapChainPanel" />
 
-</SwapChainBackgroundPanel>
+</Page>
diff --git a/ProjectTemplates/VisualStudio2015/WindowsStoreXaml/GamePage.xaml.cs b/ProjectTemplates/VisualStudio2015/WindowsStoreXaml/GamePage.xaml.cs
@@ -9,7 +9,7 @@ namespace $safeprojectname$
     /// <summary>
     /// The root page used to display the game.
     /// </summary>
-    public sealed partial class GamePage : SwapChainBackgroundPanel
+    public sealed partial class GamePage : Page
     {
         readonly Game1 _game;
 

diff --git a/ProjectTemplates/VisualStudio2015/WindowsUniversal/Shared/GamePage.xaml b/ProjectTemplates/VisualStudio2015/WindowsUniversal/Shared/GamePage.xaml
@@ -1,4 +1,4 @@
-<SwapChainBackgroundPanel
+<Page
     x:Class="$ext_safeprojectname$.GamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid >
+    <SwapChainPanel x:Name="swapChainPanel" />
 
-    </Grid>
-</SwapChainBackgroundPanel>
+</Page>
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUniversal/Shared/GamePage.xaml.cs b/ProjectTemplates/VisualStudio2015/WindowsUniversal/Shared/GamePage.xaml.cs
@@ -20,7 +20,7 @@ namespace $ext_safeprojectname$
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class GamePage : SwapChainBackgroundPanel
+    public sealed partial class GamePage : Page
     {
         readonly Game1 _game;
 
@@ -30,7 +30,7 @@ public GamePage(string launchArguments)
 
             // Create the game.
 
-            _game = XamlGame<Game1>.Create(launchArguments, Window.Current.CoreWindow, this);
+            _game = XamlGame<Game1>.Create(launchArguments, Window.Current.CoreWindow, swapChainPanel);
         }
     }
 }