Updated BBMOD to 3.21.2

blueburncz · Apr 19, 2024 · 497d809 · 497d809
1 parent 93a37a7
commit 497d809
Show file tree

Hide file tree

Showing 46 changed files with 33 additions and 24 deletions.
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_ColorGradingEffect/BBMOD_ColorGradingEffect.gml b/scripts/BBMOD_ColorGradingEffect/BBMOD_ColorGradingEffect.gml
@@ -22,7 +22,10 @@ function BBMOD_ColorGradingEffect(_lut=undefined)
 		surface_set_target(_surfaceDest);
 		shader_set(BBMOD_ShColorGrading);
 		texture_set_stage(__uLUT, LUT);
+		gpu_push_state();
+		gpu_set_tex_filter_ext(__uLUT, false);
 		draw_surface(_surfaceSrc, 0, 0);
+		gpu_pop_state();
 		shader_reset();
 		surface_reset_target();
 		return _surfaceDest;

diff --git a/scripts/BBMOD_LensDistortionEffect/BBMOD_LensDistortionEffect.gml b/scripts/BBMOD_LensDistortionEffect/BBMOD_LensDistortionEffect.gml
@@ -28,7 +28,7 @@ function BBMOD_LensDistortionEffect(_strength=0.0, _zoom=1.0)
 
 	static draw = function (_surfaceDest, _surfaceSrc, _depth, _normals)
 	{
-		if (Strength <= 0.0)
+		if (Strength == 0.0)
 		{
 			return _surfaceSrc;
 		}

diff --git a/scripts/BBMOD_NormalDistortionEffect/BBMOD_NormalDistortionEffect.gml b/scripts/BBMOD_NormalDistortionEffect/BBMOD_NormalDistortionEffect.gml
@@ -29,7 +29,8 @@ function BBMOD_NormalDistortionEffect(_texture=pointer_null, _strength=1.0)
 
 	static draw = function (_surfaceDest, _surfaceSrc, _depth, _normals)
 	{
-		if (Texture == pointer_null)
+		if (Texture == pointer_null
+			|| Strength == 0.0)
 		{
 			return _surfaceSrc;
 		}

diff --git a/scripts/BBMOD_SunShaftsEffect/BBMOD_SunShaftsEffect.gml b/scripts/BBMOD_SunShaftsEffect/BBMOD_SunShaftsEffect.gml
@@ -1,6 +1,6 @@
 /// @module PostProcessing
 
-/// @func BBMOD_SunShaftsEffect([_lightDir[, _radius[, _color[, _blurSize[, _blurStep[, _blendMode]]]]]])
+/// @func BBMOD_SunShaftsEffect([_lightDir[, _radius[, _color[, _blurSize[, _blurStep[, _blendMode[, _lensDirtStrength]]]]]]])
 ///
 /// @extends BBMOD_PostProcessEffect
 ///
@@ -19,13 +19,18 @@
 /// the quality. Defaults to 0.01 (high quality).0
 /// @param {Constant.BlendMode} [_blendMode] The blend mode used to combine the
 /// sun shafts with the scene. Good options are `bm_add` (default) and `bm_max`.
+/// @param {Real} [_lensDirtStrength] Modules the strength of the lens dirt
+/// effect when applied to sun shafts. Defaults to 1.
+///
+/// @see BBMOD_PostProcessor.LensDirtStrength
 function BBMOD_SunShaftsEffect(
 	_lightDir=undefined,
 	_radius=0.1,
 	_color=undefined,
 	_blurSize=100,
 	_blurStep=0.01,
-	_blendMode=bm_add
+	_blendMode=bm_add,
+	_lensDirtStrength=1.0
 ) : BBMOD_PostProcessEffect() constructor
 {
 	/// @var {Struct.BBMOD_Vec3} The direction in which the light is coming.
@@ -53,6 +58,11 @@ function BBMOD_SunShaftsEffect(
 	/// with the scene. Good options are `bm_add` (default) and `bm_max`.
 	BlendMode = _blendMode;
 
+	/// @var {Real} Modules the strength of the lens dirt effect when applied to
+	/// sun shafts. Default value is 1.
+	/// @see BBMOD_PostProcessor.LensDirtStrength
+	LensDirtStrength = _lensDirtStrength;
+
 	/// @var {Id.Surface}
 	/// @private
 	__surWork1 = -1;
@@ -141,7 +151,7 @@ function BBMOD_SunShaftsEffect(
 		texture_set_stage(__uLensDirtTex, PostProcessor.LensDirt);
 		var _uvs = texture_get_uvs(PostProcessor.LensDirt);
 		shader_set_uniform_f(__uLensDirtUVs, _uvs[0], _uvs[1], _uvs[2], _uvs[3]);
-		shader_set_uniform_f(__uLensDirtStrength, PostProcessor.LensDirtStrength);
+		shader_set_uniform_f(__uLensDirtStrength, PostProcessor.LensDirtStrength * LensDirtStrength);
 		draw_surface_ext(__surWork2, 0, 0, 2, 2, 0, c_white, 1.0);
 		shader_reset();
 		gpu_pop_state();

diff --git a/shaders/BBMOD_ShColorGrading/BBMOD_ShColorGrading.fsh b/shaders/BBMOD_ShColorGrading/BBMOD_ShColorGrading.fsh
@@ -40,12 +40,7 @@ vec3 ColorGrade(vec3 color, sampler2D lut)
 
 void main()
 {
-	vec3 color = texture2D(gm_BaseTexture, v_vTexCoord).rgb;
-
-//#ifndef _YY_GLSLES_
-//	color = ColorGrade(color, u_texLUT);
-//#endif
-
-	gl_FragColor.rgb = color;
+	vec3 color = clamp(texture2D(gm_BaseTexture, v_vTexCoord).rgb, vec3(0.0), vec3(1.0));
+	gl_FragColor.rgb = ColorGrade(color, u_texLUT);
 	gl_FragColor.a = 1.0;
 }
diff --git a/sprites/BBMOD_SprBestFitNormalLUT/5e52c852-96b0-44bd-a39b-919074af4aec.png b/sprites/BBMOD_SprBestFitNormalLUT/5e52c852-96b0-44bd-a39b-919074af4aec.png
diff --git a/...s/5e52c852-96b0-44bd-a39b-919074af4aec/0bfbc505-03d0-43b7-82d8-d8a257f154e1.png b/...s/5e52c852-96b0-44bd-a39b-919074af4aec/0bfbc505-03d0-43b7-82d8-d8a257f154e1.png
diff --git a/sprites/BBMOD_SprBlack/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png b/sprites/BBMOD_SprBlack/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png
diff --git a/...s/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png b/...s/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png
diff --git a/sprites/BBMOD_SprCheckerboard/f32abfde-987f-47df-8dc5-6501ccd1cffe.png b/sprites/BBMOD_SprCheckerboard/f32abfde-987f-47df-8dc5-6501ccd1cffe.png
diff --git a/...s/f32abfde-987f-47df-8dc5-6501ccd1cffe/7871b65d-a5ff-4d19-bcb3-5887144e2eca.png b/...s/f32abfde-987f-47df-8dc5-6501ccd1cffe/7871b65d-a5ff-4d19-bcb3-5887144e2eca.png
diff --git a/sprites/BBMOD_SprColorGradingLUT/9c1088e4-4abf-42a7-ba51-7768972da5f4.png b/sprites/BBMOD_SprColorGradingLUT/9c1088e4-4abf-42a7-ba51-7768972da5f4.png
diff --git a/...s/9c1088e4-4abf-42a7-ba51-7768972da5f4/609ab95a-bc6f-4dd9-8bd2-12e84733b60c.png b/...s/9c1088e4-4abf-42a7-ba51-7768972da5f4/609ab95a-bc6f-4dd9-8bd2-12e84733b60c.png
diff --git a/sprites/BBMOD_SprDefaultNormalW/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png b/sprites/BBMOD_SprDefaultNormalW/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png
diff --git a/...s/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png b/...s/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png
diff --git a/sprites/BBMOD_SprDefaultSpecularColor/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png b/sprites/BBMOD_SprDefaultSpecularColor/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png
diff --git a/sprites/BBMOD_SprDefaultSpecularColor/BBMOD_SprDefaultSpecularColor.yy b/sprites/BBMOD_SprDefaultSpecularColor/BBMOD_SprDefaultSpecularColor.yy
diff --git a/...s/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png b/...s/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png
diff --git a/sprites/BBMOD_SprGizmo/198f2eb3-626a-4665-a2b0-881cce537b25.png b/sprites/BBMOD_SprGizmo/198f2eb3-626a-4665-a2b0-881cce537b25.png
diff --git a/sprites/BBMOD_SprGizmo/f6406058-c156-411a-b6b4-53268f2116b4.png b/sprites/BBMOD_SprGizmo/f6406058-c156-411a-b6b4-53268f2116b4.png
diff --git a/...s/198f2eb3-626a-4665-a2b0-881cce537b25/cf694e91-149c-40b5-8c3e-977ad4b52c84.png b/...s/198f2eb3-626a-4665-a2b0-881cce537b25/cf694e91-149c-40b5-8c3e-977ad4b52c84.png
diff --git a/...s/f6406058-c156-411a-b6b4-53268f2116b4/cf694e91-149c-40b5-8c3e-977ad4b52c84.png b/...s/f6406058-c156-411a-b6b4-53268f2116b4/cf694e91-149c-40b5-8c3e-977ad4b52c84.png
diff --git a/sprites/BBMOD_SprLensDirt/53a81332-e4de-4bc2-98d1-95f7df68a62a.png b/sprites/BBMOD_SprLensDirt/53a81332-e4de-4bc2-98d1-95f7df68a62a.png
diff --git a/...s/53a81332-e4de-4bc2-98d1-95f7df68a62a/0d5f58c5-7c4d-40c8-9214-2a3cc66342d9.png b/...s/53a81332-e4de-4bc2-98d1-95f7df68a62a/0d5f58c5-7c4d-40c8-9214-2a3cc66342d9.png
diff --git a/sprites/BBMOD_SprLensFlareHeptagon/05f74315-7188-46ef-97f9-79d5e9f72694.png b/sprites/BBMOD_SprLensFlareHeptagon/05f74315-7188-46ef-97f9-79d5e9f72694.png
diff --git a/...s/05f74315-7188-46ef-97f9-79d5e9f72694/c2aed7b1-e8f0-4ec0-82cb-1539d2f63bb3.png b/...s/05f74315-7188-46ef-97f9-79d5e9f72694/c2aed7b1-e8f0-4ec0-82cb-1539d2f63bb3.png
diff --git a/sprites/BBMOD_SprLensFlareHoop/b96bc2e2-32e9-4783-9b2a-f8569dee2561.png b/sprites/BBMOD_SprLensFlareHoop/b96bc2e2-32e9-4783-9b2a-f8569dee2561.png
diff --git a/...s/b96bc2e2-32e9-4783-9b2a-f8569dee2561/55dc12e6-70d1-40b7-8452-33ac29851330.png b/...s/b96bc2e2-32e9-4783-9b2a-f8569dee2561/55dc12e6-70d1-40b7-8452-33ac29851330.png
diff --git a/sprites/BBMOD_SprLensFlareStarburst/971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024.png b/sprites/BBMOD_SprLensFlareStarburst/971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024.png
diff --git a/...s/971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024/747c91bc-a508-45fa-9f6c-e78468aa8d2a.png b/...s/971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024/747c91bc-a508-45fa-9f6c-e78468aa8d2a.png
diff --git a/sprites/BBMOD_SprLensFlareStreak/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39.png b/sprites/BBMOD_SprLensFlareStreak/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39.png
diff --git a/...s/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39/4c9c1895-1d2d-4e36-b501-1a04700f3b43.png b/...s/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39/4c9c1895-1d2d-4e36-b501-1a04700f3b43.png
diff --git a/sprites/BBMOD_SprParticle/3aac4271-58c7-44de-9a18-62ce002f4288.png b/sprites/BBMOD_SprParticle/3aac4271-58c7-44de-9a18-62ce002f4288.png
diff --git a/...s/3aac4271-58c7-44de-9a18-62ce002f4288/e0fec503-965d-4d6c-8c50-8ddca8cc8815.png b/...s/3aac4271-58c7-44de-9a18-62ce002f4288/e0fec503-965d-4d6c-8c50-8ddca8cc8815.png
diff --git a/sprites/BBMOD_SprWhite/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png b/sprites/BBMOD_SprWhite/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png
diff --git a/...s/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png b/...s/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png