Fixes .UpdateFromCamera() when using a view/projection matrix on a ca…

…mera
JujuAdams · Jun 7, 2021 · ed6e929 · ed6e929
1 parent 0904418
commit ed6e929
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/scripts/BulbRenderer/BulbRenderer.gml b/scripts/BulbRenderer/BulbRenderer.gml
@@ -44,7 +44,19 @@ function BulbRenderer(_ambientColour, _mode, _smooth) constructor
 
     static UpdateFromCamera = function(_camera)
     {
-        return Update(camera_get_view_x(_camera), camera_get_view_y(_camera), camera_get_view_width(_camera), camera_get_view_height(_camera));
+        //Deploy PROPER MATHS in case the dev is using matrices
+
+        var _viewMatrix = camera_get_view_mat(_camera);
+        var _projMatrix = camera_get_proj_mat(_camera);
+
+        var _cameraX          = -_viewMatrix[12];
+        var _cameraY          = -_viewMatrix[13];
+        var _cameraViewWidth  = round(abs(2/_projMatrix[0]));
+        var _cameraViewHeight = round(abs(2/_projMatrix[5]));
+        var _cameraLeft       = _cameraX - _cameraViewWidth/2;
+        var _cameraTop        = _cameraY - _cameraViewHeight/2;
+
+        return Update(_cameraLeft, _cameraTop, _cameraViewWidth, _cameraViewHeight);
     }
 
     static Update = function(_cameraL, _cameraT, _cameraW, _cameraH)

diff --git a/scripts/BulbRendererWithGroups/BulbRendererWithGroups.gml b/scripts/BulbRendererWithGroups/BulbRendererWithGroups.gml
@@ -51,7 +51,19 @@ function BulbRendererWithGroups(_ambientColour, _mode, _smooth, _maxGroups) cons
 
     static UpdateFromCamera = function(_camera)
     {
-        return Update(camera_get_view_x(_camera), camera_get_view_y(_camera), camera_get_view_width(_camera), camera_get_view_height(_camera));
+        //Deploy PROPER MATHS in case the dev is using matrices
+
+        var _viewMatrix = camera_get_view_mat(_camera);
+        var _projMatrix = camera_get_proj_mat(_camera);
+
+        var _cameraX          = -_viewMatrix[12];
+        var _cameraY          = -_viewMatrix[13];
+        var _cameraViewWidth  = round(abs(2/_projMatrix[0]));
+        var _cameraViewHeight = round(abs(2/_projMatrix[5]));
+        var _cameraLeft       = _cameraX - _cameraViewWidth/2;
+        var _cameraTop        = _cameraY - _cameraViewHeight/2;
+
+        return Update(_cameraLeft, _cameraTop, _cameraViewWidth, _cameraViewHeight);
     }
 
     static Update = function(_cameraL, _cameraT, _cameraW, _cameraH)