From f0c4af7b35336637f9178b5c1a3e00d60a14099f Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Thu, 2 Nov 2017 22:53:47 +0100 Subject: [PATCH] also allow for sketch data --- src/components/DoodlePreview.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/components/DoodlePreview.js b/src/components/DoodlePreview.js index 919b6d2..d71bc29 100644 --- a/src/components/DoodlePreview.js +++ b/src/components/DoodlePreview.js @@ -14,22 +14,24 @@ class DoodlePreview extends React.Component { }; } - componentDidMount(prevProps) { - JSONToSketchData(this.props.docData).then((sketchData) => { - const { canvas } = this.refs; - const { width, height, pixelRatio } = this.props + async componentDidMount() { + let { docData, sketchData } = this.props; - const sceneData = createSceneData(sketchData); + if (docData) sketchData = await JSONToSketchData(this.props.docData); - const scene = createScene(sceneData, canvas); - this.setState({ scene }); + const { canvas } = this.refs; + const { width, height, pixelRatio } = this.props - scene.setSize(width, height, pixelRatio); - scene.render(); + const sceneData = createSceneData(sketchData); - this.editorControls = new THREE.EditorControls(scene.camera, canvas); - this.editorControls.addEventListener('change', () => scene.render()); - }); + const scene = createScene(sceneData, canvas); + this.setState({ scene }); + + scene.setSize(width, height, pixelRatio); + scene.render(); + + this.editorControls = new THREE.EditorControls(scene.camera, canvas); + this.editorControls.addEventListener('change', () => scene.render()); } componentDidUpdate(prevProps) {