@gitborlando/geo 3.0.0 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @gitborlando/geo
 
+## 4.0.0
+
+### Major Changes
+
+- 7773415: XY,AABB类破坏性更新
+
+## 3.1.0
+
+### Minor Changes
+
+- 2b4693c: 更新xy类
+- 0ee9da2: XY类小幅更新
+
 ## 3.0.0
 
 ### Major Changes

package/__test__/aabb.test.ts

@@ -45,7 +45,7 @@ describe('AABB', () => {
 
   it('should expand correctly with single value', () => {
     const aabb = new AABB(5, 5, 15, 15)
-    const expanded = AABB.expand(aabb, 2)
+    const expanded = AABB.extend(aabb, 2)
     expect(expanded.minX).toBe(3)
     expect(expanded.minY).toBe(3)
     expect(expanded.maxX).toBe(17)
@@ -54,7 +54,7 @@ describe('AABB', () => {
 
   it('should expand correctly with four values', () => {
     const aabb = new AABB(5, 5, 15, 15)
-    const expanded = AABB.expand(aabb, 1, 2, 3, 4)
+    const expanded = AABB.extend(aabb, 1, 2, 3, 4)
     expect(expanded.minX).toBe(4)
     expect(expanded.minY).toBe(3)
     expect(expanded.maxX).toBe(18)

package/dist/index.d.ts

@@ -64,7 +64,7 @@ declare class AABB {
     static rect(aabb: AABB): IRectWithCenter;
     static collide(one: AABB, another: AABB): boolean;
     static include(one: AABB, another: AABB): number;
-    static expand(aabb: AABB, ...expands: [number] | [number, number, number, number]): AABB;
+    static extend(aabb: AABB, ...expands: [number] | [number, number, number, number]): AABB;
     static merge(...aabbList: AABB[]): AABB;
     static fromOBB(obb: OBB): AABB;
 }
@@ -212,15 +212,24 @@ declare class XY {
     x: number;
     y: number;
     constructor(x: number, y: number);
+    plain(): {
+        x: number;
+        y: number;
+    };
     plus(...others: IXY[]): XY;
     minus(...others: IXY[]): XY;
     multiply(...numbers: number[]): XY;
     divide(...numbers: number[]): XY;
     rotate(origin: IXY, rotation: number): XY;
-    symmetric(another: IXY, origin: IXY): XY;
+    symmetric(origin: IXY): XY;
+    ratio(another: IXY, t: number): XY;
     getDot(another: IXY): number;
     getDistance(another: IXY): number;
     getAngle(another: IXY, origin: IXY): number;
+    static _(x?: number, y?: number): {
+        x: number;
+        y: number;
+    };
     static of(x: number, y: number): XY;
     static from(xy: IXY): XY;
     static center(xy: {

package/dist/index.js

@@ -149,6 +149,9 @@ var XY = class _XY {
     this.x = x;
     this.y = y;
   }
+  plain() {
+    return { x: this.x, y: this.y };
+  }
   plus(...others) {
     const x = others.reduce((sum, cur) => sum + cur.x, this.x);
     const y = others.reduce((sum, cur) => sum + cur.y, this.y);
@@ -171,8 +174,13 @@ var XY = class _XY {
     if (rotation === 0) return _XY.from(this);
     return _XY.from(Angle.rotatePoint(this.x, this.y, origin.x, origin.y, rotation));
   }
-  symmetric(another, origin) {
-    return _XY.of(2 * origin.x - another.x, 2 * origin.y - another.y);
+  symmetric(origin) {
+    return _XY.of(2 * origin.x - this.x, 2 * origin.y - this.y);
+  }
+  ratio(another, t) {
+    const x = this.x + (another.x - this.x) * t;
+    const y = this.y + (another.y - this.y) * t;
+    return _XY.of(x, y);
   }
   getDot(another) {
     return this.x * another.x + this.y * another.y;
@@ -185,10 +193,14 @@ var XY = class _XY {
       Math.atan2(this.y - origin.y, this.x - origin.x) - Math.atan2(another.y - origin.y, another.x - origin.x)
     );
   }
+  static _(x = 0, y = 0) {
+    return { x, y };
+  }
   static of(x, y) {
     return new _XY(x, y);
   }
   static from(xy) {
+    if (xy instanceof _XY) return xy;
     return _XY.of(xy.x, xy.y);
   }
   static center(xy) {
@@ -237,7 +249,7 @@ var AABB = class _AABB {
     const included = large.minX <= small.minX && large.maxX >= small.maxX && large.minY <= small.minY && large.maxY >= small.maxY;
     return included ? result : -1;
   }
-  static expand(aabb, ...expands) {
+  static extend(aabb, ...expands) {
     const { minX, minY, maxX, maxY } = aabb;
     if (expands.length === 1) {
       const expand = expands[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitborlando/geo",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "",
   "type": "module",
   "exports": {

package/src/aabb.ts

@@ -47,7 +47,7 @@ export class AABB {
     return included ? result : -1
   }
 
-  static expand(
+  static extend(
     aabb: AABB,
     ...expands: [number] | [number, number, number, number]
   ): AABB {

package/src/xy.ts

@@ -102,6 +102,10 @@ export class XY {
     public x: number,
     public y: number,
   ) {}
+  plain() {
+    return { x: this.x, y: this.y }
+  }
+
   plus(...others: IXY[]) {
     const x = others.reduce((sum, cur) => sum + cur.x, this.x)
     const y = others.reduce((sum, cur) => sum + cur.y, this.y)
@@ -129,8 +133,14 @@ export class XY {
     return XY.from(Angle.rotatePoint(this.x, this.y, origin.x, origin.y, rotation))
   }
 
-  symmetric(another: IXY, origin: IXY) {
-    return XY.of(2 * origin.x - another.x, 2 * origin.y - another.y)
+  symmetric(origin: IXY) {
+    return XY.of(2 * origin.x - this.x, 2 * origin.y - this.y)
+  }
+
+  ratio(another: IXY, t: number) {
+    const x = this.x + (another.x - this.x) * t
+    const y = this.y + (another.y - this.y) * t
+    return XY.of(x, y)
   }
 
   getDot(another: IXY) {
@@ -148,11 +158,16 @@ export class XY {
     )
   }
 
+  static _(x: number = 0, y: number = 0) {
+    return { x, y }
+  }
+
   static of(x: number, y: number) {
     return new XY(x, y)
   }
 
   static from(xy: IXY) {
+    if (xy instanceof XY) return xy
     return XY.of(xy.x, xy.y)
   }