@safe-engine/cocos 2.5.7 → 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.
|
@@ -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;
|
|
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
|
-
|
|
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:
|
|
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:
|
|
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,
|
|
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
|
-
|
|
130
|
-
|
|
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 {
|