slab rendering + select
This commit is contained in:
@@ -20,7 +20,7 @@ const isNodeInCurrentLevel = (node: AnyNode): boolean => {
|
|||||||
return nodeLevelId === currentLevelId;
|
return nodeLevelId === currentLevelId;
|
||||||
};
|
};
|
||||||
|
|
||||||
type SelectableNodeType = "wall" | "item" | "building" | "zone";
|
type SelectableNodeType = "wall" | "item" | "building" | "zone" | 'slab';
|
||||||
|
|
||||||
interface SelectionStrategy {
|
interface SelectionStrategy {
|
||||||
types: SelectableNodeType[];
|
types: SelectableNodeType[];
|
||||||
@@ -44,7 +44,7 @@ const SELECTION_STRATEGIES: Record<string, SelectionStrategy> = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
structure: {
|
structure: {
|
||||||
types: ["wall", "item", "zone"],
|
types: ["wall", "item", "zone", "slab"],
|
||||||
handleSelect: (node, isShift) => {
|
handleSelect: (node, isShift) => {
|
||||||
const { selection, setSelection } = useViewer.getState();
|
const { selection, setSelection } = useViewer.getState();
|
||||||
if (node.type === 'zone') {
|
if (node.type === 'zone') {
|
||||||
@@ -73,7 +73,7 @@ const SELECTION_STRATEGIES: Record<string, SelectionStrategy> = {
|
|||||||
if (node.type === "zone") return true;
|
if (node.type === "zone") return true;
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
if (node.type === "wall") return true;
|
if (node.type === "wall" || node.type === "slab") return true;
|
||||||
if (node.type === "item") {
|
if (node.type === "item") {
|
||||||
return (
|
return (
|
||||||
(node as ItemNode).asset.category === "door" ||
|
(node as ItemNode).asset.category === "door" ||
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
import { SlabNode } from "@pascal-app/core";
|
||||||
|
import { useViewer } from "@pascal-app/viewer";
|
||||||
|
import { RectangleHorizontal } from "lucide-react";
|
||||||
|
import { TreeNodeWrapper } from "./tree-node";
|
||||||
|
import { TreeNodeActions } from "./tree-node-actions";
|
||||||
|
|
||||||
|
interface SlabTreeNodeProps {
|
||||||
|
node: SlabNode;
|
||||||
|
depth: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SlabTreeNode({ node, depth }: SlabTreeNodeProps) {
|
||||||
|
const isSelected = useViewer((state) => state.selection.selectedIds.includes(node.id));
|
||||||
|
const isHovered = useViewer((state) => state.hoveredId === node.id);
|
||||||
|
const setSelection = useViewer((state) => state.setSelection);
|
||||||
|
const setHoveredId = useViewer((state) => state.setHoveredId);
|
||||||
|
|
||||||
|
const handleClick = () => {
|
||||||
|
setSelection({ selectedIds: [node.id] });
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleMouseEnter = () => {
|
||||||
|
setHoveredId(node.id);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleMouseLeave = () => {
|
||||||
|
setHoveredId(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Calculate approximate area from polygon
|
||||||
|
const area = calculatePolygonArea(node.polygon).toFixed(1);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TreeNodeWrapper
|
||||||
|
icon={<RectangleHorizontal className="w-3.5 h-3.5" />}
|
||||||
|
label={node.name || `Slab (${area}m²)`}
|
||||||
|
depth={depth}
|
||||||
|
hasChildren={false}
|
||||||
|
expanded={false}
|
||||||
|
onToggle={() => {}}
|
||||||
|
onClick={handleClick}
|
||||||
|
onMouseEnter={handleMouseEnter}
|
||||||
|
onMouseLeave={handleMouseLeave}
|
||||||
|
isSelected={isSelected}
|
||||||
|
isHovered={isHovered}
|
||||||
|
actions={<TreeNodeActions node={node} />}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the area of a polygon using the shoelace formula
|
||||||
|
*/
|
||||||
|
function calculatePolygonArea(polygon: Array<[number, number]>): number {
|
||||||
|
if (polygon.length < 3) return 0;
|
||||||
|
|
||||||
|
let area = 0;
|
||||||
|
const n = polygon.length;
|
||||||
|
|
||||||
|
for (let i = 0; i < n; i++) {
|
||||||
|
const j = (i + 1) % n;
|
||||||
|
area += polygon[i]![0] * polygon[j]![1];
|
||||||
|
area -= polygon[j]![0] * polygon[i]![1];
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.abs(area) / 2;
|
||||||
|
}
|
||||||
@@ -2,9 +2,10 @@ import { AnyNodeId, useScene } from "@pascal-app/core";
|
|||||||
import { ChevronDown, ChevronRight } from "lucide-react";
|
import { ChevronDown, ChevronRight } from "lucide-react";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { BuildingTreeNode } from "./building-tree-node";
|
import { BuildingTreeNode } from "./building-tree-node";
|
||||||
import { LevelTreeNode } from "./level-tree-node";
|
|
||||||
import { WallTreeNode } from "./wall-tree-node";
|
|
||||||
import { ItemTreeNode } from "./item-tree-node";
|
import { ItemTreeNode } from "./item-tree-node";
|
||||||
|
import { LevelTreeNode } from "./level-tree-node";
|
||||||
|
import { SlabTreeNode } from "./slab-tree-node";
|
||||||
|
import { WallTreeNode } from "./wall-tree-node";
|
||||||
|
|
||||||
interface TreeNodeProps {
|
interface TreeNodeProps {
|
||||||
nodeId: AnyNodeId;
|
nodeId: AnyNodeId;
|
||||||
@@ -21,6 +22,8 @@ export function TreeNode({ nodeId, depth = 0 }: TreeNodeProps) {
|
|||||||
return <BuildingTreeNode node={node} depth={depth} />;
|
return <BuildingTreeNode node={node} depth={depth} />;
|
||||||
case "level":
|
case "level":
|
||||||
return <LevelTreeNode node={node} depth={depth} />;
|
return <LevelTreeNode node={node} depth={depth} />;
|
||||||
|
case "slab":
|
||||||
|
return <SlabTreeNode node={node} depth={depth} />;
|
||||||
case "wall":
|
case "wall":
|
||||||
return <WallTreeNode node={node} depth={depth} />;
|
return <WallTreeNode node={node} depth={depth} />;
|
||||||
case "item":
|
case "item":
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ export type {
|
|||||||
GridEvent,
|
GridEvent,
|
||||||
ItemEvent,
|
ItemEvent,
|
||||||
NodeEvent,
|
NodeEvent,
|
||||||
|
SlabEvent,
|
||||||
WallEvent,
|
WallEvent,
|
||||||
ZoneEvent,
|
ZoneEvent,
|
||||||
} from './events/bus'
|
} from './events/bus'
|
||||||
|
|||||||
@@ -1,14 +1,17 @@
|
|||||||
import { useRegistry, type SlabNode } from '@pascal-app/core'
|
import { type SlabNode, useRegistry } from '@pascal-app/core'
|
||||||
import { useRef } from 'react'
|
import { useRef } from 'react'
|
||||||
import type { Mesh } from 'three'
|
import type { Mesh } from 'three'
|
||||||
|
import { useNodeEvents } from '../../../hooks/use-node-events'
|
||||||
|
|
||||||
export const SlabRenderer = ({ node }: { node: SlabNode }) => {
|
export const SlabRenderer = ({ node }: { node: SlabNode }) => {
|
||||||
const ref = useRef<Mesh>(null!)
|
const ref = useRef<Mesh>(null!)
|
||||||
|
|
||||||
useRegistry(node.id, 'slab', ref)
|
useRegistry(node.id, 'slab', ref)
|
||||||
|
|
||||||
|
const handlers = useNodeEvents(node, 'slab')
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<mesh ref={ref} castShadow receiveShadow>
|
<mesh ref={ref} castShadow receiveShadow {...handlers}>
|
||||||
{/* SlabSystem will replace this geometry in the next frame */}
|
{/* SlabSystem will replace this geometry in the next frame */}
|
||||||
<boxGeometry args={[0, 0, 0]} />
|
<boxGeometry args={[0, 0, 0]} />
|
||||||
<meshStandardMaterial color="#e5e5e5" />
|
<meshStandardMaterial color="#e5e5e5" />
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import {
|
|||||||
emitter,
|
emitter,
|
||||||
type ItemEvent,
|
type ItemEvent,
|
||||||
type ItemNode,
|
type ItemNode,
|
||||||
|
type SlabEvent,
|
||||||
|
type SlabNode,
|
||||||
type WallEvent,
|
type WallEvent,
|
||||||
type WallNode,
|
type WallNode,
|
||||||
type ZoneEvent,
|
type ZoneEvent,
|
||||||
@@ -17,6 +19,7 @@ type NodeConfig = {
|
|||||||
wall: { node: WallNode; event: WallEvent }
|
wall: { node: WallNode; event: WallEvent }
|
||||||
building: { node: BuildingNode; event: BuildingEvent }
|
building: { node: BuildingNode; event: BuildingEvent }
|
||||||
zone: { node: ZoneNode; event: ZoneEvent }
|
zone: { node: ZoneNode; event: ZoneEvent }
|
||||||
|
slab: { node: SlabNode; event: SlabEvent }
|
||||||
}
|
}
|
||||||
|
|
||||||
type NodeType = keyof NodeConfig
|
type NodeType = keyof NodeConfig
|
||||||
|
|||||||
Reference in New Issue
Block a user