Remove openscad specific state from ideState
This commit is contained in:
@@ -13,13 +13,7 @@ const IdeEditor = () => {
|
|||||||
const { key, ctrlKey, metaKey } = event
|
const { key, ctrlKey, metaKey } = event
|
||||||
if (key === 's' && (ctrlKey || metaKey)) {
|
if (key === 's' && (ctrlKey || metaKey)) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
dispatch({
|
dispatch({ type: 'render', payload: { code: state.code } })
|
||||||
type: 'render',
|
|
||||||
payload: {
|
|
||||||
code: state.code,
|
|
||||||
camera: state.settings.camera,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,7 @@ const IdeToolbarNew = () => {
|
|||||||
dispatch({ type: 'setIdeType', payload: { message: ide } })
|
dispatch({ type: 'setIdeType', payload: { message: ide } })
|
||||||
}
|
}
|
||||||
function handleRender() {
|
function handleRender() {
|
||||||
dispatch({
|
dispatch({ type: 'render', payload: { code: state.code } })
|
||||||
type: 'render',
|
|
||||||
payload: {
|
|
||||||
code: state.code,
|
|
||||||
camera: state.settings.camera,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ let openScadBaseURL =
|
|||||||
process.env.OPENSCAD_BASE_URL ||
|
process.env.OPENSCAD_BASE_URL ||
|
||||||
'https://x2wvhihk56.execute-api.us-east-1.amazonaws.com/dev'
|
'https://x2wvhihk56.execute-api.us-east-1.amazonaws.com/dev'
|
||||||
|
|
||||||
|
let lastCameraSettings
|
||||||
|
|
||||||
export const render = async ({ code, settings }) => {
|
export const render = async ({ code, settings }) => {
|
||||||
const body = JSON.stringify({
|
const body = JSON.stringify({
|
||||||
settings: {
|
settings: {
|
||||||
@@ -9,10 +11,13 @@ export const render = async ({ code, settings }) => {
|
|||||||
x: 500,
|
x: 500,
|
||||||
y: 500,
|
y: 500,
|
||||||
},
|
},
|
||||||
camera: settings.camera,
|
camera: settings.camera || lastCameraSettings,
|
||||||
},
|
},
|
||||||
file: code,
|
file: code,
|
||||||
})
|
})
|
||||||
|
if (settings.camera) {
|
||||||
|
lastCameraSettings = settings.camera
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const response = await fetch(openScadBaseURL + '/render', {
|
const response = await fetch(openScadBaseURL + '/render', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ export const useIdeState = () => {
|
|||||||
ideType: 'openScad',
|
ideType: 'openScad',
|
||||||
consoleMessages: [{ type: 'message', message: 'Initialising OpenSCAD' }],
|
consoleMessages: [{ type: 'message', message: 'Initialising OpenSCAD' }],
|
||||||
code: donutInitCode,
|
code: donutInitCode,
|
||||||
settings: {},
|
|
||||||
objectData: {
|
objectData: {
|
||||||
type: 'stl',
|
type: 'stl',
|
||||||
data: 'some binary',
|
data: 'some binary',
|
||||||
@@ -77,11 +76,6 @@ export const useIdeState = () => {
|
|||||||
...state,
|
...state,
|
||||||
isLoading: true,
|
isLoading: true,
|
||||||
}
|
}
|
||||||
case 'setSettings':
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
settings: payload,
|
|
||||||
}
|
|
||||||
default:
|
default:
|
||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
@@ -109,7 +103,6 @@ export const useIdeState = () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
dispatch({ type: 'setSettings', payload: { camera: payload.camera } })
|
|
||||||
dispatch({ type: 'setLoading' })
|
dispatch({ type: 'setLoading' })
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user