@lightningjs/renderer 3.0.0-beta16 → 3.0.0-beta17

package/src/core/platforms/web/WebPlatform.ts

@@ -1,6 +1,13 @@
 import { Platform } from '../Platform.js';
 import type { Stage } from '../../Stage.js';
 
+/**
+ * make fontface add not show errors
+ */
+interface FontFaceSetWithAdd extends FontFaceSet {
+  add(font: FontFace): void;
+}
+
 export class WebPlatform extends Platform {
   ////////////////////////
   // Platform-specific methods
@@ -118,4 +125,8 @@ export class WebPlatform extends Platform {
   getTimeStamp(): number {
     return performance ? performance.now() : Date.now();
   }
+
+  override addFont(font: FontFace): void {
+    (document.fonts as FontFaceSetWithAdd).add(font);
+  }
 }

package/src/core/text-rendering/CanvasFontHandler.ts

@@ -59,12 +59,6 @@ let context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D;
 let measureContext:
   | CanvasRenderingContext2D
   | OffscreenCanvasRenderingContext2D;
-/**
- * make fontface add not show errors
- */
-interface FontFaceSetWithAdd extends FontFaceSet {
-  add(font: FontFace): void;
-}
 
 /**
  * Check if a font can be rendered
@@ -112,7 +106,7 @@ export const loadFont = async (
   const loadPromise = new FontFace(fontFamily, `url(${fontUrl})`)
     .load()
     .then((loadedFont) => {
-      (document.fonts as FontFaceSetWithAdd).add(loadedFont);
+      stage.platform.addFont(loadedFont);
       processFontData(fontFamily, loadedFont, metrics);
       fontLoadPromises.delete(fontFamily);
       for (let key in nwff) {

package/src/core/text-rendering/CanvasTextRenderer.ts

@@ -134,7 +134,6 @@ const renderText = (props: CoreTextNodeProps): TextRenderInfo => {
     metrics,
     text,
     textAlign,
-    verticalAlign,
     fontFamily,
     lineHeight,
     overflowSuffix,
@@ -144,7 +143,6 @@ const renderText = (props: CoreTextNodeProps): TextRenderInfo => {
     maxWidth,
     maxHeight,
   );
-
   const lineAmount = lines.length;
   const canvasW = Math.ceil(effectiveWidth);
   const canvasH = Math.ceil(effectiveHeight);
@@ -165,8 +163,8 @@ const renderText = (props: CoreTextNodeProps): TextRenderInfo => {
   for (let i = 0; i < lineAmount; i++) {
     const line = lines[i] as TextLineStruct;
     const textLine = line[0];
-    let currentX = Math.ceil(line[2]);
-    const currentY = Math.ceil(line[3]);
+    let currentX = Math.ceil(line[3]);
+    const currentY = Math.ceil(line[4]);
     if (letterSpacing === 0) {
       context.fillText(textLine, currentX, currentY);
     } else {

package/src/core/text-rendering/SdfTextRenderer.ts

@@ -308,7 +308,6 @@ const generateTextLayout = (
     metrics,
     props.text,
     props.textAlign,
-    verticalAlign,
     fontFamily,
     lineHeight,
     props.overflowSuffix,
@@ -329,9 +328,9 @@ const generateTextLayout = (
     const textLine = line[0];
     const textLineLength = textLine.length;
     let prevCodepoint = 0;
-    currentX = line[2];
+    currentX = line[3];
     //convert Y coord to vertex value
-    currentY = line[3] / fontScale;
+    currentY = line[4] / fontScale;
 
     for (let j = 0; j < textLineLength; j++) {
       const char = textLine.charAt(j);