@safe-engine/cocos 2.5.7 → 2.5.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/dist/core/Scene.d.ts +1 -0
  2. package/dist/core/Scene.d.ts.map +1 -1
  3. package/dist/core/Scene.js +1 -0
  4. package/dist/helper/utils.d.ts +1 -1
  5. package/dist/helper/utils.d.ts.map +1 -1
  6. package/dist/helper/utils.js +4 -1
  7. package/dist/spine/SpineSkeleton.d.ts.map +1 -1
  8. package/dist/spine/SpineSkeleton.js +1 -2
  9. package/dist/spine/spine-cocos/CCSkeleton.d.ts +3 -3
  10. package/dist/spine/spine-cocos/CCSkeleton.d.ts.map +1 -1
  11. package/dist/spine/spine-cocos/CCSkeleton.js +14 -6
  12. package/package.json +1 -1
  13. package/dist/core/index.d.ts +0 -6
  14. package/dist/core/index.d.ts.map +0 -1
  15. package/dist/core/index.js +0 -5
  16. package/dist/dragonbones/PixiDragonBonesSprite.d.ts +0 -19
  17. package/dist/dragonbones/PixiDragonBonesSprite.d.ts.map +0 -1
  18. package/dist/dragonbones/PixiDragonBonesSprite.js +0 -75
  19. package/dist/gworld/EnhancedComponent.d.ts +0 -22
  20. package/dist/gworld/EnhancedComponent.d.ts.map +0 -1
  21. package/dist/gworld/EnhancedComponent.js +0 -44
  22. package/dist/gworld/NodeComp.d.ts +0 -153
  23. package/dist/gworld/NodeComp.d.ts.map +0 -1
  24. package/dist/gworld/NodeComp.js +0 -337
  25. package/dist/gworld/NodePool.d.ts +0 -9
  26. package/dist/gworld/NodePool.d.ts.map +0 -1
  27. package/dist/gworld/NodePool.js +0 -23
  28. package/dist/gworld/Scene.d.ts +0 -5
  29. package/dist/gworld/Scene.d.ts.map +0 -1
  30. package/dist/gworld/Scene.js +0 -14
  31. package/dist/gworld/decorator.d.ts +0 -8
  32. package/dist/gworld/decorator.d.ts.map +0 -1
  33. package/dist/gworld/decorator.js +0 -12
  34. package/dist/gworld/index.d.ts +0 -8
  35. package/dist/gworld/index.d.ts.map +0 -1
  36. package/dist/gworld/index.js +0 -14
  37. package/dist/safex.d.ts +0 -10
  38. package/dist/safex.d.ts.map +0 -1
  39. package/dist/safex.js +0 -1
  40. package/dist/spine/CCSkeleton.d.ts +0 -189
  41. package/dist/spine/CCSkeleton.d.ts.map +0 -1
  42. package/dist/spine/CCSkeleton.js +0 -320
  43. package/dist/spine/CCSkeletonAnimation.d.ts +0 -146
  44. package/dist/spine/CCSkeletonAnimation.d.ts.map +0 -1
  45. package/dist/spine/CCSkeletonAnimation.js +0 -311
  46. package/dist/spine/CCSkeletonCanvasRenderCmd.d.ts +0 -2
  47. package/dist/spine/CCSkeletonCanvasRenderCmd.d.ts.map +0 -1
  48. package/dist/spine/CCSkeletonCanvasRenderCmd.js +0 -228
  49. package/dist/spine/CCSkeletonTexture.d.ts +0 -25
  50. package/dist/spine/CCSkeletonTexture.d.ts.map +0 -1
  51. package/dist/spine/CCSkeletonTexture.js +0 -60
  52. package/dist/spine/CCSkeletonWebGLRenderCmd.d.ts +0 -28
  53. package/dist/spine/CCSkeletonWebGLRenderCmd.d.ts.map +0 -1
  54. package/dist/spine/CCSkeletonWebGLRenderCmd.js +0 -277
  55. package/dist/spine/PixiSpineSprite.d.ts +0 -19
  56. package/dist/spine/PixiSpineSprite.d.ts.map +0 -1
  57. package/dist/spine/PixiSpineSprite.js +0 -72
@@ -1,5 +1,6 @@
1
1
  import { EnhancedComponent } from './EnhancedComponent';
2
2
  export declare class SceneComponent extends EnhancedComponent {
3
+ preLoad: () => Promise<void>;
3
4
  render(): this;
4
5
  }
5
6
  //# sourceMappingURL=Scene.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/core/Scene.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,MAAM;CAaP"}
1
+ {"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/core/Scene.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,MAAM;CAaP"}
@@ -2,6 +2,7 @@ import { GameWorld } from '../gworld';
2
2
  import { EnhancedComponent } from './EnhancedComponent';
3
3
  import { NodeComp } from './NodeComp';
4
4
  export class SceneComponent extends EnhancedComponent {
5
+ preLoad;
5
6
  render() {
6
7
  const world = GameWorld.Instance;
7
8
  world.entities.reset();
@@ -9,5 +9,5 @@ export declare function registerSystem<T extends ComponentX>(component: Construc
9
9
  };
10
10
  export type GetProps<T> = T extends ComponentX<infer P> ? P : never;
11
11
  export declare function instantiate<T extends ComponentX>(ComponentType: Constructor<T>, data?: GetProps<T>): T;
12
- export declare function loadScene<T extends SceneComponent>(ComponentType: Constructor<T>): void;
12
+ export declare function loadScene<T extends SceneComponent>(ComponentType: Constructor<T>): Promise<void>;
13
13
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/helper/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,YAAY,CAAA;AAEvG,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAG9C,wBAAgB,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;;iCAKjD,YAAY;yBAepB,aAAa,UAAU,YAAY,MAAM,MAAM;;EAanE;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEnE,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAOtG;AACD,wBAAgB,SAAS,CAAC,CAAC,SAAS,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,QAKhF"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/helper/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,YAAY,CAAA;AAEvG,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAG9C,wBAAgB,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;;iCAKjD,YAAY;yBAepB,aAAa,UAAU,YAAY,MAAM,MAAM;;EAanE;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEnE,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAOtG;AACD,wBAAsB,SAAS,CAAC,CAAC,SAAS,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,iBAQtF"}
@@ -42,9 +42,12 @@ export function instantiate(ComponentType, data) {
42
42
  }
43
43
  return instance.render();
44
44
  }
45
- export function loadScene(ComponentType) {
45
+ export async function loadScene(ComponentType) {
46
46
  const world = GameWorld.Instance;
47
47
  world.entities.reset();
48
48
  const instance = new ComponentType();
49
+ if (instance.preLoad) {
50
+ await instance.preLoad();
51
+ }
49
52
  instance.render();
50
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"SpineSkeleton.d.ts","sourceRoot":"","sources":["../../src/spine/SpineSkeleton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAA0B,IAAI,EAAE,MAAM,IAAI,CAAA;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAErE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,mBAAmB,CAAC,MAAA;CACrB;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IACtH,IAAI,MAAM,CAAC,IAAI,EAAE,MAAM,EAGtB;IACD,gBAAgB;IAIhB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;IAOvC,eAAe,CAAC,IAAI,EAAE,SAAS;CAKhC;AAID,UAAU,+BAAgC,SAAQ,kBAAkB,CAAC,0BAA0B,CAAC;IAC9F,OAAO,EAAE,IAAI,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AACD,qBAAa,0BAA2B,SAAQ,UAAU,CAAC,+BAA+B,EAAE,iBAAiB,CAAC;IAC5G,KAAK;CAYN"}
1
+ {"version":3,"file":"SpineSkeleton.d.ts","sourceRoot":"","sources":["../../src/spine/SpineSkeleton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAA0B,IAAI,EAAE,MAAM,IAAI,CAAA;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAErE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,mBAAmB,CAAC,MAAA;CACrB;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IACtH,IAAI,MAAM,CAAC,IAAI,EAAE,MAAM,EAGtB;IACD,gBAAgB;IAIhB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;IAOvC,eAAe,CAAC,IAAI,EAAE,SAAS;CAIhC;AAID,UAAU,+BAAgC,SAAQ,kBAAkB,CAAC,0BAA0B,CAAC;IAC9F,OAAO,EAAE,IAAI,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AACD,qBAAa,0BAA2B,SAAQ,UAAU,CAAC,+BAA+B,EAAE,iBAAiB,CAAC;IAC5G,KAAK;CAYN"}
@@ -16,8 +16,7 @@ export class SpineSkeleton extends ComponentX {
16
16
  }
17
17
  setSkeletonData(data) {
18
18
  const skel = this.node.instance;
19
- const atlas = data.atlas;
20
- skel.initWithArgs(data.skeleton, atlas, this.props.timeScale);
19
+ skel.initWithArgs(data.skeleton, data.atlas);
21
20
  }
22
21
  }
23
22
  Object.defineProperty(SpineSkeleton.prototype, 'render', { value: render });
@@ -1,4 +1,4 @@
1
- import { AnimationState, Bone, Skeleton } from '@esotericsoftware/spine-core';
1
+ import { AnimationState, Bone, Skeleton, SkeletonData } from '@esotericsoftware/spine-core';
2
2
  /****************************************************************************
3
3
  Copyright (c) 2011-2012 cocos2d-x.org
4
4
  Copyright (c) 2013-2014 Chukong Technologies Inc.
@@ -63,7 +63,7 @@ export declare class CCSkeleton extends cc.Node {
63
63
  getDebugBonesEnabled(): boolean;
64
64
  setTimeScale(scale: number): void;
65
65
  getTimeScale(): number;
66
- initWithArgs(skeletonDataFile: any, atlasFile: any, scale: any): void;
66
+ initWithArgs(skeletonDataFile: string, atlasFile: string, scale?: number): void;
67
67
  getBoundingBox(): cc.Rect;
68
68
  updateWorldTransform(): void;
69
69
  setToSetupPose(): void;
@@ -76,7 +76,7 @@ export declare class CCSkeleton extends cc.Node {
76
76
  setAttachment(slotName: string, attachmentName: string): void;
77
77
  setPremultipliedAlpha(premultiplied: boolean): void;
78
78
  isPremultipliedAlpha(): boolean;
79
- setSkeletonData(skeletonData: any, ownsSkeletonData: any): void;
79
+ setSkeletonData(skeletonData: SkeletonData, ownsSkeletonData: any): void;
80
80
  getTextureAtlas(regionAttachment: any): any;
81
81
  getBlendFunc(): any;
82
82
  setBlendFunc(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"CCSkeleton.d.ts","sourceRoot":"","sources":["../../../src/spine/spine-cocos/CCSkeleton.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,IAAI,EAGJ,QAAQ,EAIT,MAAM,8BAA8B,CAAA;AAKrC;;;;;;;;;;;;;;;;;;;;;;;;8EAwB8E;AAE9E;;;;GAIG;AACH;;;;;;;;;GASG;AACH,qBAAa,UAAW,SAAQ,EAAE,CAAC,IAAI;IACrC,SAAS,EAAE,QAAQ,CAAO;IAC1B,SAAS,EAAE,IAAI,CAAO;IACtB,UAAU,SAAI;IACd,WAAW,UAAQ;IACnB,WAAW,UAAQ;IACnB,mBAAmB,UAAQ;IAC3B,iBAAiB,EAAE,GAAG,CAAO;IAC7B,MAAM,EAAE,cAAc,CAAA;IACtB,uBAAuB,UAAQ;IAC/B,SAAS,EAAE,GAAG,CAAA;gBAEF,gBAAgB,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG;IAWhE,gBAAgB;IAKhB,IAAI,IAAI,OAAO;IAMf,OAAO;IAKP,MAAM;IAKN,cAAc,CAAC,MAAM,EAAE,OAAO;IAI9B,aAAa,CAAC,MAAM,EAAE,OAAO;IAI7B,oBAAoB,CAAC,OAAO,EAAE,OAAO;IAIrC,oBAAoB;IAIpB,oBAAoB,CAAC,OAAO,EAAE,OAAO;IAIrC,oBAAoB;IAIpB,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,YAAY;IAIZ,YAAY,CAAC,gBAAgB,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG;IAiC9D,cAAc;IAkDd,oBAAoB;IAIpB,cAAc;IAId,mBAAmB;IAInB,mBAAmB;IAInB,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAIzB,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAIzB,OAAO,CAAC,QAAQ,EAAE,MAAM;IAIxB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAItD,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAItD,qBAAqB,CAAC,aAAa,EAAE,OAAO;IAI5C,oBAAoB;IAIpB,eAAe,CAAC,YAAY,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG;IAiBxD,eAAe,CAAC,gBAAgB,EAAE,GAAG;IAIrC,YAAY;IAaZ,YAAY;IAIZ,MAAM,CAAC,EAAE,EAAE,GAAG;CAGf"}
1
+ {"version":3,"file":"CCSkeleton.d.ts","sourceRoot":"","sources":["../../../src/spine/spine-cocos/CCSkeleton.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,IAAI,EAGJ,QAAQ,EAER,YAAY,EAIb,MAAM,8BAA8B,CAAA;AAKrC;;;;;;;;;;;;;;;;;;;;;;;;8EAwB8E;AAE9E;;;;GAIG;AACH;;;;;;;;;GASG;AACH,qBAAa,UAAW,SAAQ,EAAE,CAAC,IAAI;IACrC,SAAS,EAAE,QAAQ,CAAO;IAC1B,SAAS,EAAE,IAAI,CAAO;IACtB,UAAU,SAAI;IACd,WAAW,UAAQ;IACnB,WAAW,UAAQ;IACnB,mBAAmB,UAAQ;IAC3B,iBAAiB,EAAE,GAAG,CAAO;IAC7B,MAAM,EAAE,cAAc,CAAA;IACtB,uBAAuB,UAAQ;IAC/B,SAAS,EAAE,GAAG,CAAA;gBAEF,gBAAgB,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG;IAWhE,gBAAgB;IAKhB,IAAI,IAAI,OAAO;IAMf,OAAO;IAKP,MAAM;IAKN,cAAc,CAAC,MAAM,EAAE,OAAO;IAI9B,aAAa,CAAC,MAAM,EAAE,OAAO;IAI7B,oBAAoB,CAAC,OAAO,EAAE,OAAO;IAIrC,oBAAoB;IAIpB,oBAAoB,CAAC,OAAO,EAAE,OAAO;IAIrC,oBAAoB;IAIpB,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,YAAY;IAIZ,YAAY,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,SAAI;IAuCnE,cAAc;IAkDd,oBAAoB;IAIpB,cAAc;IAId,mBAAmB;IAInB,mBAAmB;IAInB,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAIzB,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAIzB,OAAO,CAAC,QAAQ,EAAE,MAAM;IAIxB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAItD,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAItD,qBAAqB,CAAC,aAAa,EAAE,OAAO;IAI5C,oBAAoB;IAIpB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG;IAiBjE,eAAe,CAAC,gBAAgB,EAAE,GAAG;IAIrC,YAAY;IAaZ,YAAY;IAIZ,MAAM,CAAC,EAAE,EAAE,GAAG;CAGf"}
@@ -1,4 +1,4 @@
1
- import { AtlasAttachmentLoader, Physics, RegionAttachment, Skeleton, SkeletonJson, TextureAtlas, Utils, } from '@esotericsoftware/spine-core';
1
+ import { AtlasAttachmentLoader, Physics, RegionAttachment, Skeleton, SkeletonBinary, SkeletonJson, TextureAtlas, Utils, } from '@esotericsoftware/spine-core';
2
2
  import { _atlasLoader } from './CCSkeletonAnimation';
3
3
  import { CanvasRenderCmd } from './CCSkeletonCanvasRenderCmd';
4
4
  import { WebGLRenderCmd } from './CCSkeletonWebGLRenderCmd';
@@ -107,7 +107,7 @@ export class CCSkeleton extends cc.Node {
107
107
  getTimeScale() {
108
108
  return this._timeScale;
109
109
  }
110
- initWithArgs(skeletonDataFile, atlasFile, scale) {
110
+ initWithArgs(skeletonDataFile, atlasFile, scale = 1) {
111
111
  const argSkeletonFile = skeletonDataFile;
112
112
  const argAtlasFile = atlasFile;
113
113
  let skeletonData, atlas, ownsSkeletonData;
@@ -123,11 +123,19 @@ export class CCSkeleton extends cc.Node {
123
123
  }
124
124
  scale = scale || 1 / cc.director.getContentScaleFactor();
125
125
  const attachmentLoader = new AtlasAttachmentLoader(atlas);
126
- const skeletonJsonReader = new SkeletonJson(attachmentLoader);
127
- skeletonJsonReader.scale = scale;
128
126
  const skeletonJson = cc.loader.getRes(argSkeletonFile);
129
- skeletonData = skeletonJsonReader.readSkeletonData(skeletonJson);
130
- atlas.dispose(skeletonJsonReader);
127
+ if (argSkeletonFile.endsWith('.json')) {
128
+ const skeletonJsonReader = new SkeletonJson(attachmentLoader);
129
+ skeletonJsonReader.scale = scale;
130
+ skeletonData = skeletonJsonReader.readSkeletonData(skeletonJson);
131
+ atlas.dispose(skeletonJsonReader);
132
+ }
133
+ else {
134
+ const skeletonBinaryReader = new SkeletonBinary(attachmentLoader);
135
+ skeletonBinaryReader.scale = scale;
136
+ skeletonData = skeletonBinaryReader.readSkeletonData(skeletonJson);
137
+ atlas.dispose(skeletonBinaryReader);
138
+ }
131
139
  ownsSkeletonData = true;
132
140
  }
133
141
  else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@safe-engine/cocos",
3
- "version": "2.5.7",
3
+ "version": "2.5.9",
4
4
  "description": "safe-engine with cocos renderer support",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -1,6 +0,0 @@
1
- export * from './decorator';
2
- export * from './EnhancedComponent';
3
- export * from './NodeComp';
4
- export * from './NodePool';
5
- export * from './Scene';
6
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}
@@ -1,5 +0,0 @@
1
- export * from './decorator';
2
- export * from './EnhancedComponent';
3
- export * from './NodeComp';
4
- export * from './NodePool';
5
- export * from './Scene';
@@ -1,19 +0,0 @@
1
- import { PixiArmatureDisplay } from 'dragonbones-pixijs';
2
- import { Application } from 'pixi.js';
3
- export declare function loadDragonBonesAssets({ skeleton, atlas, texture }: {
4
- skeleton: any;
5
- atlas: any;
6
- texture: any;
7
- }): Promise<any>;
8
- export declare class PixiDragonBonesSprite extends cc.Sprite {
9
- _canvas: any;
10
- _pixiApp: Application;
11
- _texture: cc.Texture2D;
12
- _config: any;
13
- _armatureDisplay: PixiArmatureDisplay;
14
- constructor(config: any);
15
- _setupArmature(): void;
16
- updateTexture(): void;
17
- onExit(): void;
18
- }
19
- //# sourceMappingURL=PixiDragonBonesSprite.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"PixiDragonBonesSprite.d.ts","sourceRoot":"","sources":["../../src/dragonbones/PixiDragonBonesSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAe,MAAM,oBAAoB,CAAA;AACrE,OAAO,EAAE,WAAW,EAAU,MAAM,SAAS,CAAA;AAE7C,wBAAgB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;;;;CAAA,gBAGjE;AAED,qBAAa,qBAAsB,SAAQ,EAAE,CAAC,MAAM;IAClD,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,OAAO,MAAA;IACP,gBAAgB,EAAE,mBAAmB,CAAA;gBACzB,MAAM,KAAA;IA+BlB,cAAc;IAuBd,aAAa;IASb,MAAM;CAQP"}
@@ -1,75 +0,0 @@
1
- import { PixiFactory } from 'dragonbones-pixijs';
2
- import { Application, Assets } from 'pixi.js';
3
- export function loadDragonBonesAssets({ skeleton, atlas, texture }) {
4
- // console.log('loadDragonBonesAssets', skeleton, atlas, texture)
5
- return Assets.load([skeleton, atlas, texture]);
6
- }
7
- export class PixiDragonBonesSprite extends cc.Sprite {
8
- _canvas;
9
- _pixiApp;
10
- _texture;
11
- _config;
12
- _armatureDisplay;
13
- constructor(config) {
14
- super();
15
- super.ctor(); // always call this for compatibility with cocos2dx JS Javascript class system
16
- this._canvas = document.createElement('canvas');
17
- this._canvas.width = config.width || 1024;
18
- this._canvas.height = config.height || 1024;
19
- this._pixiApp = new Application();
20
- this._pixiApp.init({
21
- view: this._canvas,
22
- width: this._canvas.width,
23
- height: this._canvas.height,
24
- backgroundAlpha: 0, // nền trong suốt
25
- // transparent: true, // bắt buộc để alpha hoạt động
26
- clearBeforeRender: true, // xoá trước khi vẽ frame mới
27
- preserveDrawingBuffer: true, // giúp lấy ảnh từ canvas
28
- antialias: true,
29
- });
30
- this._texture = new cc.Texture2D();
31
- this._texture.initWithElement(this._canvas);
32
- this._texture.handleLoadedTexture();
33
- this.initWithTexture(this._texture);
34
- this._config = config;
35
- this._armatureDisplay = null;
36
- this._setupArmature();
37
- // this.schedule(this.updateTexture, 1 / 30);
38
- }
39
- _setupArmature() {
40
- const { skeleton, atlas, texture, playTimes, animationName, scale = 1 } = this._config;
41
- const factory = PixiFactory.factory;
42
- const atlasAsset = Assets.get(atlas);
43
- const dragonData = factory.parseDragonBonesData(Assets.get(skeleton), atlasAsset.name);
44
- factory.parseTextureAtlasData(Assets.get(atlas), Assets.get(texture), atlasAsset.name);
45
- const { armatureNames } = dragonData;
46
- const armatureName = armatureNames[0];
47
- const display = factory.buildArmatureDisplay(armatureName, atlasAsset.name);
48
- if (!display) {
49
- console.error('Cannot build armature:', armatureName);
50
- return;
51
- }
52
- display.animation.play(animationName, playTimes);
53
- display.x = this._canvas.width / 2;
54
- display.y = this._canvas.height / 2;
55
- display.scale.set(scale);
56
- this._pixiApp.stage.addChild(display);
57
- this._armatureDisplay = display;
58
- }
59
- updateTexture() {
60
- if (this._armatureDisplay && this._pixiApp.renderer && this._pixiApp.stage) {
61
- this._pixiApp.renderer.render(this._pixiApp.stage);
62
- this._texture.initWithElement(this._canvas);
63
- this._texture.handleLoadedTexture();
64
- this.setTexture(this._texture);
65
- }
66
- }
67
- onExit() {
68
- // this.unschedule(this.updateTexture);
69
- this._pixiApp.destroy(true, { children: true });
70
- this._canvas.remove();
71
- this._armatureDisplay.destroy();
72
- this._armatureDisplay = null;
73
- super.onExit();
74
- }
75
- }
@@ -1,22 +0,0 @@
1
- import { Constructor } from 'entityx-ts';
2
- import { BaseComponentProps } from '../safex';
3
- import { NodeComp } from './NodeComp';
4
- export declare class EnhancedComponent<Props = object, N extends NodeComp<any> = NodeComp<any>> {
5
- static hasRender: boolean;
6
- props: Props;
7
- node: N;
8
- enabled: boolean;
9
- constructor(data?: BaseComponentProps<EnhancedComponent> & Props);
10
- init(data?: Props): void;
11
- addComponent<T extends EnhancedComponent>(instance: T): T;
12
- getComponent<T extends EnhancedComponent>(component: Constructor<T>): T;
13
- schedule(callback: (arg: any) => void, interval: number, repeat?: number, delay?: number): void;
14
- unschedule(callback: (arg: any) => void): void;
15
- unscheduleAllCallbacks(): void;
16
- scheduleOnce(callback: (arg: any) => void, delay: number, key?: string): void;
17
- getComponentsInChildren<T extends ComponentType>(component: Constructor<T>): T[];
18
- getComponentInChildren<T extends ComponentType>(component: Constructor<T>): T;
19
- isEqual(other: EnhancedComponent): boolean;
20
- }
21
- export type ComponentType = EnhancedComponent | NodeComp;
22
- //# sourceMappingURL=EnhancedComponent.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/gworld/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpF,MAAM,CAAC,SAAS,UAAO;IACvB,KAAK,EAAE,KAAK,CAAY;IACxB,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,UAAO;gBACF,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAGhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IASjB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGvE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAgC,EAAE,KAAK,SAAI;IAG5G,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI;IAGvC,sBAAsB;IAGtB,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAGtE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}
@@ -1,44 +0,0 @@
1
- export class EnhancedComponent {
2
- static hasRender = true;
3
- props = {};
4
- node;
5
- enabled = true;
6
- constructor(data) {
7
- this.init(data);
8
- }
9
- init(data) {
10
- if (data) {
11
- // console.log('constructor', this.constructor.name, data)
12
- Object.keys(data).forEach((key) => {
13
- this.props[key] = data[key];
14
- });
15
- }
16
- }
17
- addComponent(instance) {
18
- return this.node.addComponent(instance);
19
- }
20
- getComponent(component) {
21
- return this.node.getComponent(component);
22
- }
23
- schedule(callback, interval, repeat = cc.macro.REPEAT_FOREVER, delay = 0) {
24
- this.node.instance.schedule(callback.bind(this), interval, repeat, delay);
25
- }
26
- unschedule(callback) {
27
- this.node.instance.unschedule(callback.bind(this));
28
- }
29
- unscheduleAllCallbacks() {
30
- this.node.instance.unscheduleAllCallbacks();
31
- }
32
- scheduleOnce(callback, delay, key) {
33
- this.node.instance.scheduleOnce(callback, delay, key);
34
- }
35
- getComponentsInChildren(component) {
36
- return this.node.getComponentsInChildren(component);
37
- }
38
- getComponentInChildren(component) {
39
- return this.node.getComponentInChildren(component);
40
- }
41
- isEqual(other) {
42
- return this.node.entity.id === other.node.entity.id;
43
- }
44
- }
@@ -1,153 +0,0 @@
1
- import { Constructor, Entity } from 'entityx-ts';
2
- import { Vec2 } from '../polyfills';
3
- import { ComponentType, EnhancedComponent } from './EnhancedComponent';
4
- export type EventCallbackType = (...args: any[]) => void;
5
- export declare class NodeComp<C extends cc.Node = cc.Node> {
6
- entity: Entity;
7
- instance: C;
8
- parent: NodeComp;
9
- children: NodeComp[];
10
- name: string;
11
- private _group;
12
- private _active;
13
- constructor(instance: C, entity: Entity);
14
- get uuid(): number;
15
- get position(): Readonly<Vec2>;
16
- set position(val: Vec2);
17
- set xy(val: [number, number]);
18
- get posX(): number;
19
- set posX(val: number);
20
- get posY(): number;
21
- set posY(val: number);
22
- get scale(): number;
23
- set scale(val: number);
24
- get scaleX(): number;
25
- set scaleX(val: number);
26
- get scaleY(): number;
27
- set scaleY(val: number);
28
- get anchorX(): number;
29
- set anchorX(val: number);
30
- get anchorY(): number;
31
- set anchorY(val: number);
32
- /**
33
- * Returns the angle of the node in degrees. 0 is the default rotation angle. Positive values rotate node clockwise.
34
- * @function
35
- * @return {Number} The rotation of the node in degrees.
36
- */
37
- get rotation(): number;
38
- /**
39
- *
40
- * Sets the X angle of the node in degrees which performs a horizontal rotational skew.
41
- * (support only in WebGL rendering mode)
42
- * 0 is the default rotation angle.
43
- * Positive values rotate node clockwise, and negative values for anti-clockwise.
44
- *
45
- * @param {Number} degrees The X rotation in degrees which performs a horizontal rotational skew.
46
- */
47
- set rotation(val: number);
48
- get color(): cc.Color;
49
- set color(val: cc.Color);
50
- get opacity(): number;
51
- set opacity(val: number);
52
- get active(): boolean;
53
- set active(val: boolean);
54
- get group(): string | number;
55
- set group(val: string | number);
56
- get width(): number;
57
- set width(val: number);
58
- get height(): number;
59
- set height(val: number);
60
- get zIndex(): number;
61
- set zIndex(val: number);
62
- get childrenCount(): number;
63
- destroy(): void;
64
- addComponent<T extends ComponentType>(instance: T): T;
65
- getComponent<T extends ComponentType>(component: Constructor<T>): T;
66
- getComponentsInChildren<T extends ComponentType>(component: Constructor<T>): T[];
67
- getComponentInChildren<T extends ComponentType>(component: Constructor<T>): T;
68
- hasComponentInChildren<T extends ComponentType>(component: Constructor<T>): boolean;
69
- getPercent(): number;
70
- setPercent(val: number): void;
71
- setTouchEnabled(enabled: boolean): void;
72
- addTouchEventListener(cb: any): void;
73
- convertToNodeSpace(point: cc.Point): {
74
- x: number;
75
- y: number;
76
- equals(other: /*elided*/ any): boolean;
77
- add(value: cc.Point | Vec2): /*elided*/ any;
78
- addSelf(value: cc.Point | Vec2): /*elided*/ any;
79
- sub(value: cc.Point | Vec2): /*elided*/ any;
80
- mul(multiply: number): /*elided*/ any;
81
- mulSelf(multiply: number): /*elided*/ any;
82
- mag(): number;
83
- normalizeSelf(): /*elided*/ any;
84
- normalize(): /*elided*/ any;
85
- cross(other: Vec2): number;
86
- signAngle(other: Vec2): number;
87
- lengthSqr(): number;
88
- dot(other: Vec2): number;
89
- angle(other: Vec2): number;
90
- distance(other: /*elided*/ any): number;
91
- };
92
- convertToNodeSpaceAR(point: cc.Point): {
93
- x: number;
94
- y: number;
95
- equals(other: /*elided*/ any): boolean;
96
- add(value: cc.Point | Vec2): /*elided*/ any;
97
- addSelf(value: cc.Point | Vec2): /*elided*/ any;
98
- sub(value: cc.Point | Vec2): /*elided*/ any;
99
- mul(multiply: number): /*elided*/ any;
100
- mulSelf(multiply: number): /*elided*/ any;
101
- mag(): number;
102
- normalizeSelf(): /*elided*/ any;
103
- normalize(): /*elided*/ any;
104
- cross(other: Vec2): number;
105
- signAngle(other: Vec2): number;
106
- lengthSqr(): number;
107
- dot(other: Vec2): number;
108
- angle(other: Vec2): number;
109
- distance(other: /*elided*/ any): number;
110
- };
111
- convertToWorldSpaceAR(point: cc.Vec2): {
112
- x: number;
113
- y: number;
114
- equals(other: /*elided*/ any): boolean;
115
- add(value: cc.Point | Vec2): /*elided*/ any;
116
- addSelf(value: cc.Point | Vec2): /*elided*/ any;
117
- sub(value: cc.Point | Vec2): /*elided*/ any;
118
- mul(multiply: number): /*elided*/ any;
119
- mulSelf(multiply: number): /*elided*/ any;
120
- mag(): number;
121
- normalizeSelf(): /*elided*/ any;
122
- normalize(): /*elided*/ any;
123
- cross(other: Vec2): number;
124
- signAngle(other: Vec2): number;
125
- lengthSqr(): number;
126
- dot(other: Vec2): number;
127
- angle(other: Vec2): number;
128
- distance(other: /*elided*/ any): number;
129
- };
130
- getPosition(): cc.Point;
131
- setPosition(x: number | cc.Vec2 | cc.Vec3 | cc.Point, y?: number): void;
132
- setRotation(deg: number): void;
133
- getRotation(): number;
134
- setAnchorPoint(point: number | cc.Point, y?: number): void;
135
- getAnchorPoint(): cc.Point;
136
- getBoundingBox(): cc.Rect;
137
- getContentSize(): cc.Size;
138
- setContentSize(size: cc.Size | number, height?: number): void;
139
- setColor(color: cc.Color): void;
140
- setScale(scaleX: number, scaleY?: number): void;
141
- runAction(atc: cc.ActionInterval): void;
142
- stopAllActions(): void;
143
- pauseAllActionsAndSchedule(): void;
144
- resumeAllActionsAndSchedule(): void;
145
- removeFromParent(cleanup?: boolean): void;
146
- addChild(child: NodeComp, zOrder?: number, tag?: number): any;
147
- removeAllChildren(cleanup?: any): void;
148
- getData<T>(key: string): T;
149
- setData<T extends Integer | Float | string>(key: string, value: T): void;
150
- removeData(key: string): void;
151
- resolveComponent(component: EnhancedComponent<object, NodeComp>): void;
152
- }
153
- //# sourceMappingURL=NodeComp.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/gworld/NodeComp.ts"],"names":[],"mappings":"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"}