From f38790eeede19aafb7a65a7b8e98fba17285fa18 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 22 Sep 2023 16:03:50 +0200 Subject: [PATCH] [pixi] Update to 7.3.0, generalize loaders due to PIxi API change. --- spine-ts/spine-pixi/src/assets/atlasLoader.ts | 6 +++--- spine-ts/spine-pixi/src/assets/skeletonLoader.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spine-ts/spine-pixi/src/assets/atlasLoader.ts b/spine-ts/spine-pixi/src/assets/atlasLoader.ts index a05774563..cc008c449 100644 --- a/spine-ts/spine-pixi/src/assets/atlasLoader.ts +++ b/spine-ts/spine-pixi/src/assets/atlasLoader.ts @@ -29,7 +29,7 @@ import { TextureAtlas } from "@esotericsoftware/spine-core"; import { SpineTexture } from "../SpineTexture"; -import type { AssetExtension, LoadAsset, Loader } from "@pixi/assets"; +import type { AssetExtension, Loader } from "@pixi/assets"; import { LoaderParserPriority, checkExtension } from "@pixi/assets"; import type { Texture } from "@pixi/core"; import { ExtensionType, settings, utils, BaseTexture, extensions } from "@pixi/core"; @@ -58,7 +58,7 @@ const spineTextureAtlasLoader: AssetExtension { + testParse(asset: unknown, options: {src: string}): Promise { const isExtensionRight = checkExtension(options.src, ".atlas"); const isString = typeof asset === "string"; @@ -69,7 +69,7 @@ const spineTextureAtlasLoader: AssetExtension { + async parse(asset: RawAtlas, options: {src: string, data: ISpineAtlasMetadata}, loader: Loader): Promise { const metadata: ISpineAtlasMetadata = options.data || {}; let basePath = utils.path.dirname(options.src); diff --git a/spine-ts/spine-pixi/src/assets/skeletonLoader.ts b/spine-ts/spine-pixi/src/assets/skeletonLoader.ts index dc4c0e348..030b8de9f 100644 --- a/spine-ts/spine-pixi/src/assets/skeletonLoader.ts +++ b/spine-ts/spine-pixi/src/assets/skeletonLoader.ts @@ -27,7 +27,7 @@ * SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -import type { AssetExtension, LoadAsset } from "@pixi/assets"; +import type { AssetExtension } from "@pixi/assets"; import { LoaderParserPriority, checkExtension } from "@pixi/assets"; import { ExtensionType, settings, extensions } from "@pixi/core"; @@ -62,7 +62,7 @@ const spineLoaderExtension: AssetExtension { + testParse(asset: unknown, options: {src: string}): Promise { const isJsonSpineModel = checkExtension(options.src, ".json") && isJson(asset); const isBinarySpineModel = checkExtension(options.src, ".skel") && isBuffer(asset);