From e5149f2c9520d0eae0883906577b9c12acd3155c Mon Sep 17 00:00:00 2001 From: Kurt Hutten Date: Sat, 13 Mar 2021 17:10:15 +1100 Subject: [PATCH] Tidy up --- api/src/docker/openscad/runScad.js | 2 +- web/src/components/IdeViewer/IdeViewer.js | 2 +- web/src/helpers/hooks/useIdeState.js | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/api/src/docker/openscad/runScad.js b/api/src/docker/openscad/runScad.js index 6ff251b..c313277 100644 --- a/api/src/docker/openscad/runScad.js +++ b/api/src/docker/openscad/runScad.js @@ -17,7 +17,7 @@ module.exports.runScad = async ({ const { x: rx, y: ry, z: rz } = rotation const { x: px, y: py, z: pz } = position const cameraArg = `--camera=${px},${py},${pz},${rx},${ry},${rz},300` - const command = `xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" openscad -o /tmp/${tempFile}/output.png ${cameraArg} --imgsize=${x},${y} /tmp/${tempFile}/main.scad` + const command = `xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" openscad -o /tmp/${tempFile}/output.png ${cameraArg} --imgsize=${x},${y} --colorscheme DeepOcean /tmp/${tempFile}/main.scad` console.log('command', command) try { diff --git a/web/src/components/IdeViewer/IdeViewer.js b/web/src/components/IdeViewer/IdeViewer.js index 828af15..b97d8e0 100644 --- a/web/src/components/IdeViewer/IdeViewer.js +++ b/web/src/components/IdeViewer/IdeViewer.js @@ -116,7 +116,7 @@ const IdeViewer = () => { )}
setIsDragging(true)} diff --git a/web/src/helpers/hooks/useIdeState.js b/web/src/helpers/hooks/useIdeState.js index a3e6994..90c4464 100644 --- a/web/src/helpers/hooks/useIdeState.js +++ b/web/src/helpers/hooks/useIdeState.js @@ -4,11 +4,14 @@ import { cadPackages } from 'src/helpers/cadPackages' export const useIdeState = () => { const initialState = { ideType: 'openScad', - consoleMessages: [ - { type: 'error', message: 'line 15 is being very naughty' }, - { type: 'message', message: '5 bodies produced' }, - ], - code: 'cube(60);sphere(25);', + consoleMessages: [{ type: 'message', message: 'Initialising OpenSCAD' }], + code: `difference(){ + union(){ + cube(60); + sphere(25); + } + translate([30,30,30])cylinder(r=25,h=100); +}`, objectData: { type: 'stl', data: 'some binary',