{
+ e.dataTransfer.setData('application/x-preset-id', p.id);
+ e.dataTransfer.effectAllowed = 'copy';
+ }}
+ onClick={() => toggleOpen(p.id)}
+ >
▶
{p.name}
+ {placedCount > 0 &&
{placedCount} placed}
e.stopPropagation()}>
setAmount(p.id, v)} />
@@ -340,6 +350,10 @@ export function ControlPanel({
Objects
+
+ Count tells the optimizer how many are needed. Drag a card onto the room to pin one in place
+ (locked); the optimizer arranges the rest.
+
{objects.map(renderObjectCard)}
diff --git a/src/components/RoomCanvas.tsx b/src/components/RoomCanvas.tsx
index fac571a..dffbd02 100644
--- a/src/components/RoomCanvas.tsx
+++ b/src/components/RoomCanvas.tsx
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react';
import type { LayoutState, Point } from '../types';
import { computePaths } from '../pathfinding/paths';
import { clampRectToRoom } from '../geometry/bounds';
+import { makePlaced } from '../optimization/prepare';
interface RoomCanvasProps {
state: LayoutState;
@@ -156,7 +157,7 @@ export function RoomCanvas({ state, onStateChange, mode, selectedId, onSelect, s
ctx.restore();
};
- const getMousePos = (e: React.MouseEvent
): Point => {
+ const getMousePos = (e: { clientX: number; clientY: number }): Point => {
const canvas = canvasRef.current;
if (!canvas) return { x: 0, y: 0 };
const rect = canvas.getBoundingClientRect();
@@ -250,6 +251,23 @@ export function RoomCanvas({ state, onStateChange, mode, selectedId, onSelect, s
setDrag(null);
};
+ const handleDragOver = (e: React.DragEvent) => {
+ e.preventDefault();
+ e.dataTransfer.dropEffect = 'copy';
+ };
+
+ const handleDrop = (e: React.DragEvent) => {
+ e.preventDefault();
+ const presetId = e.dataTransfer.getData('application/x-preset-id');
+ if (!presetId) return;
+ const preset = (state.presets || []).find((p) => p.id === presetId);
+ if (!preset) return;
+ const pos = getMousePos(e);
+ const f = makePlaced(preset, pos.x - preset.shape.width / 2, pos.y - preset.shape.height / 2, state.room);
+ onStateChange({ ...state, furniture: [...state.furniture, f] });
+ onSelect(f.id);
+ };
+
return (
);
}
diff --git a/src/optimization/prepare.ts b/src/optimization/prepare.ts
new file mode 100644
index 0000000..9cccf42
--- /dev/null
+++ b/src/optimization/prepare.ts
@@ -0,0 +1,74 @@
+import type { FurnitureConfig, FurniturePreset, LayoutState, RoomConfig } from '../types';
+import { clampRectToRoom, clampStateToRoom } from '../geometry/bounds';
+
+export function makeGenerated(preset: FurniturePreset, index: number, room: RoomConfig): FurnitureConfig {
+ const b = clampRectToRoom(
+ {
+ x: Math.random() * Math.max(0, room.width - preset.shape.width),
+ y: Math.random() * Math.max(0, room.height - preset.shape.height),
+ width: preset.shape.width,
+ height: preset.shape.height,
+ },
+ room,
+ );
+ return {
+ id: `${preset.id}_gen_${Date.now()}_${index}`,
+ name: preset.name,
+ type: preset.id,
+ shape: { ...preset.shape, ...b },
+ conditions: preset.conditions.map((c) => ({ ...c, params: { ...(c.params || {}) } })),
+ color: preset.color,
+ placed: false,
+ };
+}
+
+export function makePlaced(preset: FurniturePreset, x: number, y: number, room: RoomConfig): FurnitureConfig {
+ const b = clampRectToRoom(
+ { x, y, width: preset.shape.width, height: preset.shape.height },
+ room,
+ );
+ return {
+ id: `${preset.id}_placed_${Date.now()}_${Math.round(Math.random() * 1e6)}`,
+ name: preset.name,
+ type: preset.id,
+ shape: { ...preset.shape, ...b },
+ conditions: preset.conditions.map((c) => ({ ...c, params: { ...(c.params || {}) } })),
+ color: preset.color,
+ placed: true,
+ lockedForOptimization: true,
+ };
+}
+
+export function prepareForOptimize(state: LayoutState): LayoutState {
+ const presets = state.presets || [];
+ let furniture = [...state.furniture];
+
+ for (const preset of presets) {
+ const wanted = preset.amount ?? 0;
+ const ofType = furniture.filter((f) => f.type === preset.id);
+ const placed = ofType.filter((f) => f.placed);
+ let generated = ofType.filter((f) => !f.placed);
+
+ const need = Math.max(0, wanted - placed.length);
+ if (generated.length > need) {
+ generated = generated.slice(0, need);
+ }
+ while (generated.length < need) {
+ generated.push(makeGenerated(preset, generated.length, state.room));
+ }
+
+ const synced = [...placed, ...generated].map((f) => ({
+ ...f,
+ name: preset.name,
+ color: preset.color,
+ shape: { ...f.shape, width: preset.shape.width, height: preset.shape.height },
+ conditions: preset.conditions.map((c) => ({ ...c, params: { ...(c.params || {}) } })),
+ lockedForOptimization: !!f.placed,
+ }));
+
+ furniture = furniture.filter((f) => f.type !== preset.id);
+ furniture = [...furniture, ...synced];
+ }
+
+ return clampStateToRoom({ ...state, furniture });
+}