@eva/eva.js 1.2.7-editor.7 → 1.2.8-fix.1

package/dist/eva.js.cjs.js

@@ -7,7 +7,7 @@ var lodashEs = require('lodash-es');
 var inspectorDecorator = require('@eva/inspector-decorator');
 var resourceLoader$1 = require('resource-loader');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e['default'] : e; }
 
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
@@ -47,10 +47,6 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -374,65 +370,12 @@ function setSystemObserver(system, S) {
     systemInstance[S.systemName] = system;
 }
 
-var Vector2 = (function () {
-    function Vector2() {
-    }
-    __decorate([
-        inspectorDecorator.Field({ step: 0.1, default: 0 }),
-        __metadata("design:type", Number)
-    ], Vector2.prototype, "x", void 0);
-    __decorate([
-        inspectorDecorator.Field({ step: 0.1, default: 0 }),
-        __metadata("design:type", Number)
-    ], Vector2.prototype, "y", void 0);
-    return Vector2;
-}());
-var IntVector2 = (function () {
-    function IntVector2() {
-    }
-    __decorate([
-        inspectorDecorator.Field({ step: 1, default: 0 }),
-        __metadata("design:type", Number)
-    ], IntVector2.prototype, "x", void 0);
-    __decorate([
-        inspectorDecorator.Field({ step: 1, default: 0 }),
-        __metadata("design:type", Number)
-    ], IntVector2.prototype, "y", void 0);
-    return IntVector2;
-}());
-var Size2 = (function () {
-    function Size2() {
-    }
-    __decorate([
-        inspectorDecorator.Field({ step: 1, default: 0 }),
-        __metadata("design:type", Number)
-    ], Size2.prototype, "width", void 0);
-    __decorate([
-        inspectorDecorator.Field({ step: 1, default: 0 }),
-        __metadata("design:type", Number)
-    ], Size2.prototype, "height", void 0);
-    return Size2;
-}());
-var Scale = (function () {
-    function Scale() {
-    }
-    __decorate([
-        inspectorDecorator.Field({ step: 0.1, default: 1 }),
-        __metadata("design:type", Number)
-    ], Scale.prototype, "x", void 0);
-    __decorate([
-        inspectorDecorator.Field({ step: 0.1, default: 1 }),
-        __metadata("design:type", Number)
-    ], Scale.prototype, "y", void 0);
-    return Scale;
-}());
 var Transform = (function (_super) {
     __extends(Transform, _super);
     function Transform() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.name = 'Transform';
         _this._parent = null;
-        _this.childIndex = -1;
         _this.inScene = false;
         _this.children = [];
         _this.position = { x: 0, y: 0 };
@@ -479,16 +422,15 @@ var Transform = (function (_super) {
         configurable: true
     });
     Transform.prototype.addChild = function (child) {
-        if (child.parent) {
+        if (child.parent === this) {
+            var index = this.children.findIndex(function (item) { return item === child; });
+            this.children.splice(index, 1);
+        }
+        else if (child.parent) {
             child.parent.removeChild(child);
         }
         child._parent = this;
-        if (child.childIndex > -1) {
-            this.children.splice(child.childIndex, 0, child);
-        }
-        else {
-            this.children.push(child);
-        }
+        this.children.push(child);
     };
     Transform.prototype.removeChild = function (child) {
         var index = this.children.findIndex(function (item) { return item === child; });
@@ -502,32 +444,32 @@ var Transform = (function (_super) {
     };
     Transform.componentName = 'Transform';
     __decorate([
-        inspectorDecorator.Field(function () { return IntVector2; }),
-        __metadata("design:type", IntVector2)
+        inspectorDecorator.type('vector2'),
+        inspectorDecorator.step(1)
     ], Transform.prototype, "position", void 0);
     __decorate([
-        inspectorDecorator.Field(function () { return Size2; }),
-        __metadata("design:type", Size2)
+        inspectorDecorator.type('size'),
+        inspectorDecorator.step(1)
     ], Transform.prototype, "size", void 0);
     __decorate([
-        inspectorDecorator.Field(function () { return Vector2; }),
-        __metadata("design:type", Vector2)
+        inspectorDecorator.type('vector2'),
+        inspectorDecorator.step(0.1)
     ], Transform.prototype, "origin", void 0);
     __decorate([
-        inspectorDecorator.Field(function () { return Vector2; }),
-        __metadata("design:type", Vector2)
+        inspectorDecorator.type('vector2'),
+        inspectorDecorator.step(0.1)
     ], Transform.prototype, "anchor", void 0);
     __decorate([
-        inspectorDecorator.Field(function () { return Scale; }),
-        __metadata("design:type", Vector2)
+        inspectorDecorator.type('vector2'),
+        inspectorDecorator.step(0.1)
     ], Transform.prototype, "scale", void 0);
     __decorate([
-        inspectorDecorator.Field(function () { return Vector2; }),
-        __metadata("design:type", Vector2)
+        inspectorDecorator.type('vector2'),
+        inspectorDecorator.step(0.1)
     ], Transform.prototype, "skew", void 0);
     __decorate([
-        inspectorDecorator.Field({ step: 0.1 }),
-        __metadata("design:type", Number)
+        inspectorDecorator.type('number'),
+        inspectorDecorator.step(0.1)
     ], Transform.prototype, "rotation", void 0);
     return Transform;
 }(Component$1));
@@ -614,13 +556,6 @@ var GameObject = (function () {
         gameObject.transform.parent = this.transform;
         gameObject.scene = this.scene;
     };
-    GameObject.prototype.addChildAt = function (gameObject, index) {
-        if (index > this.transform.children.length) {
-            throw new Error(gameObject.name + "addChildAt: The index 18 supplied is out of bounds " + this.transform.children.length);
-        }
-        this.addChild(gameObject);
-        gameObject.transform.childIndex = index;
-    };
     GameObject.prototype.removeChild = function (gameObject) {
         if (!(gameObject instanceof GameObject) || !gameObject.parent || gameObject.parent !== this) {
             return gameObject;
@@ -1132,26 +1067,28 @@ var getAllGameObjects = function (game) {
     }
     return __spread(mainSceneGameObjects, otherSceneGameObjects);
 };
-var gameObjectResume = function (gameObjects) {
-    var e_2, _a, e_3, _b;
+var gameObjectLoop = function (e, gameObjects) {
+    var e_2, _a, e_3, _b, e_4, _c, e_5, _d;
+    if (gameObjects === void 0) { gameObjects = []; }
     try {
         for (var gameObjects_1 = __values(gameObjects), gameObjects_1_1 = gameObjects_1.next(); !gameObjects_1_1.done; gameObjects_1_1 = gameObjects_1.next()) {
             var gameObject = gameObjects_1_1.value;
             try {
-                for (var _c = (e_3 = void 0, __values(gameObject.components)), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var component = _d.value;
+                for (var _e = (e_3 = void 0, __values(gameObject.components)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var component = _f.value;
                     try {
-                        component.onResume && component.onResume();
+                        triggerStart(component);
+                        component.update && component.update(e);
                     }
                     catch (e) {
-                        console.error("gameObject: " + gameObject.name + ", " + component.name + ", onResume error", e);
+                        console.error("gameObject: " + gameObject.name + " " + component.name + " update error", e);
                     }
                 }
             }
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -1164,27 +1101,24 @@ var gameObjectResume = function (gameObjects) {
         }
         finally { if (e_2) throw e_2.error; }
     }
-};
-var gameObjectPause = function (gameObjects) {
-    var e_4, _a, e_5, _b;
     try {
         for (var gameObjects_2 = __values(gameObjects), gameObjects_2_1 = gameObjects_2.next(); !gameObjects_2_1.done; gameObjects_2_1 = gameObjects_2.next()) {
             var gameObject = gameObjects_2_1.value;
             try {
-                for (var _c = (e_5 = void 0, __values(gameObject.components)), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var component = _d.value;
+                for (var _g = (e_5 = void 0, __values(gameObject.components)), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    var component = _h.value;
                     try {
-                        component.onPause && component.onPause();
+                        component.lateUpdate && component.lateUpdate(e);
                     }
                     catch (e) {
-                        console.error("gameObject: " + gameObject.name + ", " + component.name + ", onResume error", e);
+                        console.error("gameObject: " + gameObject.name + " " + component.name + " lateUpdate error", e);
                     }
                 }
             }
             catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                    if (_h && !_h.done && (_d = _g.return)) _d.call(_g);
                 }
                 finally { if (e_5) throw e_5.error; }
             }
@@ -1193,23 +1127,87 @@ var gameObjectPause = function (gameObjects) {
     catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
-            if (gameObjects_2_1 && !gameObjects_2_1.done && (_a = gameObjects_2.return)) _a.call(gameObjects_2);
+            if (gameObjects_2_1 && !gameObjects_2_1.done && (_c = gameObjects_2.return)) _c.call(gameObjects_2);
         }
         finally { if (e_4) throw e_4.error; }
     }
 };
+var gameObjectResume = function (gameObjects) {
+    var e_6, _a, e_7, _b;
+    try {
+        for (var gameObjects_3 = __values(gameObjects), gameObjects_3_1 = gameObjects_3.next(); !gameObjects_3_1.done; gameObjects_3_1 = gameObjects_3.next()) {
+            var gameObject = gameObjects_3_1.value;
+            try {
+                for (var _c = (e_7 = void 0, __values(gameObject.components)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var component = _d.value;
+                    try {
+                        component.onResume && component.onResume();
+                    }
+                    catch (e) {
+                        console.error("gameObject: " + gameObject.name + ", " + component.name + ", onResume error", e);
+                    }
+                }
+            }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_7) throw e_7.error; }
+            }
+        }
+    }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    finally {
+        try {
+            if (gameObjects_3_1 && !gameObjects_3_1.done && (_a = gameObjects_3.return)) _a.call(gameObjects_3);
+        }
+        finally { if (e_6) throw e_6.error; }
+    }
+};
+var gameObjectPause = function (gameObjects) {
+    var e_8, _a, e_9, _b;
+    try {
+        for (var gameObjects_4 = __values(gameObjects), gameObjects_4_1 = gameObjects_4.next(); !gameObjects_4_1.done; gameObjects_4_1 = gameObjects_4.next()) {
+            var gameObject = gameObjects_4_1.value;
+            try {
+                for (var _c = (e_9 = void 0, __values(gameObject.components)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var component = _d.value;
+                    try {
+                        component.onPause && component.onPause();
+                    }
+                    catch (e) {
+                        console.error("gameObject: " + gameObject.name + ", " + component.name + ", onResume error", e);
+                    }
+                }
+            }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_9) throw e_9.error; }
+            }
+        }
+    }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+    finally {
+        try {
+            if (gameObjects_4_1 && !gameObjects_4_1.done && (_a = gameObjects_4.return)) _a.call(gameObjects_4);
+        }
+        finally { if (e_8) throw e_8.error; }
+    }
+};
 var Game = (function (_super) {
     __extends(Game, _super);
     function Game(_a) {
-        var e_6, _b;
-        var _c = _a === void 0 ? {} : _a, systems = _c.systems, _d = _c.frameRate, frameRate = _d === void 0 ? 60 : _d, _e = _c.autoStart, autoStart = _e === void 0 ? true : _e, _f = _c.needScene, needScene = _f === void 0 ? true : _f, _g = _c.mode, mode = _g === void 0 ? 'PLAY' : _g;
+        var e_10, _b;
+        var _c = _a === void 0 ? {} : _a, systems = _c.systems, _d = _c.frameRate, frameRate = _d === void 0 ? 60 : _d, _e = _c.autoStart, autoStart = _e === void 0 ? true : _e, _f = _c.needScene, needScene = _f === void 0 ? true : _f;
         var _this = _super.call(this) || this;
         _this.playing = false;
         _this.started = false;
         _this.multiScenes = [];
         _this.systems = [];
-        _this.mode = 'PLAY';
-        _this.mode = mode;
         if (window.__EVA_INSPECTOR_ENV__) {
             window.__EVA_GAME_INSTANCE__ = _this;
         }
@@ -1222,12 +1220,12 @@ var Game = (function (_super) {
                     _this.addSystem(system);
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (systems_1_1 && !systems_1_1.done && (_b = systems_1.return)) _b.call(systems_1);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_10) throw e_10.error; }
             }
         }
         if (needScene) {
@@ -1339,8 +1337,8 @@ var Game = (function (_super) {
     Game.prototype.initTicker = function () {
         var _this = this;
         this.ticker.add(function (e) {
-            var e_7, _a, e_8, _b;
-            _this.scene && _this.gameObjectLoop(e, _this.gameObjects);
+            var e_11, _a, e_12, _b;
+            _this.scene && gameObjectLoop(e, _this.gameObjects);
             try {
                 for (var _c = __values(_this.systems), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var system = _d.value;
@@ -1353,12 +1351,12 @@ var Game = (function (_super) {
                     }
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_11_1) { e_11 = { error: e_11_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_11) throw e_11.error; }
             }
             try {
                 for (var _e = __values(_this.systems), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -1371,17 +1369,17 @@ var Game = (function (_super) {
                     }
                 }
             }
-            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                 }
-                finally { if (e_8) throw e_8.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         });
     };
     Game.prototype.triggerResume = function () {
-        var e_9, _a;
+        var e_13, _a;
         gameObjectResume(this.gameObjects);
         try {
             for (var _b = __values(this.systems), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -1394,16 +1392,16 @@ var Game = (function (_super) {
                 }
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_13) throw e_13.error; }
         }
     };
     Game.prototype.triggerPause = function () {
-        var e_10, _a;
+        var e_14, _a;
         gameObjectPause(this.gameObjects);
         try {
             for (var _b = __values(this.systems), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -1416,28 +1414,28 @@ var Game = (function (_super) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_14) throw e_14.error; }
         }
     };
     Game.prototype.destroySystems = function () {
-        var e_11, _a;
+        var e_15, _a;
         try {
             for (var _b = __values(__spread(this.systems)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var system = _c.value;
                 this.removeSystem(system);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         this.systems.length = 0;
     };
@@ -1466,82 +1464,17 @@ var Game = (function (_super) {
         }
         this.emit('sceneChanged', { scene: scene, mode: mode, params: params });
     };
-    Game.prototype.shouldUpdate = function (component) {
-        return this.mode === 'PLAY' || (this.mode === 'EDIT' && inspectorDecorator.shouldExecuteInEditMode(component.constructor));
-    };
-    Game.prototype.gameObjectLoop = function (e, gameObjects) {
-        var e_12, _a, e_13, _b, e_14, _c, e_15, _d;
-        if (gameObjects === void 0) { gameObjects = []; }
-        try {
-            for (var gameObjects_3 = __values(gameObjects), gameObjects_3_1 = gameObjects_3.next(); !gameObjects_3_1.done; gameObjects_3_1 = gameObjects_3.next()) {
-                var gameObject = gameObjects_3_1.value;
-                try {
-                    for (var _e = (e_13 = void 0, __values(gameObject.components)), _f = _e.next(); !_f.done; _f = _e.next()) {
-                        var component = _f.value;
-                        try {
-                            if (this.shouldUpdate(component)) {
-                                triggerStart(component);
-                                component.update && component.update(e);
-                            }
-                        }
-                        catch (e) {
-                            console.error("gameObject: " + gameObject.name + " " + component.name + " update error", e);
-                        }
-                    }
-                }
-                catch (e_13_1) { e_13 = { error: e_13_1 }; }
-                finally {
-                    try {
-                        if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                    }
-                    finally { if (e_13) throw e_13.error; }
-                }
-            }
-        }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
-        finally {
-            try {
-                if (gameObjects_3_1 && !gameObjects_3_1.done && (_a = gameObjects_3.return)) _a.call(gameObjects_3);
-            }
-            finally { if (e_12) throw e_12.error; }
-        }
-        try {
-            for (var gameObjects_4 = __values(gameObjects), gameObjects_4_1 = gameObjects_4.next(); !gameObjects_4_1.done; gameObjects_4_1 = gameObjects_4.next()) {
-                var gameObject = gameObjects_4_1.value;
-                try {
-                    for (var _g = (e_15 = void 0, __values(gameObject.components)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                        var component = _h.value;
-                        try {
-                            if (this.shouldUpdate(component)) {
-                                component.lateUpdate && component.lateUpdate(e);
-                            }
-                        }
-                        catch (e) {
-                            console.error("gameObject: " + gameObject.name + " " + component.name + " lateUpdate error", e);
-                        }
-                    }
-                }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
-                finally {
-                    try {
-                        if (_h && !_h.done && (_d = _g.return)) _d.call(_g);
-                    }
-                    finally { if (e_15) throw e_15.error; }
-                }
-            }
-        }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
-        finally {
-            try {
-                if (gameObjects_4_1 && !gameObjects_4_1.done && (_c = gameObjects_4.return)) _c.call(gameObjects_4);
-            }
-            finally { if (e_14) throw e_14.error; }
-        }
-    };
     return Game;
 }(EventEmitter__default));
 var Game$1 = Game;
 
+function IDEProp(target, propertyKey) {
+    if (!target.constructor.IDEProps) {
+        target.constructor.IDEProps = [];
+    }
+    target.constructor.IDEProps.push(propertyKey);
+}
+
 function componentObserver(observerInfo) {
     if (observerInfo === void 0) { observerInfo = {}; }
     return function (constructor) {
@@ -1970,14 +1903,16 @@ var Resource = (function (_super) {
 var resource = new Resource();
 
 var decorators = {
+    IDEProp: IDEProp,
     componentObserver: componentObserver,
 };
-var version = '1.2.7-editor.6';
+var version = '1.2.8';
 console.log("Eva.js version: " + version);
 
 exports.Component = Component$1;
 exports.Game = Game$1;
 exports.GameObject = GameObject$1;
+exports.IDEProp = IDEProp;
 exports.RESOURCE_TYPE_STRATEGY = RESOURCE_TYPE_STRATEGY;
 exports.Scene = Scene$1;
 exports.System = System$1;