Skip to content

Update submodules #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update submodules #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47786ac
chore: update submodules to latest versions
github-actions[bot] Jun 4, 2026
9c193d8
Placeable enhancements.
wizjany Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/bindings
Open in desktop
Submodule bindings updated 1 files
+13 −1 src/biome_type.ts
194 changes: 142 additions & 52 deletions frontend/src/components/shared/PlaceableGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,57 @@ function detourPath(
return {d, mid};
}

/**
* Same-column edge: rectangular path that routes between nodes vertically.
* Path: exits right from source → goes vertical to target level →
* goes left back to column → enters from left into target.
*
* This creates an upside-down U or right-side U that curves around
* intermediate nodes in the same column without doubling back.
*/
function sameColumnPath(
srcX: number, srcY: number,
tgtX: number, tgtY: number,
): { d: string; mid: { x: number; y: number } } {
const hw = NODE_W / 2;
const pad = 25; // How far right to swing

// Exit and entry points
const exitX = srcX + hw;
const entryX = tgtX - hw; // = srcX - hw (same column)
const rightX = srcX + hw + pad;
const leftX = srcX - hw - pad;
const flipY = tgtY - (tgtY > srcY ? 1 : -1) * (NODE_H / 2);

// Path: right → vertical → left
const r = 7;
const v = tgtY > srcY ? r : -r;
const d = [
`M ${exitX} ${srcY}`,
`L ${rightX - r} ${srcY}`,
`Q ${rightX} ${srcY}, ${rightX} ${srcY + v}`,
`L ${rightX} ${flipY - v}`,
`Q ${rightX} ${flipY}, ${rightX - r} ${flipY}`,
`L ${leftX + r} ${flipY}`,
`Q ${leftX} ${flipY}, ${leftX} ${flipY + v}`,
`L ${leftX} ${tgtY - v}`,
`Q ${leftX} ${tgtY}, ${leftX + r} ${tgtY}`,
`L ${entryX} ${tgtY}`
].join(" ");

// Label positioned on the right side at the midpoint height
const mid = {
x: rightX,
y: flipY,
};

return {d, mid};
}

/**
* Compute all routed edges. Edges spanning multiple columns with intermediate
* nodes get detour paths; others get direct quadratic bezier curves.
* Same-column edges get an S-curve to the right.
* Self-loops get an arc path above the node.
*/
function computeRoutedEdges(
Expand Down Expand Up @@ -310,7 +358,11 @@ function computeRoutedEdges(
}
}

if (!hasIntermediate) {
if (srcCol === tgtCol) {
// Same-column edge: rectangular path avoiding backward cut
const {d, mid} = sameColumnPath(src.x, src.y, tgt.x, tgt.y);
result.push({index: i, d, mid, label: e.label, tooltip: e.tooltip, edgeType: e.edgeType});
} else if (!hasIntermediate) {
// Direct edge with pair offset
const offset = pairOffsets[i];
const d = directPath(src.x, src.y, tgt.x, tgt.y, offset);
Expand Down Expand Up @@ -344,6 +396,30 @@ function computeRoutedEdges(
}
}

// Post-process: spread apart label midpoints that would visually overlap.
// This handles crossing edges (e.g. Na→N+1b and Nb→N+1a) whose midpoints
// coincide at the center of the quadrilateral formed by the four nodes.
const LABEL_COL_W = 52; // approximate label box half-width threshold
const LABEL_COL_H = 22; // approximate label box height + margin
for (let i = 0; i < result.length; i++) {
if (!result[i].label || result[i].isSelfLoop) continue;
for (let j = i + 1; j < result.length; j++) {
if (!result[j].label || result[j].isSelfLoop) continue;
const dx = Math.abs(result[i].mid.x - result[j].mid.x);
const dy = Math.abs(result[i].mid.y - result[j].mid.y);
if (dx < LABEL_COL_W && dy < LABEL_COL_H) {
const push = (LABEL_COL_H - dy) / 2 + 2;
if (result[i].mid.y <= result[j].mid.y) {
result[i] = {...result[i], mid: {...result[i].mid, y: result[i].mid.y - push}};
result[j] = {...result[j], mid: {...result[j].mid, y: result[j].mid.y + push}};
} else {
result[i] = {...result[i], mid: {...result[i].mid, y: result[i].mid.y + push}};
result[j] = {...result[j], mid: {...result[j].mid, y: result[j].mid.y - push}};
}
}
}
}

return result;
}

Expand Down Expand Up @@ -796,6 +872,30 @@ export function PlaceableGraph(props: PlaceableGraphProps) {
onCleanup(() => svg.on(".zoom", null));
});

const drawEdge= (edge: RoutedEdge, isHov: boolean) => {
const bw = () => Math.max(60, edge.label.length * 6.2 + 16);
const bh = 18;
return (
<Show when={edge.label}>
<g style="pointer-events:none">
<rect
x={edge.mid.x - bw() / 2} y={edge.mid.y - bh / 2}
width={bw()} height={bh} rx={3}
class="fill-background stroke-border"
opacity={0.92}
stroke-width={0.5}
/>
<text x={edge.mid.x} y={edge.mid.y} text-anchor="middle"
dominant-baseline="middle" font-size="9"
fill="currentColor" opacity={isHov ? 1 : 0.6}
style="font-family:system-ui">
{edge.label}
</text>
</g>
</Show>
);
}

return (
<div
ref={containerRef!}
Expand Down Expand Up @@ -922,57 +1022,13 @@ export function PlaceableGraph(props: PlaceableGraphProps) {
}}
</For>

{/* Edge labels */}
<For each={routedEdges()}>
{(edge) => {
const bw = () => Math.max(60, edge.label.length * 6.2 + 16);
const bh = 18;
return (
<Show when={edge.label}>
<g style="pointer-events:none">
<rect
x={edge.mid.x - bw() / 2} y={edge.mid.y - bh / 2}
width={bw()} height={bh} rx={3}
class="fill-background stroke-border"
opacity={0.92}
stroke-width={0.5}
/>
<text x={edge.mid.x} y={edge.mid.y} text-anchor="middle"
dominant-baseline="middle" font-size="9"
fill="currentColor" opacity={0.6}
style="font-family:system-ui">
{edge.label}
</text>
</g>
</Show>
);
}}
</For>

{/* Interaction hover tooltips */}
{/* Edge labels - non-hovered */}
<For each={routedEdges()}>
{(edge) => {
const isHov = () => hoveredEdge() === edge.index;
return (
<Show when={isHov() && edge.tooltip}>
<g style="pointer-events:none">
<rect
x={edge.mid.x - 70} y={edge.mid.y + 14}
width={140} height={20} rx={3}
class="fill-background stroke-border"
opacity={0.95}
stroke-width={0.5}
/>
<text x={edge.mid.x} y={edge.mid.y + 24} text-anchor="middle"
dominant-baseline="middle" font-size="9"
fill="currentColor"
style="font-family:system-ui">
{edge.tooltip}
</text>
</g>
</Show>
);
}}
{(edge) => (
<Show when={hoveredEdge() !== edge.index}>
{drawEdge(edge, false)}
</Show>
)}
</For>

{/* Nodes — foreignObject with GameIcon */}
Expand All @@ -999,7 +1055,8 @@ export function PlaceableGraph(props: PlaceableGraphProps) {
const desc = () => cargoIndex()?.get(node.gameId);
return (
<Show when={desc()}>
{(d) => <CargoIcon cargo={d()} small noInteract/>}
{/* hardcoded to use the same size as square icons */}
{(d) => <CargoIcon cargo={d()} small noInteract class={"max-w-[65px] max-h-[65px]"}/>}
</Show>
);
} else {
Expand Down Expand Up @@ -1123,6 +1180,36 @@ export function PlaceableGraph(props: PlaceableGraphProps) {
);
}}
</For>

{/* Edge label - hovered */}
<Show when={hoveredEdge() !== null}>
{drawEdge(routedEdges()[hoveredEdge()!], true)}
</Show>
{/* Interaction hover tooltips */}
<For each={routedEdges()}>
{(edge) => {
const isHov = () => hoveredEdge() === edge.index;
return (
<Show when={isHov() && edge.tooltip}>
<g style="pointer-events:none">
<rect
x={edge.mid.x - 70} y={edge.mid.y + 14}
width={140} height={20} rx={3}
class="fill-background stroke-border"
opacity={0.95}
stroke-width={0.5}
/>
<text x={edge.mid.x} y={edge.mid.y + 24} text-anchor="middle"
dominant-baseline="middle" font-size="9"
fill="currentColor"
style="font-family:system-ui">
{edge.tooltip}
</text>
</g>
</Show>
);
}}
</For>
</g>
</svg>
</div>
Expand Down Expand Up @@ -1258,6 +1345,9 @@ export function buildPlaceableGraph(placementId: number): PlaceableGraphData {
// Interactions
const interactions = interactionsByPlaceable.get(plcId) ?? [];
for (const ia of interactions) {
// only where this is the input
if (ia.placeableId !== plcId) continue;

// Tooltip: consumed items
const tooltip = ia.consumedItemStacks.length
? ia.consumedItemStacks.map(s => {
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/lib/placeables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ export function useInteractionsByPlaceable() {
const arr = map.get(ia.placeableId);
if (arr) arr.push(ia);
else map.set(ia.placeableId, [ia]);
if (ia.onDestroySpawnedPlaceableId) {
const outArr = map.get(ia.onDestroySpawnedPlaceableId);
if (outArr) outArr.push(ia);
else map.set(ia.onDestroySpawnedPlaceableId, [ia]);
}
}
return map;
});
Expand Down