ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate a more selections types

Browse Source
This commit is contained in:
Kurt Hutten Irev-Dev
2024-11-19 06:07:48 +11:00
parent 47259c0385
commit 0d0e453bbb
2 changed files with 50 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ModelingMachineProvider.tsx
View File

@ -316,10 +316,6 @@ export const ModelingMachineProvider = ({
})
})
}
// let selections: Selections__old = {
// codeBasedSelections: [],
// otherSelections: [],
// }
let selections: Selections = {
graphSelections: [],
otherSelections: [],

198
src/lib/selections.ts
View File

@ -32,10 +32,6 @@ import {
Artifact,
getArtifactOfTypes,
getArtifactsOfTypes,
getCapCodeRef,
getSweepEdgeCodeRef,
getSolid2dCodeRef,
getWallCodeRef,
CodeRef,
getCodeRefsByArtifactId,
ArtifactId,
@ -48,7 +44,7 @@ export const Y_AXIS_UUID = '680fd157-266f-4b8a-984f-cdf46b8bdf01'
export type Axis = 'y-axis' | 'x-axis' | 'z-axis'
/** @deprecated Use {@link Artifact} instead. */
export type Selection__old =
type Selection__old =
| {
type:
| 'default'
@ -86,122 +82,6 @@ export type Selections = {
graphSelections: Array<Selection>
}
/** @deprecated If you're writing a new function, it should use {@link Selection} and not {@link Selection__old}
* this function should only be used for backwards compatibility with old functions.
*/
function convertSelectionToOld(selection: Selection): Selection__old | null {
// return {} as Selection__old
// TODO implementation
const _artifact = selection.artifact
if (_artifact?.type === 'solid2D') {
const codeRef = getSolid2dCodeRef(
_artifact,
engineCommandManager.artifactGraph
)
if (err(codeRef)) return null
return { range: codeRef.range, type: 'solid2D' }
// return {
// type: 'Set selection',
// data: {
// selectionType: 'singleCodeCursor',
// selection: { range: codeRef.range, type: 'solid2D' },
// },
// }
}
if (_artifact?.type === 'cap') {
const codeRef = getCapCodeRef(_artifact, engineCommandManager.artifactGraph)
if (err(codeRef)) return null
return {
range: codeRef.range,
type: _artifact?.subType === 'end' ? 'end-cap' : 'start-cap',
}
// return {
// type: 'Set selection',
// data: {
// selectionType: 'singleCodeCursor',
// selection: {
// range: codeRef.range,
// type: _artifact?.subType === 'end' ? 'end-cap' : 'start-cap',
// },
// },
// }
}
if (_artifact?.type === 'wall') {
const codeRef = getWallCodeRef(
_artifact,
engineCommandManager.artifactGraph
)
if (err(codeRef)) return null
return { range: codeRef.range, type: 'extrude-wall' }
// return {
// type: 'Set selection',
// data: {
// selectionType: 'singleCodeCursor',
// selection: { range: codeRef.range, type: 'extrude-wall' },
// },
// }
}
if (_artifact?.type === 'segment' || _artifact?.type === 'path') {
return { range: _artifact.codeRef.range, type: 'default' }
// return {
// type: 'Set selection',
// data: {
// selectionType: 'singleCodeCursor',
// selection: { range: _artifact.codeRef.range, type: 'default' },
// },
// }
}
if (_artifact?.type === 'sweepEdge') {
const codeRef = getSweepEdgeCodeRef(
_artifact,
engineCommandManager.artifactGraph
)
if (err(codeRef)) return null
if (_artifact?.subType === 'adjacent') {
return { range: codeRef.range, type: 'adjacent-edge' }
// return {
// type: 'Set selection',
// data: {
// selectionType: 'singleCodeCursor',
// selection: { range: codeRef.range, type: 'adjacent-edge' },
// },
// }
}
return { range: codeRef.range, type: 'edge' }
// return {
// type: 'Set selection',
// data: {
// selectionType: 'singleCodeCursor',
// selection: { range: codeRef.range, type: 'edge' },
// },
// }
}
if (_artifact?.type === 'edgeCut') {
const codeRef = _artifact.codeRef
return { range: codeRef.range, type: 'default' }
}
if (selection?.codeRef?.range) {
return { range: selection.codeRef.range, type: 'default' }
}
return null
}
/** @deprecated If you're writing a new function, it should use {@link Selection} and not {@link Selection__old}
* this function should only be used for backwards compatibility with old functions.
*/
export function convertSelectionsToOld(selection: Selections): Selections__old {
const selections: Selection__old[] = []
for (const artifact of selection.graphSelections) {
const converted = convertSelectionToOld(artifact)
if (converted) selections.push(converted)
}
const selectionsOld: Selections__old = {
otherSelections: selection.otherSelections,
codeBasedSelections: selections,
}
return selectionsOld
}
export async function getEventForSelectWithPoint({
data,
}: Extract<
@ -444,7 +324,7 @@ export function handleSelectionBatch({
selections.graphSelections.forEach(({ artifact }) => {
artifact?.id &&
selectionToEngine.push({
type: 'default',
type: artifact?.type,
id: artifact?.id,
range: getCodeRefsByArtifactId(
artifact.id,
@ -484,7 +364,7 @@ export function handleSelectionBatch({
}
type SelectionToEngine = {
type: Selection__old['type']
type: Artifact['type']
id?: string
range: SourceRange
}
@ -775,18 +655,15 @@ export function canSubmitSelectionArg(
export function codeToIdSelections(
selections: Selection[]
): SelectionToEngine[] {
const selectionsOld = convertSelectionsToOld({
graphSelections: selections,
otherSelections: [],
}).codeBasedSelections
return selectionsOld
return selections
.flatMap((selection): null | SelectionToEngine[] => {
const { type } = selection
const type = selection.artifact?.type
const artifact = selection.artifact
// TODO #868: loops over all artifacts will become inefficient at a large scale
const overlappingEntries = Array.from(engineCommandManager.artifactGraph)
.map(([id, artifact]) => {
if (!('codeRef' in artifact)) return null
return isOverlap(artifact.codeRef.range, selection.range)
return isOverlap(artifact.codeRef.range, selection?.codeRef?.range)
? {
artifact,
selection,
@ -811,12 +688,12 @@ export function codeToIdSelections(
| {
id: ArtifactId
artifact: unknown
selection: Selection__old
selection: Selection
}
| undefined
overlappingEntries.forEach((entry) => {
// TODO probably need to remove much of the `type === 'xyz'` below
if (type === 'default' && entry.artifact.type === 'segment') {
if (!artifact && entry.artifact.type === 'segment') {
bestCandidate = entry
return
}
@ -843,7 +720,7 @@ export function codeToIdSelections(
id: entry.artifact.solid2dId,
}
}
if (type === 'extrude-wall' && entry.artifact.type === 'segment') {
if (artifact?.type === 'wall' && entry.artifact.type === 'segment') {
const wall = engineCommandManager.artifactGraph.get(
entry.artifact.surfaceId
)
@ -855,7 +732,7 @@ export function codeToIdSelections(
}
return
}
if (type === 'edge' && entry.artifact.type === 'segment') {
if (artifact?.type === 'segment' && entry.artifact.type === 'segment') {
const edges = getArtifactsOfTypes(
{ keys: entry.artifact.edgeIds, types: ['sweepEdge'] },
engineCommandManager.artifactGraph
@ -868,7 +745,11 @@ export function codeToIdSelections(
id: edge[0],
}
}
if (type === 'adjacent-edge' && entry.artifact.type === 'segment') {
if (
artifact?.type === 'sweepEdge' &&
artifact.subType === 'adjacent' &&
entry.artifact.type === 'segment'
) {
const edges = getArtifactsOfTypes(
{ keys: entry.artifact.edgeIds, types: ['sweepEdge'] },
engineCommandManager.artifactGraph
@ -885,9 +766,26 @@ export function codeToIdSelections(
}
}
if (
(type === 'end-cap' || type === 'start-cap') &&
entry.artifact.type === 'path'
artifact?.type === 'sweepEdge' &&
artifact.subType === 'opposite' &&
entry.artifact.type === 'segment'
) {
const edges = getArtifactsOfTypes(
{ keys: entry.artifact.edgeIds, types: ['sweepEdge'] },
engineCommandManager.artifactGraph
)
const edge = [...edges].find(
([_, edge]) =>
edge.type === 'sweepEdge' && edge.subType === 'opposite'
)
if (!edge) return
bestCandidate = {
artifact: edge[1],
selection,
id: edge[0],
}
}
if (artifact?.type === 'cap' && entry.artifact.type === 'path') {
const extrusion = getArtifactOfTypes(
{
key: entry.artifact.sweepId,
@ -901,7 +799,7 @@ export function codeToIdSelections(
engineCommandManager.artifactGraph
)
const cap = [...caps].find(
([_, cap]) => cap.subType === (type === 'end-cap' ? 'end' : 'start')
([_, cap]) => cap.subType === artifact?.subType
)
if (!cap) return
bestCandidate = {
@ -920,12 +818,16 @@ export function codeToIdSelections(
engineCommandManager.artifactGraph
)
if (err(consumedEdge)) return
const codeRefs = getCodeRefsByArtifactId(
artifact?.id || '',
engineCommandManager.artifactGraph
)
if (
consumedEdge.type === 'segment' &&
type === 'base-edgeCut' &&
artifact?.type === 'edgeCutEdge' &&
isOverlap(
consumedEdge.codeRef.range,
selection.secondaryRange || [0, 0]
codeRefs?.[1]?.range || [0, 0]
)
) {
bestCandidate = {
@ -935,9 +837,11 @@ export function codeToIdSelections(
}
} else if (
consumedEdge.type === 'sweepEdge' &&
((type === 'adjacent-edgeCut' &&
((artifact?.type === 'sweepEdge' &&
artifact.subType === 'adjacent' &&
consumedEdge.subType === 'adjacent') ||
(type === 'opposite-edgeCut' &&
(artifact?.type === 'sweepEdge' &&
artifact.subType === 'opposite' &&
consumedEdge.subType === 'opposite'))
) {
const seg = getArtifactOfTypes(
@ -945,9 +849,7 @@ export function codeToIdSelections(
engineCommandManager.artifactGraph
)
if (err(seg)) return
if (
isOverlap(seg.codeRef.range, selection.secondaryRange || [0, 0])
) {
if (isOverlap(seg.codeRef.range, codeRefs?.[1]?.range || [0, 0])) {
bestCandidate = {
artifact: entry.artifact,
selection,
@ -958,16 +860,16 @@ export function codeToIdSelections(
}
})
if (bestCandidate) {
if (bestCandidate && type) {
return [
{
type,
id: bestCandidate.id,
range: bestCandidate.selection.range,
range: bestCandidate.selection.codeRef.range,
},
]
}
return [selection]
return null
})
.filter(isNonNullable)
}