@galacean/engine-spine 1.1.0-alpha.3 → 1.1.0-alpha.5

package/package.json

@@ -1,13 +1,12 @@
 {
-  "version": "1.1.0-alpha.3",
+  "version": "1.1.0-alpha.5",
   "description": "galacean spine runtime",
   "name": "@galacean/engine-spine",
   "main": "dist/main.js",
   "browser": "dist/browser.js",
   "module": "dist/module.js",
-  "dependencies": {},
   "peerDependencies": {
-    "@galacean/engine": ">=1.1.0-beta.0"
+    "@galacean/engine": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.22.5",
@@ -55,6 +54,7 @@
     "test-cov": "jest --coverage",
     "dev": "rollup -cw",
     "build": "npm run b:types && cross-env BUILD_TYPE=ALL rollup -c",
+    "build:watch": "npm run b:types && cross-env BUILD_TYPE=ALL rollup -c --watch",
     "ci": "npm run lint && npm run test-cov",
     "lint": "eslint src --fix --ext .ts,.tsx",
     "b:types": "tsc --emitDeclarationOnly"

package/types/SpineAnimation.d.ts

@@ -1,46 +1,11 @@
-import { Skeleton } from "./spine-core/Skeleton";
 import { SkeletonData } from "./spine-core/SkeletonData";
 import { AnimationState } from "./spine-core/AnimationState";
-import { MeshGenerator } from "./core/MeshGenerator";
-import { SpineRenderSetting } from "./types";
-import { Script, Entity, Texture2D, Material, Engine } from "@galacean/engine";
-export declare class SpineAnimation extends Script {
-    /** Spine 材质 */
-    private static _defaultMaterial;
-    static getDefaultMaterial(engine: Engine): Material;
-    private _skeletonData;
-    private _skeleton;
+import { Entity } from "@galacean/engine";
+import { SpineRenderer } from "./SpineRenderer";
+export declare class SpineAnimation extends SpineRenderer {
     private _state;
-    private _tempOffset;
-    private _tempSize;
-    private _tempArray;
-    protected _meshGenerator: MeshGenerator;
-    setting: SpineRenderSetting;
-    autoUpdate: boolean;
-    autoUpdateBounds: boolean;
-    get skeletonData(): SkeletonData;
-    get skeleton(): Skeleton;
     get state(): AnimationState;
-    get mesh(): import("@galacean/engine").BufferMesh;
-    set scale(v: number);
     constructor(entity: Entity);
-    setSkeletonData(skeletonData: SkeletonData, setting?: SpineRenderSetting): void;
-    /**
-     * Separate slot by slot name. This will add a new sub mesh, and new materials.
-     */
-    addSeparateSlot(slotName: string): void;
-    /**
-     * Change texture of a separated slot by name.
-     */
-    hackSeparateSlotTexture(slotName: string, texture: Texture2D): void;
+    initialize(skeletonData: SkeletonData): void;
     onUpdate(delta: number): void;
-    updateState(deltaTime: number): void;
-    updateGeometry(): void;
-    updateBounds(): void;
-    /**
-     * Spine animation custom clone.
-     */
-    _cloneTo(target: SpineAnimation): void;
-    private _disposeCurrentSkeleton;
-    onDestroy(): void;
 }

package/types/SpineRenderer.d.ts

@@ -1,32 +1,36 @@
-import { Script, Entity } from "@galacean/engine";
-import { SpineAnimation } from "./SpineAnimation";
+import { Skeleton } from "./spine-core/Skeleton";
+import { SkeletonData } from "./spine-core/SkeletonData";
+import { MeshGenerator } from "./core/MeshGenerator";
+import { SpineRenderSetting } from "./types";
+import { Script, Entity, Texture2D, Material, Engine } from "@galacean/engine";
 export declare class SpineRenderer extends Script {
-    private _resource;
-    private _animationName;
-    private _loop;
-    private _autoPlay;
-    private _skinName;
-    private _scale;
-    private _spineAnimation;
-    /** @internal */
-    _animationNames: Array<string>;
-    /** @internal */
-    _skinNames: Array<string>;
-    get resource(): Entity | null;
-    set resource(value: Entity | null);
-    get animationName(): string;
-    set animationName(name: string);
-    get loop(): boolean;
-    set loop(value: boolean);
-    get autoPlay(): boolean;
-    set autoPlay(value: boolean);
-    get skinName(): string;
-    set skinName(name: string);
-    get scale(): number;
-    set scale(value: number);
-    get spineAnimation(): SpineAnimation;
-    onDestroy(): void;
-    play(name?: string, loop?: boolean): void;
+    private static _defaultMaterial;
+    static getDefaultMaterial(engine: Engine): Material;
+    private _skeletonData;
+    protected _skeleton: Skeleton;
+    private _tempOffset;
+    private _tempSize;
+    private _tempArray;
+    protected _meshGenerator: MeshGenerator;
+    setting: SpineRenderSetting;
+    autoUpdateBounds: boolean;
+    get skeleton(): Skeleton;
+    constructor(entity: Entity);
+    initialize(skeletonData: SkeletonData, setting?: SpineRenderSetting): void;
+    /**
+     * Separate slot by slot name. This will add a new sub mesh, and new materials.
+     */
+    addSeparateSlot(slotName: string): void;
+    /**
+     * Change texture of a separated slot by name.
+     */
+    hackSeparateSlotTexture(slotName: string, texture: Texture2D): void;
+    onLateUpdate(): void;
+    updateBounds(): void;
+    /**
+     * Spine animation custom clone.
+     */
     _cloneTo(target: SpineRenderer): void;
-    private _removeResource;
+    private _disposeCurrentSkeleton;
+    onDestroy(): void;
 }

package/types/core/MeshGenerator.d.ts

@@ -4,10 +4,12 @@ import { SkeletonData } from "../spine-core/SkeletonData";
 import { Color } from "../spine-core/Utils";
 import { SpineRenderSetting } from "../types";
 import { BlendMode } from "../spine-core/BlendMode";
+import { AdaptiveTexture } from "../loader/LoaderUtils";
 type SubMeshItem = {
     subMesh: SubMesh;
     blendMode: BlendMode;
     texture: any;
+    slotName?: string;
 };
 export declare class MeshGenerator {
     static QUAD_TRIANGLES: number[];
@@ -15,12 +17,14 @@ export declare class MeshGenerator {
     static VERTEX_STRIDE: number;
     static tempColor: Color;
     static tempBlendMode: BlendMode | null;
+    static tempTexture: AdaptiveTexture | null;
     private _setting;
     private _engine;
     private _entity;
     private _clipper;
     private _spineMesh;
     private _vertexCount;
+    private _triangleCount;
     private _vertices;
     private _verticesWithZ;
     private _indices;
@@ -28,7 +32,7 @@ export declare class MeshGenerator {
     private _meshRenderer;
     private _subMeshItems;
     readonly separateSlots: string[];
-    readonly separateSlotTextures: Map<string, Texture2D>;
+    readonly separateSlotTextureMap: Map<string, Texture2D>;
     get mesh(): import("@galacean/engine").BufferMesh;
     get subMeshItems(): SubMeshItem[];
     constructor(engine: Engine, entity: Entity);

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import "./SpineLoader";
+import "./loader/SpineLoader";
 export { SpineRenderer } from "./SpineRenderer";
 export { SpineAnimation } from "./SpineAnimation";
 export { AssetManager } from "./spine-core/AssetManager";
@@ -7,4 +7,6 @@ export { TextureAtlas } from "./spine-core/TextureAtlas";
 export { AtlasAttachmentLoader } from "./spine-core/AtlasAttachmentLoader";
 export { SkeletonJson } from "./spine-core/SkeletonJson";
 export { SkeletonBinary } from "./spine-core/SkeletonBinary";
+export { SkeletonData } from "./spine-core/SkeletonData";
+export { generateTextureAtlas } from "./loader/LoaderUtils";
 export declare const version = "__buildVersion";

package/types/loader/LoaderUtils.d.ts

@@ -0,0 +1,18 @@
+import { Engine, Texture2D } from "@galacean/engine";
+import { TextureAtlas } from "../spine-core/TextureAtlas";
+import { Texture, TextureFilter, TextureWrap } from "../spine-core/Texture";
+import { SkeletonData } from "../spine-core/SkeletonData";
+import { SpineAssetBundle } from "./SpineLoader";
+export declare function loadAndCreateSpineSkeletonData(bundle: SpineAssetBundle, engine: Engine): Promise<SkeletonData>;
+export declare function generateTextureAtlas(atlasText: string, texturesMap: Record<string, Texture2D>): TextureAtlas;
+export declare function getBaseUrl(url: string): string;
+export declare class AdaptiveTexture extends Texture {
+    texture: Texture2D;
+    constructor(image: HTMLImageElement | ImageBitmap, texture: Texture2D);
+    getImage(): any;
+    setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
+    setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
+    dispose(): void;
+    private _convertWrapMode;
+}
+export declare function getUrlExtension(url: string, extension?: string): string | null;

package/types/loader/SpineLoader.d.ts

@@ -0,0 +1,19 @@
+import { AssetPromise, Loader, LoadItem, ResourceManager } from "@galacean/engine";
+import { SkeletonData } from "../spine-core/SkeletonData";
+export type SpineAssetBundle = {
+    skeletonPath: string;
+    skeletonExtension: string;
+    atlasPath: string;
+    imagePaths: string[];
+    imageExtensions: string[];
+};
+type SpineLoaderParams = {
+    fileExtensions?: string | string[];
+};
+type SpineLoadItem = LoadItem & {
+    params?: SpineLoaderParams;
+};
+declare class SpineLoader extends Loader<SkeletonData> {
+    load(item: SpineLoadItem, resourceManager: ResourceManager): AssetPromise<SkeletonData>;
+}
+export { SpineLoader };

package/types/spine-core/AssetManager.d.ts

@@ -1,7 +1,7 @@
 import { AssetType, Engine, Texture2D } from "@galacean/engine";
 import { Disposable, Map } from "./Utils";
 import { TextureAtlas } from "./TextureAtlas";
-import { AdaptiveTexture } from "../SpineLoader";
+import { AdaptiveTexture } from "../loader/LoaderUtils";
 export declare class AssetManager implements Disposable {
     private _engine;
     protected pathPrefix: string;

package/types/spine-core/Texture.d.ts

@@ -1,10 +1,7 @@
-import { Texture2D } from "@galacean/engine";
 export declare abstract class Texture {
-    protected _texture: Texture2D;
-    constructor(texture: Texture2D);
-    get width(): number;
-    get height(): number;
-    get texture(): Texture2D;
+    protected _image: HTMLImageElement | ImageBitmap;
+    constructor(image: HTMLImageElement | ImageBitmap);
+    getImage(): HTMLImageElement | ImageBitmap;
     abstract setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
     abstract setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
     abstract dispose(): void;

package/types/spine-core/TextureAtlas.d.ts

@@ -4,7 +4,7 @@ import { TextureWrap, TextureRegion } from "./Texture";
 export declare class TextureAtlas implements Disposable {
     pages: TextureAtlasPage[];
     regions: TextureAtlasRegion[];
-    constructor(atlasText: string, textureLoader: (path: string, width?: number, height?: number) => any);
+    constructor(atlasText: string, textureLoader: (path: string) => any);
     private load;
     findRegion(name: string): TextureAtlasRegion;
     dispose(): void;