UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[pixi] Update to 7.3.0, generalize loaders due to PIxi API change.

Browse Source
This commit is contained in:
Mario Zechner 2023-09-22 16:03:50 +02:00
parent c198203695
commit f38790eeed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-ts/spine-pixi/src/assets/atlasLoader.ts
View File

@ -29,7 +29,7 @@
import { TextureAtlas } from "@esotericsoftware/spine-core"; import { TextureAtlas } from "@esotericsoftware/spine-core";
import { SpineTexture } from "../SpineTexture"; 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 { LoaderParserPriority, checkExtension } from "@pixi/assets";
import type { Texture } from "@pixi/core"; import type { Texture } from "@pixi/core";
import { ExtensionType, settings, utils, BaseTexture, extensions } from "@pixi/core"; import { ExtensionType, settings, utils, BaseTexture, extensions } from "@pixi/core";
@ -58,7 +58,7 @@ const spineTextureAtlasLoader: AssetExtension<RawAtlas | TextureAtlas, ISpineAtl
return txt; return txt;
}, },
testParse(asset: unknown, options: LoadAsset): Promise<boolean> { testParse(asset: unknown, options: {src: string}): Promise<boolean> {
const isExtensionRight = checkExtension(options.src, ".atlas"); const isExtensionRight = checkExtension(options.src, ".atlas");
const isString = typeof asset === "string"; const isString = typeof asset === "string";
@ -69,7 +69,7 @@ const spineTextureAtlasLoader: AssetExtension<RawAtlas | TextureAtlas, ISpineAtl
atlas.dispose(); atlas.dispose();
}, },
async parse(asset: RawAtlas, options: LoadAsset, loader: Loader): Promise<TextureAtlas> { async parse(asset: RawAtlas, options: {src: string, data: ISpineAtlasMetadata}, loader: Loader): Promise<TextureAtlas> {
const metadata: ISpineAtlasMetadata = options.data || {}; const metadata: ISpineAtlasMetadata = options.data || {};
let basePath = utils.path.dirname(options.src); let basePath = utils.path.dirname(options.src);

4
spine-ts/spine-pixi/src/assets/skeletonLoader.ts
View File

@ -27,7 +27,7 @@
* SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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 { LoaderParserPriority, checkExtension } from "@pixi/assets";
import { ExtensionType, settings, extensions } from "@pixi/core"; import { ExtensionType, settings, extensions } from "@pixi/core";
@ -62,7 +62,7 @@ const spineLoaderExtension: AssetExtension<SkeletonJsonAsset | SkeletonBinaryAss
return buffer; return buffer;
}, },
testParse(asset: unknown, options: LoadAsset): Promise<boolean> { testParse(asset: unknown, options: {src: string}): Promise<boolean> {
const isJsonSpineModel = checkExtension(options.src, ".json") && isJson(asset); const isJsonSpineModel = checkExtension(options.src, ".json") && isJson(asset);
const isBinarySpineModel = checkExtension(options.src, ".skel") && isBuffer(asset); const isBinarySpineModel = checkExtension(options.src, ".skel") && isBuffer(asset);