@eva/plugin-renderer-spine 1.2.6 → 1.2.7-editor.10

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.
@@ -4,9 +4,188 @@ window.EVA = window.EVA || {};
4
4
  window.EVA.plugin = window.EVA.plugin || {};
5
5
  window.EVA.plugin.renderer = window.EVA.plugin.renderer || {};
6
6
 
7
- var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
7
+ var _EVA_IIFE_spine = function (exports, eva_js, pluginRenderer, pixi_js) {
8
8
  'use strict';
9
9
 
10
+ var _extendStatics$ = function extendStatics$2(d, b) {
11
+ _extendStatics$ = Object.setPrototypeOf || {
12
+ __proto__: []
13
+ } instanceof Array && function (d, b) {
14
+ d.__proto__ = b;
15
+ } || function (d, b) {
16
+ for (var p in b) {
17
+ if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
18
+ }
19
+ };
20
+
21
+ return _extendStatics$(d, b);
22
+ };
23
+
24
+ function __extends$3(d, b) {
25
+ if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
26
+
27
+ _extendStatics$(d, b);
28
+
29
+ function __() {
30
+ this.constructor = d;
31
+ }
32
+
33
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
34
+ }
35
+
36
+ var _extendStatics$2 = function extendStatics$1(d, b) {
37
+ _extendStatics$2 = Object.setPrototypeOf || {
38
+ __proto__: []
39
+ } instanceof Array && function (d, b) {
40
+ d.__proto__ = b;
41
+ } || function (d, b) {
42
+ for (var p in b) {
43
+ if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
44
+ }
45
+ };
46
+
47
+ return _extendStatics$2(d, b);
48
+ };
49
+
50
+ function __extends$2(d, b) {
51
+ if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
52
+
53
+ _extendStatics$2(d, b);
54
+
55
+ function __() {
56
+ this.constructor = d;
57
+ }
58
+
59
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
60
+ }
61
+
62
+ var _assign$ = function __assign$1() {
63
+ _assign$ = Object.assign || function __assign(t) {
64
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
65
+ s = arguments[i];
66
+
67
+ for (var p in s) {
68
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
69
+ }
70
+ }
71
+
72
+ return t;
73
+ };
74
+
75
+ return _assign$.apply(this, arguments);
76
+ };
77
+
78
+ var SymbolKeysNotSupportedError = function (_super) {
79
+ __extends$2(SymbolKeysNotSupportedError, _super);
80
+
81
+ function SymbolKeysNotSupportedError() {
82
+ var _newTarget = this.constructor;
83
+
84
+ var _this = _super.call(this, 'Symbol keys are not supported yet!') || this;
85
+
86
+ Object.setPrototypeOf(_this, _newTarget.prototype);
87
+ return _this;
88
+ }
89
+
90
+ return SymbolKeysNotSupportedError;
91
+ }(Error);
92
+
93
+ (function (_super) {
94
+ __extends$2(StaticGetPropertiesIsNotAFunctionError, _super);
95
+
96
+ function StaticGetPropertiesIsNotAFunctionError() {
97
+ var _newTarget = this.constructor;
98
+
99
+ var _this = _super.call(this, 'getProperties is not a function!') || this;
100
+
101
+ Object.setPrototypeOf(_this, _newTarget.prototype);
102
+ return _this;
103
+ }
104
+
105
+ return StaticGetPropertiesIsNotAFunctionError;
106
+ })(Error);
107
+
108
+ var IDE_PROPERTY_METADATA = 'IDE_PROPERTY_METADATA';
109
+
110
+ function transformBasicType(type) {
111
+ if (type === String) {
112
+ return 'string';
113
+ }
114
+
115
+ if (type === Number) {
116
+ return 'number';
117
+ }
118
+
119
+ if (type === Boolean) {
120
+ return 'boolean';
121
+ }
122
+
123
+ return 'unknown';
124
+ }
125
+
126
+ function defineTypes(target, key, options, returnTypeFunction) {
127
+ var type = Reflect.getMetadata('design:type', target, key);
128
+ var isArray = type === Array;
129
+ var str = transformBasicType(type);
130
+
131
+ if (str !== 'unknown') {
132
+ type = str;
133
+ }
134
+
135
+ if (returnTypeFunction) {
136
+ var returnType = returnTypeFunction();
137
+
138
+ if (Array.isArray(returnType)) {
139
+ isArray = true;
140
+ type = returnType[0];
141
+ } else {
142
+ type = returnType;
143
+ }
144
+ }
145
+
146
+ var properties = Reflect.getMetadata(IDE_PROPERTY_METADATA, target.constructor) || {};
147
+ properties[key] = _assign$({
148
+ type: type,
149
+ isArray: isArray
150
+ }, options);
151
+ Reflect.defineMetadata(IDE_PROPERTY_METADATA, properties, target.constructor);
152
+ }
153
+
154
+ function getTypeDecoratorParams(returnTypeFuncOrOptions, maybeOptions) {
155
+ if (typeof returnTypeFuncOrOptions === 'function') {
156
+ return {
157
+ returnTypeFunc: returnTypeFuncOrOptions,
158
+ options: maybeOptions || {}
159
+ };
160
+ }
161
+
162
+ return {
163
+ options: returnTypeFuncOrOptions || {}
164
+ };
165
+ }
166
+
167
+ function Field(returnTypeFunction, maybeOptions) {
168
+ return function (target, propertyKey) {
169
+ if (typeof propertyKey === 'symbol') {
170
+ throw new SymbolKeysNotSupportedError();
171
+ }
172
+
173
+ var _a = getTypeDecoratorParams(returnTypeFunction, maybeOptions),
174
+ options = _a.options,
175
+ returnTypeFunc = _a.returnTypeFunc;
176
+
177
+ defineTypes(target, propertyKey, options, returnTypeFunc);
178
+ };
179
+ }
180
+
181
+ var ExecuteMode;
182
+
183
+ (function (ExecuteMode) {
184
+ ExecuteMode[ExecuteMode["Edit"] = 2] = "Edit";
185
+ ExecuteMode[ExecuteMode["Game"] = 4] = "Game";
186
+ ExecuteMode[ExecuteMode["All"] = 6] = "All";
187
+ })(ExecuteMode || (ExecuteMode = {}));
188
+
10
189
  var _extendStatics = function extendStatics(d, b) {
11
190
  _extendStatics = Object.setPrototypeOf || {
12
191
  __proto__: []
@@ -31,6 +210,22 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
31
210
  d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
32
211
  }
33
212
 
213
+ var _assign = function __assign() {
214
+ _assign = Object.assign || function __assign(t) {
215
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
216
+ s = arguments[i];
217
+
218
+ for (var p in s) {
219
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
220
+ }
221
+ }
222
+
223
+ return t;
224
+ };
225
+
226
+ return _assign.apply(this, arguments);
227
+ };
228
+
34
229
  function __decorate(decorators, target, key, desc) {
35
230
  var c = arguments.length,
36
231
  r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -41,13 +236,11 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
41
236
  return c > 3 && r && Object.defineProperty(target, key, r), r;
42
237
  }
43
238
 
44
- function __awaiter(thisArg, _arguments, P, generator) {
45
- function adopt(value) {
46
- return value instanceof P ? value : new P(function (resolve) {
47
- resolve(value);
48
- });
49
- }
239
+ function __metadata(metadataKey, metadataValue) {
240
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
241
+ }
50
242
 
243
+ function __awaiter(thisArg, _arguments, P, generator) {
51
244
  return new (P || (P = Promise))(function (resolve, reject) {
52
245
  function fulfilled(value) {
53
246
  try {
@@ -66,7 +259,9 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
66
259
  }
67
260
 
68
261
  function step(result) {
69
- result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
262
+ result.done ? resolve(result.value) : new P(function (resolve) {
263
+ resolve(result.value);
264
+ }).then(fulfilled, rejected);
70
265
  }
71
266
 
72
267
  step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -185,11 +380,10 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
185
380
  }
186
381
 
187
382
  function __values(o) {
188
- var s = typeof Symbol === "function" && Symbol.iterator,
189
- m = s && o[s],
383
+ var m = typeof Symbol === "function" && o[Symbol.iterator],
190
384
  i = 0;
191
385
  if (m) return m.call(o);
192
- if (o && typeof o.length === "number") return {
386
+ return {
193
387
  next: function next() {
194
388
  if (o && i >= o.length) o = void 0;
195
389
  return {
@@ -198,29 +392,13 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
198
392
  };
199
393
  }
200
394
  };
201
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
202
395
  }
203
396
 
204
- function getIDEPropsPropertyObj(target, propertyKey) {
205
- if (!target.constructor.IDEProps) {
206
- target.constructor.IDEProps = {};
207
- }
208
-
209
- if (!target.constructor.IDEProps[propertyKey]) {
210
- target.constructor.IDEProps[propertyKey] = {};
211
- }
212
-
213
- var propertyObj = target.constructor.IDEProps[propertyKey];
214
- return propertyObj;
215
- }
216
-
217
- function type(type) {
218
- return function (target, propertyKey) {
219
- var prop = getIDEPropsPropertyObj(target, propertyKey);
220
- prop.key = propertyKey;
221
- prop.type = type;
222
- };
223
- }
397
+ var sleep = function sleep(time) {
398
+ return new Promise(function (resolve) {
399
+ return setTimeout(resolve, time);
400
+ });
401
+ };
224
402
 
225
403
  var Spine$2 = function (_super) {
226
404
  __extends$1(Spine, _super);
@@ -387,16 +565,52 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
387
565
 
388
566
  Spine.componentName = 'Spine';
389
567
 
390
- __decorate([type('string')], Spine.prototype, "resource", void 0);
568
+ __decorate([Field({
569
+ type: 'resource'
570
+ }), __metadata("design:type", String)], Spine.prototype, "resource", void 0);
571
+
572
+ __decorate([Field({
573
+ type: 'selector',
574
+ options: function options(that) {
575
+ var _a, _b, _c;
576
+
577
+ return __awaiter(this, void 0, void 0, function () {
578
+ var animations;
579
+ return __generator(this, function (_d) {
580
+ switch (_d.label) {
581
+ case 0:
582
+ return [4, sleep(0)];
391
583
 
392
- __decorate([type('string')], Spine.prototype, "animationName", void 0);
584
+ case 1:
585
+ _d.sent();
586
+
587
+ if (!that.resource || !eva_js.resource.promiseMap[that.resource]) {
588
+ return [2, {}];
589
+ }
393
590
 
394
- __decorate([type('boolean')], Spine.prototype, "autoPlay", void 0);
591
+ return [4, eva_js.resource.promiseMap[that.resource]];
592
+
593
+ case 2:
594
+ _d.sent();
595
+
596
+ animations = (_c = (_b = (_a = eva_js.resource.resourcesMap[that.resource]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.ske) === null || _c === void 0 ? void 0 : _c.animations;
597
+ return [2, animations ? Object.keys(animations).reduce(function (prev, key) {
598
+ var _a;
599
+
600
+ return _assign(_assign({}, prev), (_a = {}, _a[key] = key, _a));
601
+ }, {}) : {}];
602
+ }
603
+ });
604
+ });
605
+ }
606
+ }), __metadata("design:type", String)], Spine.prototype, "animationName", void 0);
607
+
608
+ __decorate([Field(), __metadata("design:type", Boolean)], Spine.prototype, "autoPlay", void 0);
395
609
 
396
610
  return Spine;
397
611
  }(eva_js.Component);
398
612
 
399
- var SpineBase = Spine$2;
613
+ var Spine$1$1 = Spine$2;
400
614
  var texCache = {};
401
615
 
402
616
  function cacheImage(data) {
@@ -544,21 +758,21 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
544
758
  var obj = objs[i];
545
759
 
546
760
  if (obj.id === id) {
547
- var sp = obj.getComponent(SpineBase);
761
+ var sp = obj.getComponent(Spine$1$1);
548
762
 
549
763
  if (sp) {
550
764
  _this.remove({
551
765
  type: eva_js.OBSERVER_TYPE.REMOVE,
552
766
  gameObject: obj,
553
767
  component: sp,
554
- componentName: SpineBase.componentName
768
+ componentName: Spine$1$1.componentName
555
769
  });
556
770
 
557
771
  toAdd.push({
558
772
  type: eva_js.OBSERVER_TYPE.ADD,
559
773
  gameObject: obj,
560
774
  component: sp,
561
- componentName: SpineBase.componentName
775
+ componentName: Spine$1$1.componentName
562
776
  });
563
777
  }
564
778
 
@@ -610,7 +824,7 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
610
824
  var _a, _b;
611
825
 
612
826
  return __awaiter(this, void 0, void 0, function () {
613
- var component, res, spineData, container, armature, tran;
827
+ var component, gameObjectId, asyncId, res, spineData, container, armature, tran;
614
828
 
615
829
  var _this = this;
616
830
 
@@ -619,14 +833,18 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
619
833
  case 0:
620
834
  component = changed.component;
621
835
  clearTimeout(component.addHandler);
836
+ gameObjectId = changed.gameObject.id;
837
+ asyncId = this.increaseAsyncId(gameObjectId);
622
838
  return [4, eva_js.resource.getResource(component.resource)];
623
839
 
624
840
  case 1:
625
841
  res = _c.sent();
842
+ if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
626
843
  return [4, getSpineData(res, this.pixiSpine)];
627
844
 
628
845
  case 2:
629
846
  spineData = _c.sent();
847
+ if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
630
848
 
631
849
  if (!spineData) {
632
850
  component.addHandler = setTimeout(function () {
@@ -719,6 +937,7 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
719
937
  return __generator(this, function (_e) {
720
938
  switch (_e.label) {
721
939
  case 0:
940
+ this.increaseAsyncId(changed.gameObject.id);
722
941
  component = changed.component;
723
942
  clearTimeout(component.addHandler);
724
943
  armature = this.armatures[changed.gameObject.id];
@@ -756,7 +975,8 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
756
975
  return SpineSystem;
757
976
  }(pluginRenderer.Renderer);
758
977
 
759
- var SpineSystemBase = SpineSystem$2;
978
+ var SpineSystem$1$1 = SpineSystem$2;
979
+ eva_js.resource.registerResourceType('SPINE');
760
980
  var VERSION = '4.8.9';
761
981
  var loader = pixi_js.loaders.shared;
762
982
  var PIXI = {
@@ -9552,9 +9772,9 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
9552
9772
  var cachedResource = loader.resources[name];
9553
9773
 
9554
9774
  if (cachedResource) {
9555
- var done = function done() {
9775
+ function done() {
9556
9776
  callback(cachedResource.texture.baseTexture);
9557
- };
9777
+ }
9558
9778
 
9559
9779
  if (cachedResource.texture) {
9560
9780
  done();
@@ -9605,7 +9825,7 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
9605
9825
  var pixiSpine = pixi_spine;
9606
9826
 
9607
9827
  var SpineSystem = function (_super) {
9608
- __extends$1(SpineSystem, _super);
9828
+ __extends$3(SpineSystem, _super);
9609
9829
 
9610
9830
  function SpineSystem() {
9611
9831
  return _super !== null && _super.apply(this, arguments) || this;
@@ -9618,19 +9838,19 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
9618
9838
  };
9619
9839
 
9620
9840
  return SpineSystem;
9621
- }(SpineSystemBase);
9841
+ }(SpineSystem$1$1);
9622
9842
 
9623
9843
  var SpineSystem$1 = SpineSystem;
9624
9844
 
9625
9845
  var Spine = function (_super) {
9626
- __extends$1(Spine, _super);
9846
+ __extends$3(Spine, _super);
9627
9847
 
9628
9848
  function Spine() {
9629
9849
  return _super !== null && _super.apply(this, arguments) || this;
9630
9850
  }
9631
9851
 
9632
9852
  return Spine;
9633
- }(SpineBase);
9853
+ }(Spine$1$1);
9634
9854
 
9635
9855
  var Spine$1 = Spine;
9636
9856
  exports.Spine = Spine$1;
@@ -9639,6 +9859,6 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
9639
9859
  value: true
9640
9860
  });
9641
9861
  return exports;
9642
- }({}, PIXI, EVA, EVA.plugin.renderer);
9862
+ }({}, EVA, EVA.plugin.renderer, PIXI);
9643
9863
 
9644
9864
  window.EVA.plugin.renderer.spine = window.EVA.plugin.renderer.spine || _EVA_IIFE_spine;