From b28da95535e9625b16ce5f7e8d5d1bbe7c10fe4d Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Fri, 7 Jul 2023 22:30:18 +0530
Subject: [PATCH] fix minor bugs

---
 src/gui/EndGameGui.hx   | 2 +-
 src/gui/PlayGui.hx      | 5 ++++-
 src/triggers/Trigger.hx | 8 +++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx
index 5915437f..26c3f0aa 100644
--- a/src/gui/EndGameGui.hx
+++ b/src/gui/EndGameGui.hx
@@ -70,7 +70,7 @@ class EndGameGui extends GuiImage {
 		endGameWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/endGameWindow.png", ResourceLoader.getImage, this.imageResources).toTile());
 		endGameWnd.horizSizing = Left;
 		endGameWnd.vertSizing = Top;
-		endGameWnd.position = new Vector(80 - offsetX, 170 - offsetY);
+		endGameWnd.position = new Vector(80 - offsetX, 150 - offsetY);
 		endGameWnd.extent = new Vector(336, 150);
 		innerCtrl.addChild(endGameWnd);
 
diff --git a/src/gui/PlayGui.hx b/src/gui/PlayGui.hx
index 306dc908..8cc730de 100644
--- a/src/gui/PlayGui.hx
+++ b/src/gui/PlayGui.hx
@@ -147,7 +147,7 @@ class PlayGui {
 			initFPSMeter();
 
 		if (Util.isTouchDevice()) {
-			MarbleGame.instance.touchInput.showControls(this.playGuiCtrl, game == 'ultra');
+			MarbleGame.instance.touchInput.showControls(this.playGuiCtrlOuter, game == 'ultra');
 		}
 
 		playGuiCtrlOuter.render(scene2d);
@@ -799,6 +799,9 @@ class PlayGui {
 				for (ch in pgoChildren) {
 					playGuiCtrlOuter.addChild(ch);
 				}
+				if (Util.isTouchDevice()) {
+					MarbleGame.instance.touchInput.showControls(this.playGuiCtrlOuter, true);
+				}
 				playGuiCtrlOuter.render(MarbleGame.canvas.scene2d);
 				pgoChildren = [];
 			}
diff --git a/src/triggers/Trigger.hx b/src/triggers/Trigger.hx
index db91b7ea..6bd2583c 100644
--- a/src/triggers/Trigger.hx
+++ b/src/triggers/Trigger.hx
@@ -44,13 +44,15 @@ class Trigger extends GameObject {
 		var p7 = origin.add(d2).add(d3);
 		var p8 = origin.add(d1).add(d2).add(d3);
 
+		var scale = MisParser.parseVector3(element.scale);
 		var mat = new Matrix();
+		mat.identity();
+		mat.scale(scale.x, scale.y, scale.z);
 		var quat = MisParser.parseRotation(element.rotation);
 		quat.x = -quat.x;
 		quat.w = -quat.w;
-		quat.toMatrix(mat);
-		var scale = MisParser.parseVector3(element.scale);
-		mat.scale(scale.x, scale.y, scale.z);
+		mat.multiply(mat, quat.toMatrix());
+
 		var pos = MisParser.parseVector3(element.position);
 		pos.x = -pos.x;
 		// mat.setPosition(pos);