@benev/math 0.2.0-0 → 0.2.0-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (90) hide show
  1. package/README.md +110 -23
  2. package/package.json +5 -4
  3. package/s/{primitives → core}/quat.ts +56 -16
  4. package/s/{primitives → core}/vec2.ts +52 -38
  5. package/s/{primitives → core}/vec3.ts +73 -47
  6. package/s/{primitives → core}/vec4.ts +13 -16
  7. package/s/index.ts +11 -12
  8. package/s/optimizers/hash-map.ts +4 -0
  9. package/s/optimizers/hash-set.ts +4 -0
  10. package/s/optimizers/zen.ts +27 -26
  11. package/s/physics/2d/collide2d.ts +2 -2
  12. package/s/physics/2d/intersect2d.ts +9 -6
  13. package/s/shapes/2d/circle.ts +25 -7
  14. package/s/shapes/2d/rect.ts +48 -19
  15. package/s/shapes/3d/box.ts +65 -20
  16. package/s/shapes/3d/segment.ts +12 -10
  17. package/s/{utils → tools}/angles.ts +7 -1
  18. package/s/{primitives → tools}/circular.ts +5 -3
  19. package/s/{primitives → tools}/scalar.ts +11 -11
  20. package/s/{utils → tools}/spline.ts +12 -11
  21. package/x/{primitives → core}/quat.d.ts +10 -5
  22. package/x/{primitives → core}/quat.js +49 -12
  23. package/x/core/quat.js.map +1 -0
  24. package/x/{primitives → core}/vec2.d.ts +16 -17
  25. package/x/{primitives → core}/vec2.js +38 -22
  26. package/x/core/vec2.js.map +1 -0
  27. package/x/{primitives → core}/vec3.d.ts +23 -20
  28. package/x/{primitives → core}/vec3.js +60 -27
  29. package/x/core/vec3.js.map +1 -0
  30. package/x/{primitives → core}/vec4.d.ts +5 -7
  31. package/x/{primitives → core}/vec4.js +12 -12
  32. package/x/core/vec4.js.map +1 -0
  33. package/x/index.d.ts +10 -10
  34. package/x/index.js +10 -10
  35. package/x/index.js.map +1 -1
  36. package/x/optimizers/hash-map.d.ts +1 -0
  37. package/x/optimizers/hash-map.js +3 -0
  38. package/x/optimizers/hash-map.js.map +1 -1
  39. package/x/optimizers/hash-set.d.ts +1 -0
  40. package/x/optimizers/hash-set.js +3 -0
  41. package/x/optimizers/hash-set.js.map +1 -1
  42. package/x/optimizers/zen.d.ts +14 -13
  43. package/x/optimizers/zen.js +29 -28
  44. package/x/optimizers/zen.js.map +1 -1
  45. package/x/physics/2d/collide2d.d.ts +1 -1
  46. package/x/physics/2d/collide2d.js +2 -2
  47. package/x/physics/2d/collide2d.js.map +1 -1
  48. package/x/physics/2d/intersect2d.d.ts +1 -1
  49. package/x/physics/2d/intersect2d.js +7 -5
  50. package/x/physics/2d/intersect2d.js.map +1 -1
  51. package/x/shapes/2d/circle.d.ts +11 -3
  52. package/x/shapes/2d/circle.js +19 -7
  53. package/x/shapes/2d/circle.js.map +1 -1
  54. package/x/shapes/2d/rect.d.ts +20 -10
  55. package/x/shapes/2d/rect.js +47 -24
  56. package/x/shapes/2d/rect.js.map +1 -1
  57. package/x/shapes/3d/box.d.ts +21 -8
  58. package/x/shapes/3d/box.js +56 -17
  59. package/x/shapes/3d/box.js.map +1 -1
  60. package/x/shapes/3d/segment.d.ts +5 -5
  61. package/x/shapes/3d/segment.js +11 -9
  62. package/x/shapes/3d/segment.js.map +1 -1
  63. package/x/{utils → tools}/angles.d.ts +2 -0
  64. package/x/{utils → tools}/angles.js +7 -1
  65. package/x/tools/angles.js.map +1 -0
  66. package/x/{primitives → tools}/circular.js +4 -3
  67. package/x/tools/circular.js.map +1 -0
  68. package/x/{utils → tools}/noise.js.map +1 -1
  69. package/x/{utils → tools}/randy.js.map +1 -1
  70. package/x/{primitives → tools}/scalar.d.ts +4 -4
  71. package/x/{primitives → tools}/scalar.js +11 -11
  72. package/x/tools/scalar.js.map +1 -0
  73. package/x/{utils → tools}/spline.d.ts +3 -3
  74. package/x/{utils → tools}/spline.js +4 -2
  75. package/x/tools/spline.js.map +1 -0
  76. package/x/primitives/circular.js.map +0 -1
  77. package/x/primitives/quat.js.map +0 -1
  78. package/x/primitives/scalar.js.map +0 -1
  79. package/x/primitives/vec2.js.map +0 -1
  80. package/x/primitives/vec3.js.map +0 -1
  81. package/x/primitives/vec4.js.map +0 -1
  82. package/x/utils/angles.js.map +0 -1
  83. package/x/utils/spline.js.map +0 -1
  84. /package/s/{utils → tools}/noise.ts +0 -0
  85. /package/s/{utils → tools}/randy.ts +0 -0
  86. /package/x/{primitives → tools}/circular.d.ts +0 -0
  87. /package/x/{utils → tools}/noise.d.ts +0 -0
  88. /package/x/{utils → tools}/noise.js +0 -0
  89. /package/x/{utils → tools}/randy.d.ts +0 -0
  90. /package/x/{utils → tools}/randy.js +0 -0
@@ -1,15 +1,15 @@
1
1
  import { MapG } from "@e280/stz";
2
+ import { Vec2 } from "../core/vec2.js";
2
3
  import { Rect } from "../shapes/2d/rect.js";
3
- import { Vec2 } from "../primitives/vec2.js";
4
4
  import { rectVsRect } from "../physics/2d/collide2d.js";
5
5
  export class Zen {
6
6
  grid;
7
- box;
7
+ rect;
8
8
  item;
9
9
  zones = new Set();
10
- constructor(grid, box, item) {
10
+ constructor(grid, rect, item) {
11
11
  this.grid = grid;
12
- this.box = box;
12
+ this.rect = rect;
13
13
  this.item = item;
14
14
  }
15
15
  update() {
@@ -19,12 +19,13 @@ export class Zen {
19
19
  this.grid.delete(this);
20
20
  }
21
21
  }
22
- export class ZenZone extends Rect {
22
+ export class ZenZone {
23
23
  hash;
24
+ rect;
24
25
  zens = new Set();
25
- constructor(hash, center, extent) {
26
- super(center, extent);
26
+ constructor(hash, center, size) {
27
27
  this.hash = hash;
28
+ this.rect = Rect.fromCenter(center, size);
28
29
  }
29
30
  }
30
31
  export class ZenGrid {
@@ -39,13 +40,13 @@ export class ZenGrid {
39
40
  n += zone.zens.size;
40
41
  return n;
41
42
  }
42
- create(box, item) {
43
- const zen = new Zen(this, box, item);
43
+ create(rect, item) {
44
+ const zen = new Zen(this, rect, item);
44
45
  this.update(zen);
45
46
  return zen;
46
47
  }
47
48
  update(zen) {
48
- const wantedZones = this.#selectZones(zen.box);
49
+ const wantedZones = this.#selectZones(zen.rect);
49
50
  // delete stale zones
50
51
  for (const zone of zen.zones) {
51
52
  if (!wantedZones.has(zone)) {
@@ -71,31 +72,31 @@ export class ZenGrid {
71
72
  for (const emptyZone of emptyZones)
72
73
  this.#zones.delete(emptyZone.hash);
73
74
  }
74
- check(box) {
75
- const zones = this.#selectZones(box);
75
+ check(rect) {
76
+ const zones = this.#selectZones(rect);
76
77
  for (const zone of zones)
77
78
  for (const zen of zone.zens)
78
- if (rectVsRect(box, zen.box))
79
+ if (rectVsRect(rect, zen.rect))
79
80
  return true;
80
81
  return false;
81
82
  }
82
- /** return all zens that touch the given box */
83
- query(box) {
84
- const zones = this.#selectZones(box);
85
- const selected = [];
83
+ /** return set of zens that touch the given rect */
84
+ query(rect) {
85
+ const zones = this.#selectZones(rect);
86
+ const selected = new Set();
86
87
  for (const zone of zones)
87
88
  for (const zen of zone.zens)
88
- if (rectVsRect(box, zen.box) && !selected.includes(zen))
89
- selected.push(zen);
89
+ if (!selected.has(zen) && rectVsRect(rect, zen.rect))
90
+ selected.add(zen);
90
91
  return selected;
91
92
  }
92
- /** return all zen items that touch the given box */
93
- queryItems(box) {
94
- return this.query(box).map(zen => zen.item);
93
+ /** return all zen items that touch the given rect */
94
+ queryItems(rect) {
95
+ return [...this.query(rect)].map(zen => zen.item);
95
96
  }
96
- /** return all zen boxes that touch the given box */
97
- queryBoxes(box) {
98
- return this.query(box).map(zen => zen.box);
97
+ /** return all zen rects that touch the given rect */
98
+ queryRects(rect) {
99
+ return [...this.query(rect)].map(zen => zen.rect);
99
100
  }
100
101
  #hash(v) {
101
102
  return `${v.x},${v.y}`;
@@ -107,10 +108,10 @@ export class ZenGrid {
107
108
  const hash = this.#hash(zoneCorner);
108
109
  return this.#zones.guarantee(hash, () => new ZenZone(hash, zoneCorner.clone().add(this.zoneExtent.clone().half()), this.zoneExtent));
109
110
  }
110
- #selectZones(box) {
111
+ #selectZones(rect) {
111
112
  const zones = new Set();
112
- const minZoneCorner = this.#calculateZoneCorner(box.min);
113
- const maxZoneCorner = this.#calculateZoneCorner(box.max);
113
+ const minZoneCorner = this.#calculateZoneCorner(rect.min);
114
+ const maxZoneCorner = this.#calculateZoneCorner(rect.max);
114
115
  for (let x = minZoneCorner.x; x <= maxZoneCorner.x; x += this.zoneExtent.x)
115
116
  for (let y = minZoneCorner.y; y <= maxZoneCorner.y; y += this.zoneExtent.y)
116
117
  zones.add(this.#obtainZone(new Vec2(x, y)));
@@ -1 +1 @@
1
- {"version":3,"file":"zen.js","sourceRoot":"","sources":["../../s/optimizers/zen.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,IAAI,EAAC,MAAM,sBAAsB,CAAA;AACzC,OAAO,EAAC,IAAI,EAAC,MAAM,uBAAuB,CAAA;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAA;AAErD,MAAM,OAAO,GAAG;IAIP;IACA;IACA;IALR,KAAK,GAAG,IAAI,GAAG,EAAc,CAAA;IAE7B,YACQ,IAAgB,EAChB,GAAS,EACT,IAAO;QAFP,SAAI,GAAJ,IAAI,CAAY;QAChB,QAAG,GAAH,GAAG,CAAM;QACT,SAAI,GAAJ,IAAI,CAAG;IACZ,CAAC;IAEJ,MAAM;QACL,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAED,MAAM;QACL,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;CACD;AAED,MAAM,OAAO,OAAW,SAAQ,IAAI;IAGhB;IAFnB,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAExB,YAAmB,IAAY,EAAE,MAAY,EAAE,MAAY;QAC1D,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QADH,SAAI,GAAJ,IAAI,CAAQ;IAE/B,CAAC;CACD;AAED,MAAM,OAAO,OAAO;IAGC;IAFpB,MAAM,GAAG,IAAI,IAAI,EAAsB,CAAA;IAEvC,YAAoB,UAAgB;QAAhB,eAAU,GAAV,UAAU,CAAM;IAAG,CAAC;IAExC,KAAK;QACJ,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;QACpB,OAAO,CAAC,CAAA;IACT,CAAC;IAED,MAAM,CAAC,GAAS,EAAE,IAAO;QACxB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAI,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,GAAG,CAAA;IACX,CAAC;IAED,MAAM,CAAC,GAAW;QACjB,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE9C,qBAAqB;QACrB,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5B,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACtB,CAAC;QACF,CAAC;QAED,kBAAkB;QAClB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBAClB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACpB,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,CAAC,GAAW;QACjB,MAAM,UAAU,GAAiB,EAAE,CAAA;QAEnC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACrB,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;gBACvB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,UAAU;YACjC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,GAAS;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAEpC,KAAK,MAAM,IAAI,IAAI,KAAK;YACvB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI;gBAC1B,IAAI,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC;oBAC3B,OAAO,IAAI,CAAA;QAEd,OAAO,KAAK,CAAA;IACb,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,GAAS;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAa,EAAE,CAAA;QAE7B,KAAK,MAAM,IAAI,IAAI,KAAK;YACvB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI;gBAC1B,IAAI,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACtD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAErB,OAAO,QAAQ,CAAA;IAChB,CAAC;IAED,oDAAoD;IACpD,UAAU,CAAC,GAAS;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;IAED,oDAAoD;IACpD,UAAU,CAAC,GAAS;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,CAAO;QACZ,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IACvB,CAAC;IAED,oBAAoB,CAAC,KAAW;QAC/B,OAAO,IAAI,IAAI,CACd,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EACvC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CACvC,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC5B,CAAC;IAED,WAAW,CAAC,UAAgB;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,CACnD,IAAI,EACJ,UAAU,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,EACtD,IAAI,CAAC,UAAU,CACf,CAAC,CAAA;IACH,CAAC;IAED,YAAY,CAAC,GAAS;QACrB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAc,CAAA;QACnC,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACxD,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAExD,KAAK,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;YACzE,KAAK,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;gBACzE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAE7C,OAAO,KAAK,CAAA;IACb,CAAC;CACD"}
1
+ {"version":3,"file":"zen.js","sourceRoot":"","sources":["../../s/optimizers/zen.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Vec2 } from "../../primitives/vec2.js";
1
+ import { Vec2 } from "../../core/vec2.js";
2
2
  import { Rect } from "../../shapes/2d/rect.js";
3
3
  import { Circle } from "../../shapes/2d/circle.js";
4
4
  export declare function pointVsRect(point: Vec2, box: Rect): boolean;
@@ -1,5 +1,5 @@
1
- import { Vec2 } from "../../primitives/vec2.js";
2
- import { Scalar } from "../../primitives/scalar.js";
1
+ import { Vec2 } from "../../core/vec2.js";
2
+ import { Scalar } from "../../tools/scalar.js";
3
3
  export function pointVsRect(point, box) {
4
4
  const { min, max } = box;
5
5
  return (point.x >= min.x &&
@@ -1 +1 @@
1
- {"version":3,"file":"collide2d.js","sourceRoot":"","sources":["../../../s/physics/2d/collide2d.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collide2d.js","sourceRoot":"","sources":["../../../s/physics/2d/collide2d.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Vec2 } from "../../primitives/vec2.js";
1
+ import { Vec2 } from "../../core/vec2.js";
2
2
  import { Rect } from "../../shapes/2d/rect.js";
3
3
  import { Circle } from "../../shapes/2d/circle.js";
4
4
  export declare class Intersection {
@@ -1,5 +1,5 @@
1
- import { Vec2 } from "../../primitives/vec2.js";
2
- import { Scalar } from "../../primitives/scalar.js";
1
+ import { Vec2 } from "../../core/vec2.js";
2
+ import { Scalar } from "../../tools/scalar.js";
3
3
  import { rectVsCircle, rectVsRect } from "./collide2d.js";
4
4
  export class Intersection {
5
5
  contactPoint;
@@ -19,10 +19,12 @@ export function intersectRectVsRect(a, b) {
19
19
  const overlapX = Math.min(a.max.x - b.min.x, b.max.x - a.min.x);
20
20
  const overlapY = Math.min(a.max.y - b.min.y, b.max.y - a.min.y);
21
21
  const depth = Math.min(overlapX, overlapY);
22
- const contactPoint = new Vec2(Scalar.clamp((a.center.x + b.center.x) / 2, b.min.x, b.max.x), Scalar.clamp((a.center.y + b.center.y) / 2, b.min.y, b.max.y));
22
+ const aCenter = a.center();
23
+ const bCenter = b.center();
24
+ const contactPoint = new Vec2(Scalar.clamp((aCenter.x + bCenter.x) / 2, b.min.x, b.max.x), Scalar.clamp((aCenter.y + bCenter.y) / 2, b.min.y, b.max.y));
23
25
  const normalA = depth === overlapX
24
- ? new Vec2(b.center.x > a.center.x ? -1 : 1, 0)
25
- : new Vec2(0, b.center.y > a.center.y ? -1 : 1);
26
+ ? new Vec2(bCenter.x > aCenter.x ? -1 : 1, 0)
27
+ : new Vec2(0, bCenter.y > aCenter.y ? -1 : 1);
26
28
  const normalB = normalA.clone().multiplyBy(-1);
27
29
  return new Intersection(contactPoint, depth, normalA, normalB);
28
30
  }
@@ -1 +1 @@
1
- {"version":3,"file":"intersect2d.js","sourceRoot":"","sources":["../../../s/physics/2d/intersect2d.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"intersect2d.js","sourceRoot":"","sources":["../../../s/physics/2d/intersect2d.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,18 @@
1
1
  import { Rect } from "./rect.js";
2
- import { Vec2 } from "../../primitives/vec2.js";
2
+ import { Vec2, XyArray, Xy } from "../../core/vec2.js";
3
+ export type CircleJson = [center: XyArray, radius: number];
4
+ export type CircleLike = {
5
+ center: Xy;
6
+ radius: number;
7
+ };
3
8
  export declare class Circle {
4
9
  center: Vec2;
5
10
  radius: number;
6
11
  constructor(center: Vec2, radius: number);
7
- offset(delta: Vec2): this;
8
- boundingBox(): Rect;
12
+ static from(data: CircleJson | CircleLike): Circle;
13
+ toJSON(): CircleJson;
9
14
  clone(): Circle;
15
+ set(circle: CircleLike): void;
16
+ translate(delta: Vec2): this;
17
+ boundingBox(): Rect;
10
18
  }
@@ -1,5 +1,5 @@
1
1
  import { Rect } from "./rect.js";
2
- import { Vec2 } from "../../primitives/vec2.js";
2
+ import { Vec2 } from "../../core/vec2.js";
3
3
  export class Circle {
4
4
  center;
5
5
  radius;
@@ -7,16 +7,28 @@ export class Circle {
7
7
  this.center = center;
8
8
  this.radius = radius;
9
9
  }
10
- offset(delta) {
11
- this.center.add(delta);
12
- return this;
10
+ static from(data) {
11
+ return Array.isArray(data)
12
+ ? new this(Vec2.from(data[0]), data[1])
13
+ : new this(Vec2.from(data.center), data.radius);
13
14
  }
14
- boundingBox() {
15
- const extent = Vec2.all(this.radius * 2);
16
- return new Rect(this.center, extent);
15
+ toJSON() {
16
+ return [this.center.clone().toJSON(), this.radius];
17
17
  }
18
18
  clone() {
19
19
  return new Circle(this.center.clone(), this.radius);
20
20
  }
21
+ set(circle) {
22
+ this.center.set(circle.center);
23
+ this.radius = circle.radius;
24
+ }
25
+ translate(delta) {
26
+ this.center.add(delta);
27
+ return this;
28
+ }
29
+ boundingBox() {
30
+ const size = Vec2.all(this.radius * 2);
31
+ return Rect.fromCenter(this.center.clone(), size);
32
+ }
21
33
  }
22
34
  //# sourceMappingURL=circle.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"circle.js","sourceRoot":"","sources":["../../../s/shapes/2d/circle.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAA;AAE7C,MAAM,OAAO,MAAM;IAEV;IACA;IAFR,YACQ,MAAY,EACZ,MAAc;QADd,WAAM,GAAN,MAAM,CAAM;QACZ,WAAM,GAAN,MAAM,CAAQ;IACnB,CAAC;IAEJ,MAAM,CAAC,KAAW;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,WAAW;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACxC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;CACD"}
1
+ {"version":3,"file":"circle.js","sourceRoot":"","sources":["../../../s/shapes/2d/circle.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,IAAI,EAAc,MAAM,oBAAoB,CAAA;AAKpD,MAAM,OAAO,MAAM;IAEV;IACA;IAFR,YACQ,MAAY,EACZ,MAAc;QADd,WAAM,GAAN,MAAM,CAAM;QACZ,WAAM,GAAN,MAAM,CAAQ;IACnB,CAAC;IAEJ,MAAM,CAAC,IAAI,CAAC,IAA6B;QACxC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACzB,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,MAAM;QACL,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACnD,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAED,GAAG,CAAC,MAAkB;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAC5B,CAAC;IAED,SAAS,CAAC,KAAW;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,WAAW;QACV,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;CACD"}
@@ -1,13 +1,23 @@
1
- import { Vec2 } from "../../primitives/vec2.js";
1
+ import { Vec2, XyArray, Xy } from "../../core/vec2.js";
2
+ export type RectJson = [min: XyArray, max: XyArray];
3
+ export type RectLike = {
4
+ min: Xy;
5
+ max: Xy;
6
+ };
2
7
  export declare class Rect {
3
- center: Vec2;
4
- extent: Vec2;
5
- constructor(center: Vec2, extent: Vec2);
6
- static fromCorner(min: Vec2, extent: Vec2): Rect;
7
- get min(): Vec2;
8
- get max(): Vec2;
9
- offset(delta: Vec2): this;
10
- boundingBox(): this;
11
- contains(point: Vec2): boolean;
8
+ min: Vec2;
9
+ max: Vec2;
10
+ constructor(min: Vec2, max: Vec2);
11
+ static from(data: RectJson | RectLike): Rect;
12
+ static fromCorner(min: Vec2, size: Vec2): Rect;
13
+ static fromCenter(center: Vec2, size: Vec2): Rect;
12
14
  clone(): Rect;
15
+ toJSON(): RectJson;
16
+ set(rect: RectLike): void;
17
+ normalize(): this;
18
+ size(): Vec2;
19
+ center(): Vec2;
20
+ translate(delta: Vec2): this;
21
+ contains(point: Vec2): boolean;
22
+ boundingBox(): Rect;
13
23
  }
@@ -1,36 +1,59 @@
1
+ import { Vec2 } from "../../core/vec2.js";
1
2
  import { pointVsRect } from "../../physics/2d/collide2d.js";
2
3
  export class Rect {
3
- center;
4
- extent;
5
- constructor(center, extent) {
6
- this.center = center;
7
- this.extent = extent;
8
- if (extent.x < 0 || extent.y < 0)
9
- throw new Error(`invalid negative extent, ${extent.toString()}`);
10
- }
11
- static fromCorner(min, extent) {
12
- return new this(min.add(extent.clone().half()), extent);
13
- }
14
- get min() {
15
- return this.center.clone()
16
- .subtract(this.extent.clone().half());
17
- }
18
- get max() {
19
- return this.center.clone()
20
- .add(this.extent.clone().half());
21
- }
22
- offset(delta) {
23
- this.center.add(delta);
4
+ min;
5
+ max;
6
+ constructor(min, max) {
7
+ this.min = min;
8
+ this.max = max;
9
+ }
10
+ static from(data) {
11
+ return Array.isArray(data)
12
+ ? new this(Vec2.from(data[0]), Vec2.from(data[1]))
13
+ : new this(Vec2.from(data.min), Vec2.from(data.max));
14
+ }
15
+ static fromCorner(min, size) {
16
+ const max = min.clone().add(size);
17
+ return new this(min, max);
18
+ }
19
+ static fromCenter(center, size) {
20
+ const halfSize = size.clone().half();
21
+ const min = center.clone().subtract(halfSize);
22
+ const max = center.clone().add(halfSize);
23
+ return new this(min, max);
24
+ }
25
+ clone() {
26
+ return new Rect(this.min.clone(), this.max.clone());
27
+ }
28
+ toJSON() {
29
+ return [this.min.toJSON(), this.max.toJSON()];
30
+ }
31
+ set(rect) {
32
+ this.min.set(rect.min);
33
+ this.max.set(rect.max);
34
+ }
35
+ normalize() {
36
+ const { min, max } = this;
37
+ this.min.set(Vec2.min(min, max));
38
+ this.max.set(Vec2.max(min, max));
24
39
  return this;
25
40
  }
26
- boundingBox() {
41
+ size() {
42
+ return this.max.clone().subtract(this.min);
43
+ }
44
+ center() {
45
+ return this.min.clone().add(this.size().half());
46
+ }
47
+ translate(delta) {
48
+ this.min.add(delta);
49
+ this.max.add(delta);
27
50
  return this;
28
51
  }
29
52
  contains(point) {
30
53
  return pointVsRect(point, this);
31
54
  }
32
- clone() {
33
- return new Rect(this.center.clone(), this.extent.clone());
55
+ boundingBox() {
56
+ return this.clone();
34
57
  }
35
58
  }
36
59
  //# sourceMappingURL=rect.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"rect.js","sourceRoot":"","sources":["../../../s/shapes/2d/rect.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAA;AAEzD,MAAM,OAAO,IAAI;IAEP;IACA;IAFT,YACS,MAAY,EACZ,MAAY;QADZ,WAAM,GAAN,MAAM,CAAM;QACZ,WAAM,GAAN,MAAM,CAAM;QAEpB,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAClE,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAS,EAAE,MAAY;QACxC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;IACxD,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;aACxB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;aACxB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,CAAC,KAAW;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,WAAW;QACV,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,QAAQ,CAAC,KAAW;QACnB,OAAO,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAChC,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;IAC1D,CAAC;CACD"}
1
+ {"version":3,"file":"rect.js","sourceRoot":"","sources":["../../../s/shapes/2d/rect.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,24 @@
1
- import { Vec3 } from "../../primitives/vec3.js";
1
+ import { Vec3, XyzArray, Xyz } from "../../core/vec3.js";
2
+ export type BoxJson = [min: XyzArray, max: XyzArray];
3
+ export type BoxLike = {
4
+ min: Xyz;
5
+ max: Xyz;
6
+ };
2
7
  export declare class Box {
3
- center: Vec3;
4
- extent: Vec3;
5
- constructor(center: Vec3, extent: Vec3);
6
- static fromCorner(min: Vec3, extent: Vec3): Box;
7
- get min(): Vec3;
8
- get max(): Vec3;
8
+ min: Vec3;
9
+ max: Vec3;
10
+ constructor(min: Vec3, max: Vec3);
11
+ static from(data: BoxJson | BoxLike): Box;
12
+ static fromCorner(min: Vec3, size: Vec3): Box;
13
+ static fromCenter(center: Vec3, size: Vec3): Box;
14
+ toJSON(): BoxJson;
9
15
  clone(): Box;
10
- grow(increase: number): this;
16
+ set(box: BoxLike): void;
17
+ size(): Vec3;
18
+ center(): Vec3;
19
+ normalize(): this;
20
+ translate_(x: number, y: number, z: number): this;
21
+ translate(delta: Vec3): this;
22
+ grow(increase: Vec3): this;
23
+ growBy(increase: number): this;
11
24
  }
@@ -1,28 +1,67 @@
1
+ import { Vec3 } from "../../core/vec3.js";
1
2
  export class Box {
2
- center;
3
- extent;
4
- constructor(center, extent) {
5
- this.center = center;
6
- this.extent = extent;
7
- if (extent.x < 0 || extent.y < 0 || extent.z < 0)
8
- throw new Error(`invalid negative extent, ${extent.toString()}`);
3
+ min;
4
+ max;
5
+ constructor(min, max) {
6
+ this.min = min;
7
+ this.max = max;
9
8
  }
10
- static fromCorner(min, extent) {
11
- return new this(min.clone().add(extent.clone().half()), extent);
9
+ static from(data) {
10
+ return Array.isArray(data)
11
+ ? new this(Vec3.from(data[0]), Vec3.from(data[1]))
12
+ : new this(Vec3.from(data.min), Vec3.from(data.max));
12
13
  }
13
- get min() {
14
- return this.center.clone()
15
- .subtract(this.extent.clone().half());
14
+ static fromCorner(min, size) {
15
+ return new this(min, min.clone().add(size));
16
16
  }
17
- get max() {
18
- return this.center.clone()
19
- .add(this.extent.clone().half());
17
+ static fromCenter(center, size) {
18
+ const halfSize = size.clone().half();
19
+ const min = center.clone().subtract(halfSize);
20
+ const max = center.clone().add(halfSize);
21
+ return new this(min, max);
22
+ }
23
+ toJSON() {
24
+ return [this.min.toJSON(), this.max.toJSON()];
20
25
  }
21
26
  clone() {
22
- return new Box(this.center.clone(), this.extent.clone());
27
+ return new Box(this.min.clone(), this.max.clone());
28
+ }
29
+ set(box) {
30
+ this.min.set(box.min);
31
+ this.max.set(box.max);
32
+ }
33
+ size() {
34
+ return this.max.clone().subtract(this.min);
35
+ }
36
+ center() {
37
+ return this.min.clone().add(this.size().half());
38
+ }
39
+ normalize() {
40
+ const { min, max } = this;
41
+ this.min.set(Vec3.min(min, max));
42
+ this.max.set(Vec3.max(min, max));
43
+ return this;
44
+ }
45
+ translate_(x, y, z) {
46
+ this.min.add_(x, y, z);
47
+ this.max.add_(x, y, z);
48
+ return this;
49
+ }
50
+ translate(delta) {
51
+ this.min.add(delta);
52
+ this.max.add(delta);
53
+ return this;
23
54
  }
24
55
  grow(increase) {
25
- this.extent.addBy(increase);
56
+ const halfIncrease = increase.clone().half();
57
+ this.min.subtract(halfIncrease);
58
+ this.max.add(halfIncrease);
59
+ return this;
60
+ }
61
+ growBy(increase) {
62
+ const halfIncrease = increase / 2;
63
+ this.min.subtractBy(halfIncrease);
64
+ this.max.addBy(halfIncrease);
26
65
  return this;
27
66
  }
28
67
  }
@@ -1 +1 @@
1
- {"version":3,"file":"box.js","sourceRoot":"","sources":["../../../s/shapes/3d/box.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,GAAG;IAEN;IACA;IAFT,YACS,MAAY,EACZ,MAAY;QADZ,WAAM,GAAN,MAAM,CAAM;QACZ,WAAM,GAAN,MAAM,CAAM;QAEpB,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAClE,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAS,EAAE,MAAY;QACxC,OAAO,IAAI,IAAI,CACd,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,EACtC,MAAM,CACN,CAAA;IACF,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;aACxB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;aACxB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IAClC,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;IACzD,CAAC;IAED,IAAI,CAAC,QAAgB;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC3B,OAAO,IAAI,CAAA;IACZ,CAAC;CACD"}
1
+ {"version":3,"file":"box.js","sourceRoot":"","sources":["../../../s/shapes/3d/box.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,13 @@
1
- import { Vec3 } from "../../primitives/vec3.js";
1
+ import { Vec3 } from "../../core/vec3.js";
2
2
  export declare class Segment {
3
3
  start: Vec3;
4
4
  end: Vec3;
5
5
  constructor(start: Vec3, end: Vec3);
6
- get vector(): Vec3;
7
- get length(): number;
8
- get center(): Vec3;
6
+ vector(): Vec3;
7
+ length(): number;
8
+ center(): Vec3;
9
9
  clone(): Segment;
10
10
  fromStart(length: number): Vec3;
11
11
  point(fraction: number): Vec3;
12
- scale(fraction: number): void;
12
+ scale(fraction: number): this;
13
13
  }
@@ -5,31 +5,33 @@ export class Segment {
5
5
  this.start = start;
6
6
  this.end = end;
7
7
  }
8
- get vector() {
8
+ vector() {
9
9
  return this.end.clone().subtract(this.start);
10
10
  }
11
- get length() {
11
+ length() {
12
12
  return this.start.distance(this.end);
13
13
  }
14
- get center() {
14
+ center() {
15
15
  return this.start.clone()
16
16
  .add(this.end)
17
- .divideBy(2);
17
+ .half();
18
18
  }
19
19
  clone() {
20
20
  return new Segment(this.start.clone(), this.end.clone());
21
21
  }
22
22
  fromStart(length) {
23
- const direction = this.vector.normalize();
23
+ const direction = this.vector().normalize();
24
24
  return this.start.clone().add(direction.multiplyBy(length));
25
25
  }
26
26
  point(fraction) {
27
- return this.start.clone().add(this.vector.multiplyBy(fraction));
27
+ return this.start.clone().add(this.vector().multiplyBy(fraction));
28
28
  }
29
29
  scale(fraction) {
30
- const newHalfVector = this.vector.multiplyBy(fraction / 2);
31
- this.start.set(this.center.subtract(newHalfVector));
32
- this.end.set(this.center.add(newHalfVector));
30
+ const { center } = this;
31
+ const newHalfVector = this.vector().multiplyBy(fraction / 2);
32
+ this.start.set(center().subtract(newHalfVector));
33
+ this.end.set(center().add(newHalfVector));
34
+ return this;
33
35
  }
34
36
  }
35
37
  //# sourceMappingURL=segment.js.map