@galacean/engine-spine 0.0.0-experimental-2024071103 → 0.0.0-experimental-2024071601

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.0-experimental-2024071103",
+  "version": "0.0.0-experimental-2024071601",
   "description": "galacean spine runtime",
   "name": "@galacean/engine-spine",
   "main": "dist/main.js",
@@ -16,9 +16,10 @@
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-decorators": "^7.12.1",
     "@babel/plugin-proposal-optional-chaining": "^7.12.1",
+    "@babel/plugin-transform-class-properties": "^7.24.7",
     "@babel/plugin-transform-object-assign": "^7.12.1",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/preset-typescript": "^7.12.1",
+    "@babel/preset-env": "^7.24.8",
+    "@babel/preset-typescript": "^7.24.7",
     "@galacean/engine": "1.3.0-alpha.0",
     "@galacean/engine-toolkit": "beta",
     "@rollup/plugin-babel": "^5.2.1",
@@ -29,12 +30,24 @@
     "@rollup/plugin-terser": "^0.4.3",
     "@swc/core": "^1.3.32",
     "@swc/helpers": "^0.5",
+    "@types/chai": "^4.3.16",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.14.10",
     "@vitejs/plugin-basic-ssl": "^1.1.0",
-    "cross-env": "^5.2.0",
+    "babel-core": "^6.26.3",
+    "babel-jest": "^29.7.0",
+    "canvas": "^2.11.2",
+    "chai": "^4.3.6",
+    "chai-spies": "^1.0.0",
+    "cross-env": "^5.2.1",
+    "cypress": "^13.13.0",
     "dat.gui": "^0.7.9",
-    "floss": "^5.0.1",
+    "electron": "^12.0.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
+    "regenerator-runtime": "^0.14.1",
     "rollup": "^2.32.0",
     "rollup-plugin-glslify": "^1.2.0",
     "rollup-plugin-modify": "^3.0.0",
@@ -42,7 +55,11 @@
     "rollup-plugin-swc3": "^0.8.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-version-injector": "^1.3.3",
-    "typescript": "^4.8.4",
+    "sinon": "^18.0.0",
+    "ts-jest": "^29.2.2",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.5.3",
     "vite": "^4.3.9"
   },
   "ci": {
@@ -53,11 +70,32 @@
     "types",
     "dist"
   ],
+  "jest": {
+    "runner": "jest-runner",
+    "testEnvironment": "jsdom",
+    "testEnvironmentOptions": {
+      "url": "https://jestjs.io/",
+      "userAgent": "Agent/007"
+    },
+    "preset": "ts-jest",
+    "collectCoverage": true,
+    "testRegex": "(/tests/.*\\.(test|spec))\\.ts?$",
+    "collectCoverageFrom": [
+      "src/**/*.ts"
+    ],
+    "transform": {
+      "^.+\\.js$": "babel-jest",
+      "^.+\\.ts$": "ts-jest"
+    },
+    "transformIgnorePatterns": [
+      "node_modules/(?!(.*@esotericsoftware/spine-core.*))"
+    ]
+  },
   "scripts": {
     "example": "vite",
-    "test": "cross-env TS_NODE_PROJECT=tsconfig.tests.json floss --path tests -r ts-node/register",
-    "test-debug": "cross-env TS_NODE_PROJECT=tsconfig.tests.json floss --path tests -r ts-node/register --debug",
-    "test-cov": "cross-env TS_NODE_PROJECT=tsconfig.tests.json IS_COV=1 nyc --reporter=lcov floss --path tests -r ts-node/register",
+    "test": "jest",
+    "test:cov": "jest --coverage",
+    "test:debug": "cross-env DEBUG_MODE=1 jest",
     "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",

package/types/SpineAnimation.d.ts

@@ -1,11 +1,6 @@
 import { Skeleton, SkeletonData, AnimationState, AnimationStateData } from "@esotericsoftware/spine-core";
 import { Buffer, Renderer, Entity, Material, Engine, BoundingBox, Primitive, SubPrimitive } from "@galacean/engine";
 import { SkeletonDataResource } from "./loader/SkeletonDataResource";
-declare module '@esotericsoftware/spine-core' {
-    interface SkeletonData {
-        refCount: number;
-    }
-}
 interface InitialState {
     animationName: string;
     skinName: string;
@@ -82,10 +77,6 @@ export declare class SpineAnimation extends Renderer {
      * @internal
      */
     update(delta: number): void;
-    /**
-     * @internal
-     */
-    _updateRendererShaderData(context: any): void;
     /**
      * @internal
      */
@@ -95,8 +86,8 @@ export declare class SpineAnimation extends Renderer {
      */
     _updateBounds(worldBounds: BoundingBox): void;
     /**
-   * @internal
-   */
+     * @internal
+     */
     _calculateGeneratorBounds(worldBounds: BoundingBox): void;
     /**
      * @internal
@@ -129,11 +120,7 @@ export declare class SpineAnimation extends Renderer {
     /**
      * @internal
      */
-    _onAnimationStart(): void;
-    /**
-     * @internal
-     */
-    _onTransformChanged(): void;
+    _onWorldVolumeChanged(): void;
     private onAnimationStart;
     private onAnimationComplete;
     private _clearMaterialCache;
@@ -147,7 +134,7 @@ export declare enum SpineAnimationUpdateFlags {
     /** On Animation start play */
     AnimationVolume = 2,
     /** On skeleton data asset changed */
-    AssetVolume = 4
+    InitialVolume = 4
 }
 /**
  * @internal

package/types/loader/LoaderUtils.d.ts

@@ -1,9 +1,11 @@
-import { Engine, Texture2D } from "@galacean/engine";
+import { AssetPromise, Engine, Texture2D } from "@galacean/engine";
 import { TextureAtlas, SkeletonData, Texture, TextureFilter, TextureWrap } from "@esotericsoftware/spine-core";
 export declare function createSkeletonData(textureAtlas: TextureAtlas, skeletonTextData: string | ArrayBuffer, skeletonFileType: 'json' | 'skel'): SkeletonData;
 export declare function loadTexturesByPath(imagePaths: string[], imageExtensions: string[], engine: Engine): Promise<Texture2D[]>;
 export declare function loadTextureAtlas(atlasPath: string, engine: Engine): Promise<TextureAtlas>;
 export declare function createTextureAtlas(atlasText: string, textures: Texture2D[]): TextureAtlas;
+export declare function loadTexture(url: string, engine: Engine, imageLoaderType?: string): AssetPromise<Texture2D>;
+export declare function createAdaptiveTexture(texture: Texture2D): AdaptiveTexture;
 export declare function getBaseUrl(url: string): string;
 export declare class AdaptiveTexture extends Texture {
     texture: Texture2D;
@@ -14,4 +16,3 @@ export declare class AdaptiveTexture extends Texture {
     dispose(): void;
     private _convertWrapMode;
 }
-export declare function getUrlExtension(url: string, fileExtension: string): string | null;

package/types/loader/SpineLoader.d.ts

@@ -20,6 +20,7 @@ export declare class SpineLoader extends Loader<SkeletonDataResource> {
     static parseAndAssignSpineAsset(url: string, fileExtension: string | null, bundle: SpineAssetBundle): void;
     static deriveAndAssignSpineAsset(url: string, fileExtension: string | null, bundle: SpineAssetBundle): void;
     static verifyFileExtensions(fileExtensions: string | string[], expectArray: boolean): string | string[] | null;
+    static getUrlExtension(url: string, fileExtension: string): string | null;
     load(item: SpineLoadItem, resourceManager: ResourceManager): AssetPromise<SkeletonDataResource>;
     private _handleEditorAsset;
     private _handleOriginAsset;