diff --git a/web/src/components/IdeEditor/IdeEditor.js b/web/src/components/IdeEditor/IdeEditor.js index cd56f34..eda29b4 100644 --- a/web/src/components/IdeEditor/IdeEditor.js +++ b/web/src/components/IdeEditor/IdeEditor.js @@ -13,13 +13,7 @@ const IdeEditor = () => { const { key, ctrlKey, metaKey } = event if (key === 's' && (ctrlKey || metaKey)) { event.preventDefault() - dispatch({ - type: 'render', - payload: { - code: state.code, - camera: state.settings.camera, - }, - }) + dispatch({ type: 'render', payload: { code: state.code } }) } } diff --git a/web/src/components/IdeToolbarNew/IdeToolbarNew.js b/web/src/components/IdeToolbarNew/IdeToolbarNew.js index 9b5ba42..fa0f7d6 100644 --- a/web/src/components/IdeToolbarNew/IdeToolbarNew.js +++ b/web/src/components/IdeToolbarNew/IdeToolbarNew.js @@ -10,13 +10,7 @@ const IdeToolbarNew = () => { dispatch({ type: 'setIdeType', payload: { message: ide } }) } function handleRender() { - dispatch({ - type: 'render', - payload: { - code: state.code, - camera: state.settings.camera, - }, - }) + dispatch({ type: 'render', payload: { code: state.code } }) } return ( diff --git a/web/src/helpers/cadPackages/openScadController.js b/web/src/helpers/cadPackages/openScadController.js index d363cf0..f808c81 100644 --- a/web/src/helpers/cadPackages/openScadController.js +++ b/web/src/helpers/cadPackages/openScadController.js @@ -2,6 +2,8 @@ let openScadBaseURL = process.env.OPENSCAD_BASE_URL || 'https://x2wvhihk56.execute-api.us-east-1.amazonaws.com/dev' +let lastCameraSettings + export const render = async ({ code, settings }) => { const body = JSON.stringify({ settings: { @@ -9,10 +11,13 @@ export const render = async ({ code, settings }) => { x: 500, y: 500, }, - camera: settings.camera, + camera: settings.camera || lastCameraSettings, }, file: code, }) + if (settings.camera) { + lastCameraSettings = settings.camera + } try { const response = await fetch(openScadBaseURL + '/render', { method: 'POST', diff --git a/web/src/helpers/hooks/useIdeState.js b/web/src/helpers/hooks/useIdeState.js index e786987..15723f1 100644 --- a/web/src/helpers/hooks/useIdeState.js +++ b/web/src/helpers/hooks/useIdeState.js @@ -21,7 +21,6 @@ export const useIdeState = () => { ideType: 'openScad', consoleMessages: [{ type: 'message', message: 'Initialising OpenSCAD' }], code: donutInitCode, - settings: {}, objectData: { type: 'stl', data: 'some binary', @@ -77,11 +76,6 @@ export const useIdeState = () => { ...state, isLoading: true, } - case 'setSettings': - return { - ...state, - settings: payload, - } default: return state } @@ -109,7 +103,6 @@ export const useIdeState = () => { }) } }) - dispatch({ type: 'setSettings', payload: { camera: payload.camera } }) dispatch({ type: 'setLoading' }) break