From 4a6769cb0459294a9918584fbee388ac66285ef8 Mon Sep 17 00:00:00 2001
From: Zhincore <adam@zhincore.eu>
Date: Fri, 9 Sep 2022 19:02:40 +0200
Subject: [PATCH 1/2] Improve scaleform transformation

---
 {stream => _stream}/pmms_texture_renderer.gfx | Bin
 client.lua                                    |  13 ++++++++-----
 dui.lua                                       |   4 ++--
 ui/index.html                                 |   3 +--
 ui/script.js                                  |   9 +--------
 5 files changed, 12 insertions(+), 17 deletions(-)
 rename {stream => _stream}/pmms_texture_renderer.gfx (100%)

diff --git a/stream/pmms_texture_renderer.gfx b/_stream/pmms_texture_renderer.gfx
similarity index 100%
rename from stream/pmms_texture_renderer.gfx
rename to _stream/pmms_texture_renderer.gfx
diff --git a/client.lua b/client.lua
index a0a6501..c993ac3 100644
--- a/client.lua
+++ b/client.lua
@@ -1557,19 +1557,22 @@ Citizen.CreateThread(function()
 				if info.scaleform and info.scaleform.attached then
 					if entityExists and NetworkGetEntityIsNetworked(entity) then
 						local mediaRot = GetEntityRotation(entity, 0)
+						local forwardVector, rightVector, upVector = GetEntityMatrix(entity)
 
 						local r = math.rad(mediaRot.z)
 						local cosr = math.cos(r)
 						local sinr = math.sin(r)
 
-						local posX = (info.scaleform.position.x * cosr - info.scaleform.position.y * sinr) + mediaPos.x
-						local posY = (info.scaleform.position.y * cosr + info.scaleform.position.x * sinr) + mediaPos.y
-						local posZ = info.scaleform.position.z + mediaPos.z
+						local offsetX = info.scaleform.position.x - info.scaleform.scale.x * 10
+						local offsetY = info.scaleform.position.y
+						local offsetZ = info.scaleform.position.z + info.scaleform.scale.y * 10
+						local pos = mediaPos + (rightVector * offsetX) + (forwardVector * offsetY) + (upVector * offsetZ)
 
-						info.scaleform.finalPosition = vector3(posX, posY, posZ)
+						info.scaleform.finalPosition = pos
 
 						-- FIXME: This really only works for the Z rotation (yaw)
-						info.scaleform.finalRotation = -(mediaRot + info.scaleform.rotation)
+						info.scaleform.finalRotation = mediaRot + info.scaleform.rotation
+	
 					elseif info.scaleform.finalPosition and info.scaleform.finalRotation then
 						info.scaleform.finalPosition = nil
 						info.scaleform.finalRotation = nil
diff --git a/dui.lua b/dui.lua
index d44a67e..7db44b9 100644
--- a/dui.lua
+++ b/dui.lua
@@ -256,8 +256,8 @@ function DuiBrowser:renderFrame(drawSprite)
 		DrawScaleformMovie_3dSolid(self.sfHandle,
 			self.scaleform.finalPosition or self.scaleform.position,
 			self.scaleform.finalRotation or self.scaleform.rotation,
-			2.0, 2.0, 1.0,
-			self.scaleform.scale,
+			2.0, 2.0, 2.0,
+			self.scaleform.scale.x, self.scaleform.scale.y * (Config.dui.screenHeight / Config.dui.screenWidth), 1,
 			2)
 	end
 end
diff --git a/ui/index.html b/ui/index.html
index 59926e8..529c731 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -294,8 +294,7 @@
 						</div>
 						<i class="fas fa-arrows-alt"></i>
 						<input id="scaleform-scale-x" type="number" placeholder="x" class="scaleform-setting" min="0" max="1" step="0.01" value="0.1">
-						<input id="scaleform-scale-y" type="number" placeholder="y" class="scaleform-setting" min="0" max="1" step="0.01" value="0.05">
-						<input id="scaleform-scale-z" type="number" placeholder="z" class="scaleform-setting" min="0" max="1" step="0.01" value="0">
+						<input id="scaleform-scale-y" type="number" placeholder="y" class="scaleform-setting" min="0" max="1" step="0.01" value="0.1">
 					</div>
 					<div id="scaleform-auto">
 						<button id="scaleform-auto-my-position">
diff --git a/ui/script.js b/ui/script.js
index 4bf38e0..6e0fcf2 100644
--- a/ui/script.js
+++ b/ui/script.js
@@ -1204,7 +1204,6 @@ function getScaleformSettings(standalone) {
 	var rotZInput = document.getElementById('scaleform-rotation-z');
 	var scaleXInput = document.getElementById('scaleform-scale-x');
 	var scaleYInput = document.getElementById('scaleform-scale-y');
-	var scaleZInput = document.getElementById('scaleform-scale-z');
 	var attachedInput = document.getElementById('scaleform-attached');
 
 	var name = nameInput.value;
@@ -1216,7 +1215,6 @@ function getScaleformSettings(standalone) {
 	var rotZ = parseFloat(rotZInput.value);
 	var scaleX = parseFloat(scaleXInput.value);
 	var scaleY = parseFloat(scaleYInput.value);
-	var scaleZ = parseFloat(scaleZInput.value);
 	var attached = attachedInput.checked;
 
 	if (name == '') {
@@ -1255,10 +1253,6 @@ function getScaleformSettings(standalone) {
 		scaleY = 0;
 	}
 
-	if (isNaN(scaleZ)) {
-		scaleZ = 0;
-	}
-
 	return {
 		name: name,
 		position: {
@@ -1274,7 +1268,7 @@ function getScaleformSettings(standalone) {
 		scale: {
 			x: scaleX,
 			y: scaleY,
-			z: scaleZ
+			z: 0
 		},
 		standalone: standalone,
 		attached: attached
@@ -1474,7 +1468,6 @@ function setMediaPlayerDefaults(handle) {
 			document.getElementById('scaleform-rotation-z').value = scaleform.rotation.z;
 			document.getElementById('scaleform-scale-x').value = scaleform.scale.x;
 			document.getElementById('scaleform-scale-y').value = scaleform.scale.y;
-			document.getElementById('scaleform-scale-z').value = scaleform.scale.z;
 			document.getElementById('scaleform-attached').checked = scaleform.attached;
 
 			document.getElementById('scaleform').checked = true;

From 9d8bbf882755ce2724b649b2b4f1a218f573eb0e Mon Sep 17 00:00:00 2001
From: Zhincore <adam@zhincore.eu>
Date: Fri, 9 Sep 2022 19:09:30 +0200
Subject: [PATCH 2/2] Rename _stream folder back to stream

---
 {_stream => stream}/pmms_texture_renderer.gfx | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {_stream => stream}/pmms_texture_renderer.gfx (100%)

diff --git a/_stream/pmms_texture_renderer.gfx b/stream/pmms_texture_renderer.gfx
similarity index 100%
rename from _stream/pmms_texture_renderer.gfx
rename to stream/pmms_texture_renderer.gfx