@gedit/editor-2d 0.1.31 → 0.1.38

package/src/browser/playground/selection-entity-manager.ts

@@ -37,16 +37,19 @@ export class SelectionEntityManager {
    * @param nodePath
    * @param node
    * @param gameObject
+   * @param selectable
+   * @param adsorbable
    */
-  createEntity(nodePath: string, node: Editor2dNode, gameObject: GameObject): Editor2dEntity | undefined {
+  createEntity(nodePath: string, node: Editor2dNode, gameObject: GameObject, selectable: boolean, adsorbable: boolean): Editor2dEntity | undefined {
     const register = this.context.renderEngine.getGameObjectIDERegister(gameObject.scene.config.engine, node.displayType);
     const deco = register.decoration;
-    if (!register.getSelectionData) return;
+    if (!register.getSelectionData || Editor2dNode.isRootNode(node)) return;
     const entity = this.entityManager.createEntity<Editor2dEntity>(Editor2dEntity, { id: nodePath });
-    entity.mouseSelect = deco.mouseSelect === undefined ? true : deco.mouseSelect;
-    entity.adsorbable = deco.adsorbable === undefined ? true : deco.adsorbable;
+    entity.mouseSelect = selectable && (deco.mouseSelect === undefined ? true : deco.mouseSelect);
+    entity.adsorbable = adsorbable && (deco.adsorbable === undefined ? true : deco.adsorbable);
     entity.gameObject = gameObject;
     entity.node = node;
+    entity.transform.sizeToScale = !!deco.sizeToScale;
     // 切换选择框的类型，如圆形、矩形, 默认矩形
     if (deco.selectDisplayType) {
       entity.selectState.update({
@@ -67,26 +70,17 @@ export class SelectionEntityManager {
     entity.onDispose(() => {
       this.nodeEntitiesCache.delete(nodePath);
     });
-    let lastTransform: TransformSchema | undefined;
-    // 实体数据变化
-    entity.onTransformChanged((newTransform: TransformSchema) => {
+    entity.onTransformChanged((newData: TransformSchema) => {
       const document = this.getDocument();
       if (!document) return;
-      // 第一次更新不做处理
-      if (!lastTransform || entity.ignoreTransformChanged || !TransformSchema.is(node)) {
-        lastTransform = newTransform;
-        return;
-      }
-      // 计算transform的delta偏移量
-      const delta = TransformSchema.getDelta(lastTransform, newTransform);
-      lastTransform = newTransform;
-      document.updateNode(node, TransformSchema.mergeDelta(node, delta));
+      document.updateNode(node, newData, true);
     });
     // 设置控制key
-    // TODO
-    // const controllKeys =
-    // entity.setControlKeys(this.context.renderEngine.getDisplayControlKeys(node.displayType));
-    entity.setControlKeys([]);
+    if (deco.selectControlKeys) {
+      entity.setControlKeys(deco.selectControlKeys);
+    } else {
+      entity.setControlKeys([]);
+    }
     entity.selectable = false;
 
     return entity;
@@ -97,7 +91,7 @@ export class SelectionEntityManager {
       entity.dispose();
     }
   }
-  updateEntity(nodePath: string, gameObject: GameObject): void {
+  updateEntity(nodePath: string, gameObject: GameObject, selectable: boolean, adsorbable: boolean): void {
     const register = this.context.renderEngine.getGameObjectIDERegister(gameObject.scene.config.engine, gameObject.type);
     const deco = register.decoration;
     const entity = this.nodeEntitiesCache.get(nodePath);
@@ -112,14 +106,16 @@ export class SelectionEntityManager {
         entity.transform.setParent(parentEntity.transform);
       }
     }
+    entity.transform.isContainer = !!deco.isContainer;
     entity.update(register.getSelectionData(gameObject));
     entity.ignoreTransformChanged = false;
+    const sizeVisible = !gameObject.data.canvasHide && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
     // 图层节点无法被选中
-    entity.selectable = entity.transform.size.width > 0 && entity.transform.size.height > 0;
+    entity.selectable = selectable && sizeVisible;
     // 锁定状态的节点无法通过鼠标点击
     entity.mouseSelect = (deco.mouseSelect === undefined ? true : deco.mouseSelect) && !this.isLocked(node);
-    // 无法选中的节点同样不支持吸附
-    entity.adsorbable = entity.selectable && (deco.adsorbable === undefined ? true : deco.adsorbable);
+    // 是否支持吸附
+    entity.adsorbable = adsorbable && sizeVisible && (deco.adsorbable === undefined ? true : deco.adsorbable);
     // 同步选中状态
     entity.selected = node.selected;
     // 更新zIndex, 每次都要更新，因为节点拖拽会导致所有的zIndex顺序错乱