@lightningjs/renderer 3.0.0-beta4 → 3.0.0-beta6

package/dist/src/core/shaders/webgl/LinearGradient.js

@@ -33,42 +33,42 @@ export const LinearGradient = {
         return `colors:${props.colors.length}`;
     },
     fragment(renderer, props) {
-        return `
-    # ifdef GL_FRAGMENT_PRECISION_HIGH
-    precision highp float;
-    # else
-    precision mediump float;
-    # endif
-
-    #define PI 3.14159265359
-
-    uniform float u_alpha;
-    uniform vec2 u_dimensions;
-
-    uniform sampler2D u_texture;
-
-    uniform float u_angle;
-    uniform float u_stops[${props.stops.length}];
-    uniform vec4 u_colors[${props.colors.length}];
-
-    varying vec4 v_color;
-    varying vec2 v_textureCoords;
-
-    vec2 calcPoint(float d, float angle) {
-      return d * vec2(cos(angle), sin(angle)) + (u_dimensions * 0.5);
-    }
-
-    void main() {
-      vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
-      float a = u_angle;
-      float lineDist = abs(u_dimensions.x * cos(a)) + abs(u_dimensions.y * sin(a));
-      vec2 f = calcPoint(lineDist * 0.5, a);
-      vec2 t = calcPoint(lineDist * 0.5, a + PI);
-      vec2 gradVec = t - f;
-      float dist = dot(v_textureCoords.xy * u_dimensions - f, gradVec) / dot(gradVec, gradVec);
-      ${genGradientColors(props.stops.length)}
-      gl_FragColor = mix(color, colorOut, clamp(colorOut.a, 0.0, 1.0));
-    }
+        return `
+    # ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    # else
+    precision mediump float;
+    # endif
+
+    #define PI 3.14159265359
+
+    uniform float u_alpha;
+    uniform vec2 u_dimensions;
+
+    uniform sampler2D u_texture;
+
+    uniform float u_angle;
+    uniform float u_stops[${props.stops.length}];
+    uniform vec4 u_colors[${props.colors.length}];
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+
+    vec2 calcPoint(float d, float angle) {
+      return d * vec2(cos(angle), sin(angle)) + (u_dimensions * 0.5);
+    }
+
+    void main() {
+      vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
+      float a = u_angle;
+      float lineDist = abs(u_dimensions.x * cos(a)) + abs(u_dimensions.y * sin(a));
+      vec2 f = calcPoint(lineDist * 0.5, a);
+      vec2 t = calcPoint(lineDist * 0.5, a + PI);
+      vec2 gradVec = t - f;
+      float dist = dot(v_textureCoords.xy * u_dimensions - f, gradVec) / dot(gradVec, gradVec);
+      ${genGradientColors(props.stops.length)}
+      gl_FragColor = mix(color, colorOut, clamp(colorOut.a, 0.0, 1.0));
+    }
   `;
     },
 };

package/dist/src/core/shaders/webgl/RadialGradient.js

@@ -34,39 +34,39 @@ export const RadialGradient = {
         return `colors:${props.colors.length}`;
     },
     fragment(renderer, props) {
-        return `
-    # ifdef GL_FRAGMENT_PRECISION_HIGH
-    precision highp float;
-    # else
-    precision mediump float;
-    # endif
-
-    #define PI 3.14159265359
-
-    uniform float u_alpha;
-    uniform vec2 u_dimensions;
-
-    uniform sampler2D u_texture;
-
-    uniform vec2 u_projection;
-    uniform vec2 u_size;
-    uniform float u_stops[${props.stops.length}];
-    uniform vec4 u_colors[${props.colors.length}];
-
-    varying vec4 v_color;
-    varying vec2 v_textureCoords;
-
-    vec2 calcPoint(float d, float angle) {
-      return d * vec2(cos(angle), sin(angle)) + (u_dimensions * 0.5);
-    }
-
-    void main() {
-      vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
-      vec2 point = v_textureCoords.xy * u_dimensions;
-      float dist = length((point - u_projection) / u_size);
-      ${genGradientColors(props.stops.length)}
-      gl_FragColor = mix(color, colorOut, clamp(colorOut.a, 0.0, 1.0));
-    }
+        return `
+    # ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    # else
+    precision mediump float;
+    # endif
+
+    #define PI 3.14159265359
+
+    uniform float u_alpha;
+    uniform vec2 u_dimensions;
+
+    uniform sampler2D u_texture;
+
+    uniform vec2 u_projection;
+    uniform vec2 u_size;
+    uniform float u_stops[${props.stops.length}];
+    uniform vec4 u_colors[${props.colors.length}];
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+
+    vec2 calcPoint(float d, float angle) {
+      return d * vec2(cos(angle), sin(angle)) + (u_dimensions * 0.5);
+    }
+
+    void main() {
+      vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
+      vec2 point = v_textureCoords.xy * u_dimensions;
+      float dist = length((point - u_projection) / u_size);
+      ${genGradientColors(props.stops.length)}
+      gl_FragColor = mix(color, colorOut, clamp(colorOut.a, 0.0, 1.0));
+    }
   `;
     },
 };

package/dist/src/core/shaders/webgl/Rounded.js

@@ -9,78 +9,78 @@ export const Rounded = {
     update(node) {
         this.uniform4fa('u_radius', calcFactoredRadiusArray(this.props.radius, node.width, node.height));
     },
-    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;
-
-  varying vec4 v_color;
-  varying vec2 v_textureCoords;
-  varying vec2 v_nodeCoords;
-
-  void main() {
-    vec2 normalized = a_position * u_pixelRatio;
-    vec2 screenSpace = vec2(2.0 / u_resolution.x, -2.0 / u_resolution.y);
-
-    v_color = a_color;
-    v_nodeCoords = a_nodeCoords;
-    v_textureCoords = a_textureCoords;
-
-    gl_Position = vec4(normalized.x * screenSpace.x - 1.0, normalized.y * -abs(screenSpace.y) + 1.0, 0.0, 1.0);
-    gl_Position.y = -sign(screenSpace.y) * gl_Position.y;
-  }
+    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;
+
+  varying vec4 v_color;
+  varying vec2 v_textureCoords;
+  varying vec2 v_nodeCoords;
+
+  void main() {
+    vec2 normalized = a_position * u_pixelRatio;
+    vec2 screenSpace = vec2(2.0 / u_resolution.x, -2.0 / u_resolution.y);
+
+    v_color = a_color;
+    v_nodeCoords = a_nodeCoords;
+    v_textureCoords = a_textureCoords;
+
+    gl_Position = vec4(normalized.x * screenSpace.x - 1.0, normalized.y * -abs(screenSpace.y) + 1.0, 0.0, 1.0);
+    gl_Position.y = -sign(screenSpace.y) * gl_Position.y;
+  }
 `,
-    fragment: `
-    # ifdef GL_FRAGMENT_PRECISION_HIGH
-    precision highp float;
-    # else
-    precision mediump float;
-    # endif
-
-    //renderer applies these uniforms automatically
-    uniform vec2 u_resolution;
-    uniform vec2 u_dimensions;
-    uniform float u_alpha;
-    uniform sampler2D u_texture;
-
-    //custom uniforms
-    uniform vec4 u_radius;
-
-    varying vec4 v_color;
-    varying vec2 v_textureCoords;
-    varying vec2 v_nodeCoords;
-
-    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;
-      vec2 q = abs(p) - s + r.x;
-      return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0))) - r.x;
-    }
-
-    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);
-
-      float roundedAlpha = 1.0 - smoothstep(0.0, 1.0, boxDist);
-
-      vec4 resColor = vec4(0.0);
-      resColor = mix(resColor, color, roundedAlpha);
-      gl_FragColor = resColor * u_alpha;
-    }
+    fragment: `
+    # ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    # else
+    precision mediump float;
+    # endif
+
+    //renderer applies these uniforms automatically
+    uniform vec2 u_resolution;
+    uniform vec2 u_dimensions;
+    uniform float u_alpha;
+    uniform sampler2D u_texture;
+
+    //custom uniforms
+    uniform vec4 u_radius;
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+    varying vec2 v_nodeCoords;
+
+    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;
+      vec2 q = abs(p) - s + r.x;
+      return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0))) - r.x;
+    }
+
+    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);
+
+      float roundedAlpha = 1.0 - smoothstep(0.0, 1.0, boxDist);
+
+      vec4 resColor = vec4(0.0);
+      resColor = mix(resColor, color, roundedAlpha);
+      gl_FragColor = resColor * u_alpha;
+    }
   `,
 };
 //# sourceMappingURL=Rounded.js.map

package/dist/src/core/shaders/webgl/RoundedWithBorder.js

@@ -14,84 +14,116 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-import { calcFactoredRadiusArray, valuesAreEqual } from '../../lib/utils.js';
+import { calcFactoredRadiusArray } from '../../lib/utils.js';
 import { RoundedWithBorderTemplate, } from '../templates/RoundedWithBorderTemplate.js';
-import { Rounded } from './Rounded.js';
 export const RoundedWithBorder = {
     props: RoundedWithBorderTemplate.props,
     update(node) {
-        this.uniformRGBA('u_border_color', this.props['border-color']);
-        this.uniform4fa('u_border_width', this.props['border-width']);
-        this.uniform1i('u_border_asym', valuesAreEqual(this.props['border-width']) ? 0 : 1);
+        this.uniformRGBA('u_borderColor', this.props['border-color']);
+        this.uniform4fa('u_borderWidth', this.props['border-width']);
         this.uniform4fa('u_radius', calcFactoredRadiusArray(this.props.radius, node.width, node.height));
     },
-    vertex: Rounded.vertex,
-    fragment: `
-    # ifdef GL_FRAGMENT_PRECISION_HIGH
-    precision highp float;
-    # else
-    precision mediump float;
-    # endif
-
-    uniform vec2 u_resolution;
-    uniform float u_pixelRatio;
-    uniform float u_alpha;
-    uniform vec2 u_dimensions;
-    uniform sampler2D u_texture;
-
-    uniform vec4 u_radius;
-
-    uniform vec4 u_border_width;
-    uniform vec4 u_border_color;
-    uniform int u_border_asym;
-
-    varying vec4 v_color;
-    varying vec2 v_textureCoords;
-    varying vec2 v_nodeCoords;
-
-    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;
-      vec2 q = abs(p) - s + r.x;
-      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);
-
-      float roundedAlpha = 1.0 - smoothstep(0.0, u_pixelRatio, boxDist);
-      float borderAlpha = 0.0;
-
-      if(u_border_asym == 1) {
-        borderAlpha = asymBorderWidth(boxUv, boxDist, u_radius, u_border_width);
-      }
-      else {
-        borderAlpha = 1.0 - smoothstep(u_border_width[0] - u_pixelRatio, u_border_width[0], abs(boxDist));
-      }
-
-      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;
-    }
+    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;
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+    varying vec2 v_nodeCoords;
+
+    varying vec4 v_innerRadius;
+    varying vec2 v_innerSize;
+    varying vec2 v_halfDimensions;
+
+    void main() {
+      vec2 normalized = a_position * u_pixelRatio;
+      vec2 screenSpace = vec2(2.0 / u_resolution.x, -2.0 / u_resolution.y);
+
+      v_color = a_color;
+      v_nodeCoords = a_nodeCoords;
+      v_textureCoords = a_textureCoords;
+
+      v_halfDimensions = u_dimensions * 0.5;
+
+      v_innerRadius = vec4(
+        max(0.0, u_radius.x - max(u_borderWidth.x, u_borderWidth.w) - 0.5),
+        max(0.0, u_radius.y - max(u_borderWidth.x, u_borderWidth.y) - 0.5),
+        max(0.0, u_radius.z - max(u_borderWidth.z, u_borderWidth.y) - 0.5),
+        max(0.0, u_radius.w - max(u_borderWidth.z, u_borderWidth.w) - 0.5)
+      );
+
+      v_innerSize = (vec2(u_dimensions.x - (u_borderWidth[3] + u_borderWidth[1]) + 1.0, u_dimensions.y - (u_borderWidth[0] + u_borderWidth[2])) - 2.0) * 0.5;
+
+      gl_Position = vec4(normalized.x * screenSpace.x - 1.0, normalized.y * -abs(screenSpace.y) + 1.0, 0.0, 1.0);
+      gl_Position.y = -sign(screenSpace.y) * gl_Position.y;
+    }
+  `,
+    fragment: `
+    # ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    # else
+    precision mediump float;
+    # endif
+
+    uniform vec2 u_resolution;
+    uniform float u_pixelRatio;
+    uniform float u_alpha;
+    uniform vec2 u_dimensions;
+    uniform sampler2D u_texture;
+
+    uniform vec4 u_radius;
+
+    uniform vec4 u_borderWidth;
+    uniform vec4 u_borderColor;
+
+    varying vec4 v_color;
+    varying vec2 v_textureCoords;
+    varying vec2 v_nodeCoords;
+
+    varying vec2 v_halfDimensions;
+    varying vec4 v_innerRadius;
+    varying vec2 v_innerSize;
+
+    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;
+      vec2 q = abs(p) - s + r.x;
+      return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0))) - r.x;
+    }
+
+    void main() {
+      vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
+
+      vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
+      float outerDist = roundedBox(boxUv, v_halfDimensions, u_radius);
+
+      float outerAlpha = 1.0 - smoothstep(0.0, 1.0, outerDist);
+
+      boxUv.x += u_borderWidth.y > u_borderWidth.w ? (u_borderWidth.y - u_borderWidth.w) * 0.5 : -(u_borderWidth.w - u_borderWidth.y) * 0.5;
+      boxUv.y += u_borderWidth.z > u_borderWidth.x ? ((u_borderWidth.z - u_borderWidth.x) * 0.5 + 0.5) : -(u_borderWidth.x - u_borderWidth.z) * 0.5;
+
+      float innerDist = roundedBox(boxUv, v_innerSize, v_innerRadius);
+      float innerAlpha = 1.0 - smoothstep(0.0, 1.0, innerDist);
+
+      vec4 resColor = mix(u_borderColor, color, innerAlpha);
+      resColor = mix(vec4(0.0), resColor, outerAlpha);
+      gl_FragColor = resColor * u_alpha;
+    }
   `,
 };
 //# sourceMappingURL=RoundedWithBorder.js.map

package/dist/src/core/shaders/webgl/RoundedWithBorder.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG7E,OAAO,EACL,yBAAyB,GAE1B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,iBAAiB,GAA4C;IACxE,KAAK,EAAE,yBAAyB,CAAC,KAAK;IACtC,MAAM,CAAC,IAAc;QACnB,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAS,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,CACZ,eAAe,EACf,cAAc,CAAC,IAAI,CAAC,KAAM,CAAC,cAAc,CAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAChE,CAAC;QACF,IAAI,CAAC,UAAU,CACb,UAAU,EACV,uBAAuB,CACrB,IAAI,CAAC,KAAM,CAAC,MAAc,EAC1B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,CACZ,CACF,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,OAAO,CAAC,MAAM;IACtB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkET;CACF,CAAC"}
+{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EACL,yBAAyB,GAE1B,MAAM,2CAA2C,CAAC;AAEnD,MAAM,CAAC,MAAM,iBAAiB,GAA4C;IACxE,KAAK,EAAE,yBAAyB,CAAC,KAAK;IACtC,MAAM,CAAC,IAAc;QACnB,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAS,CAAC,CAAC;QAEtE,IAAI,CAAC,UAAU,CACb,UAAU,EACV,uBAAuB,CACrB,IAAI,CAAC,KAAM,CAAC,MAAc,EAC1B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,CACZ,CACF,CAAC;IACJ,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDP;IACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDT;CACF,CAAC"}