@gedit/editor-2d 0.3.10 → 0.3.11

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

@@ -13,17 +13,22 @@ import {
 } from '@gedit/playground';
 import type { PlaygroundContext2d } from './playground-context';
 import { Rectangle } from '@gedit/math';
-import { GameObject } from '@gedit/render-engine';
+import { GameObject, GameObjectBaseType } from '@gedit/render-engine';
 import { SelectorExtendRender } from './selector-extend-renderer';
 import { followKeyType } from '@gedit/render-engine-pixi';
+import {
+  getPathBounds,
+  PathGameObjectData,
+  toFixedValue,
+} from '@gedit/canvas-draw';
 
-const numberToFixed4 = (data: {[key: string]: any}) => {
+const numberToFixed4 = (data: { [key: string]: any }) => {
   const d: any = {};
   Object.keys(data).forEach(key => {
     const value = data[key];
     // 旋转不能四舍五入，不然属性面板旋转角度误差很大
     if (typeof value === 'number' && key !== 'rotation') {
-      d[key] = parseFloat(value.toFixed(6));
+      d[key] = toFixedValue(value, 2);
     } else if (typeof value === 'object') {
       d[key] = numberToFixed4(value);
     } else {
@@ -43,13 +48,18 @@ export class SelectionEntityManager {
     protected context: PlaygroundContext2d,
     protected loading: () => boolean,
     protected getDocument: () => Editor2dDocument | undefined,
-    protected isVisible: () => boolean,
+    protected isVisible: () => boolean
   ) {
-    const editorStateConfigEntity = entityManager.getEntity<EditorStateConfigEntity>(EditorStateConfigEntity);
-    const selectionConfigEntity = entityManager.getEntity<SelectorConfigEntity>(SelectorConfigEntity);
+    const editorStateConfigEntity = entityManager.getEntity<EditorStateConfigEntity>(
+      EditorStateConfigEntity
+    );
+    const selectionConfigEntity = entityManager.getEntity<SelectorConfigEntity>(
+      SelectorConfigEntity
+    );
     selectionConfigEntity?.customSelectorEntityRenderer(props => {
-
-      const showSceneRangeRuler = editorStateConfigEntity?.getCurrentState?.() === EditorState.SHOW_SCENE_RANGE_RULER;
+      const showSceneRangeRuler =
+        editorStateConfigEntity?.getCurrentState?.() ===
+        EditorState.SHOW_SCENE_RANGE_RULER;
       const newProps: SelectorEntityRendererProps = {
         ...props,
         // editorStateConfigEntity, // 当前菜单状态， "SHOW_SCENE_RANGE_RULER" 显示场景范围标尺
@@ -57,7 +67,10 @@ export class SelectionEntityManager {
       };
       const entity = newProps.entity as Editor2dEntity;
       const register = entity.node
-        ? this.context.renderEngine.getGameObjectIDERegister(entity.gameObject.scene.config.engine, entity.node.displayType)
+        ? this.context.renderEngine.getGameObjectIDERegister(
+          entity.gameObject.scene.config.engine,
+          entity.node.displayType
+        )
         : undefined;
       const deco = register?.decoration;
       newProps.extendRenderer = () => (
@@ -80,7 +93,11 @@ export class SelectionEntityManager {
     });
   }
 
-  setTransformMask(entity: Editor2dEntity, nodePath: string, node?: Editor2dNode): void {
+  setTransformMask(
+    entity: Editor2dEntity,
+    nodePath: string,
+    node?: Editor2dNode
+  ): void {
     let maskEntity;
     if (node) {
       entity.transform.isMask = node.isMask;
@@ -107,15 +124,29 @@ export class SelectionEntityManager {
    * @param selectable
    * @param adsorbable
    */
-  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);
+  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 || Editor2dNode.isRootNode(node)) return;
-    const entity = this.entityManager.createEntity<Editor2dEntity>(Editor2dEntity, { id: nodePath });
+    const entity = this.entityManager.createEntity<Editor2dEntity>(
+      Editor2dEntity,
+      { id: nodePath }
+    );
     entity.selectableInit = selectable;
     entity.adsorbableInit = adsorbable;
-    entity.mouseSelect = selectable && (deco.mouseSelect === undefined ? true : deco.mouseSelect);
-    entity.adsorbable = 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.document = this.getDocument()!;
     entity.nodeId = node.id;
@@ -128,11 +159,15 @@ export class SelectionEntityManager {
       };
     }
 
+    if (gameObject.type === GameObjectBaseType.PATH) {
+      entity.transform.isPath = true;
+    }
+
     this.setTransformMask(entity, nodePath, node);
     // 切换选择框的类型，如圆形、矩形, 默认矩形
     if (deco.selectDisplayType) {
       entity.selectState.update({
-        displayType: deco.selectDisplayType
+        displayType: deco.selectDisplayType,
       });
     }
     // 实体选中状态改变
@@ -186,18 +221,59 @@ export class SelectionEntityManager {
           const selectionNodes = document.getSelectedNodes();
           if (selectionNodes.some(c => c.id === node.id)) {
             document.message.warn(
-              `元素开启了跟随，${type
-                ?.map(c => followKeyType[c])
-                .join(',') || 'x'} 被锁定`,
-              {timeout: 2000 }
+              `元素开启了跟随，${
+                type?.map(c => followKeyType[c]).join(',') || 'x'
+              } 被锁定`,
+              { timeout: 2000 }
             );
           }
         }
       }
+      // 减掉根据 bounds 计算的 origin
+      if (gameObject.type === GameObjectBaseType.PATH) {
+        const { bounds: pathBounds } = (gameObject as GameObject & {
+          getBounds: () => { bounds: ReturnType<typeof getPathBounds> };
+        }).getBounds();
+        const { path } = gameObject.data as PathGameObjectData;
+        const {
+          origin = { x: 0, y: 0 },
+        } = node;
+        const { originChangeBeforeSize } = path;
+        const offset = {
+          x: 0,
+          y: 0,
+        };
+        if (originChangeBeforeSize) {
+          if (originChangeBeforeSize.width !== pathBounds.width) {
+            offset.x +=
+              ((pathBounds.width - originChangeBeforeSize.width) * origin.x) /
+              pathBounds.width;
+          }
+          if (originChangeBeforeSize.height !== pathBounds.height) {
+            offset.y +=
+              ((pathBounds.height - originChangeBeforeSize.height) * origin.y) /
+              pathBounds.height;
+          }
+        }
+        newTransform.origin.x = toFixedValue(
+          newTransform.origin.x +
+            (pathBounds ? pathBounds.minX / pathBounds.width : 0) +
+            offset.x,
+          2
+        );
+        newTransform.origin.y = toFixedValue(
+          newTransform.origin.y +
+            (pathBounds ? pathBounds.minY / pathBounds.height : 0) +
+            offset.y,
+          2
+        );
+      }
       let oldTransform: TransformSchema = {} as TransformSchema;
-      Object.keys(entity.transform.data).forEach((key: keyof typeof entity.transform.data) => {
-        oldTransform[key] = node[key]! as any;
-      });
+      Object.keys(entity.transform.data).forEach(
+        (key: keyof typeof entity.transform.data) => {
+          oldTransform[key] = node[key]! as any;
+        }
+      );
       oldTransform = numberToFixed4(oldTransform);
       if (JSON.stringify(oldTransform) !== JSON.stringify(newTransform)) {
         document.updateNode(node, newTransform, true);
@@ -229,7 +305,10 @@ export class SelectionEntityManager {
     }
   }
   updateEntity(nodePath: string, gameObject: GameObject, scale?: number): void {
-    const register = this.context.renderEngine.getGameObjectIDERegister(gameObject.scene.config.engine, gameObject.type);
+    const register = this.context.renderEngine.getGameObjectIDERegister(
+      gameObject.scene.config.engine,
+      gameObject.type
+    );
     const deco = register.decoration;
     const entity = this.nodeEntitiesCache.get(nodePath);
     if (!entity || !register.getSelectionData) {
@@ -238,7 +317,9 @@ export class SelectionEntityManager {
     const node = entity.node;
     entity.ignoreTransformChanged = true;
     if (gameObject.parent) {
-      const parentEntity = this.nodeEntitiesCache.get(gameObject.parent.id as string);
+      const parentEntity = this.nodeEntitiesCache.get(
+        gameObject.parent.id as string
+      );
       if (parentEntity) {
         entity.transform.setParent(parentEntity.transform);
       }
@@ -250,6 +331,9 @@ export class SelectionEntityManager {
         height: gameObject.data.scene?.height || 400,
       };
     }
+    if (gameObject.type === GameObjectBaseType.PATH) {
+      entity.transform.isPath = true;
+    }
     entity.update(register.getSelectionData(gameObject, scale));
     entity.ignoreTransformChanged = false;
     const sizeVisible = !this.isHidden(entity.node); // && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
@@ -257,9 +341,16 @@ export class SelectionEntityManager {
     // 图层节点无法被选中
     entity.selectable = entity.selectableInit && sizeVisible;
     // 锁定状态的节点无法通过鼠标点击
-    entity.mouseSelect = (deco.mouseSelect === undefined ? true : deco.mouseSelect) && !opacityZero && !this.isLocked(node);
+    entity.mouseSelect =
+      (deco.mouseSelect === undefined ? true : deco.mouseSelect) &&
+      !opacityZero &&
+      !this.isLocked(node);
     // 是否支持吸附
-    entity.adsorbable = entity.adsorbableInit && sizeVisible && !opacityZero && (deco.adsorbable === undefined ? true : deco.adsorbable);
+    entity.adsorbable =
+      entity.adsorbableInit &&
+      sizeVisible &&
+      !opacityZero &&
+      (deco.adsorbable === undefined ? true : deco.adsorbable);
     // 同步选中状态
     entity.selected = !!node?.selected;
     // 更新zIndex, 每次都要更新，因为节点拖拽会导致所有的zIndex顺序错乱
@@ -284,7 +375,11 @@ export class SelectionEntityManager {
   scrollToSelectedNodes(): void {
     const entitiesScrollTo: Editor2dEntity[] = [];
     for (const entity of this.nodeEntitiesCache.values()) {
-      if (!Editor2dNode.isRootNode(entity.node) && entity.node && entity.selectable) {
+      if (
+        !Editor2dNode.isRootNode(entity.node) &&
+        entity.node &&
+        entity.selectable
+      ) {
         if (!entity.selected && entity.node.selected) {
           entitiesScrollTo.push(entity);
         }
@@ -295,9 +390,11 @@ export class SelectionEntityManager {
     // this.context.syncToSelectionService(this);
     if (entitiesScrollTo.length > 0) {
       // 滚动画布到选中的节点
-      this.entityManager.getEntity<PlaygroundConfigEntity>(PlaygroundConfigEntity)!.scrollToView({entities: entitiesScrollTo});
+      this.entityManager
+        .getEntity<PlaygroundConfigEntity>(PlaygroundConfigEntity)!
+        .scrollToView({ entities: entitiesScrollTo });
     }
-  };
+  }
 
   /**
    * 获取所有实体的外围最大矩形

package/src/browser/utils/bounds.ts

@@ -100,10 +100,10 @@ export const getPIXILocalBoundsByNode = (obj: GameObjectData): ChildBounds => {
           ? { x: 0, y: 0, height: 0, width: 0 }
           : Bounds.getBounds(data as any, transformData);
       return {
-        x: toFixedValue(bounds.x, 6),
-        y: toFixedValue(bounds.y, 6),
-        maxX: toFixedValue(bounds.x + bounds.width, 6),
-        maxY: toFixedValue(bounds.y + bounds.height, 6),
+        x: toFixedValue(bounds.x, 2),
+        y: toFixedValue(bounds.y, 2),
+        maxX: toFixedValue(bounds.x + bounds.width, 2),
+        maxY: toFixedValue(bounds.y + bounds.height, 2),
         isMask: c.isMask,
         mask: c.mask,
         id: c.id,

package/src/browser/utils/snapshot.ts

@@ -133,6 +133,7 @@ export class SnapshotCreator extends DisposableImpl {
       this.current = undefined;
       this.processing = undefined;
       this.drawer.renderWidget?.currentScene?.dispose();
+      this.drawer.renderWidget?.dispose();
     }));
     dispose.push(
       drawer!.onLoading(e => {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 GEdit
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.