fix(geom): update AABB/Rect.offset(), clamp size to zero

thi-ng · Jun 28, 2022 · 620121d · 620121d
1 parent 3e1b340
commit 620121d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/geom/src/api/aabb.ts b/packages/geom/src/api/aabb.ts
@@ -1,7 +1,8 @@
 import type { AABBLike, Attribs } from "@thi.ng/geom-api";
-import type { Vec } from "@thi.ng/vectors";
 import { add3 } from "@thi.ng/vectors/add";
 import { addN3 } from "@thi.ng/vectors/addn";
+import { Vec, ZERO3 } from "@thi.ng/vectors/api";
+import { max3 } from "@thi.ng/vectors/max";
 import { set3 } from "@thi.ng/vectors/set";
 import { subN3 } from "@thi.ng/vectors/subn";
 import { __asVec } from "../internal/args.js";
@@ -40,7 +41,7 @@ export class AABB implements AABBLike {
 
     offset(offset: number) {
         subN3(null, this.pos, offset);
-        addN3(null, this.size, offset * 2);
+        max3(null, addN3(null, this.size, offset * 2), ZERO3);
         return this;
     }
 }
diff --git a/packages/geom/src/api/rect.ts b/packages/geom/src/api/rect.ts
@@ -1,7 +1,8 @@
 import type { AABBLike, Attribs, IHiccupShape } from "@thi.ng/geom-api";
-import type { Vec } from "@thi.ng/vectors";
 import { add2 } from "@thi.ng/vectors/add";
 import { addN2 } from "@thi.ng/vectors/addn";
+import { Vec, ZERO2 } from "@thi.ng/vectors/api";
+import { max2 } from "@thi.ng/vectors/max";
 import { set2 } from "@thi.ng/vectors/set";
 import { subN2 } from "@thi.ng/vectors/subn";
 import { __asVec } from "../internal/args.js";
@@ -40,7 +41,7 @@ export class Rect implements AABBLike, IHiccupShape {
 
     offset(offset: number) {
         subN2(null, this.pos, offset);
-        addN2(null, this.size, offset * 2);
+        max2(null, addN2(null, this.size, offset * 2), ZERO2);
         return this;
     }