@edv4h/usketch-shape-utils 2.0.3 → 2.1.1

package/dist/free-position.d.ts

@@ -0,0 +1,24 @@
+import type { BoundingBox } from "@edv4h/usketch-shared";
+export type FreePositionStrategy = "ring" | "push";
+export interface FindFreePositionOptions {
+    /** 置きたい位置・サイズ（回転 shape は回転後 AABB を渡す）。 */
+    desired: BoundingBox;
+    /** 避ける矩形（回転後 AABB）。 */
+    occupied: BoundingBox[];
+    /** 探索戦略（既定 "ring"）。 */
+    strategy?: FreePositionStrategy;
+    /** ring の半径刻み（world px、既定 20）。 */
+    step?: number;
+    /** ring の探索上限距離（world px、既定 2000）。超過時は best-effort。 */
+    maxDistance?: number;
+    /** push の反復上限（既定 50）。 */
+    maxIterations?: number;
+}
+/** box がいずれかの occupied と重なるか。 */
+export declare function overlapsAny(box: BoundingBox, occupied: BoundingBox[]): boolean;
+/**
+ * `desired` に最も近い、occupied と重ならない位置（同サイズ）を返す。
+ * `desired` がそのまま空いていればそのまま返す。
+ */
+export declare function findFreePosition(opts: FindFreePositionOptions): BoundingBox;
+//# sourceMappingURL=free-position.d.ts.map

package/dist/free-position.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"free-position.d.ts","sourceRoot":"","sources":["../src/free-position.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEnD,MAAM,WAAW,uBAAuB;IACvC,0CAA0C;IAC1C,OAAO,EAAE,WAAW,CAAC;IACrB,uBAAuB;IACvB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,kCAAkC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yBAAyB;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAkBD,iCAAiC;AACjC,wBAAgB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAG9E;AAqFD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,uBAAuB,GAAG,WAAW,CAoB3E"}

package/dist/free-position.js

@@ -0,0 +1,124 @@
+const EPS = 0.01;
+/**
+ * 2つの AABB が重なるか。`collision-utils.intersectsAABB` と異なり EPS のマージンを挟むため、
+ * 境界がちょうど接するだけ（重なり幅 ≤ EPS）のケースは「重ならない」と判定する。
+ * これにより ring 探索で接触位置を空きとして採用でき、無限に外へ逃げるのを防ぐ。
+ */
+function intersects(a, b) {
+    return (a.x < b.x + b.width - EPS &&
+        a.x + a.width > b.x + EPS &&
+        a.y < b.y + b.height - EPS &&
+        a.y + a.height > b.y + EPS);
+}
+/** box がいずれかの occupied と重なるか。 */
+export function overlapsAny(box, occupied) {
+    for (const o of occupied)
+        if (intersects(box, o))
+            return true;
+    return false;
+}
+function moveTo(box, x, y) {
+    return { x, y, width: box.width, height: box.height };
+}
+/**
+ * `desired` 中心からの同心リングを外側へ広げ、衝突しない最近傍の位置を返す。
+ * 各半径でサンプリングした候補のうち desired 中心に最も近いものを採用。
+ */
+function findByRing(opts) {
+    const { desired, occupied, step, maxDistance } = opts;
+    if (!overlapsAny(desired, occupied))
+        return desired;
+    const cx = desired.x + desired.width / 2;
+    const cy = desired.y + desired.height / 2;
+    for (let r = step; r <= maxDistance; r += step) {
+        // 半径が大きいほど角度サンプルを増やす（密度を一定に保つ）。
+        const samples = Math.max(8, Math.round((2 * Math.PI * r) / step));
+        let best = null;
+        let bestDist = Number.POSITIVE_INFINITY;
+        for (let i = 0; i < samples; i++) {
+            const theta = (i / samples) * Math.PI * 2;
+            const ncx = cx + Math.cos(theta) * r;
+            const ncy = cy + Math.sin(theta) * r;
+            const candidate = moveTo(desired, ncx - desired.width / 2, ncy - desired.height / 2);
+            if (overlapsAny(candidate, occupied))
+                continue;
+            const dist = (ncx - cx) ** 2 + (ncy - cy) ** 2;
+            if (dist < bestDist) {
+                bestDist = dist;
+                best = candidate;
+            }
+        }
+        if (best)
+            return best;
+    }
+    // 見つからなければ best-effort で desired を返す。
+    return desired;
+}
+/**
+ * `desired` を起点に、重なる occupied から最小重なり軸方向へ押し出して分離する。
+ * 連鎖的な重なりに備えて反復し、上限で打ち切り（best-effort）。
+ */
+function findByPush(opts) {
+    const { occupied, maxIterations } = opts;
+    let box = opts.desired;
+    for (let iter = 0; iter < maxIterations; iter++) {
+        // 最も重なっている occupied を選ぶ。
+        let target = null;
+        let maxOverlapArea = 0;
+        for (const o of occupied) {
+            if (!intersects(box, o))
+                continue;
+            const ox = Math.min(box.x + box.width, o.x + o.width) - Math.max(box.x, o.x);
+            const oy = Math.min(box.y + box.height, o.y + o.height) - Math.max(box.y, o.y);
+            const area = ox * oy;
+            if (area > maxOverlapArea) {
+                maxOverlapArea = area;
+                target = o;
+            }
+        }
+        if (!target)
+            return box; // 重なり無し
+        // 最小重なり軸へ分離（接触まで）。
+        const overlapX = Math.min(box.x + box.width, target.x + target.width) - Math.max(box.x, target.x);
+        const overlapY = Math.min(box.y + box.height, target.y + target.height) - Math.max(box.y, target.y);
+        const boxCx = box.x + box.width / 2;
+        const boxCy = box.y + box.height / 2;
+        const tCx = target.x + target.width / 2;
+        const tCy = target.y + target.height / 2;
+        if (overlapX < overlapY) {
+            const dir = boxCx >= tCx ? 1 : -1;
+            box = moveTo(box, box.x + dir * (overlapX + EPS), box.y);
+        }
+        else {
+            const dir = boxCy >= tCy ? 1 : -1;
+            box = moveTo(box, box.x, box.y + dir * (overlapY + EPS));
+        }
+    }
+    return box;
+}
+/**
+ * `desired` に最も近い、occupied と重ならない位置（同サイズ）を返す。
+ * `desired` がそのまま空いていればそのまま返す。
+ */
+export function findFreePosition(opts) {
+    const strategy = opts.strategy ?? "ring";
+    if (opts.occupied.length === 0 || !overlapsAny(opts.desired, opts.occupied)) {
+        return opts.desired;
+    }
+    if (strategy === "push") {
+        return findByPush({
+            desired: opts.desired,
+            occupied: opts.occupied,
+            strategy,
+            maxIterations: opts.maxIterations ?? 50,
+        });
+    }
+    return findByRing({
+        desired: opts.desired,
+        occupied: opts.occupied,
+        strategy,
+        step: opts.step ?? 20,
+        maxDistance: opts.maxDistance ?? 2000,
+    });
+}
+//# sourceMappingURL=free-position.js.map

package/dist/free-position.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"free-position.js","sourceRoot":"","sources":["../src/free-position.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { getBounds } from "./bounds.js";
+export { type FindFreePositionOptions, type FreePositionStrategy, findFreePosition, overlapsAny, } from "./free-position.js";
 export { aabbHitTest, ellipseHitTest, lineHitTest, pointInPolygon } from "./hit-test.js";
 export { createResize } from "./resize.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACN,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EACzB,gBAAgB,EAChB,WAAW,GACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -1,4 +1,5 @@
 export { getBounds } from "./bounds.js";
+export { findFreePosition, overlapsAny, } from "./free-position.js";
 export { aabbHitTest, ellipseHitTest, lineHitTest, pointInPolygon } from "./hit-test.js";
 export { createResize } from "./resize.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAGN,gBAAgB,EAChB,WAAW,GACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edv4h/usketch-shape-utils",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,11 +12,11 @@
     }
   },
   "dependencies": {
-    "@edv4h/usketch-shared": "4.1.0"
+    "@edv4h/usketch-shared": "4.3.0"
   },
   "devDependencies": {
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "3.2.7"
   },
   "publishConfig": {
     "access": "public"