@lightningjs/renderer 3.0.0-beta8 → 3.0.0

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

@@ -1,90 +1,136 @@
-/*
- * Copyright 2023 Comcast Cable Communications Management, LLC
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { calcFactoredRadiusArray, valuesAreEqual } from '../../lib/utils.js';
-import type { CanvasShaderType } from '../../renderers/canvas/CanvasShaderNode.js';
-import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
-import {
-  RoundedWithBorderAndShadowTemplate,
-  type RoundedWithBorderAndShadowProps,
-} from '../templates/RoundedWithBorderAndShadowTemplate.js';
-import type { ComputedBorderValues } from './Border.js';
-import type { ComputedRoundedValues } from './Rounded.js';
-import type { ComputedShadowValues } from './Shadow.js';
-import * as render from './utils/render.js';
-
-type ComputedValues = ComputedRoundedValues &
-  ComputedBorderValues &
-  ComputedShadowValues;
-
-export const RoundedWithBorderAndShadow: CanvasShaderType<
-  RoundedWithBorderAndShadowProps,
-  ComputedValues
-> = {
-  props: RoundedWithBorderAndShadowTemplate.props,
-  saveAndRestore: true,
-  update(node) {
-    const props = this.props!;
-    const radius = calcFactoredRadiusArray(
-      props.radius as Vec4,
-      node.width,
-      node.height,
-    );
-    this.computed.radius = radius;
-    this.computed.borderColor = this.toColorString(props['border-color']);
-    this.computed.borderAsym = !valuesAreEqual(
-      props['border-width'] as number[],
-    );
-    const borderWidth = props['border-width'] as Vec4;
-    this.computed.borderRadius = radius.map((value, index) =>
-      Math.max(0, value - borderWidth[index]! * 0.5),
-    ) as Vec4;
-
-    this.computed.shadowColor = this.toColorString(props['shadow-color']);
-    this.computed.shadowRadius = radius.map(
-      (value) => value + props['shadow-blur'],
-    ) as Vec4;
-  },
-  render(ctx, quad, renderContext) {
-    const { tx, ty, width, height } = quad;
-    const computed = this.computed as ComputedValues;
-    render.shadow(
-      ctx,
-      tx,
-      ty,
-      height,
-      width,
-      computed.shadowColor,
-      this.props!['shadow-projection'],
-      computed.shadowRadius,
-      this.stage.pixelRatio,
-    );
-    render.roundedRectWithBorder(
-      ctx,
-      quad.tx,
-      quad.ty,
-      quad.width,
-      quad.height,
-      computed.radius,
-      this.props!['border-width'] as Vec4,
-      computed.borderRadius,
-      computed.borderColor,
-      computed.borderAsym,
-      renderContext,
-    );
-  },
-};
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { calcFactoredRadiusArray, valuesAreEqual } from '../../lib/utils.js';
+import type { CanvasShaderType } from '../../renderers/canvas/CanvasShaderNode.js';
+import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
+import {
+  RoundedWithBorderAndShadowTemplate,
+  type RoundedWithBorderAndShadowProps,
+} from '../templates/RoundedWithBorderAndShadowTemplate.js';
+import type { ComputedRoundedWithBorderValues } from './RoundedWithBorder.js';
+import type { ComputedShadowValues } from './Shadow.js';
+import * as render from './utils/render.js';
+
+type ComputedValues = ComputedRoundedWithBorderValues & ComputedShadowValues;
+
+export const RoundedWithBorderAndShadow: CanvasShaderType<
+  RoundedWithBorderAndShadowProps,
+  ComputedValues
+> = {
+  props: RoundedWithBorderAndShadowTemplate.props,
+  saveAndRestore: true,
+  update(node) {
+    const props = this.props!;
+    const radius = calcFactoredRadiusArray(
+      props.radius as Vec4,
+      node.w,
+      node.h,
+    );
+    this.computed.radius = radius;
+    this.computed.borderColor = this.toColorString(props['border-color']);
+    this.computed.borderAsym = !valuesAreEqual(props['border-w'] as number[]);
+    const borderAlign = this.props!['border-align'] as number;
+    const borderGap = this.props!['border-gap'] as number;
+
+    // Calculate outer and inner rectangle dimensions
+    const [t, r, b, l] = this.props!['border-w'] as Vec4;
+
+    const outerX = (this.computed.outerX = -l * borderAlign - borderGap);
+    const outerY = (this.computed.outerY = -t * borderAlign - borderGap);
+    let outerW = 0;
+    let outerH = 0;
+
+    if (r > 0) {
+      outerW += r * borderAlign + borderGap;
+    }
+    if (l > 0) {
+      outerW += l * borderAlign + borderGap;
+    }
+
+    if (b > 0) {
+      outerH += b * borderAlign + borderGap;
+    }
+    if (t > 0) {
+      outerH += t * borderAlign + borderGap;
+    }
+
+    this.computed.outerW = outerW;
+    this.computed.outerH = outerH;
+
+    this.computed.innerX = outerX + l;
+    this.computed.innerY = outerY + t;
+    this.computed.innerW = outerW - l - r;
+    this.computed.innerH = outerH - t - b;
+
+    this.computed.outerBorderRadius = [
+      Math.max(0.0, radius[0] + (Math.max(l, r) * borderAlign + borderGap)),
+      Math.max(0.0, radius[1] + (Math.max(t, b) * borderAlign + borderGap)),
+      Math.max(0.0, radius[2] + (Math.max(b, t) * borderAlign + borderGap)),
+      Math.max(0.0, radius[3] + (Math.max(l, r) * borderAlign + borderGap)),
+    ];
+
+    this.computed.innerBorderRadius = [
+      Math.max(0.0, this.computed.outerBorderRadius[0] - Math.max(l, r)),
+      Math.max(0.0, this.computed.outerBorderRadius[1] - Math.max(t, b)),
+      Math.max(0.0, this.computed.outerBorderRadius[2] - Math.max(b, t)),
+      Math.max(0.0, this.computed.outerBorderRadius[3] - Math.max(l, r)),
+    ];
+
+    this.computed.shadowColor = this.toColorString(props['shadow-color']);
+    this.computed.shadowRadius = this.computed.outerBorderRadius.map(
+      (value) => value + props['shadow-blur'],
+    ) as Vec4;
+  },
+  render(ctx, node, renderContext) {
+    const { tx, ty } = node.globalTransform!;
+    const { w, h } = node.props;
+    const computed = this.computed as ComputedValues;
+    render.shadow(
+      ctx,
+      tx + computed.outerX,
+      ty + computed.outerY,
+      w + computed.outerW,
+      h + computed.outerH,
+      computed.shadowColor,
+      this.props!['shadow-projection'],
+      computed.shadowRadius,
+      this.stage.pixelRatio,
+    );
+    render.roundedRectWithBorder(
+      ctx,
+      tx,
+      ty,
+      w,
+      h,
+      computed.radius,
+      this.props!['border-gap'] as number,
+      computed.outerX,
+      computed.outerY,
+      computed.outerW,
+      computed.outerH,
+      computed.outerBorderRadius,
+      computed.innerX,
+      computed.innerY,
+      computed.innerW,
+      computed.innerH,
+      computed.innerBorderRadius,
+      computed.borderColor,
+      renderContext,
+    );
+  },
+};

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

@@ -1,70 +1,71 @@
-/*
- * Copyright 2023 Comcast Cable Communications Management, LLC
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { calcFactoredRadiusArray } from '../../lib/utils.js';
-import type { CanvasShaderType } from '../../renderers/canvas/CanvasShaderNode.js';
-import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
-import {
-  RoundedWithShadowTemplate,
-  type RoundedWithShadowProps,
-} from '../templates/RoundedWithShadowTemplate.js';
-import type { ComputedRoundedValues } from './Rounded.js';
-import type { ComputedShadowValues } from './Shadow.js';
-import * as render from './utils/render.js';
-
-type ComputedValues = ComputedRoundedValues & ComputedShadowValues;
-
-export const RoundedWithShadow: CanvasShaderType<
-  RoundedWithShadowProps,
-  ComputedValues
-> = {
-  props: RoundedWithShadowTemplate.props,
-  saveAndRestore: true,
-  update(node) {
-    const props = this.props!;
-    const radius = calcFactoredRadiusArray(
-      props.radius as Vec4,
-      node.width,
-      node.height,
-    );
-    this.computed.radius = radius;
-    this.computed.shadowColor = this.toColorString(props['shadow-color']);
-    this.computed.shadowRadius = radius.map(
-      (value) => value + props['shadow-blur'],
-    ) as Vec4;
-  },
-  render(ctx, quad, renderContext) {
-    const { tx, ty, width, height } = quad;
-    const computed = this.computed as ComputedValues;
-    render.shadow(
-      ctx,
-      tx,
-      ty,
-      width,
-      height,
-      computed.shadowColor,
-      this.props!['shadow-projection'],
-      computed.shadowRadius,
-      this.stage.pixelRatio,
-    );
-
-    const path = new Path2D();
-    render.roundRect(path, tx, ty, width, height, computed.radius);
-    ctx.clip(path);
-    renderContext();
-  },
-};
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { calcFactoredRadiusArray } from '../../lib/utils.js';
+import type { CanvasShaderType } from '../../renderers/canvas/CanvasShaderNode.js';
+import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
+import {
+  RoundedWithShadowTemplate,
+  type RoundedWithShadowProps,
+} from '../templates/RoundedWithShadowTemplate.js';
+import type { ComputedRoundedValues } from './Rounded.js';
+import type { ComputedShadowValues } from './Shadow.js';
+import * as render from './utils/render.js';
+
+type ComputedValues = ComputedRoundedValues & ComputedShadowValues;
+
+export const RoundedWithShadow: CanvasShaderType<
+  RoundedWithShadowProps,
+  ComputedValues
+> = {
+  props: RoundedWithShadowTemplate.props,
+  saveAndRestore: true,
+  update(node) {
+    const props = this.props!;
+    const radius = calcFactoredRadiusArray(
+      props.radius as Vec4,
+      node.w,
+      node.h,
+    );
+    this.computed.radius = radius;
+    this.computed.shadowColor = this.toColorString(props['shadow-color']);
+    this.computed.shadowRadius = radius.map(
+      (value) => value + props['shadow-blur'],
+    ) as Vec4;
+  },
+  render(ctx, node, renderContext) {
+    const { tx, ty } = node.globalTransform!;
+    const { w, h } = node.props;
+    const computed = this.computed as ComputedValues;
+    render.shadow(
+      ctx,
+      tx,
+      ty,
+      w,
+      h,
+      computed.shadowColor,
+      this.props!['shadow-projection'],
+      computed.shadowRadius,
+      this.stage.pixelRatio,
+    );
+
+    const path = new Path2D();
+    render.roundRect(path, tx, ty, w, h, computed.radius);
+    ctx.clip(path);
+    renderContext();
+  },
+};

package/src/core/shaders/canvas/Shadow.ts

@@ -1,52 +1,54 @@
-/*
- * Copyright 2023 Comcast Cable Communications Management, LLC
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type { CanvasShaderType } from '../../renderers/canvas/CanvasShaderNode.js';
-import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
-import {
-  ShadowTemplate,
-  type ShadowProps,
-} from '../templates/ShadowTemplate.js';
-import { shadow } from './utils/render.js';
-
-export interface ComputedShadowValues {
-  shadowColor: string;
-  shadowRadius: Vec4;
-}
-
-export const Shadow: CanvasShaderType<ShadowProps, ComputedShadowValues> = {
-  props: ShadowTemplate.props,
-  update() {
-    this.computed.shadowColor = this.toColorString(this.props!['color']);
-    const blur = this.props!['blur'];
-    this.computed.shadowRadius = [blur, blur, blur, blur];
-  },
-  render(ctx, quad, renderContext) {
-    shadow(
-      ctx,
-      quad.tx,
-      quad.ty,
-      quad.width,
-      quad.height,
-      this.computed.shadowColor!,
-      this.props!['projection'],
-      this.computed.shadowRadius!,
-      this.stage.pixelRatio,
-    );
-    renderContext();
-  },
-};
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CanvasShaderType } from '../../renderers/canvas/CanvasShaderNode.js';
+import type { Vec4 } from '../../renderers/webgl/internal/ShaderUtils.js';
+import {
+  ShadowTemplate,
+  type ShadowProps,
+} from '../templates/ShadowTemplate.js';
+import { shadow } from './utils/render.js';
+
+export interface ComputedShadowValues {
+  shadowColor: string;
+  shadowRadius: Vec4;
+}
+
+export const Shadow: CanvasShaderType<ShadowProps, ComputedShadowValues> = {
+  props: ShadowTemplate.props,
+  update() {
+    this.computed.shadowColor = this.toColorString(this.props!['color']);
+    const blur = this.props!['blur'];
+    this.computed.shadowRadius = [blur, blur, blur, blur];
+  },
+  render(ctx, node, renderContext) {
+    const { tx, ty } = node.globalTransform!;
+    const { w, h } = node.props;
+    shadow(
+      ctx,
+      tx,
+      ty,
+      w,
+      h,
+      this.computed.shadowColor!,
+      this.props!['projection'],
+      this.computed.shadowRadius!,
+      this.stage.pixelRatio,
+    );
+    renderContext();
+  },
+};