Fixed particles and SSAO on macOS, increased version to 3.16.3

blueburncz · Dec 29, 2022 · 33ae077 · 33ae077
1 parent eb5b3e5
commit 33ae077
Show file tree

Hide file tree

Showing 43 changed files with 195 additions and 166 deletions.
diff --git a/BBMOD_GML/Xshaders/Uber_VS.xsh b/BBMOD_GML/Xshaders/Uber_VS.xsh
@@ -110,8 +110,11 @@ void main()
 	position.xyz = QuaternionRotate(batchRot, position.xyz);
 	vec3 normal = QuaternionRotate(batchRot, vec3(0.0, 0.0, -1.0));
 
-	mat4 W;
-	W[3][3] = 1.0;
+	mat4 W = mat4(
+		vec4(1.0, 0.0, 0.0, 0.0),
+		vec4(0.0, 1.0, 0.0, 0.0),
+		vec4(0.0, 0.0, 1.0, 0.0),
+		vec4(0.0, 0.0, 0.0, 1.0));
 	W[3].xyz += batchPosition;
 	mat4 V = gm_Matrices[MATRIX_VIEW];
 	mat4 P = gm_Matrices[MATRIX_PROJECTION];

diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy
diff --git a/BBMOD_GML/objects/OMain/OMain.yy b/BBMOD_GML/objects/OMain/OMain.yy
diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy
diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy
diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy
diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy
diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy
diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy
diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy
diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy
diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy
diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy
diff --git a/BBMOD_GML/scripts/BBMOD_BaseRenderer/BBMOD_BaseRenderer.gml b/BBMOD_GML/scripts/BBMOD_BaseRenderer/BBMOD_BaseRenderer.gml
@@ -812,7 +812,7 @@ function BBMOD_BaseRenderer()
 
 			PostProcessor.draw(__surFinal, X, Y);
 		}
-
+
 		return self;
 	};
 

diff --git a/BBMOD_GML/scripts/BBMOD_BaseRenderer/BBMOD_BaseRenderer.yy b/BBMOD_GML/scripts/BBMOD_BaseRenderer/BBMOD_BaseRenderer.yy
diff --git a/BBMOD_GML/scripts/BBMOD_DefaultRenderer/BBMOD_DefaultRenderer.gml b/BBMOD_GML/scripts/BBMOD_DefaultRenderer/BBMOD_DefaultRenderer.gml
@@ -137,7 +137,7 @@ function BBMOD_DefaultRenderer()
 
 			surface_set_target(__surDepthBuffer);
 			draw_clear(c_white);
-			matrix_set(matrix_view, _view);
+			matrix_set(matrix_view, _view);
 			matrix_set(matrix_projection, _projection);
 			bbmod_render_pass_set(BBMOD_ERenderPass.DepthOnly);
 			var _rqi = 0;
@@ -159,7 +159,9 @@ function BBMOD_DefaultRenderer()
 
 			__surSSAO = bbmod_surface_check(__surSSAO, _width, _height);
 			__surWork = bbmod_surface_check(__surWork, _width, _height);
-
+
+			bbmod_material_reset();
+
 			bbmod_ssao_draw(SSAORadius * SSAOScale, SSAOPower, SSAOAngleBias,
 				SSAODepthRange, __surSSAO, __surWork, __surDepthBuffer, _projection,
 				bbmod_camera_get_zfar());

diff --git a/BBMOD_GML/scripts/BBMOD_DefaultRenderer/BBMOD_DefaultRenderer.yy b/BBMOD_GML/scripts/BBMOD_DefaultRenderer/BBMOD_DefaultRenderer.yy
diff --git a/BBMOD_GML/scripts/__bbmod_particles/__bbmod_particles.yy b/BBMOD_GML/scripts/__bbmod_particles/__bbmod_particles.yy
diff --git a/BBMOD_GML/scripts/__bbmod_ssao/__bbmod_ssao.gml b/BBMOD_GML/scripts/__bbmod_ssao/__bbmod_ssao.gml
@@ -130,14 +130,14 @@ function bbmod_ssao_draw(
 	gpu_push_state();
 	gpu_set_tex_repeat(false);
 
-	var _cam = camera_create();
+	static _cam = camera_create();
 	camera_set_view_size(_cam, _width, _height);
 
 	gpu_set_tex_filter(false);
 
 	surface_set_target(_surSsao);
-	matrix_set(matrix_world, matrix_build_identity());
 	camera_apply(_cam);
+	matrix_set(matrix_world, matrix_build_identity());
 	draw_clear(c_white);
 	shader_set(BBMOD_ShSSAO);
 	texture_set_stage(_uTexNoise, sprite_get_texture(global.__bbmodSSAONoise, 0));
@@ -159,31 +159,29 @@ function bbmod_ssao_draw(
 
 	gpu_set_tex_filter(true);
 
+	shader_set(BBMOD_ShSSAOBlur);
+	shader_set_uniform_f(_uBlurTexel, 1.0 / _width, 0.0);
+	shader_set_uniform_f(_uBlurClipFar, _clipFar);
+	texture_set_stage(_uBlurTexDepth, surface_get_texture(_surDepth));
+	gpu_set_tex_filter_ext(_uBlurTexDepth, false);
+
 	surface_set_target(_surWork);
 	camera_apply(_cam);
+	matrix_set(matrix_world, matrix_build_identity());
 	draw_clear(0);
-	shader_set(BBMOD_ShSSAOBlur);
 	shader_set_uniform_f(_uBlurTexel, 1.0 / _width, 0.0);
-	shader_set_uniform_f(_uBlurClipFar, _clipFar);
-	texture_set_stage(_uBlurTexDepth, surface_get_texture(_surDepth));
-	gpu_set_tex_filter_ext(_uBlurTexDepth, false);
 	draw_surface(_surSsao, 0, 0);
-	shader_reset();
 	surface_reset_target();
 
 	surface_set_target(_surSsao);
 	camera_apply(_cam);
+	matrix_set(matrix_world, matrix_build_identity());
 	draw_clear(0);
-	shader_set(BBMOD_ShSSAOBlur);
 	shader_set_uniform_f(_uBlurTexel, 0.0, 1.0 / _height);
-	shader_set_uniform_f(_uBlurClipFar, _clipFar);
-	texture_set_stage(_uBlurTexDepth, surface_get_texture(_surDepth));
-	gpu_set_tex_filter_ext(_uBlurTexDepth, false);
 	draw_surface(_surWork, 0, 0);
-	shader_reset();
 	surface_reset_target();
 
+	shader_reset();
+
 	gpu_pop_state();
-
-	camera_destroy(_cam);
 }
diff --git a/BBMOD_GML/scripts/__bbmod_ssao/__bbmod_ssao.yy b/BBMOD_GML/scripts/__bbmod_ssao/__bbmod_ssao.yy
diff --git a/BBMOD_GML/shaders/BBMOD_ShDefault/BBMOD_ShDefault.fsh b/BBMOD_GML/shaders/BBMOD_ShDefault/BBMOD_ShDefault.fsh
@@ -602,7 +602,9 @@ vec2 xUnproject(vec4 p)
 {
 	vec2 uv = p.xy / p.w;
 	uv = uv * 0.5 + 0.5;
+#if defined(_YY_HLSL11_) || defined(_YY_PSSL_)
 	uv.y = 1.0 - uv.y;
+#endif
 	return uv;
 }
 /// @param d Linearized depth to encode.

diff --git a/BBMOD_GML/shaders/BBMOD_ShDefaultAnimated/BBMOD_ShDefaultAnimated.fsh b/BBMOD_GML/shaders/BBMOD_ShDefaultAnimated/BBMOD_ShDefaultAnimated.fsh
@@ -602,7 +602,9 @@ vec2 xUnproject(vec4 p)
 {
 	vec2 uv = p.xy / p.w;
 	uv = uv * 0.5 + 0.5;
+#if defined(_YY_HLSL11_) || defined(_YY_PSSL_)
 	uv.y = 1.0 - uv.y;
+#endif
 	return uv;
 }
 /// @param d Linearized depth to encode.
-Original file line number
+Diff line change
@@ Expand Up / @@ -812,7 +812,7 @@ function BBMOD_BaseRenderer() @@
     			PostProcessor.draw(__surFinal, X, Y);
     		}
     		return self;
     	};
@@ Expand Down @@