diff --git a/packages/geometry/index.ts b/packages/geometry/index.ts index 25ac13d1..eda175ee 100644 --- a/packages/geometry/index.ts +++ b/packages/geometry/index.ts @@ -7,5 +7,4 @@ export * from "./ExtrudeGeometry/Path2D" export * from "./ExtrudeGeometry/Shape2D" export * from "./ExtrudeGeometry/ShapeUtils" export * from "./parser/FontParser" -export * from "./TextGeometry" -export * from "./lib/opentype" \ No newline at end of file +export * from "./TextGeometry" \ No newline at end of file diff --git a/packages/geometry/parser/FontParser.ts b/packages/geometry/parser/FontParser.ts index 0c78ecd3..e875c2c2 100644 --- a/packages/geometry/parser/FontParser.ts +++ b/packages/geometry/parser/FontParser.ts @@ -1,7 +1,8 @@ import { ParserBase } from "@orillusion/core"; -import { parse } from "../lib/opentype"; +import { parse, Font } from "../lib/opentype"; export class FontParser extends ParserBase { + declare public data: Font; public async parseBuffer(buffer: ArrayBuffer) { const font = parse(buffer); this.data = font; diff --git a/src/assets/Res.ts b/src/assets/Res.ts index b60f37ea..c8e7de3b 100644 --- a/src/assets/Res.ts +++ b/src/assets/Res.ts @@ -165,7 +165,7 @@ export class Res { public async load(url: string, c: Parser, loaderFunctions?: LoaderFunctions) { let loader = new FileLoader(); let parser = await loader.load(url, c, loaderFunctions); - let ret = parser.data; + let ret = parser.data as T["data"]; return ret; }