Fixes, added matrix transform method

blueburncz · Feb 2, 2022 · 97946e9 · 97946e9
1 parent e46abdd
commit 97946e9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/BBMOD_GML/scripts/BBMOD_Camera/BBMOD_Camera.gml b/BBMOD_GML/scripts/BBMOD_Camera/BBMOD_Camera.gml
@@ -412,8 +412,8 @@ function BBMOD_Camera() constructor
 			return undefined;
 		}
 		_screenPos = _screenPos.Scale(1.0 / _screenPos.W);
-		_screenPos.X = (_screenPos.X * 0.5 + 0.5) * _screenWidth;
-		_screenPos.Y = (1.0 - (_screenPos.Y * 0.5 + 0.5)) * _screenHeight;
+		_screenPos.X = ((_screenPos.X * 0.5) + 0.5) * _screenWidth;
+		_screenPos.Y = (1.0 - ((_screenPos.Y * 0.5) + 0.5)) * _screenHeight;
 		return _screenPos;
 	};
 

diff --git a/BBMOD_GML/scripts/BBMOD_Matrix/BBMOD_Matrix.gml b/BBMOD_GML/scripts/BBMOD_Matrix/BBMOD_Matrix.gml
@@ -192,7 +192,7 @@ function BBMOD_Matrix(_raw=undefined) constructor
 	/// @func ApplyView()
 	/// @desc Changes the view world matrix to this one.
 	/// @return {BBMOD_Matrix} Returns `self`.
-	static ApplyWorld = function () {
+	static ApplyView = function () {
 		gml_pragma("forceinline");
 		matrix_set(matrix_view, Raw);
 		return self;
@@ -201,7 +201,7 @@ function BBMOD_Matrix(_raw=undefined) constructor
 	/// @func ApplyProjection()
 	/// @desc Changes the current projeciton matrix to this one.
 	/// @return {BBMOD_Matrix} Returns `self`.
-	static ApplyWorld = function () {
+	static ApplyProjection = function () {
 		gml_pragma("forceinline");
 		matrix_set(matrix_projection, Raw);
 		return self;
@@ -425,6 +425,16 @@ function BBMOD_Matrix(_raw=undefined) constructor
 		return _res;
 	};
 
+	/// @func Transform(_vector)
+	/// @desc Transforms a vector by the matrix and returns the result as a new
+	/// vector.
+	/// @param {BBMOD_Vec4} _vector The vector to transform.
+	/// @return {BBMOD_Vec4} The tranformed vector.
+	static Transform = function (_vector) {
+		gml_pragma("forceinline");
+		return _vector.Transform(Raw);
+	};
+
 	/// @func Transpose()
 	/// @desc Creates a transpose of this matrix.
 	/// @return {BBMOD_Matrix} The transposed matrix.

diff --git a/docs_src/Changelog/Changelog3.1.11.md b/docs_src/Changelog/Changelog3.1.11.md
@@ -4,6 +4,7 @@ This tiny release mainly adds support for orthographic camera projection, as req
 ## GML API:
 ### Core module:
 * Added new methods `ApplyWorld`, `ApplyView` and `ApplyProjection` to `BBMOD_Matrix`, using which you can set it as the current world/view/projection matrix respectively.
+* Added new method `BBMOD_Matrix.Transform`, using which you can transform a `BBMOD_Vec4` with the matrix.
 
 ### Camera module:
 * Added new property `BBMOD_Camera.Orthographic`, using which you can enable orthographic projection.