yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'ui/scene: dont snap to occupied positions' (#4967) from fixes-ui into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4967
This commit is contained in:
hsjobeki
2025-08-26 09:43:59 +00:00
parent 2b7837e2b6 360048fd04
commit f0533f9bba
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-app/ui/src/scene/cubes.tsx
View File

@@ -506,6 +506,7 @@ export function CubeScene(props: {
const intersects = raycaster.intersectObject(floor); const intersects = raycaster.intersectObject(floor);
if (intersects.length > 0) { if (intersects.length > 0) {
const point = intersects[0].point; const point = intersects[0].point;
// Snap to grid // Snap to grid
const snapped = new THREE.Vector3( const snapped = new THREE.Vector3(
Math.round(point.x / GRID_SIZE) * GRID_SIZE, Math.round(point.x / GRID_SIZE) * GRID_SIZE,
@@ -513,6 +514,17 @@ export function CubeScene(props: {
Math.round(point.z / GRID_SIZE) * GRID_SIZE, Math.round(point.z / GRID_SIZE) * GRID_SIZE,
); );
// Skip snapping if there's already a cube at this position
if (props.sceneStore()) {
const positions = Object.values(props.sceneStore());
const intersects = positions.some(
(p) => p.position[0] === snapped.x && p.position[1] === snapped.z,
);
if (intersects) {
return;
}
}
if ( if (
Math.abs(initBase.position.x - snapped.x) > 0.01 || Math.abs(initBase.position.x - snapped.x) > 0.01 ||
Math.abs(initBase.position.z - snapped.z) > 0.01 Math.abs(initBase.position.z - snapped.z) > 0.01