feat: 修复三角形和矩形绘制逻辑

JessYan0913 · Jul 27, 2023 · a45e1e3 · a45e1e3
1 parent 549037d
commit a45e1e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/core/src/tools/rect-tool.ts b/packages/core/src/tools/rect-tool.ts
@@ -30,9 +30,13 @@ class RectTool implements Tool {
     if (!this.rectangle) {
       return;
     }
-    const width = app.pointer.x - this.startPointer.x;
-    const height = app.pointer.y - this.startPointer.y;
-    this.rectangle.set({ width, height });
+
+    const width = Math.abs(app.pointer.x - this.startPointer.x);
+    const height = Math.abs(app.pointer.y - this.startPointer.y);
+    const left = Math.min(this.startPointer.x, app.pointer.x);
+    const top = Math.min(this.startPointer.y, app.pointer.y);
+
+    this.rectangle.set({ left, top, width, height });
     app.render();
   }
 

diff --git a/packages/core/src/tools/triangle-tool.ts b/packages/core/src/tools/triangle-tool.ts
@@ -32,8 +32,12 @@ class TriangleTool implements Tool {
     }
     const width = Math.abs(app.pointer.x - this.startPointer.x);
     const height = Math.abs(app.pointer.y - this.startPointer.y);
-    this.triangle.set({ width, height });
-    app.render(); // Call render after updating the triangle
+
+    const left = Math.min(this.startPointer.x, app.pointer.x);
+    const top = Math.min(this.startPointer.y, app.pointer.y);
+
+    this.triangle.set({ width, height, left, top });
+    app.render();
   }
 
   public onMouseUp({ app }: AppMouseEvent): void {