diff --git a/app/api/src/docker/aws-emulator.js b/app/api/src/docker/aws-emulator.js index 19f0275..375eed1 100644 --- a/app/api/src/docker/aws-emulator.js +++ b/app/api/src/docker/aws-emulator.js @@ -10,9 +10,10 @@ app.use(cors()) const invocationURL = (port) => `http://localhost:${port}/2015-03-31/functions/function/invocations` -app.post('/openscad/preview', async (req, res) => { +const makeRequest = (route, port) => [route, async (req, res) => { + console.log(`making post request to ${port}, ${route}`) try { - const { data } = await axios.post(invocationURL(5052), { + const { data } = await axios.post(invocationURL(port), { body: JSON.stringify(req.body), }) res.status(data.statusCode) @@ -21,20 +22,11 @@ app.post('/openscad/preview', async (req, res) => { res.status(500) res.send() } -}) -app.post('/cadquery/stl', async (req, res) => { - console.log('making post request to 5060') - try { - const { data } = await axios.post(invocationURL(5060), { - body: JSON.stringify(req.body), - }) - res.status(data.statusCode) - res.send(data.body) - } catch (e) { - res.status(500) - res.send() - } -}) +}] + +app.post(...makeRequest('/openscad/preview', 5052)) +app.post(...makeRequest('/openscad/stl', 5053)) +app.post(...makeRequest('/cadquery/stl', 5060)) app.listen(port, () => { console.log(`Example app listening at http://localhost:${port}`) diff --git a/app/web/src/components/IdeViewer/IdeViewer.js b/app/web/src/components/IdeViewer/IdeViewer.js index b9b3c47..8ce86b4 100644 --- a/app/web/src/components/IdeViewer/IdeViewer.js +++ b/app/web/src/components/IdeViewer/IdeViewer.js @@ -10,6 +10,11 @@ import { import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import { Vector3 } from 'three' import { requestRender } from 'src/helpers/hooks/useIdeState' +import texture from './dullFrontLitMetal.png' +import { TextureLoader } from 'three/src/loaders/TextureLoader' + +const loader = new TextureLoader +const colorMap = loader.load(texture) extend({ OrbitControls }) @@ -22,7 +27,7 @@ function Asset({ geometry: incomingGeo }) { return ( - + ) } @@ -193,8 +198,10 @@ const IdeViewer = ({ Loading }) => { }) }} /> - - + + + + {state.objectData?.type === 'png' && ( <>