🐛 涂鸦对象不参与对齐

Author: Littlefean

app/src/core/service/controlService/controller/concrete/ControllerEntityClickSelectAndMove.tsx

@@ -96,13 +96,6 @@ ControllerEntityClickSelectAndMove.mousemove = (event: MouseEvent) => {
       StageManager.moveConnectableEntitiesWithChildren(diffLocation);
     } else {
       StageEntityMoveManager.moveSelectedEntities(diffLocation);
-      // StageManager.moveSelectedTextNodes(diffLocation);
-      // StageManager.moveSelectedSections(diffLocation);
-      // StageManager.moveSelectedConnectPoints(diffLocation);
-      // StageManager.moveSelectedImageNodes(diffLocation);
-      // StageManager.moveSelectedUrlNodes(diffLocation);
-      // StageManager.moveSelectedPortalNodes(diffLocation);
-      // StageManager.moveSelectedPenStrokes(diffLocation);
     }
 
     // 预瞄反馈

app/src/core/service/controlService/controller/concrete/ControllerPenStrokeControl.tsx

@@ -1,5 +1,6 @@
 import { Vector } from "../../../../dataStruct/Vector";
 import { Renderer } from "../../../../render/canvas2d/renderer";
+import { Stage } from "../../../../stage/Stage";
 import { StageManager } from "../../../../stage/stageManager/StageManager";
 import { ControllerClass } from "../ControllerClass";
 
@@ -9,6 +10,9 @@ import { ControllerClass } from "../ControllerClass";
 export class ControllerPenStrokeControl extends ControllerClass {
   // 检查鼠标是否悬浮在笔迹上
   public mousemove: (event: MouseEvent) => void = (event) => {
+    if (Stage.drawingMachine.isUsing) {
+      return;
+    }
     const location = Renderer.transformView2World(new Vector(event.clientX, event.clientY));
     for (const node of StageManager.getPenStrokes()) {
       node.isMouseHover = false;

app/src/core/stage/stageManager/concreteMethods/StageAutoAlignManager.tsx

@@ -28,6 +28,11 @@ export namespace StageAutoAlignManager {
       .filter((entity) => !entity.isSelected)
       .filter((entity) => entity.collisionBox.getRectangle().isAbsoluteIn(viewRectangle));
     for (const selectedEntity of selectedEntities) {
+      if (selectedEntity.isAlignExcluded) {
+        // 涂鸦对象不参与对齐
+        continue;
+      }
+      console.log(selectedEntity);
       onEntityMoveAlignToOtherEntity(selectedEntity, otherEntities);
     }
   }
@@ -43,6 +48,10 @@ export namespace StageAutoAlignManager {
       .filter((entity) => !entity.isSelected)
       .filter((entity) => entity.collisionBox.getRectangle().isAbsoluteIn(viewRectangle));
     for (const selectedEntity of selectedEntities) {
+      if (selectedEntity.isAlignExcluded) {
+        // 涂鸦对象不参与对齐
+        continue;
+      }
       onEntityMoveAlignToOtherEntity(selectedEntity, otherEntities, true);
     }
   }

app/src/core/stage/stageObject/abstract/StageEntity.tsx

@@ -14,6 +14,11 @@ export abstract class Entity extends StageObject {
    */
   abstract move(delta: Vector): void;
 
+  /**
+   * 是否忽略自动对齐功能
+   * 例如涂鸦就不吸附对齐
+   */
+  public isAlignExcluded = false;
   /**
    * 将某个物体移动到某个位置
    * 注意：看的是最小外接矩形的左上角位置，不是中心位置

app/src/core/stage/stageObject/entity/PenStroke.tsx

@@ -18,6 +18,9 @@ class PenStrokeSegment {
 }
 
 export class PenStroke extends Entity {
+  /** 涂鸦不参与吸附对齐 */
+  public isAlignExcluded: boolean = true;
+
   public isHiddenBySectionCollapse: boolean = false;
   collisionBox: CollisionBox = new CollisionBox([]);
   public uuid: string;