Updated BBMOD to 3.21.1

blueburncz · Apr 16, 2024 · 93a37a7 · 93a37a7
1 parent f2a490b
commit 93a37a7
Show file tree

Hide file tree

Showing 51 changed files with 417 additions and 392 deletions.
diff --git a/BBMOD-Zombie-Demo.resource_order b/BBMOD-Zombie-Demo.resource_order
diff --git a/BBMOD-Zombie-Demo.yyp b/BBMOD-Zombie-Demo.yyp
diff --git a/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy
diff --git a/options/amazonfire/options_amazonfire.yy b/options/amazonfire/options_amazonfire.yy
diff --git a/options/android/options_android.yy b/options/android/options_android.yy
diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy
diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy
diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy
diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy
diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy
diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/scripts/BBMOD_BaseRenderer/BBMOD_BaseRenderer.gml b/scripts/BBMOD_BaseRenderer/BBMOD_BaseRenderer.gml
@@ -191,10 +191,10 @@ function BBMOD_BaseRenderer() constructor
 	/// blurred. Defaults to 2.
 	SSAOBlurDepthRange = 2.0;
 
-	/// @var {Id.Camera}
-	/// @private
-	__camera2D = camera_create();
-
+	/// @var {Id.Camera}
+	/// @private
+	__camera2D = camera_create();
+
 	/// @func get_width()
 	///
 	/// @desc Retrieves the width of the renderer on the screen.
@@ -805,8 +805,8 @@ function BBMOD_BaseRenderer() constructor
 	///
 	/// @desc Renders gizmo and instance IDs into dedicated surfaces.
 	///
-	/// @param {Bool} _hdr Whether HDR rendering is enabled.
-	///
+	/// @param {Bool} _hdr Whether HDR rendering is enabled.
+	///
 	/// @private
 	static __render_gizmo_and_instance_ids = function (_hdr)
 	{
@@ -922,28 +922,28 @@ function BBMOD_BaseRenderer() constructor
 			// Gizmo
 			bbmod_render_pass_set(BBMOD_ERenderPass.Forward);
 
-			__surGizmo = bbmod_surface_check(__surGizmo, _renderWidth, _renderHeight,
+			__surGizmo = bbmod_surface_check(__surGizmo, _renderWidth, _renderHeight,
 				_hdr ? surface_rgba16float : surface_rgba8unorm, true);
-
+
 			surface_set_target(__surGizmo);
 			draw_clear_alpha(0, 0.0);
 			matrix_set(matrix_view, _view);
 			matrix_set(matrix_projection, _projection);
-
-			var _hdrPrev = bbmod_shader_get_global(BBMOD_U_HDR);
-			bbmod_shader_set_global_f(BBMOD_U_HDR, _hdr ? 1.0 : 0.0);
-
+
+			var _hdrPrev = bbmod_shader_get_global(BBMOD_U_HDR);
+			bbmod_shader_set_global_f(BBMOD_U_HDR, _hdr ? 1.0 : 0.0);
+
 			Gizmo.submit();
-
-			if (_hdrPrev != undefined)
-			{
-				bbmod_shader_set_global_f(BBMOD_U_HDR, _hdrPrev);
-			}
-			else
-			{
-				bbmod_shader_unset_global(BBMOD_U_HDR);
-			}
-
+
+			if (_hdrPrev != undefined)
+			{
+				bbmod_shader_set_global_f(BBMOD_U_HDR, _hdrPrev);
+			}
+			else
+			{
+				bbmod_shader_unset_global(BBMOD_U_HDR);
+			}
+
 			bbmod_material_reset();
 			surface_reset_target();
 		}
@@ -954,62 +954,62 @@ function BBMOD_BaseRenderer() constructor
 		}
 	};
 
-	/// @private
-	static __overlay_gizmo_and_instance_highlight = function ()
-	{
-		if (!EditMode || !Gizmo || ds_list_empty(Gizmo.Selected))
-		{
-			return;
-		}
-
-		gpu_push_state();
-		gpu_set_blendenable(true);
-
-		var _world = matrix_get(matrix_world);
-		var _view = matrix_get(matrix_view);
-		var _projection = matrix_get(matrix_projection);
-		var _width = get_render_width();
-		var _height = get_render_height();
-		var _texelWidth = 1.0 / _width;
-		var _texelHeight = 1.0 / _height;
-
-		camera_set_view_size(__camera2D, _width, _height);
-		camera_apply(__camera2D);
-
-		////////////////////////////////////////////////////////////////
-		// Highlighted instances
-		if (!ds_list_empty(Gizmo.Selected)
-			&& surface_exists(__surInstanceHighlight))
-		{
-			var _shader = BBMOD_ShInstanceHighlight;
-			shader_set(_shader);
-			bbmod_shader_set_globals(_shader);
-			shader_set_uniform_f(shader_get_uniform(_shader, "u_vTexel"),
-				_texelWidth, _texelHeight);
-			shader_set_uniform_f(shader_get_uniform(_shader, "u_vColor"),
-				InstanceHighlightColor.Red / 255.0,
-				InstanceHighlightColor.Green / 255.0,
-				InstanceHighlightColor.Blue / 255.0,
-				InstanceHighlightColor.Alpha);
-			draw_surface_stretched(__surInstanceHighlight, 0, 0, _width, _height);
-			shader_reset();
-		}
-
-		////////////////////////////////////////////////////////////////
-		// Gizmo
-		if (surface_exists(__surGizmo))
-		{
-			draw_surface_stretched(__surGizmo, 0, 0, _width, _height);
-		}
-
-		matrix_set(matrix_world, _world);
-		matrix_set(matrix_view, _view);
-		matrix_set(matrix_projection, _projection);
-
-		gpu_pop_state();
-	};
-
-	/// @private
+	/// @private
+	static __overlay_gizmo_and_instance_highlight = function ()
+	{
+		if (!EditMode || !Gizmo || ds_list_empty(Gizmo.Selected))
+		{
+			return;
+		}
+
+		gpu_push_state();
+		gpu_set_blendenable(true);
+
+		var _world = matrix_get(matrix_world);
+		var _view = matrix_get(matrix_view);
+		var _projection = matrix_get(matrix_projection);
+		var _width = get_render_width();
+		var _height = get_render_height();
+		var _texelWidth = 1.0 / _width;
+		var _texelHeight = 1.0 / _height;
+
+		camera_set_view_size(__camera2D, _width, _height);
+		camera_apply(__camera2D);
+
+		////////////////////////////////////////////////////////////////
+		// Highlighted instances
+		if (!ds_list_empty(Gizmo.Selected)
+			&& surface_exists(__surInstanceHighlight))
+		{
+			var _shader = BBMOD_ShInstanceHighlight;
+			shader_set(_shader);
+			bbmod_shader_set_globals(_shader);
+			shader_set_uniform_f(shader_get_uniform(_shader, "u_vTexel"),
+				_texelWidth, _texelHeight);
+			shader_set_uniform_f(shader_get_uniform(_shader, "u_vColor"),
+				InstanceHighlightColor.Red / 255.0,
+				InstanceHighlightColor.Green / 255.0,
+				InstanceHighlightColor.Blue / 255.0,
+				InstanceHighlightColor.Alpha);
+			draw_surface_stretched(__surInstanceHighlight, 0, 0, _width, _height);
+			shader_reset();
+		}
+
+		////////////////////////////////////////////////////////////////
+		// Gizmo
+		if (surface_exists(__surGizmo))
+		{
+			draw_surface_stretched(__surGizmo, 0, 0, _width, _height);
+		}
+
+		matrix_set(matrix_world, _world);
+		matrix_set(matrix_view, _view);
+		matrix_set(matrix_projection, _projection);
+
+		gpu_pop_state();
+	};
+
+	/// @private
 	static __render_ssao = function (_surDepth, _projection)
 	{
 		if (EnableSSAO)
@@ -1113,23 +1113,23 @@ function BBMOD_BaseRenderer() constructor
 			bbmod_render_queues_clear();
 		}
 		bbmod_material_reset();
-
-		////////////////////////////////////////////////////////////////////////
-		//
-		// Draw gizmo and highlight selected instances
-		//
-		__overlay_gizmo_and_instance_highlight();
-
+
+		////////////////////////////////////////////////////////////////////////
+		//
+		// Draw gizmo and highlight selected instances
+		//
+		__overlay_gizmo_and_instance_highlight();
+
 		////////////////////////////////////////////////////////////////////////
 
 		// Reset render pass back to Forward at the end!
 		bbmod_render_pass_set(BBMOD_ERenderPass.Forward);
 
 		matrix_set(matrix_world, _world);
 
-		// Unset in case it gets destroyed when the room changes etc.
-		bbmod_shader_unset_global(BBMOD_U_SHADOWMAP);
-
+		// Unset in case it gets destroyed when the room changes etc.
+		bbmod_shader_unset_global(BBMOD_U_SHADOWMAP);
+
 		return self;
 	};
 
@@ -1146,17 +1146,26 @@ function BBMOD_BaseRenderer() constructor
 	static present = function ()
 	{
 		global.__bbmodRendererCurrent = self;
-
-		if (UseAppSurface
-			&& PostProcessor != undefined
-			&& PostProcessor.Enabled)
-		{
-			var _world = matrix_get(matrix_world);
-			matrix_set(matrix_world, matrix_build_identity());
-			PostProcessor.draw(application_surface, X, Y);
-			matrix_set(matrix_world, _world);
+
+		if (UseAppSurface)
+		{
+			var _world = matrix_get(matrix_world);
+			matrix_set(matrix_world, matrix_build_identity());
+			if (PostProcessor != undefined
+				&& PostProcessor.Enabled)
+			{
+				PostProcessor.draw(application_surface, X, Y);
+			}
+			else
+			{
+				gpu_push_state();
+				gpu_set_blendenable(false);
+				draw_surface(application_surface, X, Y);
+				gpu_pop_state();
+			}
+			matrix_set(matrix_world, _world);
 		}
-
+
 		return self;
 	};
 
@@ -1236,8 +1245,8 @@ function BBMOD_BaseRenderer() constructor
 		}
 		ds_map_destroy(__shadowmapCubes);
 
-		camera_destroy(__camera2D);
-
+		camera_destroy(__camera2D);
+
 		return undefined;
 	};
 }