refactor: baseX/baseY去除

Author: army8735

src/format/index.ts

@@ -215,10 +215,6 @@ export type RootProps = Props & {
 };
 
 export type PageProps = Props & {
-  rule?: {
-    baseX: number;
-    baseY: number;
-  };
 };
 
 export type BitmapProps = Props & {

src/format/sketch.ts

@@ -182,10 +182,6 @@ async function convertPage(page: SketchFormat.Page, index: number, opt: Opt): Pr
       nameIsFixed: page.nameIsFixed,
       index,
       constrainProportions: page.frame.constrainProportions || false,
-      // rule: {
-      //   baseX: page.horizontalRulerData?.base || 0,
-      //   baseY: page.verticalRulerData?.base || 0,
-      // },
       style: {
         width: PAGE_W,
         height: PAGE_H,

src/tools/node.ts

@@ -1198,16 +1198,6 @@ export function getBasicMatrix(node: Node) {
   return m;
 }
 
-export function getBaseCoords(node: Node) {
-  let baseX = 0,
-    baseY = 0;
-  if (!node.artBoard) {
-    baseX = (node.page?.props as PageProps).rule?.baseX || 0;
-    baseY = (node.page?.props as PageProps).rule?.baseY || 0;
-  }
-  return { baseX, baseY };
-}
-
 export function getBasicInfo(node: Node) {
   const m = getBasicMatrix(node);
   const rect = node._rect || node.rect;
@@ -1221,12 +1211,9 @@ export function getBasicInfo(node: Node) {
   const x4 = t.x4;
   const y4 = t.y4;
   const { computedStyle } = node;
-  const { baseX, baseY } = getBaseCoords(node);
   const res = {
-    baseX,
-    baseY,
-    x: Math.min(x1, x2, x3, x4) - baseX,
-    y: Math.min(y1, y2, y3, y4) - baseY,
+    x: Math.min(x1, x2, x3, x4),
+    y: Math.min(y1, y2, y3, y4),
     w: rect[2] - rect[0],
     h: rect[3] - rect[1],
     isFlippedHorizontal: computedStyle.scaleX === -1,
@@ -1382,7 +1369,6 @@ export default {
   resizeBottomLeftMultiArOperate,
   resizeBottomRightMultiArOperate,
   getBasicMatrix,
-  getBaseCoords,
   getBasicInfo,
   toBitmap,
 };

src/tools/polyline.ts

@@ -3,7 +3,7 @@ import { JPoint, Point } from '../format';
 import Polyline from '../node/geom/Polyline';
 import { calPoint, inverse4 } from '../math/matrix';
 import { isConvexPolygonOverlapRect, pointInRect } from '../math/geom';
-import { getBaseCoords, getBasicMatrix } from './node';
+import { getBasicMatrix } from './node';
 
 export function createRect() {
   return new Polyline({
@@ -213,20 +213,19 @@ export function getPointsDspByAbs(node: Polyline, points?: Point | Point[]) {
   if (!points) {
     points = node.points;
   }
-  const { baseX, baseY } = getBaseCoords(node);
   const pts = Array.isArray(points) ? points : [points];
   pts.forEach(item => {
     const p = calPoint({
-      x: item.absX - baseX,
-      y: item.absY - baseY,
+      x: item.absX,
+      y: item.absY,
     }, m);
     const f = calPoint({
-      x: item.absFx - baseX,
-      y: item.absFy - baseY,
+      x: item.absFx,
+      y: item.absFy,
     }, m);
     const t = calPoint({
-      x: item.absTx - baseX,
-      y: item.absTy - baseY,
+      x: item.absTx,
+      y: item.absTy,
     }, m);
     item.dspX = p.x;
     item.dspY = p.y;
@@ -243,20 +242,19 @@ export function getPointsAbsByDsp(node: Polyline, points?: Point | Point[]) {
     points = node.points;
   }
   const i = inverse4(m);
-  const { baseX, baseY } = getBaseCoords(node);
   const pts = Array.isArray(points) ? points : [points];
   pts.forEach(item => {
     const p = calPoint({
-      x: item.dspX + baseX,
-      y: item.dspY + baseY,
+      x: item.dspX,
+      y: item.dspY,
     }, i);
     const f = calPoint({
-      x: item.dspFx + baseX,
-      y: item.dspFy + baseY,
+      x: item.dspFx,
+      y: item.dspFy,
     }, i);
     const t = calPoint({
-      x: item.dspTx + baseX,
-      y: item.dspTy + baseY,
+      x: item.dspTx,
+      y: item.dspTy,
     }, i);
     item.absX = p.x;
     item.absY = p.y;