Merge pull request #7 from gl-vis/update-1

Make examples work, update deps
gl-vis · Feb 18, 2017 · 1dfcb27 · 1dfcb27
2 parents 7bbbb5e + 100e8ea
commit 1dfcb27
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 34 deletions.
diff --git a/example/color.js b/example/color.js
@@ -2,8 +2,8 @@ var createCamera = require('3d-view-controls')
 var getBounds    = require('bound-points')
 var bunny        = require('bunny')
 var perspective  = require('gl-mat4/perspective')
-var createAxes   = require('gl-axes')
-var createSpikes = require('gl-spikes')
+var createAxes   = require('gl-axes3d')
+var createSpikes = require('gl-spikes3d')
 var createSelect = require('gl-select-static')
 var getBounds    = require('bound-points')
 var mouseChange  = require('mouse-change')
@@ -17,7 +17,7 @@ var gl = canvas.getContext('webgl')
 var bounds = getBounds(bunny.positions)
 var camera = createCamera(canvas, {
   eye:    [0,0,50],
-  center: [-0.5*(bounds[0][0]+bounds[1][0]), 
+  center: [-0.5*(bounds[0][0]+bounds[1][0]),
            -0.5*(bounds[0][1]+bounds[1][1]),
            -0.5*(bounds[0][2]+bounds[1][2])],
   zoomMax: 500
@@ -29,7 +29,7 @@ var mesh = createMesh(gl, {
 })
 var select = createSelect(gl, [canvas.width, canvas.height])
 var axes = createAxes(gl, { bounds: bounds })
-var spikes = createSpikes(gl, { 
+var spikes = createSpikes(gl, {
   bounds: bounds
 })
 var spikeChanged = false
@@ -79,4 +79,4 @@ function render() {
     select.end()
   }
 }
-render()
+render()
diff --git a/example/flat.js b/example/flat.js
@@ -2,8 +2,8 @@ var createCamera = require('3d-view-controls')
 var getBounds    = require('bound-points')
 var bunny        = require('bunny')
 var perspective  = require('gl-mat4/perspective')
-var createAxes   = require('gl-axes')
-var createSpikes = require('gl-spikes')
+var createAxes   = require('gl-axes3d')
+var createSpikes = require('gl-spikes3d')
 var createSelect = require('gl-select-static')
 var getBounds    = require('bound-points')
 var mouseChange  = require('mouse-change')
@@ -17,7 +17,7 @@ var gl = canvas.getContext('webgl')
 var bounds = getBounds(bunny.positions)
 var camera = createCamera(canvas, {
   eye:    [0,0,50],
-  center: [-0.5*(bounds[0][0]+bounds[1][0]), 
+  center: [-0.5*(bounds[0][0]+bounds[1][0]),
            -0.5*(bounds[0][1]+bounds[1][1]),
            -0.5*(bounds[0][2]+bounds[1][2])],
   zoomMax: 500
@@ -30,7 +30,7 @@ var mesh = createMesh(gl, {
 })
 var select = createSelect(gl, [canvas.width, canvas.height])
 var axes = createAxes(gl, { bounds: bounds })
-var spikes = createSpikes(gl, { 
+var spikes = createSpikes(gl, {
   bounds: bounds
 })
 var spikeChanged = false
@@ -80,4 +80,4 @@ function render() {
     select.end()
   }
 }
-render()
+render()
diff --git a/example/point.js b/example/point.js
@@ -2,8 +2,8 @@ var createCamera = require('3d-view-controls')
 var getBounds    = require('bound-points')
 var bunny        = require('bunny')
 var perspective  = require('gl-mat4/perspective')
-var createAxes   = require('gl-axes')
-var createSpikes = require('gl-spikes')
+var createAxes   = require('gl-axes3d')
+var createSpikes = require('gl-spikes3d')
 var createSelect = require('gl-select-static')
 var getBounds    = require('bound-points')
 var mouseChange  = require('mouse-change')
@@ -18,7 +18,7 @@ var gl = canvas.getContext('webgl')
 var bounds = getBounds(bunny.positions)
 var camera = createCamera(canvas, {
   eye:    [0,0,50],
-  center: [-0.5*(bounds[0][0]+bounds[1][0]), 
+  center: [-0.5*(bounds[0][0]+bounds[1][0]),
            -0.5*(bounds[0][1]+bounds[1][1]),
            -0.5*(bounds[0][2]+bounds[1][2])],
   zoomMax: 500
@@ -30,7 +30,7 @@ var mesh = createMesh(gl, {
 })
 var select = createSelect(gl, [canvas.width, canvas.height])
 var axes = createAxes(gl, { bounds: bounds })
-var spikes = createSpikes(gl, { 
+var spikes = createSpikes(gl, {
   bounds: bounds
 })
 var spikeChanged = false
@@ -80,4 +80,4 @@ function render() {
     select.end()
   }
 }
-render()
+render()
diff --git a/example/smooth.js b/example/smooth.js
@@ -2,8 +2,8 @@ var createCamera = require('3d-view-controls')
 var getBounds    = require('bound-points')
 var bunny        = require('bunny')
 var perspective  = require('gl-mat4/perspective')
-var createAxes   = require('gl-axes')
-var createSpikes = require('gl-spikes')
+var createAxes   = require('gl-axes3d')
+var createSpikes = require('gl-spikes3d')
 var createSelect = require('gl-select-static')
 var getBounds    = require('bound-points')
 var mouseChange  = require('mouse-change')
@@ -17,7 +17,7 @@ var gl = canvas.getContext('webgl')
 var bounds = getBounds(bunny.positions)
 var camera = createCamera(canvas, {
   eye:    [0,0,50],
-  center: [-0.5*(bounds[0][0]+bounds[1][0]), 
+  center: [-0.5*(bounds[0][0]+bounds[1][0]),
            -0.5*(bounds[0][1]+bounds[1][1]),
            -0.5*(bounds[0][2]+bounds[1][2])],
   zoomMax: 500
@@ -29,7 +29,7 @@ var mesh = createMesh(gl, {
 })
 var select = createSelect(gl, [canvas.width, canvas.height])
 var axes = createAxes(gl, { bounds: bounds })
-var spikes = createSpikes(gl, { 
+var spikes = createSpikes(gl, {
   bounds: bounds
 })
 var spikeChanged = false
@@ -79,4 +79,4 @@ function render() {
     select.end()
   }
 }
-render()
+render()
diff --git a/example/wire.js b/example/wire.js
@@ -2,8 +2,8 @@ var createCamera = require('3d-view-controls')
 var getBounds    = require('bound-points')
 var bunny        = require('bunny')
 var perspective  = require('gl-mat4/perspective')
-var createAxes   = require('gl-axes')
-var createSpikes = require('gl-spikes')
+var createAxes   = require('gl-axes3d')
+var createSpikes = require('gl-spikes3d')
 var createSelect = require('gl-select-static')
 var getBounds    = require('bound-points')
 var mouseChange  = require('mouse-change')
@@ -18,7 +18,7 @@ var gl = canvas.getContext('webgl')
 var bounds = getBounds(bunny.positions)
 var camera = createCamera(canvas, {
   eye:    [0,0,50],
-  center: [-0.5*(bounds[0][0]+bounds[1][0]), 
+  center: [-0.5*(bounds[0][0]+bounds[1][0]),
            -0.5*(bounds[0][1]+bounds[1][1]),
            -0.5*(bounds[0][2]+bounds[1][2])],
   zoomMax: 500
@@ -30,7 +30,7 @@ var mesh = createMesh(gl, {
 })
 var select = createSelect(gl, [canvas.width, canvas.height])
 var axes = createAxes(gl, { bounds: bounds })
-var spikes = createSpikes(gl, { 
+var spikes = createSpikes(gl, {
   bounds: bounds
 })
 var spikeChanged = false
@@ -80,4 +80,4 @@ function render() {
     select.end()
   }
 }
-render()
+render()
diff --git a/mesh.js b/mesh.js
@@ -826,7 +826,7 @@ proto.dispose = function() {
 }
 
 function createMeshShader(gl) {
-  var shader = createShader(gl, meshShader)
+  var shader = createShader(gl, meshShader.vertex, meshShader.fragment)
   shader.attributes.position.location = 0
   shader.attributes.color.location    = 2
   shader.attributes.uv.location       = 3
@@ -835,15 +835,15 @@ function createMeshShader(gl) {
 }
 
 function createWireShader(gl) {
-  var shader = createShader(gl, wireShader)
+  var shader = createShader(gl, wireShader.vertex, wireShader.fragment)
   shader.attributes.position.location = 0
   shader.attributes.color.location    = 2
   shader.attributes.uv.location       = 3
   return shader
 }
 
 function createPointShader(gl) {
-  var shader = createShader(gl, pointShader)
+  var shader = createShader(gl, pointShader.vertex, pointShader.fragment)
   shader.attributes.position.location  = 0
   shader.attributes.color.location     = 2
   shader.attributes.uv.location        = 3
@@ -852,28 +852,31 @@ function createPointShader(gl) {
 }
 
 function createPickShader(gl) {
-  var shader = createShader(gl, pickShader)
+  var shader = createShader(gl, pickShader.vertex, pickShader.fragment)
   shader.attributes.position.location = 0
   shader.attributes.id.location       = 1
   return shader
 }
 
 function createPointPickShader(gl) {
-  var shader = createShader(gl, pointPickShader)
+  var shader = createShader(gl, pointPickShader.vertex, pointPickShader.fragment)
   shader.attributes.position.location  = 0
   shader.attributes.id.location        = 1
   shader.attributes.pointSize.location = 4
   return shader
 }
 
 function createContourShader(gl) {
-  var shader = createShader(gl, contourShader)
+  var shader = createShader(gl, contourShader.vertex, contourShader.fragment)
   shader.attributes.position.location = 0
   return shader
 }
 
-function createSimplicialMesh(params) {
-  var gl = params.gl
+function createSimplicialMesh(gl, params) {
+  if (arguments.length === 1) {
+    params = gl;
+    gl = params.gl;
+  }
 
   var triShader       = createMeshShader(gl)
   var lineShader      = createWireShader(gl)

diff --git a/package.json b/package.json
@@ -22,7 +22,15 @@
     "simplicial-complex-contour": "^1.0.0",
     "typedarray-pool": "^1.1.0"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "3d-view-controls": "^2.1.1",
+    "bound-points": "^1.0.0",
+    "bunny": "^1.0.1",
+    "canvas-fit": "^1.5.0",
+    "gl-axes3d": "^1.2.5",
+    "gl-select-static": "^2.0.2",
+    "gl-spikes3d": "^1.0.5"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },