use sculpture-park-core + works with js type

torinmb · torinmb · commit 039e03bb3213 · 2019-07-16T20:20:05.000-04:00
diff --git a/src/Sculpture.js b/src/Sculpture.js
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { defaultVertexSource, sculptureStarterCode, fragFooter} from './core-glsl.js'
+import { defaultVertexSource, sculptureStarterCode, fragFooter } from 'sculpture-park-core'
 import { sketch } from './sketch.js'
 
 export class Sculpture {
diff --git a/src/there-scene.js b/src/there-scene.js
@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 // import * as OrbitControls from './OrbitControls.js'
 import { Sculpture } from './Sculpture.js'
+import { sourceGenerator } from 'sculpture-park-core'
 
 export const renderScene = (container, sculptureData) => {
     // const container = document.querySelector('.container');
@@ -30,6 +31,11 @@ export const renderScene = (container, sculptureData) => {
     // container.addEventListener('mouseup', this.onMouseUp, false);
     document.addEventListener('mousemove', onDocumentMouseMove, false);
 
+    if (sculptureData.type === "js") {
+        let source = sourceGenerator(sculptureData.shaderSource);
+        sculptureData.shaderSource = source.geoGLSL + source.colorGLSL;
+    }
+    
     let objectsToRaycast = [];
     let sculpture = new Sculpture(1, texture, sculptureData);
     scene.add(sculpture.mesh);
