@eva/plugin-renderer-render 1.2.7-editor.9 → 1.2.7-fix.4

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,9 +1,7 @@
1
- function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
2
-
1
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
3
2
  window.EVA = window.EVA || {};
4
3
  window.EVA.plugin = window.EVA.plugin || {};
5
4
  window.EVA.plugin.renderer = window.EVA.plugin.renderer || {};
6
-
7
5
  var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
8
6
  'use strict';
9
7
 
@@ -14,63 +12,34 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
14
12
  d.__proto__ = b;
15
13
  } || function (d, b) {
16
14
  for (var p in b) {
17
- if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
15
+ if (b.hasOwnProperty(p)) d[p] = b[p];
18
16
  }
19
17
  };
20
-
21
18
  return _extendStatics(d, b);
22
19
  };
23
-
24
20
  function __extends(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
21
  _extendStatics(d, b);
28
-
29
22
  function __() {
30
23
  this.constructor = d;
31
24
  }
32
-
33
25
  d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
34
26
  }
35
-
36
- var _assign = function __assign() {
37
- _assign = Object.assign || function __assign(t) {
38
- for (var s, i = 1, n = arguments.length; i < n; i++) {
39
- s = arguments[i];
40
-
41
- for (var p in s) {
42
- if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
43
- }
44
- }
45
-
46
- return t;
47
- };
48
-
49
- return _assign.apply(this, arguments);
50
- };
51
-
52
27
  function __decorate(decorators, target, key, desc) {
53
28
  var c = arguments.length,
54
- r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
55
- d;
29
+ r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
30
+ d;
56
31
  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
57
32
  if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
58
33
  }
59
34
  return c > 3 && r && Object.defineProperty(target, key, r), r;
60
35
  }
61
-
62
- function __metadata(metadataKey, metadataValue) {
63
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
64
- }
65
-
66
36
  function __read(o, n) {
67
37
  var m = typeof Symbol === "function" && o[Symbol.iterator];
68
38
  if (!m) return o;
69
39
  var i = m.call(o),
70
- r,
71
- ar = [],
72
- e;
73
-
40
+ r,
41
+ ar = [],
42
+ e;
74
43
  try {
75
44
  while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
76
45
  ar.push(r.value);
@@ -86,135 +55,41 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
86
55
  if (e) throw e.error;
87
56
  }
88
57
  }
89
-
90
58
  return ar;
91
59
  }
92
-
93
60
  function __spread() {
94
61
  for (var ar = [], i = 0; i < arguments.length; i++) {
95
62
  ar = ar.concat(__read(arguments[i]));
96
63
  }
97
-
98
64
  return ar;
99
65
  }
100
-
101
- var SymbolKeysNotSupportedError = function (_super) {
102
- __extends(SymbolKeysNotSupportedError, _super);
103
-
104
- function SymbolKeysNotSupportedError() {
105
- var _newTarget = this.constructor;
106
-
107
- var _this = _super.call(this, 'Symbol keys are not supported yet!') || this;
108
-
109
- Object.setPrototypeOf(_this, _newTarget.prototype);
110
- return _this;
111
- }
112
-
113
- return SymbolKeysNotSupportedError;
114
- }(Error);
115
-
116
- (function (_super) {
117
- __extends(StaticGetPropertiesIsNotAFunctionError, _super);
118
-
119
- function StaticGetPropertiesIsNotAFunctionError() {
120
- var _newTarget = this.constructor;
121
-
122
- var _this = _super.call(this, 'getProperties is not a function!') || this;
123
-
124
- Object.setPrototypeOf(_this, _newTarget.prototype);
125
- return _this;
126
- }
127
-
128
- return StaticGetPropertiesIsNotAFunctionError;
129
- })(Error);
130
-
131
- var IDE_PROPERTY_METADATA = 'IDE_PROPERTY_METADATA';
132
-
133
- function transformBasicType(type) {
134
- if (type === String) {
135
- return 'string';
136
- }
137
-
138
- if (type === Number) {
139
- return 'number';
140
- }
141
-
142
- if (type === Boolean) {
143
- return 'boolean';
144
- }
145
-
146
- return 'unknown';
147
- }
148
-
149
- function defineTypes(target, key, options, returnTypeFunction) {
150
- var type = Reflect.getMetadata('design:type', target, key);
151
- var isArray = type === Array;
152
- var str = transformBasicType(type);
153
-
154
- if (str !== 'unknown') {
155
- type = str;
66
+ function getIDEPropsPropertyObj(target, propertyKey) {
67
+ if (!target.constructor.IDEProps) {
68
+ target.constructor.IDEProps = {};
156
69
  }
157
-
158
- if (returnTypeFunction) {
159
- var returnType = returnTypeFunction();
160
-
161
- if (Array.isArray(returnType)) {
162
- isArray = true;
163
- type = returnType[0];
164
- } else {
165
- type = returnType;
166
- }
70
+ if (!target.constructor.IDEProps[propertyKey]) {
71
+ target.constructor.IDEProps[propertyKey] = {};
167
72
  }
168
-
169
- var properties = Reflect.getMetadata(IDE_PROPERTY_METADATA, target.constructor) || {};
170
- properties[key] = _assign({
171
- type: type,
172
- isArray: isArray
173
- }, options);
174
- Reflect.defineMetadata(IDE_PROPERTY_METADATA, properties, target.constructor);
73
+ var propertyObj = target.constructor.IDEProps[propertyKey];
74
+ return propertyObj;
175
75
  }
176
-
177
- function getTypeDecoratorParams(returnTypeFuncOrOptions, maybeOptions) {
178
- if (typeof returnTypeFuncOrOptions === 'function') {
179
- return {
180
- returnTypeFunc: returnTypeFuncOrOptions,
181
- options: maybeOptions || {}
182
- };
183
- }
184
-
185
- return {
186
- options: returnTypeFuncOrOptions || {}
76
+ function type(type) {
77
+ return function (target, propertyKey) {
78
+ var prop = getIDEPropsPropertyObj(target, propertyKey);
79
+ prop.key = propertyKey;
80
+ prop.type = type;
187
81
  };
188
82
  }
189
-
190
- function Field(returnTypeFunction, maybeOptions) {
83
+ function step(step) {
191
84
  return function (target, propertyKey) {
192
- if (typeof propertyKey === 'symbol') {
193
- throw new SymbolKeysNotSupportedError();
194
- }
195
-
196
- var _a = getTypeDecoratorParams(returnTypeFunction, maybeOptions),
197
- options = _a.options,
198
- returnTypeFunc = _a.returnTypeFunc;
199
-
200
- defineTypes(target, propertyKey, options, returnTypeFunc);
85
+ var prop = getIDEPropsPropertyObj(target, propertyKey);
86
+ prop.step = step;
201
87
  };
202
88
  }
203
-
204
- var ExecuteMode;
205
-
206
- (function (ExecuteMode) {
207
- ExecuteMode[ExecuteMode["Edit"] = 2] = "Edit";
208
- ExecuteMode[ExecuteMode["Game"] = 4] = "Game";
209
- ExecuteMode[ExecuteMode["All"] = 6] = "All";
210
- })(ExecuteMode || (ExecuteMode = {}));
211
-
212
89
  var Render$2 = function (_super) {
213
90
  __extends(Render, _super);
214
-
215
91
  function Render() {
216
92
  var _this = _super !== null && _super.apply(this, arguments) || this;
217
-
218
93
  _this.sortDirty = false;
219
94
  _this.visible = true;
220
95
  _this.alpha = 1;
@@ -222,53 +97,34 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
222
97
  _this.sortableChildren = false;
223
98
  return _this;
224
99
  }
225
-
226
100
  Render.prototype.init = function (obj) {
227
101
  obj && _extends(this, obj);
228
102
  };
229
-
230
103
  Render.componentName = 'Render';
231
-
232
- __decorate([Field(), __metadata("design:type", Boolean)], Render.prototype, "visible", void 0);
233
-
234
- __decorate([Field({
235
- step: 0.1
236
- }), __metadata("design:type", Number)], Render.prototype, "alpha", void 0);
237
-
238
- __decorate([Field({
239
- step: 1
240
- }), __metadata("design:type", Number)], Render.prototype, "zIndex", void 0);
241
-
242
- __decorate([Field(), __metadata("design:type", Boolean)], Render.prototype, "sortableChildren", void 0);
243
-
104
+ __decorate([type('boolean')], Render.prototype, "visible", void 0);
105
+ __decorate([type('number'), step(0.1)], Render.prototype, "alpha", void 0);
106
+ __decorate([type('number'), step(1)], Render.prototype, "zIndex", void 0);
107
+ __decorate([type('boolean')], Render.prototype, "sortableChildren", void 0);
244
108
  return Render;
245
109
  }(eva_js.Component);
246
-
247
110
  var Render$3 = Render$2;
248
-
249
111
  var Render = function (_super) {
250
112
  __extends(Render, _super);
251
-
252
113
  function Render() {
253
114
  var _this = _super !== null && _super.apply(this, arguments) || this;
254
-
255
115
  _this.name = 'Render';
256
116
  return _this;
257
117
  }
258
-
259
118
  Render.prototype.init = function () {
260
119
  this.renderSystem = this.game.getSystem(pluginRenderer.RendererSystem);
261
120
  this.renderSystem.rendererManager.register(this);
262
121
  };
263
-
264
122
  Render.prototype.rendererUpdate = function (gameObject) {
265
123
  var _this = this;
266
-
267
124
  var component = gameObject.getComponent('Render');
268
125
  var container = this.containerManager.getContainer(gameObject.id);
269
126
  container.alpha = component.alpha;
270
127
  container.visible = component.visible;
271
-
272
128
  if (component.sortDirty && component.sortableChildren) {
273
129
  var gameObjects = gameObject.transform.children.map(function (_a) {
274
130
  var gameObject = _a.gameObject;
@@ -277,15 +133,12 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
277
133
  var children_1 = gameObjects.sort(function (a, b) {
278
134
  var aRender = a.getComponent('Render');
279
135
  var bRender = b.getComponent('Render');
280
-
281
136
  if (!aRender) {
282
137
  return -1;
283
138
  }
284
-
285
139
  if (!bRender) {
286
140
  return 1;
287
141
  }
288
-
289
142
  return aRender.zIndex - bRender.zIndex;
290
143
  }).map(function (gameObject) {
291
144
  return _this.containerManager.getContainer(gameObject.id);
@@ -299,55 +152,45 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
299
152
  component.sortDirty = false;
300
153
  }
301
154
  };
302
-
303
155
  Render.prototype.componentChanged = function (changed) {
304
156
  if (changed.type === eva_js.OBSERVER_TYPE.ADD || changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
305
157
  this.add(changed);
306
158
  }
307
-
308
159
  if (changed.type === eva_js.OBSERVER_TYPE.CHANGE) {
309
160
  this.change(changed);
310
161
  }
311
-
312
162
  if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
313
163
  this.remove(changed);
314
164
  }
315
165
  };
316
-
317
166
  Render.prototype.add = function (changed) {
318
167
  if (changed.component.name === 'Render') {
319
168
  this.setDirty(changed);
320
169
  }
321
170
  };
322
-
323
171
  Render.prototype.change = function (changed) {
324
172
  if (changed.component.name === 'Render' && changed.prop.prop[0] === 'zIndex') {
325
173
  this.setDirty(changed);
326
174
  }
327
175
  };
328
-
329
176
  Render.prototype.remove = function (changed) {
330
177
  if (changed.component.name === 'Render') {
331
178
  var container = this.containerManager.getContainer(changed.gameObject.id);
332
179
  container.alpha = 1;
333
180
  }
334
181
  };
335
-
336
182
  Render.prototype.setDirty = function (changed) {
337
183
  var parentRender = changed.gameObject.parent && changed.gameObject.parent.getComponent('Render');
338
-
339
184
  if (parentRender) {
340
185
  parentRender.sortDirty = true;
341
186
  }
342
187
  };
343
-
344
188
  Render.systemName = 'Render';
345
189
  Render = __decorate([eva_js.decorators.componentObserver({
346
190
  Render: ['zIndex']
347
191
  })], Render);
348
192
  return Render;
349
193
  }(pluginRenderer.Renderer);
350
-
351
194
  var Render$1 = Render;
352
195
  exports.Render = Render$3;
353
196
  exports.RenderSystem = Render$1;
@@ -356,5 +199,4 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
356
199
  });
357
200
  return exports;
358
201
  }({}, EVA, EVA.plugin.renderer);
359
-
360
202
  window.EVA.plugin.renderer.render = window.EVA.plugin.renderer.render || _EVA_IIFE_render;
@@ -1 +1 @@
1
- function _extends(){return _extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},_extends.apply(this,arguments)}window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_render=function(e,t,n){"use strict";var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])},r(e,t)};function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}var i=function(){return i=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e},i.apply(this,arguments)};function a(e,t,n,r){var o,i=arguments.length,a=i<3?t:null===r?r=Object.getOwnPropertyDescriptor(t,n):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,n,r);else for(var p=e.length-1;p>=0;p--)(o=e[p])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}function p(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function c(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,i=n.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return a}var u=function(e){function t(){var t=this.constructor,n=e.call(this,"Symbol keys are not supported yet!")||this;return Object.setPrototypeOf(n,t.prototype),n}return o(t,e),t}(Error);!function(e){function t(){var t=this.constructor,n=e.call(this,"getProperties is not a function!")||this;return Object.setPrototypeOf(n,t.prototype),n}o(t,e)}(Error);var s,l="IDE_PROPERTY_METADATA";function f(e,t,n,r){var o=Reflect.getMetadata("design:type",e,t),a=o===Array,p=function(e){return e===String?"string":e===Number?"number":e===Boolean?"boolean":"unknown"}(o);if("unknown"!==p&&(o=p),r){var c=r();Array.isArray(c)?(a=!0,o=c[0]):o=c}var u=Reflect.getMetadata(l,e.constructor)||{};u[t]=i({type:o,isArray:a},n),Reflect.defineMetadata(l,u,e.constructor)}function d(e,t){return function(n,r){if("symbol"==typeof r)throw new u;var o=function(e,t){return"function"==typeof e?{returnTypeFunc:e,options:t||{}}:{options:e||{}}}(e,t);f(n,r,o.options,o.returnTypeFunc)}}!function(e){e[e.Edit=2]="Edit",e[e.Game=4]="Game",e[e.All=6]="All"}(s||(s={}));var y=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.sortDirty=!1,t.visible=!0,t.alpha=1,t.zIndex=0,t.sortableChildren=!1,t}return o(t,e),t.prototype.init=function(e){e&&_extends(this,e)},t.componentName="Render",a([d(),p("design:type",Boolean)],t.prototype,"visible",void 0),a([d({step:.1}),p("design:type",Number)],t.prototype,"alpha",void 0),a([d({step:1}),p("design:type",Number)],t.prototype,"zIndex",void 0),a([d(),p("design:type",Boolean)],t.prototype,"sortableChildren",void 0),t}(t.Component),h=y,g=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Render",t}return o(r,e),r.prototype.init=function(){this.renderSystem=this.game.getSystem(n.RendererSystem),this.renderSystem.rendererManager.register(this)},r.prototype.rendererUpdate=function(e){var t=this,n=e.getComponent("Render"),r=this.containerManager.getContainer(e.id);if(r.alpha=n.alpha,r.visible=n.visible,n.sortDirty&&n.sortableChildren){var o=e.transform.children.map((function(e){return e.gameObject})).sort((function(e,t){var n=e.getComponent("Render"),r=t.getComponent("Render");return n?r?n.zIndex-r.zIndex:1:-1})).map((function(e){return t.containerManager.getContainer(e.id)})),i=this.containerManager.getContainer(n.gameObject.id).children,a=i.filter((function(e){return-1===o.indexOf(e)}));i.length=0,i.push.apply(i,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(c(arguments[t]));return e}(a,o)),n.sortDirty=!1}},r.prototype.componentChanged=function(e){e.type!==t.OBSERVER_TYPE.ADD&&e.type!==t.OBSERVER_TYPE.REMOVE||this.add(e),e.type===t.OBSERVER_TYPE.CHANGE&&this.change(e),e.type===t.OBSERVER_TYPE.REMOVE&&this.remove(e)},r.prototype.add=function(e){"Render"===e.component.name&&this.setDirty(e)},r.prototype.change=function(e){"Render"===e.component.name&&"zIndex"===e.prop.prop[0]&&this.setDirty(e)},r.prototype.remove=function(e){"Render"===e.component.name&&(this.containerManager.getContainer(e.gameObject.id).alpha=1)},r.prototype.setDirty=function(e){var t=e.gameObject.parent&&e.gameObject.parent.getComponent("Render");t&&(t.sortDirty=!0)},r.systemName="Render",r=a([t.decorators.componentObserver({Render:["zIndex"]})],r)}(n.Renderer),m=g;return e.Render=h,e.RenderSystem=m,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer);window.EVA.plugin.renderer.render=window.EVA.plugin.renderer.render||_EVA_IIFE_render;
1
+ function _extends(){return _extends=Object.assign?Object.assign.bind():function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])}return e},_extends.apply(this,arguments)}window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_render=function(e,n,t){"use strict";var r=function(e,n){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,n){e.__proto__=n}||function(e,n){for(var t in n)n.hasOwnProperty(t)&&(e[t]=n[t])},r(e,n)};function o(e,n){function t(){this.constructor=e}r(e,n),e.prototype=null===n?Object.create(n):(t.prototype=n.prototype,new t)}function i(e,n,t,r){var o,i=arguments.length,a=i<3?n:null===r?r=Object.getOwnPropertyDescriptor(n,t):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,n,t,r);else for(var p=e.length-1;p>=0;p--)(o=e[p])&&(a=(i<3?o(a):i>3?o(n,t,a):o(n,t))||a);return i>3&&a&&Object.defineProperty(n,t,a),a}function a(e,n){var t="function"==typeof Symbol&&e[Symbol.iterator];if(!t)return e;var r,o,i=t.call(e),a=[];try{for(;(void 0===n||n-- >0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(t=i.return)&&t.call(i)}finally{if(o)throw o.error}}return a}function p(e,n){return e.constructor.IDEProps||(e.constructor.IDEProps={}),e.constructor.IDEProps[n]||(e.constructor.IDEProps[n]={}),e.constructor.IDEProps[n]}function c(e){return function(n,t){var r=p(n,t);r.key=t,r.type=e}}function u(e){return function(n,t){p(n,t).step=e}}var s=function(e){function n(){var n=null!==e&&e.apply(this,arguments)||this;return n.sortDirty=!1,n.visible=!0,n.alpha=1,n.zIndex=0,n.sortableChildren=!1,n}return o(n,e),n.prototype.init=function(e){e&&_extends(this,e)},n.componentName="Render",i([c("boolean")],n.prototype,"visible",void 0),i([c("number"),u(.1)],n.prototype,"alpha",void 0),i([c("number"),u(1)],n.prototype,"zIndex",void 0),i([c("boolean")],n.prototype,"sortableChildren",void 0),n}(n.Component),d=s,l=function(e){function r(){var n=null!==e&&e.apply(this,arguments)||this;return n.name="Render",n}return o(r,e),r.prototype.init=function(){this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this)},r.prototype.rendererUpdate=function(e){var n=this,t=e.getComponent("Render"),r=this.containerManager.getContainer(e.id);if(r.alpha=t.alpha,r.visible=t.visible,t.sortDirty&&t.sortableChildren){var o=e.transform.children.map((function(e){return e.gameObject})).sort((function(e,n){var t=e.getComponent("Render"),r=n.getComponent("Render");return t?r?t.zIndex-r.zIndex:1:-1})).map((function(e){return n.containerManager.getContainer(e.id)})),i=this.containerManager.getContainer(t.gameObject.id).children,p=i.filter((function(e){return-1===o.indexOf(e)}));i.length=0,i.push.apply(i,function(){for(var e=[],n=0;n<arguments.length;n++)e=e.concat(a(arguments[n]));return e}(p,o)),t.sortDirty=!1}},r.prototype.componentChanged=function(e){e.type!==n.OBSERVER_TYPE.ADD&&e.type!==n.OBSERVER_TYPE.REMOVE||this.add(e),e.type===n.OBSERVER_TYPE.CHANGE&&this.change(e),e.type===n.OBSERVER_TYPE.REMOVE&&this.remove(e)},r.prototype.add=function(e){"Render"===e.component.name&&this.setDirty(e)},r.prototype.change=function(e){"Render"===e.component.name&&"zIndex"===e.prop.prop[0]&&this.setDirty(e)},r.prototype.remove=function(e){"Render"===e.component.name&&(this.containerManager.getContainer(e.gameObject.id).alpha=1)},r.prototype.setDirty=function(e){var n=e.gameObject.parent&&e.gameObject.parent.getComponent("Render");n&&(n.sortDirty=!0)},r.systemName="Render",r=i([n.decorators.componentObserver({Render:["zIndex"]})],r)}(t.Renderer),f=l;return e.Render=d,e.RenderSystem=f,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer);window.EVA.plugin.renderer.render=window.EVA.plugin.renderer.render||_EVA_IIFE_render;
@@ -0,0 +1,112 @@
1
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
2
+ import { __extends, __decorate, __spread } from 'tslib';
3
+ import { Component, OBSERVER_TYPE, decorators } from '@eva/eva.js/dist/miniprogram';
4
+ import { type, step } from '@eva/inspector-decorator';
5
+ import { RendererSystem, Renderer } from '@eva/plugin-renderer/dist/miniprogram';
6
+ var Render$2 = function (_super) {
7
+ __extends(Render, _super);
8
+ function Render() {
9
+ var _this = _super !== null && _super.apply(this, arguments) || this;
10
+ _this.sortDirty = false;
11
+ _this.visible = true;
12
+ _this.alpha = 1;
13
+ _this.zIndex = 0;
14
+ _this.sortableChildren = false;
15
+ return _this;
16
+ }
17
+ Render.prototype.init = function (obj) {
18
+ obj && _extends(this, obj);
19
+ };
20
+ Render.componentName = 'Render';
21
+ __decorate([type('boolean')], Render.prototype, "visible", void 0);
22
+ __decorate([type('number'), step(0.1)], Render.prototype, "alpha", void 0);
23
+ __decorate([type('number'), step(1)], Render.prototype, "zIndex", void 0);
24
+ __decorate([type('boolean')], Render.prototype, "sortableChildren", void 0);
25
+ return Render;
26
+ }(Component);
27
+ var Render$3 = Render$2;
28
+ var Render = function (_super) {
29
+ __extends(Render, _super);
30
+ function Render() {
31
+ var _this = _super !== null && _super.apply(this, arguments) || this;
32
+ _this.name = 'Render';
33
+ return _this;
34
+ }
35
+ Render.prototype.init = function () {
36
+ this.renderSystem = this.game.getSystem(RendererSystem);
37
+ this.renderSystem.rendererManager.register(this);
38
+ };
39
+ Render.prototype.rendererUpdate = function (gameObject) {
40
+ var _this = this;
41
+ var component = gameObject.getComponent('Render');
42
+ var container = this.containerManager.getContainer(gameObject.id);
43
+ container.alpha = component.alpha;
44
+ container.visible = component.visible;
45
+ if (component.sortDirty && component.sortableChildren) {
46
+ var gameObjects = gameObject.transform.children.map(function (_a) {
47
+ var gameObject = _a.gameObject;
48
+ return gameObject;
49
+ });
50
+ var children_1 = gameObjects.sort(function (a, b) {
51
+ var aRender = a.getComponent('Render');
52
+ var bRender = b.getComponent('Render');
53
+ if (!aRender) {
54
+ return -1;
55
+ }
56
+ if (!bRender) {
57
+ return 1;
58
+ }
59
+ return aRender.zIndex - bRender.zIndex;
60
+ }).map(function (gameObject) {
61
+ return _this.containerManager.getContainer(gameObject.id);
62
+ });
63
+ var oldChildren = this.containerManager.getContainer(component.gameObject.id).children;
64
+ var elements = oldChildren.filter(function (c) {
65
+ return children_1.indexOf(c) === -1;
66
+ });
67
+ oldChildren.length = 0;
68
+ oldChildren.push.apply(oldChildren, __spread(elements, children_1));
69
+ component.sortDirty = false;
70
+ }
71
+ };
72
+ Render.prototype.componentChanged = function (changed) {
73
+ if (changed.type === OBSERVER_TYPE.ADD || changed.type === OBSERVER_TYPE.REMOVE) {
74
+ this.add(changed);
75
+ }
76
+ if (changed.type === OBSERVER_TYPE.CHANGE) {
77
+ this.change(changed);
78
+ }
79
+ if (changed.type === OBSERVER_TYPE.REMOVE) {
80
+ this.remove(changed);
81
+ }
82
+ };
83
+ Render.prototype.add = function (changed) {
84
+ if (changed.component.name === 'Render') {
85
+ this.setDirty(changed);
86
+ }
87
+ };
88
+ Render.prototype.change = function (changed) {
89
+ if (changed.component.name === 'Render' && changed.prop.prop[0] === 'zIndex') {
90
+ this.setDirty(changed);
91
+ }
92
+ };
93
+ Render.prototype.remove = function (changed) {
94
+ if (changed.component.name === 'Render') {
95
+ var container = this.containerManager.getContainer(changed.gameObject.id);
96
+ container.alpha = 1;
97
+ }
98
+ };
99
+ Render.prototype.setDirty = function (changed) {
100
+ var parentRender = changed.gameObject.parent && changed.gameObject.parent.getComponent('Render');
101
+ if (parentRender) {
102
+ parentRender.sortDirty = true;
103
+ }
104
+ };
105
+ Render.systemName = 'Render';
106
+ Render = __decorate([decorators.componentObserver({
107
+ Render: ['zIndex']
108
+ })], Render);
109
+ return Render;
110
+ }(Renderer);
111
+ var Render$1 = Render;
112
+ export { Render$3 as Render, Render$1 as RenderSystem };
@@ -42,10 +42,6 @@ function __decorate(decorators, target, key, desc) {
42
42
  return c > 3 && r && Object.defineProperty(target, key, r), r;
43
43
  }
44
44
 
45
- function __metadata(metadataKey, metadataValue) {
46
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
47
- }
48
-
49
45
  function __read(o, n) {
50
46
  var m = typeof Symbol === "function" && o[Symbol.iterator];
51
47
  if (!m) return o;
@@ -85,20 +81,18 @@ var Render$2 = (function (_super) {
85
81
  };
86
82
  Render.componentName = 'Render';
87
83
  __decorate([
88
- inspectorDecorator.Field(),
89
- __metadata("design:type", Boolean)
84
+ inspectorDecorator.type('boolean')
90
85
  ], Render.prototype, "visible", void 0);
91
86
  __decorate([
92
- inspectorDecorator.Field({ step: 0.1 }),
93
- __metadata("design:type", Number)
87
+ inspectorDecorator.type('number'),
88
+ inspectorDecorator.step(0.1)
94
89
  ], Render.prototype, "alpha", void 0);
95
90
  __decorate([
96
- inspectorDecorator.Field({ step: 1 }),
97
- __metadata("design:type", Number)
91
+ inspectorDecorator.type('number'),
92
+ inspectorDecorator.step(1)
98
93
  ], Render.prototype, "zIndex", void 0);
99
94
  __decorate([
100
- inspectorDecorator.Field(),
101
- __metadata("design:type", Boolean)
95
+ inspectorDecorator.type('boolean')
102
96
  ], Render.prototype, "sortableChildren", void 0);
103
97
  return Render;
104
98
  }(eva_js.Component));
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),n=require("@eva/plugin-renderer"),r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},r(e,t)};function o(e,t){function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}function i(e,t,n,r){var o,i=arguments.length,a=i<3?t:null===r?r=Object.getOwnPropertyDescriptor(t,n):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,n,r);else for(var p=e.length-1;p>=0;p--)(o=e[p])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}function a(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function p(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,i=n.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return a}var c=function(e){function n(){var t=null!==e&&e.apply(this,arguments)||this;return t.sortDirty=!1,t.visible=!0,t.alpha=1,t.zIndex=0,t.sortableChildren=!1,t}return o(n,e),n.prototype.init=function(e){e&&Object.assign(this,e)},n.componentName="Render",i([t.Field(),a("design:type",Boolean)],n.prototype,"visible",void 0),i([t.Field({step:.1}),a("design:type",Number)],n.prototype,"alpha",void 0),i([t.Field({step:1}),a("design:type",Number)],n.prototype,"zIndex",void 0),i([t.Field(),a("design:type",Boolean)],n.prototype,"sortableChildren",void 0),n}(e.Component),s=c,d=function(t){function r(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Render",e}return o(r,t),r.prototype.init=function(){this.renderSystem=this.game.getSystem(n.RendererSystem),this.renderSystem.rendererManager.register(this)},r.prototype.rendererUpdate=function(e){var t=this,n=e.getComponent("Render"),r=this.containerManager.getContainer(e.id);if(r.alpha=n.alpha,r.visible=n.visible,n.sortDirty&&n.sortableChildren){var o=e.transform.children.map((function(e){return e.gameObject})).sort((function(e,t){var n=e.getComponent("Render"),r=t.getComponent("Render");return n?r?n.zIndex-r.zIndex:1:-1})).map((function(e){return t.containerManager.getContainer(e.id)})),i=this.containerManager.getContainer(n.gameObject.id).children,a=i.filter((function(e){return-1===o.indexOf(e)}));i.length=0,i.push.apply(i,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(p(arguments[t]));return e}(a,o)),n.sortDirty=!1}},r.prototype.componentChanged=function(t){t.type!==e.OBSERVER_TYPE.ADD&&t.type!==e.OBSERVER_TYPE.REMOVE||this.add(t),t.type===e.OBSERVER_TYPE.CHANGE&&this.change(t),t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t)},r.prototype.add=function(e){"Render"===e.component.name&&this.setDirty(e)},r.prototype.change=function(e){"Render"===e.component.name&&"zIndex"===e.prop.prop[0]&&this.setDirty(e)},r.prototype.remove=function(e){"Render"===e.component.name&&(this.containerManager.getContainer(e.gameObject.id).alpha=1)},r.prototype.setDirty=function(e){var t=e.gameObject.parent&&e.gameObject.parent.getComponent("Render");t&&(t.sortDirty=!0)},r.systemName="Render",r=i([e.decorators.componentObserver({Render:["zIndex"]})],r)}(n.Renderer);exports.Render=s,exports.RenderSystem=d;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),r=require("@eva/plugin-renderer"),n=function(e,t){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])},n(e,t)};function o(e,t){function r(){this.constructor=e}n(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function i(e,t,r,n){var o,i=arguments.length,a=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n);else for(var p=e.length-1;p>=0;p--)(o=e[p])&&(a=(i<3?o(a):i>3?o(t,r,a):o(t,r))||a);return i>3&&a&&Object.defineProperty(t,r,a),a}function a(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,i=r.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(n=i.next()).done;)a.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=i.return)&&r.call(i)}finally{if(o)throw o.error}}return a}var p=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.sortDirty=!1,t.visible=!0,t.alpha=1,t.zIndex=0,t.sortableChildren=!1,t}return o(r,e),r.prototype.init=function(e){e&&Object.assign(this,e)},r.componentName="Render",i([t.type("boolean")],r.prototype,"visible",void 0),i([t.type("number"),t.step(.1)],r.prototype,"alpha",void 0),i([t.type("number"),t.step(1)],r.prototype,"zIndex",void 0),i([t.type("boolean")],r.prototype,"sortableChildren",void 0),r}(e.Component),c=p,s=function(t){function n(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Render",e}return o(n,t),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=this,r=e.getComponent("Render"),n=this.containerManager.getContainer(e.id);if(n.alpha=r.alpha,n.visible=r.visible,r.sortDirty&&r.sortableChildren){var o=e.transform.children.map((function(e){return e.gameObject})).sort((function(e,t){var r=e.getComponent("Render"),n=t.getComponent("Render");return r?n?r.zIndex-n.zIndex:1:-1})).map((function(e){return t.containerManager.getContainer(e.id)})),i=this.containerManager.getContainer(r.gameObject.id).children,p=i.filter((function(e){return-1===o.indexOf(e)}));i.length=0,i.push.apply(i,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(a(arguments[t]));return e}(p,o)),r.sortDirty=!1}},n.prototype.componentChanged=function(t){t.type!==e.OBSERVER_TYPE.ADD&&t.type!==e.OBSERVER_TYPE.REMOVE||this.add(t),t.type===e.OBSERVER_TYPE.CHANGE&&this.change(t),t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t)},n.prototype.add=function(e){"Render"===e.component.name&&this.setDirty(e)},n.prototype.change=function(e){"Render"===e.component.name&&"zIndex"===e.prop.prop[0]&&this.setDirty(e)},n.prototype.remove=function(e){"Render"===e.component.name&&(this.containerManager.getContainer(e.gameObject.id).alpha=1)},n.prototype.setDirty=function(e){var t=e.gameObject.parent&&e.gameObject.parent.getComponent("Render");t&&(t.sortDirty=!0)},n.systemName="Render",n=i([e.decorators.componentObserver({Render:["zIndex"]})],n)}(r.Renderer);exports.Render=c,exports.RenderSystem=s;
@@ -1,5 +1,5 @@
1
1
  import { Component, OBSERVER_TYPE, decorators } from '@eva/eva.js';
2
- import { Field } from '@eva/inspector-decorator';
2
+ import { type, step } from '@eva/inspector-decorator';
3
3
  import { RendererSystem, Renderer } from '@eva/plugin-renderer';
4
4
 
5
5
  /*! *****************************************************************************
@@ -38,10 +38,6 @@ function __decorate(decorators, target, key, desc) {
38
38
  return c > 3 && r && Object.defineProperty(target, key, r), r;
39
39
  }
40
40
 
41
- function __metadata(metadataKey, metadataValue) {
42
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
43
- }
44
-
45
41
  function __read(o, n) {
46
42
  var m = typeof Symbol === "function" && o[Symbol.iterator];
47
43
  if (!m) return o;
@@ -81,20 +77,18 @@ var Render$2 = (function (_super) {
81
77
  };
82
78
  Render.componentName = 'Render';
83
79
  __decorate([
84
- Field(),
85
- __metadata("design:type", Boolean)
80
+ type('boolean')
86
81
  ], Render.prototype, "visible", void 0);
87
82
  __decorate([
88
- Field({ step: 0.1 }),
89
- __metadata("design:type", Number)
83
+ type('number'),
84
+ step(0.1)
90
85
  ], Render.prototype, "alpha", void 0);
91
86
  __decorate([
92
- Field({ step: 1 }),
93
- __metadata("design:type", Number)
87
+ type('number'),
88
+ step(1)
94
89
  ], Render.prototype, "zIndex", void 0);
95
90
  __decorate([
96
- Field(),
97
- __metadata("design:type", Boolean)
91
+ type('boolean')
98
92
  ], Render.prototype, "sortableChildren", void 0);
99
93
  return Render;
100
94
  }(Component));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eva/plugin-renderer-render",
3
- "version": "1.2.7-editor.9",
3
+ "version": "1.2.7-fix.4",
4
4
  "description": "@eva/plugin-renderer-render",
5
5
  "main": "index.js",
6
6
  "module": "dist/plugin-renderer-render.esm.js",
@@ -18,10 +18,10 @@
18
18
  "license": "MIT",
19
19
  "homepage": "https://eva.js.org",
20
20
  "dependencies": {
21
- "@eva/inspector-decorator": "0.1.0-alpha.2",
22
- "@eva/plugin-renderer": "1.2.7-editor.9",
23
- "@eva/renderer-adapter": "1.2.7-editor.9",
24
- "@eva/eva.js": "1.2.7-editor.9",
21
+ "@eva/inspector-decorator": "^0.0.5",
22
+ "@eva/plugin-renderer": "1.2.7-fix.4",
23
+ "@eva/renderer-adapter": "1.2.7-fix.4",
24
+ "@eva/eva.js": "1.2.7-fix.4",
25
25
  "pixi.js": "^4.8.7"
26
26
  }
27
27
  }