@gedit/editor-2d 0.1.114 → 0.2.0

package/lib/browser/playground/canvas-draw.js

@@ -1,84 +1,11 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CanvasDraw = exports.GameObjectEventType = void 0;
-var render_engine_1 = require("@gedit/render-engine");
-var editor2d_1 = require("../model/editor2d");
-var utils_1 = require("@gedit/utils");
-var WAIT_TO_DISPOSE_TIME = 30000; // 延迟删除, 这样tab在频繁切换时候不会有延迟
-var SCENE_KEY = 'boot';
+const render_engine_1 = require("@gedit/render-engine");
+const editor2d_1 = require("../model/editor2d");
+const utils_1 = require("@gedit/utils");
+const WAIT_TO_DISPOSE_TIME = 30000; // 延迟删除, 这样tab在频繁切换时候不会有延迟
+const SCENE_KEY = 'boot';
 var GameObjectEventType;
 (function (GameObjectEventType) {
     GameObjectEventType[GameObjectEventType["CREATE"] = 0] = "CREATE";
@@ -89,24 +16,24 @@ var GameObjectEventType;
 function replaceSymbolKey(originData, config, obj, path) {
     if (!obj)
         return originData;
-    (0, utils_1.each)(obj, function (v, key) {
+    (0, utils_1.each)(obj, (v, key) => {
         var _a;
-        var currentPath = path ? "".concat(path, ".").concat(key) : key;
+        const currentPath = path ? `${path}.${key}` : key;
         if (typeof v === 'string') {
-            var matched = v.match(/^\$\{([^\}]+)\}$/);
+            let matched = v.match(/^\$\{([^\}]+)\}$/);
             // 旧的写法, TODO 暂时做兼容
             if (!matched && key === 'textureId') {
                 matched = v.match(/^symbol\/(.+)/);
             }
             if (matched) {
-                var symbolId_1 = matched[1];
-                var symbolValue = ((_a = config.symbols.find(function (s) { return s.id === symbolId_1; })) === null || _a === void 0 ? void 0 : _a.value) || '';
+                const symbolId = matched[1];
+                const symbolValue = ((_a = config.symbols.find(s => s.id === symbolId)) === null || _a === void 0 ? void 0 : _a.value) || '';
                 originData = (0, utils_1.setByKey)(originData, currentPath, symbolValue, true, true);
             }
         }
         else if (Array.isArray(v)) {
-            v.forEach(function (item, i) {
-                originData = replaceSymbolKey(originData, config, item, "".concat(currentPath, ".").concat(i));
+            v.forEach((item, i) => {
+                originData = replaceSymbolKey(originData, config, item, `${currentPath}.${i}`);
             });
         }
         else if (typeof v === 'object') {
@@ -116,59 +43,52 @@ function replaceSymbolKey(originData, config, obj, path) {
     return originData;
 }
 function toNodeData(node, config) {
-    var originData = (0, utils_1.omit)(node, ['parent', 'previousSibling', 'nextSibling', 'children']);
+    const originData = (0, utils_1.omit)(node, ['parent', 'previousSibling', 'nextSibling', 'children']);
     return replaceSymbolKey(originData, config, originData);
 }
 ;
 /**
  * 画布绘制逻辑
  */
-var CanvasDraw = /** @class */ (function (_super) {
-    __extends(CanvasDraw, _super);
-    function CanvasDraw(opts) {
-        var _this = _super.call(this) || this;
-        _this.opts = opts;
-        _this.onDrawEmitter = new utils_1.Emitter();
-        _this.onLoadingEmitter = new utils_1.Emitter();
-        _this.onGameObjectChangeEmitter = new utils_1.Emitter();
-        _this.booted = false;
-        _this.libLoaded = false;
-        _this.libLoading = false;
-        _this.lastVisible = false;
-        _this.gameObjectCache = new Map();
-        _this.nodeCache = new Map();
-        _this.nodeVersionCache = new Map();
-        _this.lastRenderKeys = [];
-        _this.allCount = -1;
-        _this.onDraw = _this.onDrawEmitter.event;
-        _this.onLoading = _this.onLoadingEmitter.event;
-        _this.onGameObjectChange = _this.onGameObjectChangeEmitter.event;
-        _this.loading = true;
-        _this.lastZoom = 0.1;
-        _this.toDispose.pushAll([
-            _this.onDrawEmitter,
-            _this.onLoadingEmitter,
-            _this.onGameObjectChangeEmitter,
+class CanvasDraw extends utils_1.DisposableImpl {
+    constructor(opts) {
+        super();
+        this.opts = opts;
+        this.onDrawEmitter = new utils_1.Emitter();
+        this.onLoadingEmitter = new utils_1.Emitter();
+        this.onGameObjectChangeEmitter = new utils_1.Emitter();
+        this.onRenderWidgetCreateEmitter = new utils_1.Emitter();
+        this.booted = false;
+        this.libLoaded = false;
+        this.libLoading = false;
+        this.lastVisible = false;
+        this.gameObjectCache = new Map();
+        this.nodeCache = new Map();
+        this.nodeVersionCache = new Map();
+        this.maskCache = new Map();
+        this.lastRenderKeys = [];
+        this.allCount = -1;
+        this.onDraw = this.onDrawEmitter.event;
+        this.onLoading = this.onLoadingEmitter.event;
+        this.onGameObjectChange = this.onGameObjectChangeEmitter.event;
+        this.onRenderWidgetCreate = this.onRenderWidgetCreateEmitter.event;
+        this.loading = true;
+        this.lastZoom = 0.1;
+        this.toDispose.pushAll([
+            this.onDrawEmitter,
+            this.onLoadingEmitter,
+            this.onGameObjectChangeEmitter,
+            this.onRenderWidgetCreateEmitter,
         ]);
-        return _this;
     }
-    CanvasDraw.prototype.startLoadLibs = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.opts.renderEngine.loadIDELibs()];
-                    case 1:
-                        _a.sent();
-                        this.libLoaded = true;
-                        this.draw();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    CanvasDraw.prototype.getData = function () {
+    async startLoadLibs() {
+        await this.opts.renderEngine.loadIDELibs();
+        this.libLoaded = true;
+        this.draw();
+    }
+    getData() {
         return this.data;
-    };
+    }
     /**
      * 在不可见情况下，销毁gameObject，来提升性能
      * @param appConfig
@@ -176,8 +96,7 @@ var CanvasDraw = /** @class */ (function (_super) {
      * @param engineName
      * @return visible changed
      */
-    CanvasDraw.prototype.toggleVisible = function (appConfig, visible, engineName) {
-        var _this = this;
+    toggleVisible(appConfig, visible, engineName) {
         var _a, _b;
         if (this.waitToDispose) {
             this.waitToDispose.dispose();
@@ -187,35 +106,37 @@ var CanvasDraw = /** @class */ (function (_super) {
         if (appConfig.pixelArt !== this.pixelArt && this.renderWidget) {
             this.renderWidget.dispose();
         }
-        var isScene = new utils_1.URI((_a = this.data) === null || _a === void 0 ? void 0 : _a.uri).path.ext === '.scene';
+        const isScene = new utils_1.URI((_a = this.data) === null || _a === void 0 ? void 0 : _a.uri).path.ext === '.scene';
         // 组件模式用透明
-        var backgroundColor = isScene ? appConfig.backgroundColor : '';
+        const backgroundColor = isScene ? appConfig.backgroundColor : '';
         this.pixelArt = appConfig.pixelArt;
         if (visible && !this.renderWidget) {
-            var element_1 = window.document.createElement('canvas');
-            this.opts.host.appendChild(element_1);
-            element_1.className = 'gedit-canvas-transparent';
-            this.renderWidget = this.opts.renderEngine.createGameWidget(engineName, __assign(__assign({}, appConfig), { width: 0, height: 0, uri: (_b = this.data) === null || _b === void 0 ? void 0 : _b.uri, canvas: element_1, backgroundColor: backgroundColor, assetsURI: this.opts.assetsURI, isIDE: true }));
-            this.renderWidget.toDispose.push(utils_1.Disposable.create(function () {
-                if (_this.renderWidgetDispose) {
-                    _this.renderWidgetDispose.dispose();
-                    _this.renderWidgetDispose = undefined;
+            const element = window.document.createElement('canvas');
+            this.opts.host.appendChild(element);
+            element.className = 'gedit-canvas-transparent';
+            this.renderWidget = this.opts.renderEngine.createGameWidget(engineName, Object.assign(Object.assign({}, appConfig), { width: 0, height: 0, uri: (_b = this.data) === null || _b === void 0 ? void 0 : _b.uri, canvas: element, backgroundColor, assetsURI: this.opts.assetsURI, isSnapshot: this.opts.isSnapshot, isIDE: true }));
+            this.renderWidget.toDispose.push(utils_1.Disposable.create(() => {
+                if (this.renderWidgetDispose) {
+                    this.renderWidgetDispose.dispose();
+                    this.renderWidgetDispose = undefined;
                 }
-                _this.opts.host.removeChild(element_1);
-                _this.renderWidget = undefined;
-                _this.booted = false;
-                _this.loading = true;
-                _this.onLoadingEmitter.fire({
+                element.remove();
+                // this.opts.host.removeChild(element);
+                this.renderWidget = undefined;
+                this.booted = false;
+                this.loading = true;
+                this.onLoadingEmitter.fire({
                     loaded: false,
-                    allCount: _this.allCount,
+                    allCount: this.allCount,
                     currentCount: 0,
                     reload: true,
                 });
             }));
             this.renderWidgetDispose = this.toDispose.push(this.renderWidget);
-            this.renderWidget.start().then(function () {
-                _this.booted = true;
-                _this.draw();
+            Promise.resolve(this.renderWidget.start()).then(() => {
+                this.onRenderWidgetCreateEmitter.fire(this.renderWidget);
+                this.booted = true;
+                this.draw();
             });
         }
         // 更新backgroundColor
@@ -224,12 +145,12 @@ var CanvasDraw = /** @class */ (function (_super) {
         }
         // 延迟删除不可见的游戏对象, 提升性能
         if (!visible && this.renderWidget) {
-            var timeoutId_1 = setTimeout(function () {
-                if (_this.renderWidget)
-                    _this.renderWidget.dispose();
+            const timeoutId = setTimeout(() => {
+                if (this.renderWidget)
+                    this.renderWidget.dispose();
             }, WAIT_TO_DISPOSE_TIME);
-            this.waitToDispose = utils_1.Disposable.create(function () {
-                window.clearTimeout(timeoutId_1);
+            this.waitToDispose = utils_1.Disposable.create(() => {
+                window.clearTimeout(timeoutId);
             });
         }
         if (visible !== this.lastVisible) {
@@ -237,37 +158,33 @@ var CanvasDraw = /** @class */ (function (_super) {
             return true;
         }
         return false;
-    };
+    }
     ;
-    CanvasDraw.prototype.updateGameObjects = function (scene, content) {
-        var _this = this;
-        var renderKeys = [];
+    updateGameObjects(scene, content) {
+        const renderKeys = [];
         if (!content)
             return;
         this.allCount = this.updateGameObject(scene, content, 0, renderKeys);
         // 删除节点
-        this.lastRenderKeys.forEach(function (key) {
+        this.lastRenderKeys.forEach(key => {
             if (!renderKeys.includes(key)) {
-                var obj = _this.gameObjectCache.get(key);
+                const obj = this.gameObjectCache.get(key);
                 if (obj) {
                     obj.dispose();
                 }
             }
         });
         this.lastRenderKeys = renderKeys;
-    };
-    CanvasDraw.prototype.updateGameObject = function (scene, node, depth, renderKeys, isInside, parentId) {
-        var e_1, _a;
-        var _this = this;
-        var _b;
-        if (isInside === void 0) { isInside = false; }
-        var nodePath = editor2d_1.Editor2dNode.getNodePath(node);
-        var children = (node.children || []).slice().reverse();
-        var deco = this.opts.renderEngine.getGameObjectDecoration(this.data.engineName, node.displayType);
-        var compId = !editor2d_1.Editor2dNode.isRootNode(node) && deco.getComponentId ? deco.getComponentId(node) : undefined;
-        var adsorbable = true; // 是否可被吸附
-        var selectable = !isInside && (!this.opts.isTemplate || !editor2d_1.Editor2dNode.isTemplateDisabled(node)); // 是否可被选中
-        var childInside = false;
+    }
+    updateGameObject(scene, node, depth, renderKeys, isInside = false, parentId) {
+        var _a;
+        const nodePath = editor2d_1.Editor2dNode.getNodePath(node);
+        let children = (node.children || []).slice().reverse();
+        const deco = this.opts.renderEngine.getGameObjectDecoration(this.data.engineName, node.displayType);
+        const compId = !editor2d_1.Editor2dNode.isRootNode(node) && deco.getComponentId ? deco.getComponentId(node) : undefined;
+        let adsorbable = true; // 是否可被吸附
+        const selectable = !isInside && (!this.opts.isTemplate || !editor2d_1.Editor2dNode.isTemplateDisabled(node)); // 是否可被选中
+        let childInside = false;
         if (compId) {
             children = (this.opts.getComponentContent(compId, node) || []).slice().reverse();
             // 内部节点
@@ -277,92 +194,95 @@ var CanvasDraw = /** @class */ (function (_super) {
         }
         // 子节点先创建
         if (children && children.length > 0) {
-            try {
-                for (var children_1 = __values(children), children_1_1 = children_1.next(); !children_1_1.done; children_1_1 = children_1.next()) {
-                    var child = children_1_1.value;
-                    depth = this.updateGameObject(scene, child, depth, renderKeys, childInside || isInside, nodePath);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (children_1_1 && !children_1_1.done && (_a = children_1.return)) _a.call(children_1);
-                }
-                finally { if (e_1) throw e_1.error; }
+            for (const child of children) {
+                depth = this.updateGameObject(scene, child, depth, renderKeys, childInside || isInside, nodePath);
             }
         }
-        var gameObjectCache = this.gameObjectCache;
-        var currentDepth = depth;
-        var oldNode = this.nodeCache.get(nodePath);
-        var nodeChanged = node !== oldNode;
-        var gameObject = gameObjectCache.get(nodePath);
+        const gameObjectCache = this.gameObjectCache;
+        const currentDepth = depth;
+        const oldNode = this.nodeCache.get(nodePath);
+        const nodeChanged = node !== oldNode;
+        let gameObject = gameObjectCache.get(nodePath);
         // 节点重置
         if (nodeChanged) {
             this.nodeCache.set(nodePath, node);
         }
-        var firstCreate = false;
-        var nodeData = toNodeData(node, this.data.appConfig);
-        var newVersion = currentDepth + (node.version || 0) + ':' + (((_b = this.data) === null || _b === void 0 ? void 0 : _b.configVersion) || 0);
+        let firstCreate = false;
+        const nodeData = toNodeData(node, this.data.appConfig);
+        const newVersion = currentDepth + (node.version || 0) + ':' + (((_a = this.data) === null || _a === void 0 ? void 0 : _a.configVersion) || 0);
         // 内部节点无法选中
         if (!gameObject) {
-            var gameObjectChildren = children ? children.map(function (c) { return gameObjectCache.get(editor2d_1.Editor2dNode.getNodePath(c)); }) : [];
+            const gameObjectChildren = children ? children.map(c => gameObjectCache.get(editor2d_1.Editor2dNode.getNodePath(c))) : [];
             try {
-                gameObject = scene.createAuto(__assign(__assign({}, nodeData), { id: nodePath, depth: currentDepth, parentId: parentId }), gameObjectChildren);
+                const d = Object.assign(Object.assign({}, nodeData), { id: nodePath, depth: currentDepth, parentId });
+                if (d.mask) {
+                    d.mask = `${parentId}/${d.mask}`;
+                }
+                gameObject = scene.createAuto(d, gameObjectChildren);
             }
             catch (e) {
                 console.error(e);
                 return depth;
             }
             gameObjectCache.set(nodePath, gameObject);
-            scene.onGameObjectDispose(gameObject, function () {
-                _this.gameObjectCache.delete(nodePath);
-                _this.nodeVersionCache.delete(nodePath);
-                _this.nodeCache.delete(nodePath);
-                _this.onGameObjectChangeEmitter.fire({ type: GameObjectEventType.DESTROY, gameObject: gameObject, node: _this.nodeCache.get(nodePath) });
+            scene.onGameObjectDispose(gameObject, () => {
+                this.gameObjectCache.delete(nodePath);
+                this.nodeVersionCache.delete(nodePath);
+                this.nodeCache.delete(nodePath);
+                this.maskCache.delete(nodePath);
+                this.onGameObjectChangeEmitter.fire({ type: GameObjectEventType.DESTROY, gameObject: gameObject, node: this.nodeCache.get(nodePath) });
             });
-            scene.onGameObjectUpdate(gameObject, function () {
-                _this.onGameObjectChangeEmitter.fire({
+            scene.onGameObjectUpdate(gameObject, () => {
+                this.onGameObjectChangeEmitter.fire({
                     type: GameObjectEventType.UPDATE,
                     gameObject: gameObject,
-                    node: _this.nodeCache.get(nodePath),
+                    node: this.nodeCache.get(nodePath),
                 });
             });
-            scene.onGameObjectCreate(gameObject, function () {
-                _this.nodeVersionCache.set(nodePath, newVersion);
+            scene.onGameObjectCreate(gameObject, () => {
+                this.nodeVersionCache.set(nodePath, newVersion);
+                this.maskCache.set(nodePath, { mask: node.mask, isMask: node.isMask, ignoreMask: node.ignoreMask });
                 // 根节点创建完成则代表加载完成
-                _this.fireLoading(editor2d_1.Editor2dNode.isRootNode(_this.nodeCache.get(nodePath)));
+                this.fireLoading(editor2d_1.Editor2dNode.isRootNode(this.nodeCache.get(nodePath)));
             });
-            scene.onGameObjectError(gameObject, function (error) {
-                _this.onGameObjectChangeEmitter.fire({
+            scene.onGameObjectError(gameObject, error => {
+                this.onGameObjectChangeEmitter.fire({
                     type: GameObjectEventType.ERROR,
                     gameObject: gameObject,
-                    node: _this.nodeCache.get(nodePath),
-                    error: error,
+                    node: this.nodeCache.get(nodePath),
+                    error,
                 });
             });
             this.onGameObjectChangeEmitter.fire({
                 type: GameObjectEventType.CREATE,
                 gameObject: gameObject,
                 node: this.nodeCache.get(nodePath),
-                state: { selectable: selectable, adsorbable: adsorbable, isInside: isInside }
+                state: { selectable, adsorbable, isInside }
             });
             firstCreate = true;
         }
-        if (gameObject && gameObject.getTextureId) {
-            var oldTexture = gameObject.getTextureId();
-            var newTexture = nodeData.textureId;
+        if (gameObject && gameObject.needResource) {
+            const oldTexture = gameObject.data.textureId || '';
+            const newTexture = nodeData.textureId || '';
             // 素材更新则销毁重新创建
-            if (oldTexture !== newTexture) {
+            if (oldTexture.toString() !== newTexture.toString()) {
                 gameObject.dispose();
                 this.nodeCache.set(nodePath, node);
                 return this.updateGameObject(scene, node, currentDepth, renderKeys, isInside, parentId);
             }
         }
-        var update = function () {
-            var oldVersion = _this.nodeVersionCache.get(nodePath);
-            if (nodeChanged || oldVersion !== newVersion) {
-                gameObject.update(__assign(__assign({}, nodeData), { parentId: parentId, id: nodePath, textureId: nodeData.textureId, depth: currentDepth }));
-                _this.nodeVersionCache.set(nodePath, newVersion);
+        const update = () => {
+            const oldVersion = this.nodeVersionCache.get(nodePath);
+            const oldMask = this.maskCache.get(nodePath);
+            const maskChange = (oldMask === null || oldMask === void 0 ? void 0 : oldMask.mask) !== node.mask || (oldMask === null || oldMask === void 0 ? void 0 : oldMask.isMask) !== node.isMask || (oldMask === null || oldMask === void 0 ? void 0 : oldMask.ignoreMask) !== node.ignoreMask;
+            if (nodeChanged || maskChange || oldVersion !== newVersion) {
+                const d = Object.assign(Object.assign({}, nodeData), { parentId, id: nodePath, textureId: nodeData.textureId, depth: currentDepth });
+                if (d.mask) {
+                    d.mask = `${parentId}/${d.mask}`;
+                }
+                gameObject.update(d);
+                this.nodeVersionCache.set(nodePath, newVersion);
+                this.maskCache.set(nodePath, { mask: node.mask, isMask: node.isMask, ignoreMask: node.ignoreMask });
             }
         };
         if (!firstCreate && gameObject.created) {
@@ -376,62 +296,60 @@ var CanvasDraw = /** @class */ (function (_super) {
         renderKeys.push(nodePath);
         depth++;
         return depth;
-    };
-    CanvasDraw.prototype.fireLoading = function (allLoaded) {
-        var allCount = this.allCount;
-        var currentCount = this.nodeVersionCache.size;
+    }
+    fireLoading(allLoaded) {
+        const allCount = this.allCount;
+        const currentCount = this.nodeVersionCache.size;
         if (allLoaded) {
             this.loading = false;
         }
         this.onLoadingEmitter.fire({
             loaded: allLoaded,
-            allCount: allCount,
-            currentCount: currentCount,
+            allCount,
+            currentCount,
         });
-    };
-    CanvasDraw.prototype.refreshScale = function (delayDraw, zoom) {
+    }
+    refreshScale(delayDraw = true, zoom = this.lastZoom) {
         var _a, _b;
-        if (delayDraw === void 0) { delayDraw = true; }
-        if (zoom === void 0) { zoom = this.lastZoom; }
-        var visible = (_a = this.data) === null || _a === void 0 ? void 0 : _a.visible;
-        var scene = (_b = this.renderWidget) === null || _b === void 0 ? void 0 : _b.currentScene;
+        const visible = (_a = this.data) === null || _a === void 0 ? void 0 : _a.visible;
+        const scene = (_b = this.renderWidget) === null || _b === void 0 ? void 0 : _b.currentScene;
         this.lastZoom = zoom;
         if (scene) {
             // 隐藏的画布把像素点降低减少内存消耗
             scene.setScale(visible ? zoom : 0.1, delayDraw);
         }
-    };
-    CanvasDraw.prototype.update = function (data) {
+    }
+    update(data) {
         this.data = data;
         this.draw();
-    };
+    }
     /**
      * 获取画布的宽高
      */
-    CanvasDraw.prototype.getSceneSize = function () {
+    getSceneSize() {
         if (!this.data)
             return undefined;
-        var _a = this.data, content = _a.content, appConfig = _a.appConfig;
+        const { content, appConfig } = this.data;
         if (!appConfig || !content)
             return undefined;
         return render_engine_1.GameConfig.getSceneSize(appConfig, content);
-    };
-    CanvasDraw.prototype.draw = function () {
+    }
+    draw() {
         if (!this.data)
             return;
-        var _a = this.data, visible = _a.visible, appConfig = _a.appConfig, content = _a.content, engineName = _a.engineName;
+        const { visible, appConfig, content, engineName } = this.data;
         if (!this.libLoaded && !this.libLoading) {
             this.libLoading = true;
             this.startLoadLibs();
             return;
         }
-        var size = this.getSceneSize();
+        const size = this.getSceneSize();
         if (!content || !appConfig || !this.libLoaded || !size)
             return;
-        var visibleChanged = this.toggleVisible(appConfig, visible, engineName);
+        const visibleChanged = this.toggleVisible(appConfig, visible, engineName);
         if (!this.renderWidget || !this.booted)
             return;
-        var scene = this.renderWidget.switchScene(SCENE_KEY, size);
+        const scene = this.renderWidget.switchScene(SCENE_KEY, size);
         /**
          * 更新画布大小
          */
@@ -444,14 +362,8 @@ var CanvasDraw = /** @class */ (function (_super) {
          * 加载scene的资源文件并渲染
          */
         this.renderWidget.loadCurrentScene();
-        /**
-         * 动态计算画布宽高
-         */
-        // const enlargeBounds = this.selectionEntityManager.getEntityEnlargeBounds(CANVAS_MIN_WIDTH, CANVAS_MIN_HEIGHT);
-        // this.renderWidget.updateCanvasBounds(enlargeBounds);
         this.onDrawEmitter.fire(size);
-    };
-    return CanvasDraw;
-}(utils_1.DisposableImpl));
+    }
+}
 exports.CanvasDraw = CanvasDraw;
 //# sourceMappingURL=canvas-draw.js.map