@lightningjs/renderer 3.0.0-beta2 → 3.0.0-beta21

package/src/core/shaders/webgl/RoundedWithBorder.ts

@@ -16,34 +16,134 @@
  */
 
 import type { CoreNode } from '../../CoreNode.js';
-import { calcFactoredRadiusArray, valuesAreEqual } from '../../lib/utils.js';
+import { calcFactoredRadiusArray } from '../../lib/utils.js';
 import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
 import type { WebGlShaderType } from '../../renderers/webgl/WebGlShaderNode.js';
 import {
   RoundedWithBorderTemplate,
   type RoundedWithBorderProps,
 } from '../templates/RoundedWithBorderTemplate.js';
-import { Rounded } from './Rounded.js';
 
 export const RoundedWithBorder: WebGlShaderType<RoundedWithBorderProps> = {
   props: RoundedWithBorderTemplate.props,
   update(node: CoreNode) {
-    this.uniformRGBA('u_border_color', this.props!['border-color']);
-    this.uniform4fa('u_border_width', this.props!['border-width'] as Vec4);
-    this.uniform1i(
-      'u_border_asym',
-      valuesAreEqual(this.props!['border-width'] as number[]) ? 0 : 1,
-    );
+    this.uniformRGBA('u_borderColor', this.props!['border-color']);
+    this.uniform4fa('u_borderWidth', this.props!['border-w'] as Vec4);
+    this.uniform1f('u_borderGap', this.props!['border-gap'] as number);
+    this.uniform1f('u_borderAlign', this.props!['border-align'] as number);
+
     this.uniform4fa(
       'u_radius',
-      calcFactoredRadiusArray(
-        this.props!.radius as Vec4,
-        node.width,
-        node.height,
-      ),
+      calcFactoredRadiusArray(this.props!.radius as Vec4, node.w, node.h),
     );
   },
-  vertex: Rounded.vertex,
+  vertex: `
+    # ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    # else
+    precision mediump float;
+    # endif
+
+    attribute vec2 a_position;
+    attribute vec2 a_textureCoords;
+    attribute vec4 a_color;
+    attribute vec2 a_nodeCoords;
+
+    uniform vec2 u_resolution;
+    uniform float u_pixelRatio;
+    uniform vec2 u_dimensions;
+
+    uniform vec4 u_radius;
+    uniform vec4 u_borderWidth;
+    uniform float u_borderGap;
+    uniform float u_borderAlign;
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+    varying vec2 v_nodeCoords;
+
+    varying vec2 v_innerSize;
+    varying vec2 v_outerSize;
+    varying vec2 v_outerBorderUv;
+    varying vec2 v_innerBorderUv;
+    varying vec4 v_innerBorderRadius;
+    varying vec4 v_outerBorderRadius;
+    varying vec2 v_halfDimensions;
+    varying float v_edgeWidth;
+    varying float v_borderZero;
+
+    void main() {
+      vec2 vertexPos = a_position * u_pixelRatio;
+      vec2 screenSpace = vec2(2.0 / u_resolution.x, -2.0 / u_resolution.y);
+      vec2 edge = clamp(a_nodeCoords * 2.0 - vec2(1.0), -1.0, 1.0);
+      vec2 edgeOffset = vec2(0.0);
+
+      v_borderZero = u_borderWidth == vec4(0.0) ? 1.0 : 0.0;
+      v_innerSize = vec2(0.0);
+      v_outerSize = vec2(0.0);
+
+      if(v_borderZero == 0.0) {
+        float borderTop = u_borderWidth.x;
+        float borderRight = u_borderWidth.y;
+        float borderBottom = u_borderWidth.z;
+        float borderLeft = u_borderWidth.w;
+
+        v_outerBorderUv = vec2(0.0);
+        v_innerBorderUv = vec2(0.0);
+
+        vec2 borderSize = vec2(borderRight + borderLeft, borderTop + borderBottom);
+        vec2 extraSize = borderSize * u_borderAlign;
+        float gapLeft = step(0.001, borderLeft) * u_borderGap;
+        float gapRight = step(0.001, borderRight) * u_borderGap;
+        float gapTop = step(0.001, borderTop) * u_borderGap;
+        float gapBottom = step(0.001, borderBottom) * u_borderGap;
+        vec2 gapSize = vec2(gapLeft + gapRight, gapTop + gapBottom);
+
+        v_outerSize = (u_dimensions + gapSize + extraSize) * 0.5;
+        v_innerSize = v_outerSize - borderSize * 0.5;
+
+        // Use sign() to avoid branching
+        vec2 borderDiff = vec2(borderRight - borderLeft, borderBottom - borderTop);
+        vec2 signDiff = sign(borderDiff);
+        borderDiff = abs(borderDiff);
+
+        vec2 gapDiff = vec2(gapRight - gapLeft, gapBottom - gapTop);
+        vec2 signGapDiff = sign(gapDiff);
+        gapDiff = abs(gapDiff);
+
+        v_outerBorderUv = -signDiff * borderDiff * u_borderAlign * 0.5 - signGapDiff * gapDiff * 0.5;
+        v_innerBorderUv = v_outerBorderUv + signDiff * borderDiff * 0.5;
+
+        v_outerBorderRadius = vec4(
+          max(0.0, u_radius.x + max(borderTop * u_borderAlign + u_borderGap, borderLeft * u_borderAlign + u_borderGap)),
+          max(0.0, u_radius.y + max(borderTop * u_borderAlign + u_borderGap, borderRight * u_borderAlign + u_borderGap)),
+          max(0.0, u_radius.z + max(borderBottom * u_borderAlign + u_borderGap, borderRight * u_borderAlign + u_borderGap)),
+          max(0.0, u_radius.w + max(borderBottom * u_borderAlign + u_borderGap, borderLeft * u_borderAlign + u_borderGap))
+        );
+
+        v_innerBorderRadius = vec4(
+          max(0.0, v_outerBorderRadius.x - max(borderTop, borderLeft)),
+          max(0.0, v_outerBorderRadius.y - max(borderTop, borderRight)),
+          max(0.0, v_outerBorderRadius.z - max(borderBottom, borderRight)),
+          max(0.0, v_outerBorderRadius.w - max(borderBottom, borderLeft))
+        );
+
+        vec2 edgeOffsetExtra = step(u_dimensions * 0.5, v_outerSize) * edge * (extraSize + u_borderGap);
+        edgeOffset = edgeOffsetExtra;
+
+        vertexPos = (a_position + edge + edgeOffset) * u_pixelRatio;
+      }
+
+      gl_Position = vec4(vertexPos.x * screenSpace.x - 1.0, -sign(screenSpace.y) * (vertexPos.y * -abs(screenSpace.y)) + 1.0, 0.0, 1.0);
+
+      v_color = a_color;
+      v_nodeCoords = a_nodeCoords + (screenSpace + edgeOffset) / (u_dimensions);
+      v_textureCoords = a_textureCoords + (screenSpace + edgeOffset) / (u_dimensions);
+
+      v_halfDimensions = u_dimensions * 0.5;
+      v_edgeWidth = 1.0 / u_pixelRatio;
+    }
+  `,
   fragment: `
     # ifdef GL_FRAGMENT_PRECISION_HIGH
     precision highp float;
@@ -58,15 +158,25 @@ export const RoundedWithBorder: WebGlShaderType<RoundedWithBorderProps> = {
     uniform sampler2D u_texture;
 
     uniform vec4 u_radius;
-
-    uniform vec4 u_border_width;
-    uniform vec4 u_border_color;
-    uniform int u_border_asym;
+    uniform vec4 u_borderWidth;
+    uniform vec4 u_borderColor;
+    uniform float u_borderGap;
+    uniform float u_borderAlign;
 
     varying vec4 v_color;
     varying vec2 v_textureCoords;
     varying vec2 v_nodeCoords;
 
+    varying vec2 v_innerSize;
+    varying vec2 v_outerSize;
+    varying vec2 v_outerBorderUv;
+    varying vec2 v_innerBorderUv;
+    varying vec4 v_innerBorderRadius;
+    varying vec4 v_outerBorderRadius;
+    varying vec2 v_halfDimensions;
+    varying float v_edgeWidth;
+    varying float v_borderZero;
+
     float roundedBox(vec2 p, vec2 s, vec4 r) {
       r.xy = (p.x > 0.0) ? r.yz : r.xw;
       r.x = (p.y > 0.0) ? r.y : r.x;
@@ -74,41 +184,39 @@ export const RoundedWithBorder: WebGlShaderType<RoundedWithBorderProps> = {
       return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0))) - r.x;
     }
 
-    float asymBorderWidth(vec2 p, float d, vec4 r, vec4 w) {
-      r.x = (r.x - (max(w.w, w.x) - min(w.w, w.x))) * 0.5;
-      r.y = (r.y - (max(w.y, w.x) - min(w.y, w.x))) * 0.5;
-      r.z = (r.z - (max(w.y, w.z) - min(w.y, w.z))) * 0.5;
-      r.w = (r.w - (max(w.w, w.z) - min(w.w, w.z))) * 0.5;
-
-      p.x += w.y > w.w ? (w.y - w.w) * 0.5 : -(w.w - w.y) * 0.5;
-      p.y += w.z > w.x ? (w.z - w.x) * 0.5 : -(w.x - w.z) * 0.5;
-
-      vec2 size = vec2(u_dimensions.x - (w[3] + w[1]), u_dimensions.y - (w[0] + w[2])) * 0.5;
-      float borderDist = roundedBox(p, size + u_pixelRatio, r);
-      return 1.0 - smoothstep(0.0, u_pixelRatio, max(-borderDist, d));
-    }
-
     void main() {
       vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
-      vec2 halfDimensions = (u_dimensions * 0.5);
-
-      vec2 boxUv = v_nodeCoords.xy * u_dimensions - halfDimensions;
-      float boxDist = roundedBox(boxUv, halfDimensions, u_radius);
+      vec4 resultColor = vec4(0.0);
+      vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
 
-      float roundedAlpha = 1.0 - smoothstep(0.0, u_pixelRatio, boxDist);
-      float borderAlpha = 0.0;
+      float nodeDist;
+      float nodeAlpha;
 
-      if(u_border_asym == 1) {
-        borderAlpha = asymBorderWidth(boxUv, boxDist, u_radius, u_border_width);
+      if(v_borderZero == 1.0) {
+        nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
+        nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
+        gl_FragColor = mix(vec4(0.0), color, nodeAlpha) * u_alpha;
+        return;
       }
-      else {
-        borderAlpha = 1.0 - smoothstep(u_border_width[0] - u_pixelRatio, u_border_width[0], abs(boxDist));
+
+      float outerDist = roundedBox(boxUv + v_outerBorderUv, v_outerSize - v_edgeWidth, v_outerBorderRadius);
+      float innerDist = roundedBox(boxUv + v_innerBorderUv, v_innerSize - v_edgeWidth, v_innerBorderRadius);
+
+      if(u_borderGap == 0.0) {
+        resultColor = mix(resultColor, u_borderColor, 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, outerDist));
+        resultColor = mix(resultColor, color, 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, innerDist));
+        gl_FragColor = resultColor * u_alpha;
+        return;
       }
 
-      vec4 resColor = vec4(0.0);
-      resColor = mix(resColor, color, min(color.a, roundedAlpha));
-      resColor = mix(resColor, u_border_color, min(u_border_color.a, min(borderAlpha, roundedAlpha)));
-      gl_FragColor = resColor * u_alpha;
+      nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
+      nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
+      float borderDist = max(-innerDist, outerDist);
+      float borderAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist);
+
+      resultColor = mix(vec4(0.0), color, nodeAlpha);
+      resultColor = mix(resultColor, u_borderColor, borderAlpha * u_borderColor.a);
+      gl_FragColor = resultColor * u_alpha;
     }
   `,
 };

package/src/core/shaders/webgl/RoundedWithBorderAndShadow.ts

@@ -16,40 +16,142 @@
  */
 
 import type { CoreNode } from '../../CoreNode.js';
-import { calcFactoredRadiusArray, valuesAreEqual } from '../../lib/utils.js';
+import { calcFactoredRadiusArray } from '../../lib/utils.js';
 import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
 import type { WebGlShaderType } from '../../renderers/webgl/WebGlShaderNode.js';
 import {
   RoundedWithBorderAndShadowTemplate,
   type RoundedWithBorderAndShadowProps,
 } from '../templates/RoundedWithBorderAndShadowTemplate.js';
-import { Shadow } from './Shadow.js';
 
 export const RoundedWithBorderAndShadow: WebGlShaderType<RoundedWithBorderAndShadowProps> =
   {
     props: RoundedWithBorderAndShadowTemplate.props,
     update(node: CoreNode) {
-      this.uniformRGBA('u_border_color', this.props!['border-color']);
-      this.uniform4fa('u_border_width', this.props!['border-width'] as Vec4);
+      const props = this.props!;
+      this.uniformRGBA('u_borderColor', props['border-color']);
+      this.uniform4fa('u_borderWidth', props['border-w'] as Vec4);
+      this.uniform1f('u_borderGap', this.props!['border-gap'] as number);
+      this.uniform1f('u_borderAlign', this.props!['border-align'] as number);
 
-      this.uniform1i(
-        'u_border_asym',
-        valuesAreEqual(this.props!['border-width'] as number[]) ? 0 : 1,
-      );
-
-      this.uniformRGBA('u_shadow_color', this.props!['shadow-color']);
-      this.uniform4fa('u_shadow', this.props!['shadow-projection']);
+      this.uniformRGBA('u_shadowColor', props['shadow-color']);
+      this.uniform4fa('u_shadow', props['shadow-projection']);
 
       this.uniform4fa(
         'u_radius',
-        calcFactoredRadiusArray(
-          this.props!.radius as Vec4,
-          node.width,
-          node.height,
-        ),
+        calcFactoredRadiusArray(props.radius as Vec4, node.w, node.h),
       );
     },
-    vertex: Shadow.vertex as string,
+    vertex: `
+    # ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    # else
+    precision mediump float;
+    # endif
+
+    attribute vec2 a_position;
+    attribute vec2 a_textureCoords;
+    attribute vec4 a_color;
+    attribute vec2 a_nodeCoords;
+
+    uniform vec2 u_resolution;
+    uniform float u_pixelRatio;
+    uniform float u_rtt;
+    uniform vec2 u_dimensions;
+
+    uniform vec4 u_shadow;
+    uniform vec4 u_radius;
+    uniform vec4 u_borderWidth;
+    uniform float u_borderGap;
+    uniform float u_borderAlign;
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+    varying vec2 v_nodeCoords;
+
+    varying vec2 v_innerSize;
+    varying vec2 v_outerSize;
+    varying vec2 v_outerBorderUv;
+    varying vec2 v_innerBorderUv;
+    varying vec4 v_innerBorderRadius;
+    varying vec4 v_outerBorderRadius;
+    varying vec2 v_halfDimensions;
+    varying float v_edgeWidth;
+    varying float v_borderZero;
+
+    void main() {
+      vec2 screenSpace = vec2(2.0 / u_resolution.x,  -2.0 / u_resolution.y);
+      vec2 edge = clamp(a_nodeCoords * 2.0 - vec2(1.0), -1.0, 1.0);
+
+      vec2 edgeOffset = edge * ((u_shadow.w * 2.0)+ u_shadow.z) + u_shadow.xy;
+      vec2 vertexPos = (a_position + edge + edgeOffset) * u_pixelRatio;
+
+      v_borderZero = u_borderWidth == vec4(0.0) ? 1.0 : 0.0;
+
+      v_innerSize = vec2(0.0);
+      v_outerSize = vec2(0.0);
+
+      if(v_borderZero == 0.0) {
+        float borderTop = u_borderWidth.x;
+        float borderRight = u_borderWidth.y;
+        float borderBottom = u_borderWidth.z;
+        float borderLeft = u_borderWidth.w;
+
+        v_outerBorderUv = vec2(0.0);
+        v_innerBorderUv = vec2(0.0);
+
+        vec2 borderSize = vec2(borderRight + borderLeft, borderTop + borderBottom);
+        vec2 extraSize = borderSize * u_borderAlign;
+        float gapLeft = step(0.001, borderLeft) * u_borderGap;
+        float gapRight = step(0.001, borderRight) * u_borderGap;
+        float gapTop = step(0.001, borderTop) * u_borderGap;
+        float gapBottom = step(0.001, borderBottom) * u_borderGap;
+        vec2 gapSize = vec2(gapLeft + gapRight, gapTop + gapBottom);
+
+        v_outerSize = (u_dimensions + gapSize + extraSize) * 0.5;
+        v_innerSize = v_outerSize - borderSize * 0.5;
+
+        // Use sign() to avoid branching
+        vec2 borderDiff = vec2(borderRight - borderLeft, borderBottom - borderTop);
+        vec2 signDiff = sign(borderDiff);
+        borderDiff = abs(borderDiff);
+
+        vec2 gapDiff = vec2(gapRight - gapLeft, gapBottom - gapTop);
+        vec2 signGapDiff = sign(gapDiff);
+        gapDiff = abs(gapDiff);
+
+        v_outerBorderUv = -signDiff * borderDiff * u_borderAlign * 0.5 - signGapDiff * gapDiff * 0.5;
+        v_innerBorderUv = v_outerBorderUv + signDiff * borderDiff * 0.5;
+
+        v_outerBorderRadius = vec4(
+          max(0.0, u_radius.x + max(borderTop * u_borderAlign + u_borderGap, borderLeft * u_borderAlign + u_borderGap)),
+          max(0.0, u_radius.y + max(borderTop * u_borderAlign + u_borderGap, borderRight * u_borderAlign + u_borderGap)),
+          max(0.0, u_radius.z + max(borderBottom * u_borderAlign + u_borderGap, borderRight * u_borderAlign + u_borderGap)),
+          max(0.0, u_radius.w + max(borderBottom * u_borderAlign + u_borderGap, borderLeft * u_borderAlign + u_borderGap))
+        );
+
+        v_innerBorderRadius = vec4(
+          max(0.0, v_outerBorderRadius.x - max(borderTop, borderLeft)),
+          max(0.0, v_outerBorderRadius.y - max(borderTop, borderRight)),
+          max(0.0, v_outerBorderRadius.z - max(borderBottom, borderRight)),
+          max(0.0, v_outerBorderRadius.w - max(borderBottom, borderLeft))
+        );
+
+        vec2 edgeOffsetExtra = step(u_dimensions * 0.5, v_outerSize) * edge * (extraSize + u_borderGap);
+        edgeOffset += edgeOffsetExtra;
+
+        vertexPos = (a_position + edge + edgeOffset) * u_pixelRatio;
+      }
+
+      gl_Position = vec4(vertexPos.x * screenSpace.x - 1.0, -sign(screenSpace.y) * (vertexPos.y * -abs(screenSpace.y)) + 1.0, 0.0, 1.0);
+
+      v_halfDimensions = u_dimensions * 0.5;
+      v_edgeWidth = 1.0 / u_pixelRatio;
+      v_color = a_color;
+      v_nodeCoords = a_nodeCoords + (screenSpace + edgeOffset) / (u_dimensions);
+      v_textureCoords = a_textureCoords + (screenSpace + edgeOffset) / (u_dimensions);
+    }
+  `,
     fragment: `
     # ifdef GL_FRAGMENT_PRECISION_HIGH
     precision highp float;
@@ -65,16 +167,25 @@ export const RoundedWithBorderAndShadow: WebGlShaderType<RoundedWithBorderAndSha
     uniform float u_rtt;
 
     uniform vec4 u_radius;
-    uniform vec4 u_border_width;
-    uniform vec4 u_border_color;
-    uniform int u_border_asym;
-    uniform vec4 u_shadow_color;
+    uniform vec4 u_borderWidth;
+    uniform vec4 u_borderColor;
+    uniform vec4 u_shadowColor;
     uniform vec4 u_shadow;
 
     varying vec4 v_color;
     varying vec2 v_textureCoords;
     varying vec2 v_nodeCoords;
 
+    varying vec2 v_innerSize;
+    varying vec2 v_outerSize;
+    varying vec2 v_outerBorderUv;
+    varying vec2 v_innerBorderUv;
+    varying vec4 v_innerBorderRadius;
+    varying vec4 v_outerBorderRadius;
+    varying vec2 v_halfDimensions;
+    varying float v_edgeWidth;
+    varying float v_borderZero;
+
     float roundedBox(vec2 p, vec2 s, vec4 r) {
       r.xy = (p.x > 0.0) ? r.yz : r.xw;
       r.x = (p.y > 0.0) ? r.y : r.x;
@@ -82,20 +193,6 @@ export const RoundedWithBorderAndShadow: WebGlShaderType<RoundedWithBorderAndSha
       return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0))) - r.x;
     }
 
-    float asymBorderWidth(vec2 p, float d, vec4 r, vec4 w) {
-      r.x = (r.x - (max(w.w, w.x) - min(w.w, w.x))) * 0.5;
-      r.y = (r.y - (max(w.y, w.x) - min(w.y, w.x))) * 0.5;
-      r.z = (r.z - (max(w.y, w.z) - min(w.y, w.z))) * 0.5;
-      r.w = (r.w - (max(w.w, w.z) - min(w.w, w.z))) * 0.5;
-
-      p.x += w.y > w.w ? (w.y - w.w) * 0.5 : -(w.w - w.y) * 0.5;
-      p.y += w.z > w.x ? (w.z - w.x) * 0.5 : -(w.x - w.z) * 0.5;
-
-      vec2 size = vec2(u_dimensions.x - (w[3] + w[1]), u_dimensions.y - (w[0] + w[2])) * 0.5;
-      float borderDist = roundedBox(p, size, r);
-      return 1.0 - smoothstep(0.0, u_pixelRatio, max(-borderDist, d));
-    }
-
     float shadowBox(vec2 p, vec2 s, vec4 r) {
       r.xy = (p.x > 0.0) ? r.yz : r.xw;
       r.x = (p.y > 0.0) ? r.y : r.x;
@@ -106,28 +203,38 @@ export const RoundedWithBorderAndShadow: WebGlShaderType<RoundedWithBorderAndSha
 
     void main() {
       vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
-      vec2 halfDimensions = (u_dimensions * 0.5);
-
-      vec2 boxUv = v_nodeCoords.xy * u_dimensions - halfDimensions;
-      float outerBoxDist = roundedBox(boxUv, halfDimensions, u_radius);
-
-      float roundedAlpha = 1.0 - smoothstep(0.0, u_pixelRatio, outerBoxDist);
-      float borderAlpha = 0.0;
+      vec4 resultColor = vec4(0.0);
+      vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
+      float nodeDist;
+      float nodeAlpha;
+      float shadowAlpha;
+
+      if(v_borderZero == 1.0) {
+        nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
+        nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
+        shadowAlpha = shadowBox(boxUv - u_shadow.xy, v_halfDimensions + u_shadow.w - v_edgeWidth, u_radius + u_shadow.z);
+        resultColor = mix(resultColor, u_shadowColor, shadowAlpha);
+        gl_FragColor = mix(resultColor, color, nodeAlpha) * u_alpha;
+        return;
+      }
 
-      if(u_border_asym == 1) {
-        borderAlpha = asymBorderWidth(boxUv, outerBoxDist, u_radius, u_border_width);
+      if(v_outerSize.x > v_halfDimensions.x || v_outerSize.y > v_halfDimensions.y) {
+        shadowAlpha = shadowBox(boxUv + v_outerBorderUv - u_shadow.xy, v_outerSize + u_shadow.w - v_edgeWidth, v_outerBorderRadius + u_shadow.z);
       }
       else {
-        borderAlpha = 1.0 - smoothstep(u_border_width[0], u_border_width[0], abs(outerBoxDist));
+        shadowAlpha = shadowBox(boxUv - u_shadow.xy, v_halfDimensions + u_shadow.w - v_edgeWidth, u_radius + u_shadow.z);
       }
 
-      float shadowAlpha = shadowBox(boxUv - u_shadow.xy, halfDimensions + u_shadow.w, u_radius + u_shadow.z);
-
-      vec4 resColor = vec4(0.0);
-      resColor = mix(resColor, u_shadow_color, shadowAlpha);
-      resColor = mix(resColor, color, min(color.a, roundedAlpha));
-      resColor = mix(resColor, u_border_color, min(u_border_color.a, min(borderAlpha, roundedAlpha)));
-      gl_FragColor = resColor * u_alpha;
+      nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
+      nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
+      float outerDist = roundedBox(boxUv + v_outerBorderUv, v_outerSize - v_edgeWidth, v_outerBorderRadius);
+      float innerDist = roundedBox(boxUv + v_innerBorderUv, v_innerSize - v_edgeWidth, v_innerBorderRadius);
+      float borderDist = max(-innerDist, outerDist);
+      float borderAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist);
+      resultColor = mix(resultColor, u_shadowColor, shadowAlpha);
+      resultColor = mix(resultColor, color, nodeAlpha);
+      resultColor = mix(resultColor, u_borderColor, borderAlpha * u_borderColor.a);
+      gl_FragColor = resultColor * u_alpha;
     }
   `,
   };

package/src/core/shaders/webgl/RoundedWithShadow.ts

@@ -32,11 +32,7 @@ export const RoundedWithShadow: WebGlShaderType<RoundedWithShadowProps> = {
     this.uniform4fa('u_shadow', this.props!['shadow-projection']!);
     this.uniform4fa(
       'u_radius',
-      calcFactoredRadiusArray(
-        this.props!.radius as Vec4,
-        node.width,
-        node.height,
-      ),
+      calcFactoredRadiusArray(this.props!.radius as Vec4, node.w, node.h),
     );
   },
   vertex: Shadow.vertex as string,
@@ -63,6 +59,8 @@ export const RoundedWithShadow: WebGlShaderType<RoundedWithShadowProps> = {
     varying vec2 v_textureCoords;
     varying vec2 v_nodeCoords;
 
+    varying float v_edgeWidth;
+
     float roundedBox(vec2 p, vec2 s, vec4 r) {
       r.xy = (p.x > 0.0) ? r.yz : r.xw;
       r.x = (p.y > 0.0) ? r.y : r.x;
@@ -83,11 +81,11 @@ export const RoundedWithShadow: WebGlShaderType<RoundedWithShadowProps> = {
       vec2 halfDimensions = (u_dimensions * 0.5);
 
       vec2 boxUv = v_nodeCoords.xy * u_dimensions - halfDimensions;
-      float boxDist = roundedBox(boxUv, halfDimensions, u_radius);
+      float boxDist = roundedBox(boxUv, halfDimensions - v_edgeWidth, u_radius);
 
-      float roundedAlpha = 1.0 - smoothstep(0.0, u_pixelRatio, boxDist);
+      float roundedAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, boxDist);
 
-      float shadowAlpha = shadowBox(boxUv - u_shadow.xy, halfDimensions + u_shadow.w, u_radius + u_shadow.z);
+      float shadowAlpha = shadowBox(boxUv - u_shadow.xy, halfDimensions + u_shadow.w - v_edgeWidth, u_radius + u_shadow.z);
 
       vec4 resColor = vec4(0.0);
       resColor = mix(resColor, u_shadow_color, shadowAlpha);

package/src/core/shaders/webgl/SdfShader.ts

@@ -25,7 +25,6 @@ const IDENTITY_MATRIX_3x3 = new Float32Array([1, 0, 0, 0, 1, 0, 0, 0, 1]);
  */
 export interface SdfShaderProps {
   transform: Float32Array;
-  scrollY: number;
   /**
    * Color in RGBA format
    *
@@ -35,7 +34,6 @@ export interface SdfShaderProps {
   color: number;
   size: number;
   distanceRange: number;
-  debug: boolean;
 }
 /**
  * SdfShader supports multi-channel and single-channel signed distance field textures.
@@ -53,19 +51,15 @@ export interface SdfShaderProps {
 export const Sdf: WebGlShaderType<SdfShaderProps> = {
   props: {
     transform: IDENTITY_MATRIX_3x3,
-    scrollY: 0,
     color: 0xffffffff,
     size: 16,
     distanceRange: 1.0,
-    debug: false,
   },
   onSdfBind(props) {
     this.uniformMatrix3fv('u_transform', props.transform);
-    this.uniform1f('u_scrollY', props.scrollY);
     this.uniform4fa('u_color', getNormalizedRgbaComponents(props.color));
     this.uniform1f('u_size', props.size);
     this.uniform1f('u_distanceRange', props.distanceRange);
-    this.uniform1i('u_debug', props.debug ? 1 : 0);
   },
   vertex: `
     # ifdef GL_FRAGMENT_PRECISION_HIGH
@@ -80,14 +74,15 @@ export const Sdf: WebGlShaderType<SdfShaderProps> = {
 
     uniform vec2 u_resolution;
     uniform mat3 u_transform;
-    uniform float u_scrollY;
     uniform float u_pixelRatio;
     uniform float u_size;
+    uniform float u_distanceRange;
 
     varying vec2 v_texcoord;
+    varying float v_scaledDistRange;
 
     void main() {
-      vec2 scrolledPosition = a_position * u_size - vec2(0, u_scrollY);
+      vec2 scrolledPosition = a_position * u_size;
       vec2 transformedPosition = (u_transform * vec3(scrolledPosition, 1)).xy;
 
       // Calculate screen space with pixel ratio
@@ -95,7 +90,7 @@ export const Sdf: WebGlShaderType<SdfShaderProps> = {
 
       gl_Position = vec4(screenSpace, 0.0, 1.0);
       v_texcoord = a_textureCoords;
-
+      v_scaledDistRange = u_distanceRange * u_pixelRatio;
     }
   `,
   fragment: `
@@ -106,24 +101,17 @@ export const Sdf: WebGlShaderType<SdfShaderProps> = {
     # endif
     uniform vec4 u_color;
     uniform sampler2D u_texture;
-    uniform float u_distanceRange;
-    uniform float u_pixelRatio;
-    uniform int u_debug;
 
     varying vec2 v_texcoord;
+    varying float v_scaledDistRange;
 
     float median(float r, float g, float b) {
-        return max(min(r, g), min(max(r, g), b));
+        return clamp(b, min(r, g), max(r, g));
     }
 
     void main() {
         vec3 sample = texture2D(u_texture, v_texcoord).rgb;
-        if (u_debug == 1) {
-          gl_FragColor = vec4(sample.r, sample.g, sample.b, 1.0);
-          return;
-        }
-        float scaledDistRange = u_distanceRange * u_pixelRatio;
-        float sigDist = scaledDistRange * (median(sample.r, sample.g, sample.b) - 0.5);
+        float sigDist = v_scaledDistRange * (median(sample.r, sample.g, sample.b) - 0.5);
         float opacity = clamp(sigDist + 0.5, 0.0, 1.0) * u_color.a;
 
         // Build the final color.