@lightningjs/renderer 3.0.0-beta10 → 3.0.0-beta12

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

@@ -1,55 +1,55 @@
-/*
- * 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 {
-  RoundedTemplate,
-  type RoundedProps,
-} from '../templates/RoundedTemplate.js';
-import { roundRect } from './utils/render.js';
-
-export interface ComputedRoundedValues {
-  radius: Vec4;
-}
-
-export const Rounded: CanvasShaderType<RoundedProps, ComputedRoundedValues> = {
-  props: RoundedTemplate.props,
-  saveAndRestore: true,
-  update(node) {
-    this.computed.radius = calcFactoredRadiusArray(
-      this.props!.radius as Vec4,
-      node.width,
-      node.height,
-    );
-  },
-  render(ctx, quad, renderContext) {
-    const path = new Path2D();
-    roundRect(
-      path,
-      quad.tx,
-      quad.ty,
-      quad.width,
-      quad.height,
-      this.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 {
+  RoundedTemplate,
+  type RoundedProps,
+} from '../templates/RoundedTemplate.js';
+import { roundRect } from './utils/render.js';
+
+export interface ComputedRoundedValues {
+  radius: Vec4;
+}
+
+export const Rounded: CanvasShaderType<RoundedProps, ComputedRoundedValues> = {
+  props: RoundedTemplate.props,
+  saveAndRestore: true,
+  update(node) {
+    this.computed.radius = calcFactoredRadiusArray(
+      this.props!.radius as Vec4,
+      node.w,
+      node.h,
+    );
+  },
+  render(ctx, quad, renderContext) {
+    const path = new Path2D();
+    roundRect(
+      path,
+      quad.tx,
+      quad.ty,
+      quad.width,
+      quad.height,
+      this.computed.radius!,
+    );
+    ctx.clip(path);
+
+    renderContext();
+  },
+};

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

@@ -1,74 +1,72 @@
-/*
- * 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 {
-  RoundedWithBorderTemplate,
-  type RoundedWithBorderProps,
-} from '../templates/RoundedWithBorderTemplate.js';
-import type { ComputedBorderValues } from './Border.js';
-import type { ComputedRoundedValues } from './Rounded.js';
-import { roundedRectWithBorder } from './utils/render.js';
-
-type ComputedValues = ComputedRoundedValues & ComputedBorderValues;
-
-export const RoundedWithBorder: CanvasShaderType<
-  RoundedWithBorderProps,
-  ComputedValues
-> = {
-  props: RoundedWithBorderTemplate.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[],
-    );
-    //following vec4 convention 0, 1, 2, 3 => x, y, z, w;
-    const [x, y, z, w] = props['border-width'] as Vec4;
-    this.computed.borderRadius = [
-      Math.max(0.0, radius[0] - Math.max(x, w) * 0.5),
-      Math.max(0.0, radius[1] - Math.max(x, y) * 0.5),
-      Math.max(0.0, radius[2] - Math.max(z, y) * 0.5),
-      Math.max(0.0, radius[3] - Math.max(z, w) * 0.5),
-    ];
-  },
-  render(ctx, quad, renderContext) {
-    const computed = this.computed as ComputedValues;
-    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 {
+  RoundedWithBorderTemplate,
+  type RoundedWithBorderProps,
+} from '../templates/RoundedWithBorderTemplate.js';
+import type { ComputedBorderValues } from './Border.js';
+import type { ComputedRoundedValues } from './Rounded.js';
+import { roundedRectWithBorder } from './utils/render.js';
+
+type ComputedValues = ComputedRoundedValues & ComputedBorderValues;
+
+export const RoundedWithBorder: CanvasShaderType<
+  RoundedWithBorderProps,
+  ComputedValues
+> = {
+  props: RoundedWithBorderTemplate.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[]);
+    //following vec4 convention 0, 1, 2, 3 => x, y, z, w;
+    const [x, y, z, w] = props['border-w'] as Vec4;
+    this.computed.borderRadius = [
+      Math.max(0.0, radius[0] - Math.max(x, w) * 0.5),
+      Math.max(0.0, radius[1] - Math.max(x, y) * 0.5),
+      Math.max(0.0, radius[2] - Math.max(z, y) * 0.5),
+      Math.max(0.0, radius[3] - Math.max(z, w) * 0.5),
+    ];
+  },
+  render(ctx, quad, renderContext) {
+    const computed = this.computed as ComputedValues;
+    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,
+    );
+  },
+};

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

@@ -1,90 +1,88 @@
-/*
- * 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 { 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.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 borderWidth = props['border-w'] 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,
+    );
+  },
+};

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

@@ -1,70 +1,70 @@
-/*
- * 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, 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();
+  },
+};