Merge pull request #720 from pmndrs/dev

Version 6.37.6

Author: vanruesc

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "postprocessing",
-	"version": "6.37.5",
+	"version": "6.37.6",
 	"description": "A post processing library for three.js.",
 	"homepage": "https://github.com/pmndrs/postprocessing",
 	"license": "Zlib",

src/effects/BloomEffect.js

@@ -23,9 +23,9 @@ export class BloomEffect extends Effect {
 	 *
 	 * @param {Object} [options] - The options.
 	 * @param {BlendFunction} [options.blendFunction=BlendFunction.SCREEN] - The blend function of this effect.
-	 * @param {Number} [options.luminanceThreshold=0.9] - The luminance threshold. Raise this value to mask out darker elements in the scene.
-	 * @param {Number} [options.luminanceSmoothing=0.025] - Controls the smoothness of the luminance threshold.
-	 * @param {Boolean} [options.mipmapBlur=false] - Enables or disables mipmap blur.
+	 * @param {Number} [options.luminanceThreshold=1.0] - The luminance threshold. Raise this value to mask out darker elements in the scene.
+	 * @param {Number} [options.luminanceSmoothing=0.03] - Controls the smoothness of the luminance threshold.
+	 * @param {Boolean} [options.mipmapBlur=true] - Enables or disables mipmap blur.
 	 * @param {Number} [options.intensity=1.0] - The bloom intensity.
 	 * @param {Number} [options.radius=0.85] - The blur radius. Only applies to mipmap blur.
 	 * @param {Number} [options.levels=8] - The amount of MIP levels. Only applies to mipmap blur.
@@ -39,9 +39,9 @@ export class BloomEffect extends Effect {
 
 	constructor({
 		blendFunction = BlendFunction.SCREEN,
-		luminanceThreshold = 0.9,
-		luminanceSmoothing = 0.025,
-		mipmapBlur = false,
+		luminanceThreshold = 1.0,
+		luminanceSmoothing = 0.03,
+		mipmapBlur = true,
 		intensity = 1.0,
 		radius = 0.85,
 		levels = 8,

src/effects/glsl/bloom.frag

@@ -13,6 +13,6 @@ uniform float intensity;
 void mainImage(const in vec4 inputColor, const in vec2 uv, out vec4 outputColor) {
 
 	vec4 texel = texture2D(map, uv);
-	outputColor = vec4(texel.rgb * intensity, texel.a);
+	outputColor = vec4(texel.rgb * intensity, max(inputColor.a, texel.a));
 
 }

src/effects/glsl/texture.frag

@@ -23,5 +23,6 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, out vec4 outputColor)
 	#endif
 
 	outputColor = TEXEL;
+	outputColor.a = max(inputColor.a, outputColor.a);
 
 }

types/index.d.ts

@@ -5270,9 +5270,9 @@ declare module "postprocessing" {
 		 *
 		 * @param {Object} [options] - The options.
 		 * @param {BlendFunction} [options.blendFunction=BlendFunction.SCREEN] - The blend function of this effect.
-		 * @param {Number} [options.luminanceThreshold=0.9] - The luminance threshold. Raise this value to mask out darker elements in the scene.
-		 * @param {Number} [options.luminanceSmoothing=0.025] - Controls the smoothness of the luminance threshold.
-		 * @param {Boolean} [options.mipmapBlur=false] - Enables or disables mipmap blur.
+		 * @param {Number} [options.luminanceThreshold=1.0] - The luminance threshold. Raise this value to mask out darker elements in the scene.
+		 * @param {Number} [options.luminanceSmoothing=0.03] - Controls the smoothness of the luminance threshold.
+		 * @param {Boolean} [options.mipmapBlur=true] - Enables or disables mipmap blur.
 		 * @param {Number} [options.intensity=1.0] - The bloom intensity.
 		 * @param {Number} [options.radius=0.85] - The blur radius. Only applies to mipmap blur.
 		 * @param {Number} [options.levels=8] - The amount of MIP levels. Only applies to mipmap blur.