@react-three/postprocessing 2.8.1 → 2.8.3

package/dist/effects/TiltShift2.d.ts

@@ -5,15 +5,15 @@ export declare class TiltShiftEffect extends Effect {
     taper, // [0, 1], can go beyond 1 for extra
     start, // [0,1] percentage x,y of screenspace
     end, // [0,1] percentage x,y of screenspace
-    sampleCount, // number of blur samples
+    samples, // number of blur samples
     direction }?: {
         blendFunction?: BlendFunction;
         blur?: number;
         taper?: number;
         start?: number[];
         end?: number[];
-        sampleCount?: number;
+        samples?: number;
         direction?: number[];
     });
 }
-export declare const TiltShift2: import("react").ForwardRefExoticComponent<Pick<import("../util").EffectProps<typeof TiltShiftEffect>, "children" | "attach" | "attachArray" | "attachObject" | "attachFns" | "args" | "key" | "onUpdate" | "blendFunction" | "opacity" | "blur" | "taper" | "start" | "end" | "sampleCount" | "direction" | keyof TiltShiftEffect> & import("react").RefAttributes<typeof TiltShiftEffect>>;
+export declare const TiltShift2: import("react").ForwardRefExoticComponent<Pick<import("../util").EffectProps<typeof TiltShiftEffect>, "children" | "attach" | "attachArray" | "attachObject" | "attachFns" | "args" | "key" | "onUpdate" | "blendFunction" | "opacity" | "blur" | "samples" | "taper" | "start" | "end" | "direction" | keyof TiltShiftEffect> & import("react").RefAttributes<typeof TiltShiftEffect>>;

package/dist/index.cjs

@@ -733,7 +733,7 @@ var TiltShift = wrapEffect(postprocessing.TiltShiftEffect, {
 });
 
 var TiltShiftShader = {
-  fragmentShader: "\n\n    // original shader by Evan Wallace\n\n    #define MAX_ITERATIONS 100\n\n    uniform float blur;\n    uniform float taper;\n    uniform vec2 start;\n    uniform vec2 end;\n    uniform vec2 direction;\n    uniform int sampleCount;\n\n    float random(vec3 scale, float seed) {\n        /* use the fragment position for a different seed per-pixel */\n        return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n    }\n\n    void mainImage(const in vec4 inputColor, const in vec2 uv, out vec4 outputColor) {\n        vec4 color = vec4(0.0);\n        float total = 0.0;\n        vec2 startPixel = vec2(start.x * resolution.x, start.y * resolution.y);\n        vec2 endPixel = vec2(end.x * resolution.x, end.y * resolution.y);\n        float f_samples = float(sampleCount);\n        float half_samples = f_samples / 2.0;\n\n        // use screen diagonal to normalize blur radii\n        float maxScreenDistance = distance(vec2(0.0), resolution); // diagonal distance\n        float gradientRadius = taper * (maxScreenDistance);\n        float blurRadius = blur * (maxScreenDistance / 16.0);\n\n        /* randomize the lookup values to hide the fixed number of samples */\n        float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);\n        vec2 normal = normalize(vec2(startPixel.y - endPixel.y, endPixel.x - startPixel.x));\n        float radius = smoothstep(0.0, 1.0, abs(dot(uv * resolution - startPixel, normal)) / gradientRadius) * blurRadius;\n\n        #pragma unroll_loop_start\n        for (int i = 0; i <= MAX_ITERATIONS; i++) {\n            if (i >= sampleCount) { break; } // return early if over sample count\n            float f_i = float(i);\n            float s_i = -half_samples + f_i;\n            float percent = (s_i + offset - 0.5) / half_samples;\n            float weight = 1.0 - abs(percent);\n            vec4 sample_i = texture2D(inputBuffer, uv + normalize(direction) / resolution * percent * radius);\n            /* switch to pre-multiplied alpha to correctly blur transparent images */\n            sample_i.rgb *= sample_i.a;\n            color += sample_i * weight;\n            total += weight;\n        }\n        #pragma unroll_loop_end\n\n        outputColor = color / total;\n\n        /* switch back from pre-multiplied alpha */\n        outputColor.rgb /= outputColor.a + 0.00001;\n    }\n    "
+  fragmentShader: "\n\n    // original shader by Evan Wallace\n\n    #define MAX_ITERATIONS 100\n\n    uniform float blur;\n    uniform float taper;\n    uniform vec2 start;\n    uniform vec2 end;\n    uniform vec2 direction;\n    uniform int samples;\n\n    float random(vec3 scale, float seed) {\n        /* use the fragment position for a different seed per-pixel */\n        return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n    }\n\n    void mainImage(const in vec4 inputColor, const in vec2 uv, out vec4 outputColor) {\n        vec4 color = vec4(0.0);\n        float total = 0.0;\n        vec2 startPixel = vec2(start.x * resolution.x, start.y * resolution.y);\n        vec2 endPixel = vec2(end.x * resolution.x, end.y * resolution.y);\n        float f_samples = float(samples);\n        float half_samples = f_samples / 2.0;\n\n        // use screen diagonal to normalize blur radii\n        float maxScreenDistance = distance(vec2(0.0), resolution); // diagonal distance\n        float gradientRadius = taper * (maxScreenDistance);\n        float blurRadius = blur * (maxScreenDistance / 16.0);\n\n        /* randomize the lookup values to hide the fixed number of samples */\n        float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);\n        vec2 normal = normalize(vec2(startPixel.y - endPixel.y, endPixel.x - startPixel.x));\n        float radius = smoothstep(0.0, 1.0, abs(dot(uv * resolution - startPixel, normal)) / gradientRadius) * blurRadius;\n\n        #pragma unroll_loop_start\n        for (int i = 0; i <= MAX_ITERATIONS; i++) {\n            if (i >= samples) { break; } // return early if over sample count\n            float f_i = float(i);\n            float s_i = -half_samples + f_i;\n            float percent = (s_i + offset - 0.5) / half_samples;\n            float weight = 1.0 - abs(percent);\n            vec4 sample_i = texture2D(inputBuffer, uv + normalize(direction) / resolution * percent * radius);\n            /* switch to pre-multiplied alpha to correctly blur transparent images */\n            sample_i.rgb *= sample_i.a;\n            color += sample_i * weight;\n            total += weight;\n        }\n        #pragma unroll_loop_end\n\n        outputColor = color / total;\n\n        /* switch back from pre-multiplied alpha */\n        outputColor.rgb /= outputColor.a + 0.00001;\n    }\n    "
 };
 var TiltShiftEffect = /*#__PURE__*/function (_Effect) {
   _inheritsLoose__default["default"](TiltShiftEffect, _Effect);
@@ -743,22 +743,22 @@ var TiltShiftEffect = /*#__PURE__*/function (_Effect) {
         _ref$blendFunction = _ref.blendFunction,
         blendFunction = _ref$blendFunction === void 0 ? postprocessing.BlendFunction.NORMAL : _ref$blendFunction,
         _ref$blur = _ref.blur,
-        blur = _ref$blur === void 0 ? 1.0 : _ref$blur,
+        blur = _ref$blur === void 0 ? 0.15 : _ref$blur,
         _ref$taper = _ref.taper,
         taper = _ref$taper === void 0 ? 0.5 : _ref$taper,
         _ref$start = _ref.start,
         start = _ref$start === void 0 ? [0.5, 0.0] : _ref$start,
         _ref$end = _ref.end,
         end = _ref$end === void 0 ? [0.5, 1.0] : _ref$end,
-        _ref$sampleCount = _ref.sampleCount,
-        sampleCount = _ref$sampleCount === void 0 ? 10.0 : _ref$sampleCount,
+        _ref$samples = _ref.samples,
+        samples = _ref$samples === void 0 ? 10.0 : _ref$samples,
         _ref$direction = _ref.direction,
         direction = _ref$direction === void 0 ? [1, 1] : _ref$direction;
 
     return _Effect.call(this, 'TiltShiftEffect', TiltShiftShader.fragmentShader, {
       blendFunction: blendFunction,
       attributes: postprocessing.EffectAttribute.CONVOLUTION,
-      uniforms: new Map([['blur', new THREE.Uniform(blur)], ['taper', new THREE.Uniform(taper)], ['start', new THREE.Uniform(start)], ['end', new THREE.Uniform(end)], ['sampleCount', new THREE.Uniform(sampleCount)], ['direction', new THREE.Uniform(direction)]])
+      uniforms: new Map([['blur', new THREE.Uniform(blur)], ['taper', new THREE.Uniform(taper)], ['start', new THREE.Uniform(start)], ['end', new THREE.Uniform(end)], ['samples', new THREE.Uniform(samples)], ['direction', new THREE.Uniform(direction)]])
     }) || this;
   }
 

package/dist/index.js

@@ -627,7 +627,7 @@ const TiltShiftShader = {
     uniform vec2 start;
     uniform vec2 end;
     uniform vec2 direction;
-    uniform int sampleCount;
+    uniform int samples;
 
     float random(vec3 scale, float seed) {
         /* use the fragment position for a different seed per-pixel */
@@ -639,7 +639,7 @@ const TiltShiftShader = {
         float total = 0.0;
         vec2 startPixel = vec2(start.x * resolution.x, start.y * resolution.y);
         vec2 endPixel = vec2(end.x * resolution.x, end.y * resolution.y);
-        float f_samples = float(sampleCount);
+        float f_samples = float(samples);
         float half_samples = f_samples / 2.0;
 
         // use screen diagonal to normalize blur radii
@@ -654,7 +654,7 @@ const TiltShiftShader = {
 
         #pragma unroll_loop_start
         for (int i = 0; i <= MAX_ITERATIONS; i++) {
-            if (i >= sampleCount) { break; } // return early if over sample count
+            if (i >= samples) { break; } // return early if over sample count
             float f_i = float(i);
             float s_i = -half_samples + f_i;
             float percent = (s_i + offset - 0.5) / half_samples;
@@ -678,7 +678,7 @@ class TiltShiftEffect extends Effect {
   constructor(_temp) {
     let {
       blendFunction = BlendFunction.NORMAL,
-      blur = 1.0,
+      blur = 0.15,
       // [0, 1], can go beyond 1 for extra
       taper = 0.5,
       // [0, 1], can go beyond 1 for extra
@@ -686,7 +686,7 @@ class TiltShiftEffect extends Effect {
       // [0,1] percentage x,y of screenspace
       end = [0.5, 1.0],
       // [0,1] percentage x,y of screenspace
-      sampleCount = 10.0,
+      samples = 10.0,
       // number of blur samples
       direction = [1, 1] // direction of blur
 
@@ -694,7 +694,7 @@ class TiltShiftEffect extends Effect {
     super('TiltShiftEffect', TiltShiftShader.fragmentShader, {
       blendFunction,
       attributes: EffectAttribute.CONVOLUTION,
-      uniforms: new Map([['blur', new Uniform(blur)], ['taper', new Uniform(taper)], ['start', new Uniform(start)], ['end', new Uniform(end)], ['sampleCount', new Uniform(sampleCount)], ['direction', new Uniform(direction)]])
+      uniforms: new Map([['blur', new Uniform(blur)], ['taper', new Uniform(taper)], ['start', new Uniform(start)], ['end', new Uniform(end)], ['samples', new Uniform(samples)], ['direction', new Uniform(direction)]])
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/postprocessing",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "postprocessing wrapper for React and @react-three/fiber",
   "keywords": [
     "postprocessing",