Skip to content

#8837 Sketch doesnt close with grid snap on #8866

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

#8837 Sketch doesnt close with grid snap on #8866

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9584c63
snap to startProfile should override snap to grid
andrewvarga Nov 10, 2025
416e4f1
fmt
andrewvarga Nov 10, 2025
bc5f884
Merge branch 'main' into andrewvarga/8837/sketch-doesnt-close-with-gr…
andrewvarga Nov 10, 2025
aeeac39
wip snaptogrid should have lower prio than snaptoprofile
andrewvarga Nov 11, 2025
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
73 changes: 56 additions & 17 deletions src/clientSideScene/sceneEntities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,7 @@
sketchEntryNodePath,
intersects: args.intersects,
intersection2d: new Vector2(...maybeSnapToAxis),
})
}).intersection2d

if (sketchInit.type === 'PipeExpression') {
const moddedResult = changeSketchArguments(
Expand Down Expand Up @@ -2832,7 +2832,8 @@
// - the three.js object currently being dragged: the new draft segment or existing segment (may not be the last in activeSegments)
// When placing the draft segment::
// - the last segment in activeSegments
currentObject?: Object3D | Group
currentObject?: Object3D | Group,
sketchEntryNodePath?: PathToNode
) {
let snappedPoint: Coords2d = [pos.x, pos.y]

Expand Down Expand Up @@ -2937,18 +2938,58 @@
}

if (!snappedToTangent) {
// Snap to the main axes if there was no snapping to tangent direction
// Snap to axes
snappedPoint = [
intersectsYAxis ? 0 : snappedPoint[0],
intersectsXAxis ? 0 : snappedPoint[1],
] as const

if (!intersectsXAxis && !intersectsYAxis) {
;({ point: snappedPoint, snapped: snappedToGrid } = this.snapToGrid(
snappedPoint,
mouseEvent
))
// Snap to grid
;({ point: snappedPoint, snapped: snappedToGrid } = this.snapToGrid(
snappedPoint,
mouseEvent
))

// There was no snapping to tangent -> try snapping to profileStart or the main axes
let snappedToProfileStart = false
if (sketchEntryNodePath) {
// This is incorrect snappedPoint is not in world space!
const ndc = new Vector3(snappedPoint[0], snappedPoint[1], 0).project(
this.sceneInfra.camControls.camera
)
this.sceneInfra.currentMouseVector.copy(ndc)
intersects = this.sceneInfra.raycastRing()

const snappedToProfileStartResult =
this.maybeSnapProfileStartIntersect2d({
sketchEntryNodePath,
intersects,
intersection2d: new Vector2(...snappedPoint),
})
if (snappedToProfileStartResult.snapped) {
console.log('snap')
snappedToProfileStart = true

Check failure on line 2971 in src/clientSideScene/sceneEntities.ts

View workflow job for this annotation

GitHub Actions / npm-lint 

'snappedToProfileStart' is assigned a value but never used. Allowed unused vars must match /^_/u
snappedPoint = [
snappedToProfileStartResult.intersection2d.x,
snappedToProfileStartResult.intersection2d.y,
]
}
}

// if (!snappedToProfileStart) {
// // Snap to grid if there was no snapping to profileStart either
// snappedPoint = [
// intersectsYAxis ? 0 : snappedPoint[0],
// intersectsXAxis ? 0 : snappedPoint[1],
// ] as const
//
// if (!intersectsXAxis && !intersectsYAxis) {
// ;({ point: snappedPoint, snapped: snappedToGrid } = this.snapToGrid(
// snappedPoint,
// mouseEvent
// ))
// }
// }
}

return {
Expand Down Expand Up @@ -3008,12 +3049,15 @@
intersectsProfileStart.position.y
)
: _intersection2d
return intersection2d
return {
snapped: Boolean(intersectsProfileStart),
intersection2d,
}
}

async onDragSegment({
object,
intersection2d: _intersection2d,
intersection2d,
sketchEntryNodePath,
sketchNodePaths,
draftInfo,
Expand All @@ -3031,12 +3075,6 @@
}
mouseEvent: MouseEvent
}) {
const intersection2d = this.maybeSnapProfileStartIntersect2d({
sketchEntryNodePath,
intersects,
intersection2d: _intersection2d,
})

const group = getParentGroup(object, SEGMENT_BODIES_PLUS_PROFILE_START)
const subGroup = getParentGroup(object, [
ARROWHEAD,
Expand Down Expand Up @@ -3066,7 +3104,8 @@
intersection2d,
intersects,
mouseEvent,
object
object,
sketchEntryNodePath
)
let modifiedAst = draftInfo
? draftInfo.truncatedAst
Expand Down
Loading