diff --git a/__test__/Geometry/__snapshots__/circle.test.ts.snap b/__test__/Geometry/__snapshots__/circle.test.ts.snap index 18dfeb2b1..856d2a244 100644 --- a/__test__/Geometry/__snapshots__/circle.test.ts.snap +++ b/__test__/Geometry/__snapshots__/circle.test.ts.snap @@ -2,7 +2,7 @@ exports[`圆偏移 1`] = ` Vector3 { - "x": 2, + "x": 7, "y": 0, "z": 0, } @@ -10,7 +10,7 @@ Vector3 { exports[`圆偏移 2`] = ` Vector3 { - "x": 2, + "x": 7, "y": 0, "z": 0, } @@ -18,7 +18,7 @@ Vector3 { exports[`圆偏移 3`] = ` Vector3 { - "x": 5, + "x": 15, "y": 0, "z": 0, } @@ -26,7 +26,7 @@ Vector3 { exports[`圆偏移 4`] = ` Vector3 { - "x": 5, + "x": 15, "y": 0, "z": 0, } @@ -34,7 +34,7 @@ Vector3 { exports[`圆偏移 5`] = ` Vector3 { - "x": 20, + "x": 30, "y": 0, "z": 0, } @@ -42,7 +42,7 @@ Vector3 { exports[`圆偏移 6`] = ` Vector3 { - "x": 20, + "x": 30, "y": 0, "z": 0, } @@ -50,7 +50,7 @@ Vector3 { exports[`圆偏移 7`] = ` Vector3 { - "x": 20, + "x": 30, "y": 0, "z": 0, } @@ -58,7 +58,7 @@ Vector3 { exports[`圆偏移 8`] = ` Vector3 { - "x": 20, + "x": 30, "y": 0, "z": 0, } @@ -66,7 +66,7 @@ Vector3 { exports[`圆偏移 9`] = ` Vector3 { - "x": 5, + "x": 15, "y": 0, "z": 0, } @@ -74,7 +74,7 @@ Vector3 { exports[`圆偏移 10`] = ` Vector3 { - "x": 5, + "x": 15, "y": 0, "z": 0, } diff --git a/src/DatabaseServices/Circle.ts b/src/DatabaseServices/Circle.ts index d83fcb0ab..ccad524bf 100644 --- a/src/DatabaseServices/Circle.ts +++ b/src/DatabaseServices/Circle.ts @@ -1,5 +1,5 @@ import * as THREE from 'three'; -import { Box3, EllipseCurve, Geometry, Object3D, Vector3, Shape } from 'three'; +import { Box3, EllipseCurve, Geometry, Object3D, Vector3, Shape, Quaternion } from 'three'; import { arrayLast, arrayRemoveDuplicateBySort } from '../Common/ArrayExt'; import { ColorMaterial } from '../Common/ColorPalette'; import { clamp } from '../Common/Utils'; @@ -55,9 +55,7 @@ export class Circle extends Curve get StartPoint(): Vector3 { - let startPt = new Vector3(this.m_Radius, 0, 0); - this.Center.clone().add(startPt); - return startPt; + return this.GetPointAtParam(0); } get StartParam(): number { @@ -65,9 +63,7 @@ export class Circle extends Curve } get EndPoint(): Vector3 { - let endPt = new Vector3(this.m_Radius, 0, 0); - this.Center.clone().add(endPt); - return endPt; + return this.GetPointAtParam(0); } get EndParam(): number {