@eva/plugin-renderer-render 2.0.0-beta.1 → 2.0.0-beta.3
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,23 +4,6 @@ window.EVA.plugin = window.EVA.plugin || {};
|
|
|
4
4
|
window.EVA.plugin.renderer = window.EVA.plugin.renderer || {};
|
|
5
5
|
var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
|
|
6
6
|
'use strict';
|
|
7
|
-
var extendStatics = function (d, b) {
|
|
8
|
-
extendStatics = Object.setPrototypeOf || {
|
|
9
|
-
__proto__: []
|
|
10
|
-
} instanceof Array && function (d, b) {
|
|
11
|
-
d.__proto__ = b;
|
|
12
|
-
} || function (d, b) {
|
|
13
|
-
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
|
|
14
|
-
};
|
|
15
|
-
return extendStatics(d, b);
|
|
16
|
-
};
|
|
17
|
-
function __extends(d, b) {
|
|
18
|
-
extendStatics(d, b);
|
|
19
|
-
function __() {
|
|
20
|
-
this.constructor = d;
|
|
21
|
-
}
|
|
22
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
23
|
-
}
|
|
24
7
|
function __decorate(decorators, target, key, desc) {
|
|
25
8
|
var c = arguments.length,
|
|
26
9
|
r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
|
|
@@ -28,32 +11,6 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
|
|
|
28
11
|
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--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
29
12
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
30
13
|
}
|
|
31
|
-
function __read(o, n) {
|
|
32
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
33
|
-
if (!m) return o;
|
|
34
|
-
var i = m.call(o),
|
|
35
|
-
r,
|
|
36
|
-
ar = [],
|
|
37
|
-
e;
|
|
38
|
-
try {
|
|
39
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
40
|
-
} catch (error) {
|
|
41
|
-
e = {
|
|
42
|
-
error: error
|
|
43
|
-
};
|
|
44
|
-
} finally {
|
|
45
|
-
try {
|
|
46
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
47
|
-
} finally {
|
|
48
|
-
if (e) throw e.error;
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
return ar;
|
|
52
|
-
}
|
|
53
|
-
function __spread() {
|
|
54
|
-
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
|
|
55
|
-
return ar;
|
|
56
|
-
}
|
|
57
14
|
function getIDEPropsPropertyObj(target, propertyKey) {
|
|
58
15
|
if (!target.constructor.IDEProps) {
|
|
59
16
|
target.constructor.IDEProps = {};
|
|
@@ -77,53 +34,45 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
|
|
|
77
34
|
prop.step = step;
|
|
78
35
|
};
|
|
79
36
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
_this.sortableChildren = false;
|
|
89
|
-
return _this;
|
|
37
|
+
class Render$2 extends eva_js.Component {
|
|
38
|
+
constructor() {
|
|
39
|
+
super(...arguments);
|
|
40
|
+
this.sortDirty = false;
|
|
41
|
+
this.visible = true;
|
|
42
|
+
this.alpha = 1;
|
|
43
|
+
this.zIndex = 0;
|
|
44
|
+
this.sortableChildren = false;
|
|
90
45
|
}
|
|
91
|
-
|
|
46
|
+
init(obj) {
|
|
92
47
|
obj && _extends(this, obj);
|
|
93
|
-
};
|
|
94
|
-
Render.componentName = 'Render';
|
|
95
|
-
__decorate([type('boolean')], Render.prototype, "visible", void 0);
|
|
96
|
-
__decorate([type('number'), step(0.1)], Render.prototype, "alpha", void 0);
|
|
97
|
-
__decorate([type('number'), step(1)], Render.prototype, "zIndex", void 0);
|
|
98
|
-
__decorate([type('boolean')], Render.prototype, "sortableChildren", void 0);
|
|
99
|
-
return Render;
|
|
100
|
-
}(eva_js.Component);
|
|
101
|
-
var Render$3 = Render$2;
|
|
102
|
-
var Render = function (_super) {
|
|
103
|
-
__extends(Render, _super);
|
|
104
|
-
function Render() {
|
|
105
|
-
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
106
|
-
_this.name = 'Render';
|
|
107
|
-
return _this;
|
|
108
48
|
}
|
|
109
|
-
|
|
49
|
+
}
|
|
50
|
+
Render$2.componentName = 'Render';
|
|
51
|
+
__decorate([type('boolean')], Render$2.prototype, "visible", void 0);
|
|
52
|
+
__decorate([type('number'), step(0.1)], Render$2.prototype, "alpha", void 0);
|
|
53
|
+
__decorate([type('number'), step(1)], Render$2.prototype, "zIndex", void 0);
|
|
54
|
+
__decorate([type('boolean')], Render$2.prototype, "sortableChildren", void 0);
|
|
55
|
+
let Render = class Render extends pluginRenderer.Renderer {
|
|
56
|
+
constructor() {
|
|
57
|
+
super(...arguments);
|
|
58
|
+
this.name = 'Render';
|
|
59
|
+
}
|
|
60
|
+
init() {
|
|
110
61
|
this.renderSystem = this.game.getSystem(pluginRenderer.RendererSystem);
|
|
111
62
|
this.renderSystem.rendererManager.register(this);
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
var container = this.containerManager.getContainer(gameObject.id);
|
|
63
|
+
}
|
|
64
|
+
rendererUpdate(gameObject) {
|
|
65
|
+
const component = gameObject.getComponent('Render');
|
|
66
|
+
const container = this.containerManager.getContainer(gameObject.id);
|
|
117
67
|
container.alpha = component.alpha;
|
|
118
68
|
container.visible = component.visible;
|
|
119
69
|
if (component.sortDirty && component.sortableChildren) {
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
var bRender = b.getComponent('Render');
|
|
70
|
+
const gameObjects = gameObject.transform.children.map(({
|
|
71
|
+
gameObject
|
|
72
|
+
}) => gameObject);
|
|
73
|
+
const children = gameObjects.sort((a, b) => {
|
|
74
|
+
const aRender = a.getComponent('Render');
|
|
75
|
+
const bRender = b.getComponent('Render');
|
|
127
76
|
if (!aRender) {
|
|
128
77
|
return -1;
|
|
129
78
|
}
|
|
@@ -131,19 +80,17 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
|
|
|
131
80
|
return 1;
|
|
132
81
|
}
|
|
133
82
|
return aRender.zIndex - bRender.zIndex;
|
|
134
|
-
}).map(
|
|
135
|
-
return
|
|
136
|
-
});
|
|
137
|
-
var oldChildren = this.containerManager.getContainer(component.gameObject.id).children;
|
|
138
|
-
var elements = oldChildren.filter(function (c) {
|
|
139
|
-
return children_1.indexOf(c) === -1;
|
|
83
|
+
}).map(gameObject => {
|
|
84
|
+
return this.containerManager.getContainer(gameObject.id);
|
|
140
85
|
});
|
|
86
|
+
const oldChildren = this.containerManager.getContainer(component.gameObject.id).children;
|
|
87
|
+
const elements = oldChildren.filter(c => children.indexOf(c) === -1);
|
|
141
88
|
oldChildren.length = 0;
|
|
142
|
-
oldChildren.push
|
|
89
|
+
oldChildren.push(...elements, ...children);
|
|
143
90
|
component.sortDirty = false;
|
|
144
91
|
}
|
|
145
|
-
}
|
|
146
|
-
|
|
92
|
+
}
|
|
93
|
+
componentChanged(changed) {
|
|
147
94
|
if (changed.type === eva_js.OBSERVER_TYPE.ADD || changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
|
|
148
95
|
this.add(changed);
|
|
149
96
|
}
|
|
@@ -153,37 +100,36 @@ var _EVA_IIFE_render = function (exports, eva_js, pluginRenderer) {
|
|
|
153
100
|
if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
|
|
154
101
|
this.remove(changed);
|
|
155
102
|
}
|
|
156
|
-
}
|
|
157
|
-
|
|
103
|
+
}
|
|
104
|
+
add(changed) {
|
|
158
105
|
if (changed.component.name === 'Render') {
|
|
159
106
|
this.setDirty(changed);
|
|
160
107
|
}
|
|
161
|
-
}
|
|
162
|
-
|
|
108
|
+
}
|
|
109
|
+
change(changed) {
|
|
163
110
|
if (changed.component.name === 'Render' && changed.prop.prop[0] === 'zIndex') {
|
|
164
111
|
this.setDirty(changed);
|
|
165
112
|
}
|
|
166
|
-
}
|
|
167
|
-
|
|
113
|
+
}
|
|
114
|
+
remove(changed) {
|
|
168
115
|
if (changed.component.name === 'Render') {
|
|
169
|
-
|
|
116
|
+
const container = this.containerManager.getContainer(changed.gameObject.id);
|
|
170
117
|
container.alpha = 1;
|
|
171
118
|
}
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
|
|
119
|
+
}
|
|
120
|
+
setDirty(changed) {
|
|
121
|
+
const parentRender = changed.gameObject.parent && changed.gameObject.parent.getComponent('Render');
|
|
175
122
|
if (parentRender) {
|
|
176
123
|
parentRender.sortDirty = true;
|
|
177
124
|
}
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
}(pluginRenderer.Renderer);
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
Render.systemName = 'Render';
|
|
128
|
+
Render = __decorate([eva_js.decorators.componentObserver({
|
|
129
|
+
Render: ['zIndex']
|
|
130
|
+
})], Render);
|
|
185
131
|
var Render$1 = Render;
|
|
186
|
-
exports.Render = Render$
|
|
132
|
+
exports.Render = Render$2;
|
|
187
133
|
exports.RenderSystem = Render$1;
|
|
188
134
|
Object.defineProperty(exports, '__esModule', {
|
|
189
135
|
value: true
|
|
@@ -1 +1 @@
|
|
|
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)({}).hasOwnProperty.call(t,r)&&(e[r]=t[r])}return e},_extends.apply(null,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";
|
|
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)({}).hasOwnProperty.call(t,r)&&(e[r]=t[r])}return e},_extends.apply(null,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";function r(e,n,t,r){var o,i=arguments.length,s=i<3?n:null===r?r=Object.getOwnPropertyDescriptor(n,t):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,n,t,r);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(s=(i<3?o(s):i>3?o(n,t,s):o(n,t))||s);return i>3&&s&&Object.defineProperty(n,t,s),s}function o(e,n){return e.constructor.IDEProps||(e.constructor.IDEProps={}),e.constructor.IDEProps[n]||(e.constructor.IDEProps[n]={}),e.constructor.IDEProps[n]}function i(e){return function(n,t){var r=o(n,t);r.key=t,r.type=e}}function s(e){return function(n,t){o(n,t).step=e}}class a extends n.Component{constructor(){super(...arguments),this.sortDirty=!1,this.visible=!0,this.alpha=1,this.zIndex=0,this.sortableChildren=!1}init(e){e&&_extends(this,e)}}a.componentName="Render",r([i("boolean")],a.prototype,"visible",void 0),r([i("number"),s(.1)],a.prototype,"alpha",void 0),r([i("number"),s(1)],a.prototype,"zIndex",void 0),r([i("boolean")],a.prototype,"sortableChildren",void 0);let d=class extends t.Renderer{constructor(){super(...arguments),this.name="Render"}init(){this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this)}rendererUpdate(e){const n=e.getComponent("Render"),t=this.containerManager.getContainer(e.id);if(t.alpha=n.alpha,t.visible=n.visible,n.sortDirty&&n.sortableChildren){const t=e.transform.children.map((({gameObject:e})=>e)).sort(((e,n)=>{const t=e.getComponent("Render"),r=n.getComponent("Render");return t?r?t.zIndex-r.zIndex:1:-1})).map((e=>this.containerManager.getContainer(e.id))),r=this.containerManager.getContainer(n.gameObject.id).children,o=r.filter((e=>-1===t.indexOf(e)));r.length=0,r.push(...o,...t),n.sortDirty=!1}}componentChanged(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)}add(e){"Render"===e.component.name&&this.setDirty(e)}change(e){"Render"===e.component.name&&"zIndex"===e.prop.prop[0]&&this.setDirty(e)}remove(e){if("Render"===e.component.name){this.containerManager.getContainer(e.gameObject.id).alpha=1}}setDirty(e){const n=e.gameObject.parent&&e.gameObject.parent.getComponent("Render");n&&(n.sortDirty=!0)}};d.systemName="Render",d=r([n.decorators.componentObserver({Render:["zIndex"]})],d);var c=d;return e.Render=a,e.RenderSystem=c,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer);window.EVA.plugin.renderer.render=window.EVA.plugin.renderer.render||_EVA_IIFE_render;
|
|
@@ -20,110 +20,63 @@ MERCHANTABLITY OR NON-INFRINGEMENT.
|
|
|
20
20
|
See the Apache Version 2.0 License for specific language governing permissions
|
|
21
21
|
and limitations under the License.
|
|
22
22
|
***************************************************************************** */
|
|
23
|
-
/* global Reflect, Promise */
|
|
24
|
-
|
|
25
|
-
var extendStatics = function(d, b) {
|
|
26
|
-
extendStatics = Object.setPrototypeOf ||
|
|
27
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
28
|
-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
|
|
29
|
-
return extendStatics(d, b);
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
function __extends(d, b) {
|
|
33
|
-
extendStatics(d, b);
|
|
34
|
-
function __() { this.constructor = d; }
|
|
35
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
36
|
-
}
|
|
37
23
|
|
|
38
24
|
function __decorate(decorators, target, key, desc) {
|
|
39
25
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
40
26
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
41
27
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
42
28
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function __read(o, n) {
|
|
46
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
47
|
-
if (!m) return o;
|
|
48
|
-
var i = m.call(o), r, ar = [], e;
|
|
49
|
-
try {
|
|
50
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
51
|
-
}
|
|
52
|
-
catch (error) { e = { error: error }; }
|
|
53
|
-
finally {
|
|
54
|
-
try {
|
|
55
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
56
|
-
}
|
|
57
|
-
finally { if (e) throw e.error; }
|
|
58
|
-
}
|
|
59
|
-
return ar;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
function __spread() {
|
|
63
|
-
for (var ar = [], i = 0; i < arguments.length; i++)
|
|
64
|
-
ar = ar.concat(__read(arguments[i]));
|
|
65
|
-
return ar;
|
|
66
29
|
}
|
|
67
30
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
_this.sortableChildren = false;
|
|
77
|
-
return _this;
|
|
31
|
+
class Render$2 extends eva_js.Component {
|
|
32
|
+
constructor() {
|
|
33
|
+
super(...arguments);
|
|
34
|
+
this.sortDirty = false;
|
|
35
|
+
this.visible = true;
|
|
36
|
+
this.alpha = 1;
|
|
37
|
+
this.zIndex = 0;
|
|
38
|
+
this.sortableChildren = false;
|
|
78
39
|
}
|
|
79
|
-
|
|
40
|
+
init(obj) {
|
|
80
41
|
obj && Object.assign(this, obj);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}(eva_js.Component));
|
|
99
|
-
var Render$3 = Render$2;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
Render$2.componentName = 'Render';
|
|
45
|
+
__decorate([
|
|
46
|
+
inspectorDecorator.type('boolean')
|
|
47
|
+
], Render$2.prototype, "visible", void 0);
|
|
48
|
+
__decorate([
|
|
49
|
+
inspectorDecorator.type('number'),
|
|
50
|
+
inspectorDecorator.step(0.1)
|
|
51
|
+
], Render$2.prototype, "alpha", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
inspectorDecorator.type('number'),
|
|
54
|
+
inspectorDecorator.step(1)
|
|
55
|
+
], Render$2.prototype, "zIndex", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
inspectorDecorator.type('boolean')
|
|
58
|
+
], Render$2.prototype, "sortableChildren", void 0);
|
|
100
59
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
_this.name = 'Render';
|
|
106
|
-
return _this;
|
|
60
|
+
let Render = class Render extends pluginRenderer.Renderer {
|
|
61
|
+
constructor() {
|
|
62
|
+
super(...arguments);
|
|
63
|
+
this.name = 'Render';
|
|
107
64
|
}
|
|
108
|
-
|
|
65
|
+
init() {
|
|
109
66
|
this.renderSystem = this.game.getSystem(pluginRenderer.RendererSystem);
|
|
110
67
|
this.renderSystem.rendererManager.register(this);
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
var container = this.containerManager.getContainer(gameObject.id);
|
|
68
|
+
}
|
|
69
|
+
rendererUpdate(gameObject) {
|
|
70
|
+
const component = gameObject.getComponent('Render');
|
|
71
|
+
const container = this.containerManager.getContainer(gameObject.id);
|
|
116
72
|
container.alpha = component.alpha;
|
|
117
73
|
container.visible = component.visible;
|
|
118
74
|
if (component.sortDirty && component.sortableChildren) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
.sort(function (a, b) {
|
|
125
|
-
var aRender = a.getComponent('Render');
|
|
126
|
-
var bRender = b.getComponent('Render');
|
|
75
|
+
const gameObjects = gameObject.transform.children.map(({ gameObject }) => gameObject);
|
|
76
|
+
const children = gameObjects
|
|
77
|
+
.sort((a, b) => {
|
|
78
|
+
const aRender = a.getComponent('Render');
|
|
79
|
+
const bRender = b.getComponent('Render');
|
|
127
80
|
if (!aRender) {
|
|
128
81
|
return -1;
|
|
129
82
|
}
|
|
@@ -132,17 +85,17 @@ var Render = (function (_super) {
|
|
|
132
85
|
}
|
|
133
86
|
return aRender.zIndex - bRender.zIndex;
|
|
134
87
|
})
|
|
135
|
-
.map(
|
|
136
|
-
return
|
|
88
|
+
.map(gameObject => {
|
|
89
|
+
return this.containerManager.getContainer(gameObject.id);
|
|
137
90
|
});
|
|
138
|
-
|
|
139
|
-
|
|
91
|
+
const oldChildren = this.containerManager.getContainer(component.gameObject.id).children;
|
|
92
|
+
const elements = oldChildren.filter(c => children.indexOf(c) === -1);
|
|
140
93
|
oldChildren.length = 0;
|
|
141
|
-
oldChildren.push
|
|
94
|
+
oldChildren.push(...elements, ...children);
|
|
142
95
|
component.sortDirty = false;
|
|
143
96
|
}
|
|
144
|
-
}
|
|
145
|
-
|
|
97
|
+
}
|
|
98
|
+
componentChanged(changed) {
|
|
146
99
|
if (changed.type === eva_js.OBSERVER_TYPE.ADD || changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
|
|
147
100
|
this.add(changed);
|
|
148
101
|
}
|
|
@@ -152,38 +105,37 @@ var Render = (function (_super) {
|
|
|
152
105
|
if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
|
|
153
106
|
this.remove(changed);
|
|
154
107
|
}
|
|
155
|
-
}
|
|
156
|
-
|
|
108
|
+
}
|
|
109
|
+
add(changed) {
|
|
157
110
|
if (changed.component.name === 'Render') {
|
|
158
111
|
this.setDirty(changed);
|
|
159
112
|
}
|
|
160
|
-
}
|
|
161
|
-
|
|
113
|
+
}
|
|
114
|
+
change(changed) {
|
|
162
115
|
if (changed.component.name === 'Render' && changed.prop.prop[0] === 'zIndex') {
|
|
163
116
|
this.setDirty(changed);
|
|
164
117
|
}
|
|
165
|
-
}
|
|
166
|
-
|
|
118
|
+
}
|
|
119
|
+
remove(changed) {
|
|
167
120
|
if (changed.component.name === 'Render') {
|
|
168
|
-
|
|
121
|
+
const container = this.containerManager.getContainer(changed.gameObject.id);
|
|
169
122
|
container.alpha = 1;
|
|
170
123
|
}
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
124
|
+
}
|
|
125
|
+
setDirty(changed) {
|
|
126
|
+
const parentRender = changed.gameObject.parent && changed.gameObject.parent.getComponent('Render');
|
|
174
127
|
if (parentRender) {
|
|
175
128
|
parentRender.sortDirty = true;
|
|
176
129
|
}
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
}(pluginRenderer.Renderer));
|
|
130
|
+
}
|
|
131
|
+
};
|
|
132
|
+
Render.systemName = 'Render';
|
|
133
|
+
Render = __decorate([
|
|
134
|
+
eva_js.decorators.componentObserver({
|
|
135
|
+
Render: ['zIndex'],
|
|
136
|
+
})
|
|
137
|
+
], Render);
|
|
186
138
|
var Render$1 = Render;
|
|
187
139
|
|
|
188
|
-
exports.Render = Render$
|
|
140
|
+
exports.Render = Render$2;
|
|
189
141
|
exports.RenderSystem = Render$1;
|
|
@@ -1 +1,16 @@
|
|
|
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")
|
|
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");
|
|
2
|
+
/*! *****************************************************************************
|
|
3
|
+
Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
|
|
5
|
+
this file except in compliance with the License. You may obtain a copy of the
|
|
6
|
+
License at http://www.apache.org/licenses/LICENSE-2.0
|
|
7
|
+
|
|
8
|
+
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
9
|
+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
|
|
10
|
+
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
|
|
11
|
+
MERCHANTABLITY OR NON-INFRINGEMENT.
|
|
12
|
+
|
|
13
|
+
See the Apache Version 2.0 License for specific language governing permissions
|
|
14
|
+
and limitations under the License.
|
|
15
|
+
***************************************************************************** */
|
|
16
|
+
function n(e,t,r,n){var o,i=arguments.length,s=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(s=(i<3?o(s):i>3?o(t,r,s):o(t,r))||s);return i>3&&s&&Object.defineProperty(t,r,s),s}class o extends e.Component{constructor(){super(...arguments),this.sortDirty=!1,this.visible=!0,this.alpha=1,this.zIndex=0,this.sortableChildren=!1}init(e){e&&Object.assign(this,e)}}o.componentName="Render",n([t.type("boolean")],o.prototype,"visible",void 0),n([t.type("number"),t.step(.1)],o.prototype,"alpha",void 0),n([t.type("number"),t.step(1)],o.prototype,"zIndex",void 0),n([t.type("boolean")],o.prototype,"sortableChildren",void 0);let i=class extends r.Renderer{constructor(){super(...arguments),this.name="Render"}init(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)}rendererUpdate(e){const t=e.getComponent("Render"),r=this.containerManager.getContainer(e.id);if(r.alpha=t.alpha,r.visible=t.visible,t.sortDirty&&t.sortableChildren){const r=e.transform.children.map((({gameObject:e})=>e)).sort(((e,t)=>{const r=e.getComponent("Render"),n=t.getComponent("Render");return r?n?r.zIndex-n.zIndex:1:-1})).map((e=>this.containerManager.getContainer(e.id))),n=this.containerManager.getContainer(t.gameObject.id).children,o=n.filter((e=>-1===r.indexOf(e)));n.length=0,n.push(...o,...r),t.sortDirty=!1}}componentChanged(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)}add(e){"Render"===e.component.name&&this.setDirty(e)}change(e){"Render"===e.component.name&&"zIndex"===e.prop.prop[0]&&this.setDirty(e)}remove(e){if("Render"===e.component.name){this.containerManager.getContainer(e.gameObject.id).alpha=1}}setDirty(e){const t=e.gameObject.parent&&e.gameObject.parent.getComponent("Render");t&&(t.sortDirty=!0)}};i.systemName="Render",i=n([e.decorators.componentObserver({Render:["zIndex"]})],i);var s=i;exports.Render=o,exports.RenderSystem=s;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Component, OBSERVER_TYPE, decorators } from '@eva/eva.js';
|
|
2
2
|
import { type, step } from '@eva/inspector-decorator';
|
|
3
|
-
import {
|
|
3
|
+
import { Renderer, RendererSystem } from '@eva/plugin-renderer';
|
|
4
4
|
|
|
5
5
|
/*! *****************************************************************************
|
|
6
6
|
Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -16,110 +16,63 @@ MERCHANTABLITY OR NON-INFRINGEMENT.
|
|
|
16
16
|
See the Apache Version 2.0 License for specific language governing permissions
|
|
17
17
|
and limitations under the License.
|
|
18
18
|
***************************************************************************** */
|
|
19
|
-
/* global Reflect, Promise */
|
|
20
|
-
|
|
21
|
-
var extendStatics = function(d, b) {
|
|
22
|
-
extendStatics = Object.setPrototypeOf ||
|
|
23
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
24
|
-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
|
|
25
|
-
return extendStatics(d, b);
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
function __extends(d, b) {
|
|
29
|
-
extendStatics(d, b);
|
|
30
|
-
function __() { this.constructor = d; }
|
|
31
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
32
|
-
}
|
|
33
19
|
|
|
34
20
|
function __decorate(decorators, target, key, desc) {
|
|
35
21
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
36
22
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
37
23
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
38
24
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
function __read(o, n) {
|
|
42
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
43
|
-
if (!m) return o;
|
|
44
|
-
var i = m.call(o), r, ar = [], e;
|
|
45
|
-
try {
|
|
46
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
47
|
-
}
|
|
48
|
-
catch (error) { e = { error: error }; }
|
|
49
|
-
finally {
|
|
50
|
-
try {
|
|
51
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
52
|
-
}
|
|
53
|
-
finally { if (e) throw e.error; }
|
|
54
|
-
}
|
|
55
|
-
return ar;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
function __spread() {
|
|
59
|
-
for (var ar = [], i = 0; i < arguments.length; i++)
|
|
60
|
-
ar = ar.concat(__read(arguments[i]));
|
|
61
|
-
return ar;
|
|
62
25
|
}
|
|
63
26
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
_this.sortableChildren = false;
|
|
73
|
-
return _this;
|
|
27
|
+
class Render$2 extends Component {
|
|
28
|
+
constructor() {
|
|
29
|
+
super(...arguments);
|
|
30
|
+
this.sortDirty = false;
|
|
31
|
+
this.visible = true;
|
|
32
|
+
this.alpha = 1;
|
|
33
|
+
this.zIndex = 0;
|
|
34
|
+
this.sortableChildren = false;
|
|
74
35
|
}
|
|
75
|
-
|
|
36
|
+
init(obj) {
|
|
76
37
|
obj && Object.assign(this, obj);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}(Component));
|
|
95
|
-
var Render$3 = Render$2;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
Render$2.componentName = 'Render';
|
|
41
|
+
__decorate([
|
|
42
|
+
type('boolean')
|
|
43
|
+
], Render$2.prototype, "visible", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
type('number'),
|
|
46
|
+
step(0.1)
|
|
47
|
+
], Render$2.prototype, "alpha", void 0);
|
|
48
|
+
__decorate([
|
|
49
|
+
type('number'),
|
|
50
|
+
step(1)
|
|
51
|
+
], Render$2.prototype, "zIndex", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
type('boolean')
|
|
54
|
+
], Render$2.prototype, "sortableChildren", void 0);
|
|
96
55
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
_this.name = 'Render';
|
|
102
|
-
return _this;
|
|
56
|
+
let Render = class Render extends Renderer {
|
|
57
|
+
constructor() {
|
|
58
|
+
super(...arguments);
|
|
59
|
+
this.name = 'Render';
|
|
103
60
|
}
|
|
104
|
-
|
|
61
|
+
init() {
|
|
105
62
|
this.renderSystem = this.game.getSystem(RendererSystem);
|
|
106
63
|
this.renderSystem.rendererManager.register(this);
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
var container = this.containerManager.getContainer(gameObject.id);
|
|
64
|
+
}
|
|
65
|
+
rendererUpdate(gameObject) {
|
|
66
|
+
const component = gameObject.getComponent('Render');
|
|
67
|
+
const container = this.containerManager.getContainer(gameObject.id);
|
|
112
68
|
container.alpha = component.alpha;
|
|
113
69
|
container.visible = component.visible;
|
|
114
70
|
if (component.sortDirty && component.sortableChildren) {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
.sort(function (a, b) {
|
|
121
|
-
var aRender = a.getComponent('Render');
|
|
122
|
-
var bRender = b.getComponent('Render');
|
|
71
|
+
const gameObjects = gameObject.transform.children.map(({ gameObject }) => gameObject);
|
|
72
|
+
const children = gameObjects
|
|
73
|
+
.sort((a, b) => {
|
|
74
|
+
const aRender = a.getComponent('Render');
|
|
75
|
+
const bRender = b.getComponent('Render');
|
|
123
76
|
if (!aRender) {
|
|
124
77
|
return -1;
|
|
125
78
|
}
|
|
@@ -128,17 +81,17 @@ var Render = (function (_super) {
|
|
|
128
81
|
}
|
|
129
82
|
return aRender.zIndex - bRender.zIndex;
|
|
130
83
|
})
|
|
131
|
-
.map(
|
|
132
|
-
return
|
|
84
|
+
.map(gameObject => {
|
|
85
|
+
return this.containerManager.getContainer(gameObject.id);
|
|
133
86
|
});
|
|
134
|
-
|
|
135
|
-
|
|
87
|
+
const oldChildren = this.containerManager.getContainer(component.gameObject.id).children;
|
|
88
|
+
const elements = oldChildren.filter(c => children.indexOf(c) === -1);
|
|
136
89
|
oldChildren.length = 0;
|
|
137
|
-
oldChildren.push
|
|
90
|
+
oldChildren.push(...elements, ...children);
|
|
138
91
|
component.sortDirty = false;
|
|
139
92
|
}
|
|
140
|
-
}
|
|
141
|
-
|
|
93
|
+
}
|
|
94
|
+
componentChanged(changed) {
|
|
142
95
|
if (changed.type === OBSERVER_TYPE.ADD || changed.type === OBSERVER_TYPE.REMOVE) {
|
|
143
96
|
this.add(changed);
|
|
144
97
|
}
|
|
@@ -148,37 +101,36 @@ var Render = (function (_super) {
|
|
|
148
101
|
if (changed.type === OBSERVER_TYPE.REMOVE) {
|
|
149
102
|
this.remove(changed);
|
|
150
103
|
}
|
|
151
|
-
}
|
|
152
|
-
|
|
104
|
+
}
|
|
105
|
+
add(changed) {
|
|
153
106
|
if (changed.component.name === 'Render') {
|
|
154
107
|
this.setDirty(changed);
|
|
155
108
|
}
|
|
156
|
-
}
|
|
157
|
-
|
|
109
|
+
}
|
|
110
|
+
change(changed) {
|
|
158
111
|
if (changed.component.name === 'Render' && changed.prop.prop[0] === 'zIndex') {
|
|
159
112
|
this.setDirty(changed);
|
|
160
113
|
}
|
|
161
|
-
}
|
|
162
|
-
|
|
114
|
+
}
|
|
115
|
+
remove(changed) {
|
|
163
116
|
if (changed.component.name === 'Render') {
|
|
164
|
-
|
|
117
|
+
const container = this.containerManager.getContainer(changed.gameObject.id);
|
|
165
118
|
container.alpha = 1;
|
|
166
119
|
}
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
|
|
120
|
+
}
|
|
121
|
+
setDirty(changed) {
|
|
122
|
+
const parentRender = changed.gameObject.parent && changed.gameObject.parent.getComponent('Render');
|
|
170
123
|
if (parentRender) {
|
|
171
124
|
parentRender.sortDirty = true;
|
|
172
125
|
}
|
|
173
|
-
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
}(Renderer));
|
|
126
|
+
}
|
|
127
|
+
};
|
|
128
|
+
Render.systemName = 'Render';
|
|
129
|
+
Render = __decorate([
|
|
130
|
+
decorators.componentObserver({
|
|
131
|
+
Render: ['zIndex'],
|
|
132
|
+
})
|
|
133
|
+
], Render);
|
|
182
134
|
var Render$1 = Render;
|
|
183
135
|
|
|
184
|
-
export { Render$
|
|
136
|
+
export { Render$2 as Render, Render$1 as RenderSystem };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eva/plugin-renderer-render",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.3",
|
|
4
4
|
"description": "@eva/plugin-renderer-render",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "dist/plugin-renderer-render.esm.js",
|
|
@@ -19,9 +19,9 @@
|
|
|
19
19
|
"homepage": "https://eva.js.org",
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@eva/inspector-decorator": "^0.0.5",
|
|
22
|
-
"@eva/plugin-renderer": "2.0.0-beta.
|
|
23
|
-
"@eva/renderer-adapter": "2.0.0-beta.
|
|
24
|
-
"@eva/eva.js": "2.0.0-beta.
|
|
22
|
+
"@eva/plugin-renderer": "2.0.0-beta.3",
|
|
23
|
+
"@eva/renderer-adapter": "2.0.0-beta.3",
|
|
24
|
+
"@eva/eva.js": "2.0.0-beta.3",
|
|
25
25
|
"pixi.js": "^8.6.3"
|
|
26
26
|
}
|
|
27
27
|
}
|