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

fix horz vert distance contraint (#2572)

Browse Source 
fix hor vert distance contraint
This commit is contained in:
Kurt Hutten
2024-06-03 15:37:23 +10:00
committed by GitHub
parent 59b1319e50
commit f52d2d55f1
4 changed files with 151 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/ModelingMachineProvider.tsx
View File

@ -508,13 +508,26 @@ export const ModelingMachineProvider = ({
},
'Get horizontal info': async ({
selectionRanges,
sketchDetails,
}): Promise<SetSelections> => {
const { modifiedAst, pathToNodeMap } =
await applyConstraintHorzVertDistance({
constraint: 'setHorzDistance',
selectionRanges,
})
await kclManager.updateAst(modifiedAst, true)
const _modifiedAst = parse(recast(modifiedAst))
if (!sketchDetails) throw new Error('No sketch details')
const updatedPathToNode = updatePathToNodeFromMap(
sketchDetails.sketchPathToNode,
pathToNodeMap
)
await sceneEntitiesManager.updateAstAndRejigSketch(
updatedPathToNode,
_modifiedAst,
sketchDetails.zAxis,
sketchDetails.yAxis,
sketchDetails.origin
)
return {
selectionType: 'completeSelection',
selection: pathMapToSelections(
@ -522,17 +535,31 @@ export const ModelingMachineProvider = ({
selectionRanges,
pathToNodeMap
),
updatedPathToNode,
}
},
'Get vertical info': async ({
selectionRanges,
sketchDetails,
}): Promise<SetSelections> => {
const { modifiedAst, pathToNodeMap } =
await applyConstraintHorzVertDistance({
constraint: 'setVertDistance',
selectionRanges,
})
await kclManager.updateAst(modifiedAst, true)
const _modifiedAst = parse(recast(modifiedAst))
if (!sketchDetails) throw new Error('No sketch details')
const updatedPathToNode = updatePathToNodeFromMap(
sketchDetails.sketchPathToNode,
pathToNodeMap
)
await sceneEntitiesManager.updateAstAndRejigSketch(
updatedPathToNode,
_modifiedAst,
sketchDetails.zAxis,
sketchDetails.yAxis,
sketchDetails.origin
)
return {
selectionType: 'completeSelection',
selection: pathMapToSelections(
@ -540,6 +567,7 @@ export const ModelingMachineProvider = ({
selectionRanges,
pathToNodeMap
),
updatedPathToNode,
}
},
'Get angle info': async ({

11
src/components/Toolbar/SetHorzVertDistance.tsx
View File

@ -106,7 +106,11 @@ export async function applyConstraintHorzVertDistance({
value: valueUsedInTransform,
initialVariableName: constraint === 'setHorzDistance' ? 'xDis' : 'yDis',
} as any)
if (segName === tagInfo?.tag && Number(value) === valueUsedInTransform) {
if (
!variableName &&
segName === tagInfo?.tag &&
Number(value) === valueUsedInTransform
) {
return {
modifiedAst,
pathToNodeMap,
@ -126,6 +130,7 @@ export async function applyConstraintHorzVertDistance({
forceValueUsedInTransform: finalValue,
})
if (variableName) {
console.log('variableName', variableName)
const newBody = [..._modifiedAst.body]
newBody.splice(
newVariableInsertIndex,
@ -133,6 +138,10 @@ export async function applyConstraintHorzVertDistance({
createVariableDeclaration(variableName, valueNode)
)
_modifiedAst.body = newBody
Object.values(pathToNodeMap).forEach((pathToNode) => {
const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
pathToNode[index][0] = Number(pathToNode[index][0]) + 1
})
}
return {
modifiedAst: _modifiedAst,