@safe-engine/cocos 2.5.6 → 2.5.8

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 (7) hide show
  1. package/dist/fasttiled/tield.js +3 -3
  2. package/dist/spine/SpineSkeleton.d.ts.map +1 -1
  3. package/dist/spine/SpineSkeleton.js +1 -2
  4. package/dist/spine/spine-cocos/CCSkeleton.d.ts +3 -3
  5. package/dist/spine/spine-cocos/CCSkeleton.d.ts.map +1 -1
  6. package/dist/spine/spine-cocos/CCSkeleton.js +14 -6
  7. package/package.json +1 -1
package/dist/fasttiled/tield.js CHANGED
@@ -29,7 +29,7 @@ export function tileToPixel(map, tx, ty) {
29
29
  const x0 = tx * (tw / 2);
30
30
  const y0 = ty * th + offset;
31
31
  const x = x0 + tw / 2;
32
- const y = map.height * th - y0 - th / 2;
32
+ const y = -y0 - th / 2;
33
33
  return { x, y };
34
34
  }
35
35
  else {
@@ -38,7 +38,7 @@ export function tileToPixel(map, tx, ty) {
38
38
  const x0 = tx * tw + offset;
39
39
  const y0 = ty * (th / 2);
40
40
  const x = x0 + tw / 2;
41
- const y = map.height * th - y0 - th / 2;
41
+ const y = -y0 - th / 2;
42
42
  return { x, y };
43
43
  }
44
44
  }
@@ -79,7 +79,7 @@ export function loadIsometricMap(mapUrl) {
79
79
  const frame = new cc.SpriteFrame(tilesetTexture, cc.rect(frameX, frameY, tileW, tileH));
80
80
  const sprite = new cc.Sprite(frame);
81
81
  sprite.x = x;
82
- sprite.y = y - cc.winSize.height;
82
+ sprite.y = y;
83
83
  // console.log('x,y', x, y)
84
84
  tileLayer.addChild(sprite);
85
85
  }
package/dist/spine/SpineSkeleton.d.ts.map CHANGED
@@ -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"}
package/dist/spine/SpineSkeleton.js CHANGED
@@ -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 });
package/dist/spine/spine-cocos/CCSkeleton.d.ts CHANGED
@@ -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;
package/dist/spine/spine-cocos/CCSkeleton.d.ts.map CHANGED
@@ -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"}
package/dist/spine/spine-cocos/CCSkeleton.js CHANGED
@@ -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.6",
3
+ "version": "2.5.8",
4
4
  "description": "safe-engine with cocos renderer support",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",