@luma.gl/effects 9.2.6 → 9.3.0-alpha.10

package/src/passes/postprocessing/image-warp-filters/bulgepinch.ts

@@ -6,41 +6,55 @@ import type {ShaderPass} from '@luma.gl/shadertools';
 import {warp} from './warp';
 
 const source = /* wgsl */ `\
-uniform bulgePinchUniforms {
+struct bulgePinchUniforms {
+  center: vec2f,
   radius: f32,
   strength: f32,
-  center: vec2f,
 };
 
-@group(0) @binding(1) var<uniform> bulgePinch: bulgePinchUniforms;
+@group(0) @binding(auto) var<uniform> bulgePinch: bulgePinchUniforms;
 
-fn bulgePinch_warp(vec2 coord, vec2 texCenter) -> vec2f {
-  coord -= texCenter;
-  float distance = length(coord);
+fn bulgePinch_warp(coordIn: vec2f, texCenter: vec2f) -> vec2f {
+  var coord = coordIn - texCenter;
+  let distance = length(coord);
   if (distance < bulgePinch.radius) {
-    float percent = distance / bulgePinch.radius;
+    let percent = distance / bulgePinch.radius;
+    let safeDistance = max(distance, 0.00001);
     if (bulgePinch.strength > 0.0) {
-      coord *= mix(1.0, smoothstep(0.0, bulgePinch.radius / distance, percent), bulgePinch.strength * 0.75);
+      coord *= mix(
+        1.0,
+        smoothstep(0.0, bulgePinch.radius / safeDistance, percent),
+        bulgePinch.strength * 0.75
+      );
     } else {
-      coord *= mix(1.0, pow(percent, 1.0 + bulgePinch.strength * 0.75) * bulgePinch.radius / distance, 1.0 - percent);
+      coord *= mix(
+        1.0,
+        pow(percent, 1.0 + bulgePinch.strength * 0.75) * bulgePinch.radius / safeDistance,
+        1.0 - percent
+      );
     }
   }
   coord += texCenter;
   return coord;
 }
 
-fn bulgePinch_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec2 coord = texCoord * texSize;
+fn bulgePinch_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  var coord = texCoord * texSize;
   coord = bulgePinch_warp(coord, bulgePinch.center * texSize);
-  return warp_sampleColor(source, texSize, coord);
+  return warp_sampleColor(sourceTexture, sourceTextureSampler, texSize, coord);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform bulgePinchUniforms {
+layout(std140) uniform bulgePinchUniforms {
+  vec2 center;
   float radius;
   float strength;
-  vec2 center;
 } bulgePinch;
 
 vec2 bulgePinch_warp(vec2 coord, vec2 texCenter) {

package/src/passes/postprocessing/image-warp-filters/swirl.ts

@@ -6,23 +6,23 @@ import type {ShaderPass} from '@luma.gl/shadertools';
 import {warp} from './warp';
 
 const source = /* wgsl */ `\
-uniform swirlUniforms {
+struct swirlUniforms {
+  center: vec2f,
   radius: f32,
   angle: f32,
-  center: vec2f,
 };
 
-@group(0) @binding(1) swirl: swirlUniforms;
+@group(0) @binding(auto) var<uniform> swirl: swirlUniforms;
 
-fn swirl_warp(vec2 coord, vec2 texCenter) -> vec2f {
-  coord -= texCenter;
-  float distance = length(coord);
+fn swirl_warp(coordIn: vec2f, texCenter: vec2f) -> vec2f {
+  var coord = coordIn - texCenter;
+  let distance = length(coord);
   if (distance < swirl.radius) {
-    float percent = (swirl.radius - distance) / swirl.radius;
-    float theta = percent * percent * swirl.angle;
-    float s = sin(theta);
-    float c = cos(theta);
-    coord = vec2(
+    let percent = (swirl.radius - distance) / swirl.radius;
+    let theta = percent * percent * swirl.angle;
+    let s = sin(theta);
+    let c = cos(theta);
+    coord = vec2f(
       coord.x * c - coord.y * s,
       coord.x * s + coord.y * c
     );
@@ -31,18 +31,23 @@ fn swirl_warp(vec2 coord, vec2 texCenter) -> vec2f {
   return coord;
 }
 
-fn swirl_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec2 coord = texCoord * texSize;
+fn swirl_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  var coord = texCoord * texSize;
   coord = swirl_warp(coord, swirl.center * texSize);
-  return warp_sampleColor(source, texSize, coord);
+  return warp_sampleColor(sourceTexture, sourceTextureSampler, texSize, coord);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform swirlUniforms {
+layout(std140) uniform swirlUniforms {
+  vec2 center;
   float radius;
   float angle;
-  vec2 center;
 } swirl;
 
 vec2 swirl_warp(vec2 coord, vec2 texCenter) {

package/src/passes/postprocessing/image-warp-filters/warp.ts

@@ -5,10 +5,15 @@
 import type {ShaderPass} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `\
-vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
-  vec4 color = texture(source, coord / texSize);
-  vec2 clampedCoord = clamp(coord, vec2(0.0), texSize);
-  if (coord != clampedCoord) {
+fn warp_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  coord: vec2f
+) -> vec4f {
+  var color = textureSample(sourceTexture, sourceTextureSampler, coord / texSize);
+  let clampedCoord = clamp(coord, vec2f(0.0), texSize);
+  if (any(coord != clampedCoord)) {
     /* fade to transparent if we are outside the image */
     color.a *= max(0.0, 1.0 - length(coord - clampedCoord));
   }