Nadro/adhoc/center rectangle (#4480)
* fix: big commit, doing this to save work then do a PR cleanup; center rectangle * fix: making a center function for each scenario * fix: reverting the update rectangle code since I have a center rectangle one * fix: does not allow seletcing circle or rectangle tool while selecting a face * chore: adding comment to better read the HTML * fix: cleaning up for PR * fix: pushing broken code for someone to checkout * fix: fixed the typescript issues, removed the as keyword for my center rectangle expressions * fix: removing comment * fix: removed as for type narrowing checks
This commit is contained in:
@ -184,6 +184,7 @@ export type SketchTool =
|
||||
| 'line'
|
||||
| 'tangentialArc'
|
||||
| 'rectangle'
|
||||
| 'center rectangle'
|
||||
| 'circle'
|
||||
| 'none'
|
||||
|
||||
@ -238,6 +239,10 @@ export type ModelingMachineEvent =
|
||||
type: 'Add rectangle origin'
|
||||
data: [x: number, y: number]
|
||||
}
|
||||
| {
|
||||
type: 'Add center rectangle origin'
|
||||
data: [x: number, y: number]
|
||||
}
|
||||
| {
|
||||
type: 'Add circle origin'
|
||||
data: [x: number, y: number]
|
||||
@ -278,6 +283,7 @@ export type ModelingMachineEvent =
|
||||
}
|
||||
}
|
||||
| { type: 'Finish rectangle' }
|
||||
| { type: 'Finish center rectangle' }
|
||||
| { type: 'Finish circle' }
|
||||
| { type: 'Artifact graph populated' }
|
||||
| { type: 'Artifact graph emptied' }
|
||||
@ -506,6 +512,9 @@ export const modelingMachine = setup({
|
||||
'next is rectangle': ({ context: { sketchDetails, currentTool } }) =>
|
||||
currentTool === 'rectangle' &&
|
||||
canRectangleOrCircleTool({ sketchDetails }),
|
||||
'next is center rectangle': ({ context: { sketchDetails, currentTool } }) =>
|
||||
currentTool === 'center rectangle' &&
|
||||
canRectangleOrCircleTool({ sketchDetails }),
|
||||
'next is circle': ({ context: { sketchDetails, currentTool } }) =>
|
||||
currentTool === 'circle' && canRectangleOrCircleTool({ sketchDetails }),
|
||||
'next is line': ({ context }) => context.currentTool === 'line',
|
||||
@ -806,6 +815,26 @@ export const modelingMachine = setup({
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
'listen for center rectangle origin': ({ context: { sketchDetails } }) => {
|
||||
if (!sketchDetails) return
|
||||
// setupNoPointsListener has the code for startProfileAt onClick
|
||||
sceneEntitiesManager.setupNoPointsListener({
|
||||
sketchDetails,
|
||||
afterClick: (args) => {
|
||||
const twoD = args.intersectionPoint?.twoD
|
||||
if (twoD) {
|
||||
sceneInfra.modelingSend({
|
||||
type: 'Add center rectangle origin',
|
||||
data: [twoD.x, twoD.y],
|
||||
})
|
||||
} else {
|
||||
console.error('No intersection point found')
|
||||
}
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
'listen for circle origin': ({ context: { sketchDetails } }) => {
|
||||
if (!sketchDetails) return
|
||||
sceneEntitiesManager.createIntersectionPlane()
|
||||
@ -859,6 +888,21 @@ export const modelingMachine = setup({
|
||||
return codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
|
||||
})
|
||||
},
|
||||
'set up draft center rectangle': ({
|
||||
context: { sketchDetails },
|
||||
event,
|
||||
}) => {
|
||||
if (event.type !== 'Add center rectangle origin') return
|
||||
if (!sketchDetails || !event.data) return
|
||||
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
||||
sceneEntitiesManager.setupDraftCenterRectangle(
|
||||
sketchDetails.sketchPathToNode,
|
||||
sketchDetails.zAxis,
|
||||
sketchDetails.yAxis,
|
||||
sketchDetails.origin,
|
||||
event.data
|
||||
)
|
||||
},
|
||||
'set up draft circle': ({ context: { sketchDetails }, event }) => {
|
||||
if (event.type !== 'Add circle origin') return
|
||||
if (!sketchDetails || !event.data) return
|
||||
@ -1822,6 +1866,40 @@ export const modelingMachine = setup({
|
||||
},
|
||||
},
|
||||
|
||||
'Center Rectangle tool': {
|
||||
entry: ['listen for center rectangle origin'],
|
||||
|
||||
states: {
|
||||
'Awaiting corner': {
|
||||
on: {
|
||||
'Finish center rectangle': 'Finished Center Rectangle',
|
||||
},
|
||||
},
|
||||
|
||||
'Awaiting origin': {
|
||||
on: {
|
||||
'Add center rectangle origin': {
|
||||
target: 'Awaiting corner',
|
||||
// TODO
|
||||
actions: 'set up draft center rectangle',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
'Finished Center Rectangle': {
|
||||
always: '#Modeling.Sketch.SketchIdle',
|
||||
},
|
||||
},
|
||||
|
||||
initial: 'Awaiting origin',
|
||||
|
||||
on: {
|
||||
'change tool': {
|
||||
target: 'Change Tool',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
'clean slate': {
|
||||
always: 'SketchIdle',
|
||||
},
|
||||
@ -2015,6 +2093,10 @@ export const modelingMachine = setup({
|
||||
target: 'Circle tool',
|
||||
guard: 'next is circle',
|
||||
},
|
||||
{
|
||||
target: 'Center Rectangle tool',
|
||||
guard: 'next is center rectangle',
|
||||
},
|
||||
],
|
||||
|
||||
entry: 'assign tool in context',
|
||||
|
Reference in New Issue
Block a user