UWP: Use MarbleGame.instance.scene2d

Prevents offset/extent corruption in 2d menus

src/Main.hx

@@ -79,6 +79,11 @@ class Main extends hxd.App {
 			+ ")");
 		#end
 
+		#if uwp
+		Settings.zoomRatio = Window.getInstance().height / 1200;
+		s2d.scaleMode = Zoom(Settings.zoomRatio);
+		#end
+
 		#if android
 		Window.getInstance().addEventTarget(ev -> {
 			if (ev.kind == EPush || ev.kind == ERelease || ev.kind == EMove) {

src/Settings.hx

@@ -570,6 +570,11 @@ class Settings {
 			canvasElement.style.height = "100%";
 			#end
 
+			#if uwp
+			zoomRatio = Window.getInstance().height / 1200;
+			Settings.zoomRatio = zoomRatio;
+			#end
+
 			Console.log("Window resized to " + Settings.optionsSettings.screenWidth + "x" + Settings.optionsSettings.screenHeight + " (Zoom " + zoomRatio +
 				")");
 

src/gui/AboutMenuOptionsGui.hx

@@ -27,7 +27,7 @@ class AboutMenuOptionsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/AchievementsGui.hx

@@ -29,7 +29,7 @@ class AchievementsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/CreateMatchGui.hx

@@ -27,7 +27,7 @@ class CreateMatchGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/DifficultySelectGui.hx

@@ -28,7 +28,7 @@ class DifficultySelectGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/EndGameGui.hx

@@ -50,7 +50,7 @@ class EndGameGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/ExitGameDlg.hx

@@ -34,7 +34,7 @@ class ExitGameDlg extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/GuiControl.hx

@@ -204,7 +204,7 @@ class GuiControl {
 		}
 
 		var scaleFactor = 1.0 / Window.getInstance().windowToPixelRatio;
-		#if (js || android)
+		#if (js || android || uwp)
 		scaleFactor = 1 / Settings.zoomRatio; // 768 / js.Browser.window.innerHeight * js.Browser.window.devicePixelRatio; // 0.5; // 768 / js.Browser.window.innerHeight; // js.Browser.window.innerHeight * js.Browser.window.devicePixelRatio / 768;
 		#end
 

src/gui/HelpCreditsGui.hx

@@ -36,7 +36,7 @@ class HelpCreditsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/InputOptionsGui.hx

@@ -27,7 +27,7 @@ class InputOptionsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/JoinServerGui.hx

@@ -27,7 +27,7 @@ class JoinServerGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/KeyBindingsGui.hx

@@ -89,7 +89,7 @@ class KeyBindingsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/LeaderboardsGui.hx

@@ -33,7 +33,7 @@ class LeaderboardsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/LevelSelectGui.hx

@@ -102,7 +102,7 @@ class LevelSelectGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MPServerListGui.hx

@@ -33,7 +33,7 @@ class MPServerListGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MainMenuGui.hx

@@ -33,7 +33,7 @@ class MainMenuGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MarblePickerGui.hx

@@ -248,7 +248,7 @@ class MarblePickerGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MiscOptionsGui.hx

@@ -26,7 +26,7 @@ class MiscOptionsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MultiplayerGui.hx

@@ -28,7 +28,7 @@ class MultiplayerGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MultiplayerLevelSelectGui.hx

@@ -120,7 +120,7 @@ class MultiplayerLevelSelectGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/MultiplayerLoadingGui.hx

@@ -65,7 +65,7 @@ class MultiplayerLoadingGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/OptionsListGui.hx

@@ -26,7 +26,7 @@ class OptionsListGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/PlayGui.hx

@@ -156,7 +156,7 @@ class PlayGui {
 		#if hl
 		var wnd = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var wnd = MarbleGame.instance.scene2d;
 		#end
 
@@ -236,7 +236,7 @@ class PlayGui {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 		var safeVerMargin = 1 + (scene2d.height * 0.15) / 2;
@@ -347,7 +347,7 @@ class PlayGui {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 		var safeVerMargin = 1 + (scene2d.height * 0.15) / 2;
@@ -439,7 +439,7 @@ class PlayGui {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 		var safeVerMargin = 1 + (scene2d.height * 0.15) / 2;
@@ -596,7 +596,7 @@ class PlayGui {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 		var safeVerMargin = 1 + (scene2d.height * 0.15) / 2;

src/gui/ReplayCenterGui.hx

@@ -33,7 +33,7 @@ class ReplayCenterGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/TouchCtrlsEditGui.hx

@@ -24,7 +24,7 @@ class TouchCtrlsEditGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/TouchOptionsGui.hx

@@ -27,7 +27,7 @@ class TouchOptionsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/VersionGui.hx

@@ -22,7 +22,7 @@ class VersionGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end
 

src/gui/VideoOptionsGui.hx

@@ -26,7 +26,7 @@ class VideoOptionsGui extends GuiImage {
 		#if hl
 		var scene2d = hxd.Window.getInstance();
 		#end
-		#if js
+		#if (js || uwp)
 		var scene2d = MarbleGame.instance.scene2d;
 		#end