Merge pull request #102 from suresh-gangumalla/font-construction

Updated SDF and Web Font Construction
lightning-js · Jun 5, 2024 · 58c2f5a · 58c2f5a
2 parents e82073a + 24275cf
commit 58c2f5a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@lightningjs/msdf-generator": "^1.0.1",
-    "@lightningjs/renderer": "^0.8.4",
+    "@lightningjs/renderer": "^0.9.1",
     "@lightningjs/vite-plugin-import-chunk-url": "^0.3.0",
     "execa": "^8.0.1",
     "kolorist": "^1.8.0",

diff --git a/src/engines/L3/fontLoader.js b/src/engines/L3/fontLoader.js
@@ -16,10 +16,24 @@ export default () => {
         font.json = font.file.replace(/\.[^.]+$/, `.${font.type}.json`)
       }
       stage.fontManager.addFontFace(
-        new SdfTrFontFace(font.family, {}, font.type, stage, font.png, font.json)
+        new SdfTrFontFace(font.type, {
+          fontFamily: font.family,
+          descriptors: {},
+          atlasUrl: font.png,
+          atlasDataUrl: font.json,
+          stage,
+          metrics: font.metrics,
+        })
       )
     } else if (font.type === 'web') {
-      stage.fontManager.addFontFace(new WebTrFontFace(font.family, {}, font.file))
+      stage.fontManager.addFontFace(
+        new WebTrFontFace({
+          fontFamily: font.family,
+          fontUrl: font.file,
+          descriptors: {},
+          metrics: font.metrics,
+        })
+      )
     }
   })
 }