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

inital rework of execution (#528)

Browse Source 
* inital rework

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* update the program memory as well

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* cleanups

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* code

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates for typing code

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fixing

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* some fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* more fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* Only unselect line or move tool on escape, don't exit sketch

* Make scrollbar on toolbar smaller

* Add escape to exit sketch mode

* tidy up usestore

* clear scene on empty file

* disable sketch mode and re-execute on sketch loop close

* disable all but xy plane

* fix entering back into edit mode

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>
Co-authored-by: Frank Noirot <frank@kittycad.io>
Co-authored-by: Kurt Hutten Irev-Dev <k.hutten@protonmail.ch>
This commit is contained in:
Jess Frazelle
2023-09-15 04:35:48 -07:00
committed by GitHub
parent 663c396128
commit e4f2e66029
22 changed files with 448 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Toolbar.tsx
View File

@ -27,6 +27,7 @@ export const Toolbar = () => {
updateAst,
programMemory,
engineCommandManager,
executeAst,
} = useStore((s) => ({
guiMode: s.guiMode,
setGuiMode: s.setGuiMode,
@ -35,6 +36,7 @@ export const Toolbar = () => {
updateAst: s.updateAst,
programMemory: s.programMemory,
engineCommandManager: s.engineCommandManager,
executeAst: s.executeAst,
}))
useAppMode()
@ -44,7 +46,7 @@ export const Toolbar = () => {
function ToolbarButtons() {
return (
<span className="overflow-x-auto">
<span className={styles.smallScrollbar}>
{guiMode.mode === 'default' && (
<button
onClick={() => {
@ -70,7 +72,7 @@ export const Toolbar = () => {
pathToNode,
programMemory
)
updateAst(modifiedAst)
updateAst(modifiedAst, true)
}}
>
SketchOnFace
@ -113,7 +115,7 @@ export const Toolbar = () => {
ast,
pathToNode
)
updateAst(modifiedAst, { focusPath: pathToExtrudeArg })
updateAst(modifiedAst, true, { focusPath: pathToExtrudeArg })
}}
>
ExtrudeSketch
@ -130,7 +132,7 @@ export const Toolbar = () => {
pathToNode,
false
)
updateAst(modifiedAst, { focusPath: pathToExtrudeArg })
updateAst(modifiedAst, true, { focusPath: pathToExtrudeArg })
}}
>
ExtrudeSketch (w/o pipe)
@ -146,7 +148,14 @@ export const Toolbar = () => {
cmd_id: uuidv4(),
cmd: { type: 'edit_mode_exit' },
})
engineCommandManager?.sendSceneCommand({
type: 'modeling_cmd_req',
cmd_id: uuidv4(),
cmd: { type: 'default_camera_disable_sketch_mode' },
})
setGuiMode({ mode: 'default' })
executeAst()
}}
>
Exit sketch