* Remove .env.local guard; add portless dep
Remove the check that blocked a local .env.local in apps/editor's dev script and simplify the dev startup to source the root .env. Add portless@^0.4.2 to the project dependencies in package.json. Lockfile updated accordingly.
* Improve tool cursors, previews, and contextual tools
Revamp editor tool visuals and behaviour: replace mesh cursors with a new CursorSphere Group (adds ground marker, vertical indicator and optional tool icon tooltip), unify preview colors to #818cf8, add ground-level previews and ghost lines for ceiling and roof tools, and update slab/zone/wall visuals to match. Add automatic build-mode switching and contextual highlighting for structure tools via a new useContextualTools hook, and relax action-menu visibility checks so tool rows are shown even when not in build mode. Minor typing/import adjustments and small opacity/placement tweaks across multiple tool components.
* Keep tools active and refine action-menu styles
Stop auto-deactivating tools in RoofTool and ZoneTool by removing setTool(null) (and setMode('select') in roof). Add hasActiveTool checks and small layout padding to FurnishTools and StructureTools, and update button classes to improve visual emphasis: smoother transitions, stronger active rings/scale, and dimming/grayscale of non-active tools when another tool is active. These changes improve UX by keeping the selected tool active and giving clearer visual feedback in the action menu.
* Improve selection behavior and refresh UI styling
SelectionManager: add global enter/leave/double-click handlers to support cross-phase hovering and auto-switching into structure/furnish on double-click; normalize click handling (explicitly coalesce shiftKey). Remove per-strategy enter/leave listeners.
UI panels & controls: unify and modernize styles across many panels (ceiling, door, item, reference, roof, slab, wall, window) and action buttons — rounded-md, neutral borders, subtle shadows, translucent headers and consistent hover/focus states. Update view toggles icons and toggle styling.
NumberInput: integrate @number-flow/react NumberFlow for formatted value display, add visual drag progress indicator and refine input/label interactions and styling.
Sidebar: replace rename-popover with inline-rename-input and update tree nodes to use inline editing. Add slider-demo and tweak slider implementation. Update package.json accordingly.
* Use Barlow font across editor UI
Add the Google Barlow font and expose it as a CSS variable, update theme font variables in globals.css, and apply the new font across the editor UI. Imports: add Barlow in app/layout.tsx and include its variable on <html>, set body to use font-sans. Apply font-barlow or font-mono classes to headings, labels, numeric readouts and buttons across multiple panels and primitives to standardize typography. Also update button base variant to include font-barlow. Remove the PhaseSwitcher component and its import/usage from the action menu.
* Replace button wrapper with div in LevelItem
Replace the outer <button> around the LevelItem content with a <div> to avoid nesting interactive button elements (and the resulting invalid HTML/interaction issues). Preserves the original classes and onClick/onDoubleClick handlers so behavior remains the same and allows the PopoverTrigger/button children to function correctly.
* Refine site panel list styles and spacing
Update the SitePanel and TreeNode UI to use compact, border-bottom list rows instead of rounded, card-like items. Simplified active/hover states to use bg-accent variants and reduced shadow/ring styles for a cleaner look. Adjusted paddings (pl/px/py) and container layouts (many sections switched to flex-col) and increased tree node indent/paddingRight for consistent alignment. These changes unify spacing and visual hierarchy across levels, buildings, zones and tree nodes.
* Add auto-scroll to selected items and refine icon styles
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
370 lines
11 KiB
TypeScript
370 lines
11 KiB
TypeScript
import { emitter, type GridEvent, useScene, ZoneNode, type LevelNode } from "@pascal-app/core";
|
|
import { useViewer } from "@pascal-app/viewer";
|
|
import { useEffect, useMemo, useRef, useState } from "react";
|
|
import { BufferGeometry, DoubleSide, type Line, type Group, Shape, Vector3 } from "three";
|
|
import useEditor from "@/store/use-editor";
|
|
import { CursorSphere } from "../shared/cursor-sphere";
|
|
|
|
// Zone colors for cycling through
|
|
const ZONE_COLORS = [
|
|
"#3b82f6", // blue
|
|
"#ef4444", // red
|
|
"#22c55e", // green
|
|
"#f59e0b", // amber
|
|
"#8b5cf6", // violet
|
|
"#06b6d4", // cyan
|
|
"#ec4899", // pink
|
|
"#84cc16", // lime
|
|
];
|
|
|
|
const Y_OFFSET = 0.02;
|
|
|
|
/**
|
|
* Snaps a point to the nearest axis-aligned or 45-degree diagonal from the last point
|
|
*/
|
|
const calculateSnapPoint = (
|
|
lastPoint: [number, number],
|
|
currentPoint: [number, number]
|
|
): [number, number] => {
|
|
const [x1, y1] = lastPoint;
|
|
const [x, y] = currentPoint;
|
|
|
|
const dx = x - x1;
|
|
const dy = y - y1;
|
|
const absDx = Math.abs(dx);
|
|
const absDy = Math.abs(dy);
|
|
|
|
// Calculate distances to horizontal, vertical, and diagonal lines
|
|
const horizontalDist = absDy;
|
|
const verticalDist = absDx;
|
|
const diagonalDist = Math.abs(absDx - absDy);
|
|
|
|
// Find the minimum distance to determine which axis to snap to
|
|
const minDist = Math.min(horizontalDist, verticalDist, diagonalDist);
|
|
|
|
if (minDist === diagonalDist) {
|
|
// Snap to 45° diagonal
|
|
const diagonalLength = Math.min(absDx, absDy);
|
|
return [
|
|
x1 + Math.sign(dx) * diagonalLength,
|
|
y1 + Math.sign(dy) * diagonalLength,
|
|
];
|
|
} else if (minDist === horizontalDist) {
|
|
// Snap to horizontal
|
|
return [x, y1];
|
|
} else {
|
|
// Snap to vertical
|
|
return [x1, y];
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Creates a zone with the given polygon points
|
|
*/
|
|
const commitZoneDrawing = (
|
|
levelId: LevelNode["id"],
|
|
points: Array<[number, number]>
|
|
) => {
|
|
const { createNode, nodes } = useScene.getState();
|
|
|
|
// Count existing zones for naming and color cycling
|
|
const zoneCount = Object.values(nodes).filter((n) => n.type === "zone").length;
|
|
const name = `Zone ${zoneCount + 1}`;
|
|
|
|
// Cycle through colors
|
|
const color = ZONE_COLORS[zoneCount % ZONE_COLORS.length];
|
|
|
|
const zone = ZoneNode.parse({
|
|
name,
|
|
polygon: points,
|
|
color,
|
|
});
|
|
|
|
createNode(zone, levelId);
|
|
|
|
// Select the newly created zone
|
|
useViewer.getState().setSelection({ zoneId: zone.id });
|
|
};
|
|
|
|
type PreviewState = {
|
|
points: Array<[number, number]>;
|
|
cursorPoint: [number, number] | null;
|
|
levelY: number;
|
|
};
|
|
|
|
// Helper to validate point values (no NaN or Infinity)
|
|
const isValidPoint = (
|
|
pt: [number, number] | null | undefined
|
|
): pt is [number, number] => {
|
|
if (!pt) return false;
|
|
return Number.isFinite(pt[0]) && Number.isFinite(pt[1]);
|
|
};
|
|
|
|
export const ZoneTool: React.FC = () => {
|
|
const cursorRef = useRef<Group>(null);
|
|
const mainLineRef = useRef<Line>(null!);
|
|
const closingLineRef = useRef<Line>(null!);
|
|
const pointsRef = useRef<Array<[number, number]>>([]);
|
|
const levelYRef = useRef(0); // Track current level Y position
|
|
const currentLevelId = useViewer((state) => state.selection.levelId);
|
|
const setTool = useEditor((state) => state.setTool);
|
|
|
|
// Preview state for reactive rendering (for shape and point markers)
|
|
const [preview, setPreview] = useState<PreviewState>({
|
|
points: [],
|
|
cursorPoint: null,
|
|
levelY: 0,
|
|
});
|
|
|
|
useEffect(() => {
|
|
if (!currentLevelId) return;
|
|
|
|
let cursorPosition: [number, number] = [0, 0];
|
|
|
|
// Initialize line geometries
|
|
mainLineRef.current.geometry = new BufferGeometry();
|
|
closingLineRef.current.geometry = new BufferGeometry();
|
|
|
|
const updateLines = () => {
|
|
const points = pointsRef.current;
|
|
const y = levelYRef.current + Y_OFFSET;
|
|
|
|
if (points.length === 0) {
|
|
mainLineRef.current.visible = false;
|
|
closingLineRef.current.visible = false;
|
|
return;
|
|
}
|
|
|
|
// Build main line points
|
|
const linePoints: Vector3[] = points.map(
|
|
([x, z]) => new Vector3(x, y, z)
|
|
);
|
|
|
|
// Add cursor point
|
|
const lastPoint = points[points.length - 1];
|
|
if (lastPoint) {
|
|
const snapped = calculateSnapPoint(lastPoint, cursorPosition);
|
|
if (isValidPoint(snapped)) {
|
|
linePoints.push(new Vector3(snapped[0], y, snapped[1]));
|
|
}
|
|
}
|
|
|
|
// Update main line geometry
|
|
if (linePoints.length >= 2) {
|
|
mainLineRef.current.geometry.dispose();
|
|
mainLineRef.current.geometry = new BufferGeometry().setFromPoints(linePoints);
|
|
mainLineRef.current.visible = true;
|
|
} else {
|
|
mainLineRef.current.visible = false;
|
|
}
|
|
|
|
// Update closing line (from cursor back to first point)
|
|
const firstPoint = points[0];
|
|
if (points.length >= 2 && lastPoint && isValidPoint(firstPoint)) {
|
|
const snapped = calculateSnapPoint(lastPoint, cursorPosition);
|
|
if (isValidPoint(snapped)) {
|
|
const closingPoints = [
|
|
new Vector3(snapped[0], y, snapped[1]),
|
|
new Vector3(firstPoint[0], y, firstPoint[1]),
|
|
];
|
|
closingLineRef.current.geometry.dispose();
|
|
closingLineRef.current.geometry = new BufferGeometry().setFromPoints(closingPoints);
|
|
closingLineRef.current.visible = true;
|
|
}
|
|
} else {
|
|
closingLineRef.current.visible = false;
|
|
}
|
|
};
|
|
|
|
const updatePreview = () => {
|
|
const points = pointsRef.current;
|
|
const lastPoint = points[points.length - 1];
|
|
|
|
let cursorPt: [number, number] | null = null;
|
|
if (lastPoint) {
|
|
cursorPt = calculateSnapPoint(lastPoint, cursorPosition);
|
|
} else if (points.length === 0) {
|
|
cursorPt = cursorPosition;
|
|
}
|
|
|
|
setPreview({ points: [...points], cursorPoint: cursorPt, levelY: levelYRef.current });
|
|
updateLines();
|
|
};
|
|
|
|
const onGridMove = (event: GridEvent) => {
|
|
if (!cursorRef.current) return;
|
|
|
|
// Snap to 0.5 grid
|
|
const gridX = Math.round(event.position[0] * 2) / 2;
|
|
const gridZ = Math.round(event.position[2] * 2) / 2;
|
|
cursorPosition = [gridX, gridZ];
|
|
levelYRef.current = event.position[1];
|
|
|
|
// If we have points, snap to axis from last point
|
|
const lastPoint = pointsRef.current[pointsRef.current.length - 1];
|
|
if (lastPoint) {
|
|
const snapped = calculateSnapPoint(lastPoint, cursorPosition);
|
|
cursorRef.current.position.set(snapped[0], event.position[1], snapped[1]);
|
|
} else {
|
|
cursorRef.current.position.set(gridX, event.position[1], gridZ);
|
|
}
|
|
|
|
updatePreview();
|
|
};
|
|
|
|
const onGridClick = (event: GridEvent) => {
|
|
if (!currentLevelId) return;
|
|
|
|
const gridX = Math.round(event.position[0] * 2) / 2;
|
|
const gridZ = Math.round(event.position[2] * 2) / 2;
|
|
let clickPoint: [number, number] = [gridX, gridZ];
|
|
|
|
// Snap to axis from last point
|
|
const lastPoint = pointsRef.current[pointsRef.current.length - 1];
|
|
if (lastPoint) {
|
|
clickPoint = calculateSnapPoint(lastPoint, clickPoint);
|
|
}
|
|
|
|
// Check if clicking on the first point to close the shape
|
|
const firstPoint = pointsRef.current[0];
|
|
if (
|
|
pointsRef.current.length >= 3 &&
|
|
firstPoint &&
|
|
Math.abs(clickPoint[0] - firstPoint[0]) < 0.25 &&
|
|
Math.abs(clickPoint[1] - firstPoint[1]) < 0.25
|
|
) {
|
|
// Create the zone
|
|
commitZoneDrawing(currentLevelId, pointsRef.current);
|
|
|
|
// Reset state
|
|
pointsRef.current = [];
|
|
setPreview({ points: [], cursorPoint: null, levelY: levelYRef.current });
|
|
mainLineRef.current.visible = false;
|
|
closingLineRef.current.visible = false;
|
|
} else {
|
|
// Add point to polygon
|
|
pointsRef.current = [...pointsRef.current, clickPoint];
|
|
updatePreview();
|
|
}
|
|
};
|
|
|
|
const onGridDoubleClick = (_event: GridEvent) => {
|
|
if (!currentLevelId) return;
|
|
|
|
// Need at least 3 points to form a polygon
|
|
if (pointsRef.current.length >= 3) {
|
|
commitZoneDrawing(currentLevelId, pointsRef.current);
|
|
|
|
// Reset state
|
|
pointsRef.current = [];
|
|
setPreview({ points: [], cursorPoint: null, levelY: levelYRef.current });
|
|
mainLineRef.current.visible = false;
|
|
closingLineRef.current.visible = false;
|
|
}
|
|
};
|
|
|
|
// Subscribe to events
|
|
emitter.on("grid:move", onGridMove);
|
|
emitter.on("grid:click", onGridClick);
|
|
emitter.on("grid:double-click", onGridDoubleClick);
|
|
|
|
return () => {
|
|
emitter.off("grid:move", onGridMove);
|
|
emitter.off("grid:click", onGridClick);
|
|
emitter.off("grid:double-click", onGridDoubleClick);
|
|
|
|
// Reset state on unmount
|
|
pointsRef.current = [];
|
|
};
|
|
}, [currentLevelId, setTool]);
|
|
|
|
const { points, cursorPoint, levelY } = preview;
|
|
|
|
// Create preview shape when we have 3+ points
|
|
const previewShape = useMemo(() => {
|
|
if (points.length < 3) return null;
|
|
|
|
const allPoints = [...points];
|
|
if (isValidPoint(cursorPoint)) {
|
|
allPoints.push(cursorPoint);
|
|
}
|
|
|
|
// THREE.Shape is in X-Y plane. After rotation of -PI/2 around X:
|
|
// - Shape X -> World X
|
|
// - Shape Y -> World -Z (so we negate Z to get correct orientation)
|
|
const firstPt = allPoints[0];
|
|
if (!isValidPoint(firstPt)) return null;
|
|
|
|
const shape = new Shape();
|
|
shape.moveTo(firstPt[0], -firstPt[1]);
|
|
|
|
for (let i = 1; i < allPoints.length; i++) {
|
|
const pt = allPoints[i];
|
|
if (isValidPoint(pt)) {
|
|
shape.lineTo(pt[0], -pt[1]);
|
|
}
|
|
}
|
|
shape.closePath();
|
|
|
|
return shape;
|
|
}, [points, cursorPoint]);
|
|
|
|
return (
|
|
<group>
|
|
{/* Cursor */}
|
|
<CursorSphere ref={cursorRef} />
|
|
|
|
{/* Preview fill */}
|
|
{previewShape && (
|
|
<mesh
|
|
frustumCulled={false}
|
|
position={[0, levelY + Y_OFFSET, 0]}
|
|
rotation={[-Math.PI / 2, 0, 0]}
|
|
>
|
|
<shapeGeometry args={[previewShape]} />
|
|
<meshBasicMaterial
|
|
color="#818cf8"
|
|
depthTest={false}
|
|
opacity={0.15}
|
|
side={DoubleSide}
|
|
transparent
|
|
/>
|
|
</mesh>
|
|
)}
|
|
|
|
{/* Main line - uses native line element with TSL-compatible material */}
|
|
{/* @ts-ignore */}
|
|
<line ref={mainLineRef} frustumCulled={false} renderOrder={1} visible={false}>
|
|
<bufferGeometry />
|
|
<lineBasicNodeMaterial
|
|
color="#818cf8"
|
|
linewidth={3}
|
|
depthTest={false}
|
|
depthWrite={false}
|
|
/>
|
|
</line>
|
|
|
|
{/* Closing line - uses native line element with TSL-compatible material */}
|
|
{/* @ts-ignore */}
|
|
<line ref={closingLineRef} frustumCulled={false} renderOrder={1} visible={false}>
|
|
<bufferGeometry />
|
|
<lineBasicNodeMaterial
|
|
color="#818cf8"
|
|
linewidth={2}
|
|
depthTest={false}
|
|
depthWrite={false}
|
|
opacity={0.5}
|
|
transparent
|
|
/>
|
|
</line>
|
|
|
|
{/* Point markers */}
|
|
{points.map(([x, z], index) =>
|
|
isValidPoint([x, z]) ? (
|
|
<CursorSphere key={index} position={[x, levelY + Y_OFFSET + 0.01, z]} color="#818cf8" showTooltip={false} height={0} />
|
|
) : null
|
|
)}
|
|
</group>
|
|
);
|
|
};
|