From d8708818cbe52843a8f933ae2a76744d86b396c7 Mon Sep 17 00:00:00 2001
From: cosmonaut <evan@moonside.games>
Date: Fri, 25 Feb 2022 13:27:27 -0800
Subject: [PATCH] moonworks ABI update

---
 lib/MoonWorks                   |  2 +-
 src/MoonWorksMultiWindowGame.cs | 26 ++++++++-----------
 src/Program.cs                  | 45 ++++++++++++++++-----------------
 3 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/lib/MoonWorks b/lib/MoonWorks
index e5213da..9028a8b 160000
--- a/lib/MoonWorks
+++ b/lib/MoonWorks
@@ -1 +1 @@
-Subproject commit e5213da686fd4700d16a0c627d5f1ab4fce0ee12
+Subproject commit 9028a8b1a02d1f73be3d8006f72a8a68acccacdf
diff --git a/src/MoonWorksMultiWindowGame.cs b/src/MoonWorksMultiWindowGame.cs
index 60b7294..d23f2d5 100644
--- a/src/MoonWorksMultiWindowGame.cs
+++ b/src/MoonWorksMultiWindowGame.cs
@@ -1,5 +1,4 @@
 using MoonWorks.Graphics;
-using MoonWorks.Window;
 using MoonWorks;
 using MoonWorksMultiWindow.Graphics;
 using System.Threading.Tasks;
@@ -10,10 +9,7 @@ namespace MoonWorksMultiWindow
 	{
 		private GraphicsObjects GraphicsObjects { get; }
 
-		private int RenderWidth { get; }
-		private int RenderHeight { get; }
-
-		private OSWindow ExtraWindow { get; }
+		private Window ExtraWindow { get; }
 
 		public MoonWorksMultiWindowGame(
 			WindowCreateInfo windowCreateInfo,
@@ -27,8 +23,6 @@ namespace MoonWorksMultiWindow
 				windowCreateInfo.WindowWidth,
 				windowCreateInfo.WindowHeight
 			);
-			RenderWidth = (int)windowCreateInfo.WindowWidth;
-			RenderHeight = (int)windowCreateInfo.WindowHeight;
 
 			var extraWindowCreateInfo = new WindowCreateInfo
 			{
@@ -38,7 +32,7 @@ namespace MoonWorksMultiWindow
 				ScreenMode = ScreenMode.Windowed
 			};
 
-			ExtraWindow = new OSWindow(extraWindowCreateInfo);
+			ExtraWindow = new Window(extraWindowCreateInfo);
 		}
 
 		protected override void Update(System.TimeSpan dt)
@@ -62,10 +56,10 @@ namespace MoonWorksMultiWindow
 			commandBuffer.BeginRenderPass(
 				new ColorAttachmentInfo
 				{
-					renderTarget = GraphicsObjects.RenderTargets.ExampleRenderTarget,
-					clearColor = Color.CornflowerBlue,
-					loadOp = LoadOp.Clear,
-					storeOp = StoreOp.DontCare
+					RenderTarget = GraphicsObjects.RenderTargets.ExampleRenderTarget,
+					ClearColor = Color.CornflowerBlue,
+					LoadOp = LoadOp.Clear,
+					StoreOp = StoreOp.DontCare
 				}
 			);
 
@@ -87,10 +81,10 @@ namespace MoonWorksMultiWindow
 			commandBuffer.BeginRenderPass(
 				new ColorAttachmentInfo
 				{
-					renderTarget = GraphicsObjects.RenderTargets.ExtraWindowRenderTarget,
-					clearColor = Color.OrangeRed,
-					loadOp = LoadOp.Clear,
-					storeOp = StoreOp.DontCare
+					RenderTarget = GraphicsObjects.RenderTargets.ExtraWindowRenderTarget,
+					ClearColor = Color.OrangeRed,
+					LoadOp = LoadOp.Clear,
+					StoreOp = StoreOp.DontCare
 				}
 			);
 
diff --git a/src/Program.cs b/src/Program.cs
index 4c52ff3..fb5c19a 100644
--- a/src/Program.cs
+++ b/src/Program.cs
@@ -2,34 +2,33 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using MoonWorks;
-using MoonWorks.Window;
 
 namespace MoonWorksMultiWindow
 {
-    class Program
-    {
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        static extern bool SetDllDirectory(string lpPathName);
+	class Program
+	{
+		[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+		[return: MarshalAs(UnmanagedType.Bool)]
+		static extern bool SetDllDirectory(string lpPathName);
 
 
-        static void Main(string[] args)
-        {
-            WindowCreateInfo windowCreateInfo = new WindowCreateInfo
-            {
-                WindowWidth = 1280,
-                WindowHeight = 720,
-                WindowTitle = "MoonWorksMultiWindow",
-                ScreenMode = ScreenMode.Windowed
-            };
+		static void Main(string[] args)
+		{
+			WindowCreateInfo windowCreateInfo = new WindowCreateInfo
+			{
+				WindowWidth = 1280,
+				WindowHeight = 720,
+				WindowTitle = "MoonWorksMultiWindow",
+				ScreenMode = ScreenMode.Windowed
+			};
 
-            MoonWorksMultiWindowGame game = new MoonWorksMultiWindowGame(
-                windowCreateInfo,
-                MoonWorks.Graphics.PresentMode.FIFORelaxed,
-                true
-            );
+			MoonWorksMultiWindowGame game = new MoonWorksMultiWindowGame(
+				windowCreateInfo,
+				MoonWorks.Graphics.PresentMode.FIFORelaxed,
+				true
+			);
 
-            game.Run();
-        }
-    }
+			game.Run();
+		}
+	}
 }