@lightningjs/renderer 2.13.2 → 2.13.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/core/CoreNode.d.ts +1 -0
- package/dist/src/core/CoreNode.js +5 -0
- package/dist/src/core/CoreNode.js.map +1 -1
- package/dist/src/core/CoreTextureManager.js +6 -0
- package/dist/src/core/CoreTextureManager.js.map +1 -1
- package/dist/src/core/animations/CoreAnimation.js +5 -0
- package/dist/src/core/animations/CoreAnimation.js.map +1 -1
- package/dist/src/core/animations/CoreAnimationController.d.ts +1 -0
- package/dist/src/core/animations/CoreAnimationController.js +7 -1
- package/dist/src/core/animations/CoreAnimationController.js.map +1 -1
- package/dist/src/core/platforms/Platform.d.ts +37 -0
- package/dist/src/core/platforms/Platform.js +22 -0
- package/dist/src/core/platforms/Platform.js.map +1 -0
- package/dist/src/core/platforms/web/WebPlatform.d.ts +9 -0
- package/dist/src/core/platforms/web/WebPlatform.js +58 -0
- package/dist/src/core/platforms/web/WebPlatform.js.map +1 -0
- package/dist/src/core/renderers/CoreShaderNode.d.ts +2 -3
- package/dist/src/core/renderers/CoreShaderNode.js +0 -3
- package/dist/src/core/renderers/CoreShaderNode.js.map +1 -1
- package/dist/src/core/renderers/canvas/CanvasRenderer.js.map +1 -1
- package/dist/src/core/renderers/canvas/CanvasTexture.js +3 -2
- package/dist/src/core/renderers/canvas/CanvasTexture.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlRenderOp.d.ts +10 -2
- package/dist/src/core/renderers/webgl/WebGlRenderOp.js +27 -16
- package/dist/src/core/renderers/webgl/WebGlRenderOp.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlRenderer.d.ts +4 -3
- package/dist/src/core/renderers/webgl/WebGlRenderer.js +101 -76
- package/dist/src/core/renderers/webgl/WebGlRenderer.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlShaderNode.d.ts +2 -1
- package/dist/src/core/renderers/webgl/WebGlShaderNode.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlShaderProgram.d.ts +1 -1
- package/dist/src/core/renderers/webgl/WebGlShaderProgram.js +32 -26
- package/dist/src/core/renderers/webgl/WebGlShaderProgram.js.map +1 -1
- package/dist/src/core/shaders/canvas/RoundedWithBorder.js +8 -2
- package/dist/src/core/shaders/canvas/RoundedWithBorder.js.map +1 -1
- package/dist/src/core/shaders/webgl/Border.js +57 -34
- package/dist/src/core/shaders/webgl/Border.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithBorder.js +69 -37
- package/dist/src/core/shaders/webgl/RoundedWithBorder.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithBorderAndShadow.js +78 -41
- package/dist/src/core/shaders/webgl/RoundedWithBorderAndShadow.js.map +1 -1
- package/dist/src/core/shaders/webgl/SdfShader.js +1 -1
- package/dist/src/core/shaders/webgl/SdfShader.js.map +1 -1
- package/dist/src/core/temp.d.ts +1 -0
- package/dist/src/core/temp.js +77 -0
- package/dist/src/core/temp.js.map +1 -0
- package/dist/tsconfig.dist.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/core/CoreNode.ts +7 -0
- package/src/core/CoreTextureManager.ts +7 -0
- package/src/core/animations/CoreAnimation.ts +7 -0
- package/src/core/animations/CoreAnimationController.ts +8 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebGlShaderNode.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlShaderNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAuB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebGlShaderNode.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlShaderNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export declare class WebGlShaderProgram implements CoreShaderProgram {
|
|
|
26
26
|
constructor(renderer: WebGlRenderer, config: WebGlShaderType, resolvedProps: Record<string, any>);
|
|
27
27
|
disableAttribute(location: number): void;
|
|
28
28
|
disableAttributes(): void;
|
|
29
|
-
reuseRenderOp(
|
|
29
|
+
reuseRenderOp(incomingQuad: QuadOptions, currentRenderOp: WebGlRenderOp): boolean;
|
|
30
30
|
bindRenderOp(renderOp: WebGlRenderOp): void;
|
|
31
31
|
bindBufferCollection(buffer: BufferCollection): void;
|
|
32
32
|
bindTextures(textures: WebGlCtxTexture[]): void;
|
|
@@ -78,26 +78,33 @@ export class WebGlShaderProgram {
|
|
|
78
78
|
glw.disableVertexAttribArray(i);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
-
reuseRenderOp(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
: true;
|
|
85
|
-
if (!lifecycleCheck) {
|
|
86
|
-
return false;
|
|
81
|
+
reuseRenderOp(incomingQuad, currentRenderOp) {
|
|
82
|
+
if (this.lifecycle.canBatch !== undefined) {
|
|
83
|
+
return this.lifecycle.canBatch(incomingQuad, currentRenderOp);
|
|
87
84
|
}
|
|
88
|
-
if (this.useSystemAlpha) {
|
|
89
|
-
if (
|
|
85
|
+
if (this.useSystemAlpha === true) {
|
|
86
|
+
if (incomingQuad.alpha !== currentRenderOp.alpha) {
|
|
90
87
|
return false;
|
|
91
88
|
}
|
|
92
89
|
}
|
|
93
|
-
if (this.useSystemDimensions) {
|
|
94
|
-
if (
|
|
95
|
-
|
|
90
|
+
if (this.useSystemDimensions === true) {
|
|
91
|
+
if (incomingQuad.width !== currentRenderOp.width ||
|
|
92
|
+
incomingQuad.height !== currentRenderOp.height) {
|
|
96
93
|
return false;
|
|
97
94
|
}
|
|
98
95
|
}
|
|
99
|
-
|
|
100
|
-
|
|
96
|
+
let shaderPropsA = undefined;
|
|
97
|
+
let shaderPropsB = undefined;
|
|
98
|
+
if (incomingQuad.shader !== null) {
|
|
99
|
+
shaderPropsA = incomingQuad.shader.resolvedProps;
|
|
100
|
+
}
|
|
101
|
+
if (currentRenderOp.shader !== null) {
|
|
102
|
+
shaderPropsB = currentRenderOp.shader.resolvedProps;
|
|
103
|
+
}
|
|
104
|
+
if ((shaderPropsA === undefined && shaderPropsB !== undefined) ||
|
|
105
|
+
(shaderPropsA !== undefined && shaderPropsB === undefined)) {
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
101
108
|
if (shaderPropsA !== undefined && shaderPropsB !== undefined) {
|
|
102
109
|
for (const key in shaderPropsA) {
|
|
103
110
|
if (shaderPropsA[key] !== shaderPropsB[key]) {
|
|
@@ -110,15 +117,15 @@ export class WebGlShaderProgram {
|
|
|
110
117
|
bindRenderOp(renderOp) {
|
|
111
118
|
this.bindBufferCollection(renderOp.buffers);
|
|
112
119
|
this.bindTextures(renderOp.textures);
|
|
113
|
-
const { parentHasRenderTexture } = renderOp
|
|
120
|
+
const { parentHasRenderTexture } = renderOp;
|
|
114
121
|
// Skip if the parent and current operation both have render textures
|
|
115
|
-
if (renderOp.
|
|
122
|
+
if (renderOp.rtt === true && parentHasRenderTexture === true) {
|
|
116
123
|
return;
|
|
117
124
|
}
|
|
118
125
|
// Bind render texture framebuffer dimensions as resolution
|
|
119
126
|
// if the parent has a render texture
|
|
120
|
-
if (parentHasRenderTexture) {
|
|
121
|
-
const { width, height } = renderOp.
|
|
127
|
+
if (parentHasRenderTexture === true) {
|
|
128
|
+
const { width, height } = renderOp.framebufferDimensions;
|
|
122
129
|
// Force pixel ratio to 1.0 for render textures since they are always 1:1
|
|
123
130
|
// the final render texture will be rendered to the screen with the correct pixel ratio
|
|
124
131
|
this.glw.uniform1f('u_pixelRatio', 1.0);
|
|
@@ -129,19 +136,18 @@ export class WebGlShaderProgram {
|
|
|
129
136
|
this.glw.uniform1f('u_pixelRatio', renderOp.renderer.stage.pixelRatio);
|
|
130
137
|
this.glw.uniform2f('u_resolution', this.glw.canvas.width, this.glw.canvas.height);
|
|
131
138
|
}
|
|
132
|
-
this.
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
}
|
|
139
|
+
// if (this.useSystemAlpha) {
|
|
140
|
+
this.glw.uniform1f('u_alpha', renderOp.alpha);
|
|
141
|
+
// }
|
|
142
|
+
// if (this.useSystemDimensions) {
|
|
143
|
+
this.glw.uniform2f('u_dimensions', renderOp.width, renderOp.height);
|
|
144
|
+
// }
|
|
139
145
|
/**temporary fix to make sdf texts work */
|
|
140
146
|
if (renderOp.sdfShaderProps !== undefined) {
|
|
141
147
|
renderOp.shader.shaderType.onSdfBind?.call(this.glw, renderOp.sdfShaderProps);
|
|
142
148
|
return;
|
|
143
149
|
}
|
|
144
|
-
if (renderOp.shader.props) {
|
|
150
|
+
if (renderOp.shader.props !== undefined) {
|
|
145
151
|
/**
|
|
146
152
|
* loop over all precalculated uniform types
|
|
147
153
|
*/
|
|
@@ -171,7 +177,7 @@ export class WebGlShaderProgram {
|
|
|
171
177
|
const name = attribs[i];
|
|
172
178
|
const resolvedBuffer = buffer.getBuffer(name);
|
|
173
179
|
const resolvedInfo = buffer.getAttributeInfo(name);
|
|
174
|
-
if (
|
|
180
|
+
if (resolvedBuffer === undefined || resolvedInfo === undefined) {
|
|
175
181
|
continue;
|
|
176
182
|
}
|
|
177
183
|
glw.enableVertexAttribArray(i);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebGlShaderProgram.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlShaderProgram.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WebGlShaderProgram.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlShaderProgram.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,14 @@ export const RoundedWithBorder = {
|
|
|
25
25
|
this.computed.radius = radius;
|
|
26
26
|
this.computed.borderColor = this.toColorString(this.props['border-color']);
|
|
27
27
|
this.computed.borderAsym = !valuesAreEqual(this.props['border-width']);
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
//following vec4 convention 0, 1, 2, 3 => x, y, z, w;
|
|
29
|
+
const [x, y, z, w] = this.props['border-width'];
|
|
30
|
+
this.computed.borderRadius = [
|
|
31
|
+
Math.max(0.0, radius[0] - Math.max(x, w) * 0.5),
|
|
32
|
+
Math.max(0.0, radius[1] - Math.max(x, y) * 0.5),
|
|
33
|
+
Math.max(0.0, radius[2] - Math.max(z, y) * 0.5),
|
|
34
|
+
Math.max(0.0, radius[3] - Math.max(z, w) * 0.5),
|
|
35
|
+
];
|
|
30
36
|
},
|
|
31
37
|
render(ctx, quad, renderContext) {
|
|
32
38
|
roundedRectWithBorder(ctx, quad.tx, quad.ty, quad.width, quad.height, this.computed.radius, this.props['border-width'], this.computed.borderRadius, this.computed.borderColor, this.computed.borderAsym, renderContext);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/canvas/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG7E,OAAO,EACL,yBAAyB,GAE1B,MAAM,2CAA2C,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAI1D,MAAM,CAAC,MAAM,iBAAiB,GAG1B;IACF,KAAK,EAAE,yBAAyB,CAAC,KAAK;IACtC,cAAc,EAAE,IAAI;IACpB,MAAM,CAAC,IAAI;QACT,MAAM,MAAM,GAAG,uBAAuB,CACpC,IAAI,CAAC,KAAM,CAAC,MAAc,EAC1B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,cAAc,CACxC,IAAI,CAAC,KAAM,CAAC,cAAc,CAAa,CACxC,CAAC;QACF,MAAM,
|
|
1
|
+
{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/canvas/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG7E,OAAO,EACL,yBAAyB,GAE1B,MAAM,2CAA2C,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAI1D,MAAM,CAAC,MAAM,iBAAiB,GAG1B;IACF,KAAK,EAAE,yBAAyB,CAAC,KAAK;IACtC,cAAc,EAAE,IAAI;IACpB,MAAM,CAAC,IAAI;QACT,MAAM,MAAM,GAAG,uBAAuB,CACpC,IAAI,CAAC,KAAM,CAAC,MAAc,EAC1B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,cAAc,CACxC,IAAI,CAAC,KAAM,CAAC,cAAc,CAAa,CACxC,CAAC;QACF,qDAAqD;QACrD,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAM,CAAC,cAAc,CAAS,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG;YAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;SAChD,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa;QAC7B,qBAAqB,CACnB,GAAG,EACH,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,CAAC,MAAO,EACrB,IAAI,CAAC,KAAM,CAAC,cAAc,CAAS,EACnC,IAAI,CAAC,QAAQ,CAAC,YAAa,EAC3B,IAAI,CAAC,QAAQ,CAAC,WAAY,EAC1B,IAAI,CAAC,QAAQ,CAAC,UAAW,EACzB,aAAa,CACd,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -18,11 +18,51 @@ import { valuesAreEqual } from '../../lib/utils.js';
|
|
|
18
18
|
import { BorderTemplate, } from '../templates/BorderTemplate.js';
|
|
19
19
|
export const Border = {
|
|
20
20
|
props: BorderTemplate.props,
|
|
21
|
-
update() {
|
|
22
|
-
this.uniform4fa('
|
|
23
|
-
this.
|
|
24
|
-
this.uniformRGBA('u_color', this.props.color);
|
|
21
|
+
update(node) {
|
|
22
|
+
this.uniform4fa('u_borderWidth', this.props.width);
|
|
23
|
+
this.uniformRGBA('u_borderColor', this.props.color);
|
|
25
24
|
},
|
|
25
|
+
vertex: `
|
|
26
|
+
# ifdef GL_FRAGMENT_PRECISION_HIGH
|
|
27
|
+
precision highp float;
|
|
28
|
+
# else
|
|
29
|
+
precision mediump float;
|
|
30
|
+
# endif
|
|
31
|
+
|
|
32
|
+
attribute vec2 a_position;
|
|
33
|
+
attribute vec2 a_textureCoords;
|
|
34
|
+
attribute vec4 a_color;
|
|
35
|
+
attribute vec2 a_nodeCoords;
|
|
36
|
+
|
|
37
|
+
uniform vec2 u_resolution;
|
|
38
|
+
uniform float u_pixelRatio;
|
|
39
|
+
uniform vec2 u_dimensions;
|
|
40
|
+
|
|
41
|
+
uniform vec4 u_radius;
|
|
42
|
+
uniform vec4 u_borderWidth;
|
|
43
|
+
|
|
44
|
+
varying vec4 v_color;
|
|
45
|
+
varying vec2 v_textureCoords;
|
|
46
|
+
varying vec2 v_nodeCoords;
|
|
47
|
+
|
|
48
|
+
varying vec2 v_innerSize;
|
|
49
|
+
varying vec2 v_halfDimensions;
|
|
50
|
+
|
|
51
|
+
void main() {
|
|
52
|
+
vec2 normalized = a_position * u_pixelRatio;
|
|
53
|
+
vec2 screenSpace = vec2(2.0 / u_resolution.x, -2.0 / u_resolution.y);
|
|
54
|
+
|
|
55
|
+
v_color = a_color;
|
|
56
|
+
v_nodeCoords = a_nodeCoords;
|
|
57
|
+
v_textureCoords = a_textureCoords;
|
|
58
|
+
|
|
59
|
+
v_halfDimensions = u_dimensions * 0.5;
|
|
60
|
+
v_innerSize = vec2(u_dimensions.x - (u_borderWidth[3] + u_borderWidth[1]), u_dimensions.y - (u_borderWidth[0] + u_borderWidth[2])) * 0.5 - 0.5;
|
|
61
|
+
|
|
62
|
+
gl_Position = vec4(normalized.x * screenSpace.x - 1.0, normalized.y * -abs(screenSpace.y) + 1.0, 0.0, 1.0);
|
|
63
|
+
gl_Position.y = -sign(screenSpace.y) * gl_Position.y;
|
|
64
|
+
}
|
|
65
|
+
`,
|
|
26
66
|
fragment: `
|
|
27
67
|
# ifdef GL_FRAGMENT_PRECISION_HIGH
|
|
28
68
|
precision highp float;
|
|
@@ -37,49 +77,32 @@ export const Border = {
|
|
|
37
77
|
uniform vec2 u_dimensions;
|
|
38
78
|
uniform sampler2D u_texture;
|
|
39
79
|
|
|
40
|
-
uniform vec4
|
|
41
|
-
uniform vec4
|
|
42
|
-
|
|
43
|
-
uniform int u_asymWidth;
|
|
80
|
+
uniform vec4 u_borderWidth;
|
|
81
|
+
uniform vec4 u_borderColor;
|
|
44
82
|
|
|
45
83
|
varying vec4 v_color;
|
|
46
|
-
varying vec2
|
|
84
|
+
varying vec2 v_nodeCoords;
|
|
47
85
|
varying vec2 v_textureCoords;
|
|
48
86
|
|
|
87
|
+
varying vec2 v_innerSize;
|
|
88
|
+
varying vec2 v_halfDimensions;
|
|
89
|
+
|
|
49
90
|
float box(vec2 p, vec2 s) {
|
|
50
|
-
vec2 q = abs(p) -
|
|
91
|
+
vec2 q = abs(p) - s;
|
|
51
92
|
return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0)));
|
|
52
93
|
}
|
|
53
94
|
|
|
54
|
-
float asymBorderWidth(vec2 p, float d, vec4 w) {
|
|
55
|
-
p.x += w.y > w.w ? (w.y - w.w) * 0.5 : -(w.w - w.y) * 0.5;
|
|
56
|
-
p.y += w.z > w.x ? (w.z - w.x) * 0.5 : -(w.x - w.z) * 0.5;
|
|
57
|
-
|
|
58
|
-
vec2 size = vec2(u_dimensions.x - (w[3] + w[1]), u_dimensions.y - (w[0] + w[2])) * 0.5;
|
|
59
|
-
float borderDist = box(p, size + 2.0);
|
|
60
|
-
return 1.0 - smoothstep(0.0, u_pixelRatio, max(-borderDist, d));
|
|
61
|
-
}
|
|
62
|
-
|
|
63
95
|
void main() {
|
|
64
96
|
vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
|
|
65
|
-
vec2
|
|
66
|
-
|
|
67
|
-
vec2 boxUv = v_textureCoords.xy * u_dimensions - halfDimensions;
|
|
68
|
-
float boxDist = box(boxUv, halfDimensions);
|
|
97
|
+
vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
|
|
69
98
|
|
|
70
|
-
|
|
71
|
-
|
|
99
|
+
boxUv.x += u_borderWidth.y > u_borderWidth.w ? (u_borderWidth.y - u_borderWidth.w) * 0.5 : -(u_borderWidth.w - u_borderWidth.y) * 0.5;
|
|
100
|
+
boxUv.y += u_borderWidth.z > u_borderWidth.x ? (u_borderWidth.z - u_borderWidth.x) * 0.5 : -(u_borderWidth.x - u_borderWidth.z) * 0.5;
|
|
72
101
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
borderAlpha = 1.0 - smoothstep(u_width[0], u_width[0], abs(boxDist));
|
|
78
|
-
}
|
|
102
|
+
float innerDist = box(boxUv, v_innerSize);
|
|
103
|
+
float innerAlpha = 1.0 - smoothstep(0.0, 1.0, innerDist);
|
|
79
104
|
|
|
80
|
-
vec4 resColor =
|
|
81
|
-
resColor = mix(resColor, color, min(color.a, boxAlpha));
|
|
82
|
-
resColor = mix(resColor, u_color, min(u_color.a, min(borderAlpha, boxAlpha)));
|
|
105
|
+
vec4 resColor = mix(u_borderColor, color, innerAlpha);
|
|
83
106
|
gl_FragColor = resColor * u_alpha;
|
|
84
107
|
}
|
|
85
108
|
`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Border.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/Border.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,cAAc,GAEf,MAAM,gCAAgC,CAAC;AAIxC,MAAM,CAAC,MAAM,MAAM,GAAiC;IAClD,KAAK,EAAE,cAAc,CAAC,KAAK;IAC3B,MAAM;
|
|
1
|
+
{"version":3,"file":"Border.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/Border.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,cAAc,GAEf,MAAM,gCAAgC,CAAC;AAIxC,MAAM,CAAC,MAAM,MAAM,GAAiC;IAClD,KAAK,EAAE,cAAc,CAAC,KAAK;IAC3B,MAAM,CAAC,IAAI;QACT,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,KAAa,CAAC,CAAC;QAC5D,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCP;IACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CT;CACF,CAAC"}
|
|
@@ -14,18 +14,65 @@
|
|
|
14
14
|
*
|
|
15
15
|
* SPDX-License-Identifier: Apache-2.0
|
|
16
16
|
*/
|
|
17
|
-
import { calcFactoredRadiusArray
|
|
17
|
+
import { calcFactoredRadiusArray } from '../../lib/utils.js';
|
|
18
18
|
import { RoundedWithBorderTemplate, } from '../templates/RoundedWithBorderTemplate.js';
|
|
19
|
-
import { Rounded } from './Rounded.js';
|
|
20
19
|
export const RoundedWithBorder = {
|
|
21
20
|
props: RoundedWithBorderTemplate.props,
|
|
22
21
|
update(node) {
|
|
23
|
-
this.uniformRGBA('
|
|
24
|
-
this.uniform4fa('
|
|
25
|
-
this.uniform1i('u_border_asym', valuesAreEqual(this.props['border-width']) ? 0 : 1);
|
|
22
|
+
this.uniformRGBA('u_borderColor', this.props['border-color']);
|
|
23
|
+
this.uniform4fa('u_borderWidth', this.props['border-width']);
|
|
26
24
|
this.uniform4fa('u_radius', calcFactoredRadiusArray(this.props.radius, node.width, node.height));
|
|
27
25
|
},
|
|
28
|
-
vertex:
|
|
26
|
+
vertex: `
|
|
27
|
+
# ifdef GL_FRAGMENT_PRECISION_HIGH
|
|
28
|
+
precision highp float;
|
|
29
|
+
# else
|
|
30
|
+
precision mediump float;
|
|
31
|
+
# endif
|
|
32
|
+
|
|
33
|
+
attribute vec2 a_position;
|
|
34
|
+
attribute vec2 a_textureCoords;
|
|
35
|
+
attribute vec4 a_color;
|
|
36
|
+
attribute vec2 a_nodeCoords;
|
|
37
|
+
|
|
38
|
+
uniform vec2 u_resolution;
|
|
39
|
+
uniform float u_pixelRatio;
|
|
40
|
+
uniform vec2 u_dimensions;
|
|
41
|
+
|
|
42
|
+
uniform vec4 u_radius;
|
|
43
|
+
uniform vec4 u_borderWidth;
|
|
44
|
+
|
|
45
|
+
varying vec4 v_color;
|
|
46
|
+
varying vec2 v_textureCoords;
|
|
47
|
+
varying vec2 v_nodeCoords;
|
|
48
|
+
|
|
49
|
+
varying vec4 v_innerRadius;
|
|
50
|
+
varying vec2 v_innerSize;
|
|
51
|
+
varying vec2 v_halfDimensions;
|
|
52
|
+
|
|
53
|
+
void main() {
|
|
54
|
+
vec2 normalized = a_position * u_pixelRatio;
|
|
55
|
+
vec2 screenSpace = vec2(2.0 / u_resolution.x, -2.0 / u_resolution.y);
|
|
56
|
+
|
|
57
|
+
v_color = a_color;
|
|
58
|
+
v_nodeCoords = a_nodeCoords;
|
|
59
|
+
v_textureCoords = a_textureCoords;
|
|
60
|
+
|
|
61
|
+
v_halfDimensions = u_dimensions * 0.5;
|
|
62
|
+
|
|
63
|
+
v_innerRadius = vec4(
|
|
64
|
+
max(0.0, u_radius.x - max(u_borderWidth.x, u_borderWidth.w) - 0.5),
|
|
65
|
+
max(0.0, u_radius.y - max(u_borderWidth.x, u_borderWidth.y) - 0.5),
|
|
66
|
+
max(0.0, u_radius.z - max(u_borderWidth.z, u_borderWidth.y) - 0.5),
|
|
67
|
+
max(0.0, u_radius.w - max(u_borderWidth.z, u_borderWidth.w) - 0.5)
|
|
68
|
+
);
|
|
69
|
+
|
|
70
|
+
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;
|
|
71
|
+
|
|
72
|
+
gl_Position = vec4(normalized.x * screenSpace.x - 1.0, normalized.y * -abs(screenSpace.y) + 1.0, 0.0, 1.0);
|
|
73
|
+
gl_Position.y = -sign(screenSpace.y) * gl_Position.y;
|
|
74
|
+
}
|
|
75
|
+
`,
|
|
29
76
|
fragment: `
|
|
30
77
|
# ifdef GL_FRAGMENT_PRECISION_HIGH
|
|
31
78
|
precision highp float;
|
|
@@ -41,14 +88,17 @@ export const RoundedWithBorder = {
|
|
|
41
88
|
|
|
42
89
|
uniform vec4 u_radius;
|
|
43
90
|
|
|
44
|
-
uniform vec4
|
|
45
|
-
uniform vec4
|
|
46
|
-
uniform int u_border_asym;
|
|
91
|
+
uniform vec4 u_borderWidth;
|
|
92
|
+
uniform vec4 u_borderColor;
|
|
47
93
|
|
|
48
94
|
varying vec4 v_color;
|
|
49
95
|
varying vec2 v_textureCoords;
|
|
50
96
|
varying vec2 v_nodeCoords;
|
|
51
97
|
|
|
98
|
+
varying vec2 v_halfDimensions;
|
|
99
|
+
varying vec4 v_innerRadius;
|
|
100
|
+
varying vec2 v_innerSize;
|
|
101
|
+
|
|
52
102
|
float roundedBox(vec2 p, vec2 s, vec4 r) {
|
|
53
103
|
r.xy = (p.x > 0.0) ? r.yz : r.xw;
|
|
54
104
|
r.x = (p.y > 0.0) ? r.y : r.x;
|
|
@@ -56,40 +106,22 @@ export const RoundedWithBorder = {
|
|
|
56
106
|
return (min(max(q.x, q.y), 0.0) + length(max(q, 0.0))) - r.x;
|
|
57
107
|
}
|
|
58
108
|
|
|
59
|
-
float asymBorderWidth(vec2 p, float d, vec4 r, vec4 w) {
|
|
60
|
-
r.x = (r.x - (max(w.w, w.x) - min(w.w, w.x))) * 0.5;
|
|
61
|
-
r.y = (r.y - (max(w.y, w.x) - min(w.y, w.x))) * 0.5;
|
|
62
|
-
r.z = (r.z - (max(w.y, w.z) - min(w.y, w.z))) * 0.5;
|
|
63
|
-
r.w = (r.w - (max(w.w, w.z) - min(w.w, w.z))) * 0.5;
|
|
64
|
-
|
|
65
|
-
p.x += w.y > w.w ? (w.y - w.w) * 0.5 : -(w.w - w.y) * 0.5;
|
|
66
|
-
p.y += w.z > w.x ? (w.z - w.x) * 0.5 : -(w.x - w.z) * 0.5;
|
|
67
|
-
|
|
68
|
-
vec2 size = vec2(u_dimensions.x - (w[3] + w[1]), u_dimensions.y - (w[0] + w[2])) * 0.5;
|
|
69
|
-
float borderDist = roundedBox(p, size + u_pixelRatio, r);
|
|
70
|
-
return 1.0 - smoothstep(0.0, u_pixelRatio, max(-borderDist, d));
|
|
71
|
-
}
|
|
72
|
-
|
|
73
109
|
void main() {
|
|
74
110
|
vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
|
|
75
|
-
vec2 halfDimensions = (u_dimensions * 0.5);
|
|
76
111
|
|
|
77
|
-
vec2 boxUv = v_nodeCoords.xy * u_dimensions -
|
|
78
|
-
float
|
|
112
|
+
vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
|
|
113
|
+
float outerDist = roundedBox(boxUv, v_halfDimensions, u_radius);
|
|
114
|
+
|
|
115
|
+
float outerAlpha = 1.0 - smoothstep(0.0, 1.0, outerDist);
|
|
79
116
|
|
|
80
|
-
|
|
81
|
-
|
|
117
|
+
boxUv.x += u_borderWidth.y > u_borderWidth.w ? (u_borderWidth.y - u_borderWidth.w) * 0.5 : -(u_borderWidth.w - u_borderWidth.y) * 0.5;
|
|
118
|
+
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;
|
|
82
119
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
borderAlpha = 1.0 - smoothstep(u_border_width[0] - u_pixelRatio, u_border_width[0], abs(boxDist));
|
|
88
|
-
}
|
|
120
|
+
float innerDist = roundedBox(boxUv, v_innerSize, v_innerRadius);
|
|
121
|
+
float innerAlpha = 1.0 - smoothstep(0.0, 1.0, innerDist);
|
|
89
122
|
|
|
90
|
-
vec4 resColor =
|
|
91
|
-
resColor = mix(
|
|
92
|
-
resColor = mix(resColor, u_border_color, min(u_border_color.a, min(borderAlpha, roundedAlpha)));
|
|
123
|
+
vec4 resColor = mix(u_borderColor, color, innerAlpha);
|
|
124
|
+
resColor = mix(vec4(0.0), resColor, outerAlpha);
|
|
93
125
|
gl_FragColor = resColor * u_alpha;
|
|
94
126
|
}
|
|
95
127
|
`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,
|
|
1
|
+
{"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"}
|