Merge pull request #10 from gl-vis/streamtube-color

Handle various orders of input data

Author: archmoj

README.md

@@ -44,11 +44,11 @@ Creates a stream tube plot of a vector field.
 * `params` is an object that has the following properties:
 
     + `startingPositions` *(Required)* An array of starting positions for the vector field, encoded as arrays.
-    + `getVelocity(point)` *(Required)* A getter function to get the velocity at a given point.
+    + `getVelocity(point)` *(Optional)* A getter function to get the velocity at a given point.
     + `getDivergence(point)` *(Optional)* A getter function to get the divergence at a given point. Used for the width of the streamtube. Defaults to the divergence of the getVelocity function.
     + `maxLength` *(Optional)* The maximum number of segments to add to a streamtube. Default is 1000.
     + `tubeSize` *(Optional)* The scaling factor for the streamtubes. The default is 1, which avoids two max divergence tubes from touching at adjacent starting positions.
-    + `absoluteTubeSize` *(Optional)* Absolute scaling factor for the streamtubes. A value of 1 scales divergence of 1 to 1 coordinate system unit. Overrides tubeSize. 
+    + `absoluteTubeSize` *(Optional)* Absolute scaling factor for the streamtubes. A value of 1 scales divergence of 1 to 1 coordinate system unit. Overrides tubeSize.
     + `colormap` *(Optional)* The colormap to use.
 
 **Returns** A streamtube plot object that can be passed to gl-mesh3d.

lib/shaders.js

@@ -10,7 +10,6 @@ exports.meshShader = {
   fragment: triFragSrc,
   attributes: [
     {name: 'position', type: 'vec4'},
-    {name: 'normal', type: 'vec3'},
     {name: 'color', type: 'vec4'},
     {name: 'uv', type: 'vec2'},
     {name: 'vector', type: 'vec4'}

lib/triangle-fragment.glsl

@@ -6,19 +6,10 @@ precision highp float;
 #pragma glslify: outOfRange = require(glsl-out-of-range)
 
 uniform vec3 clipBounds[2];
-uniform float roughness
-            , fresnel
-            , kambient
-            , kdiffuse
-            , kspecular
-            , opacity;
+uniform float roughness, fresnel, kambient, kdiffuse, kspecular, opacity;
 uniform sampler2D texture;
 
-varying vec3 f_normal
-           , f_lightDirection
-           , f_eyeDirection
-           , f_data
-           , f_position;
+varying vec3 f_normal, f_lightDirection, f_eyeDirection, f_data, f_position;
 varying vec4 f_color;
 varying vec2 f_uv;
 

lib/triangle-vertex.glsl

@@ -5,21 +5,12 @@ precision highp float;
 attribute vec4 vector;
 attribute vec4 color, position;
 attribute vec2 uv;
-uniform float vectorScale;
-uniform float tubeScale;
-
-uniform mat4 model
-           , view
-           , projection
-           , inverseModel;
-uniform vec3 eyePosition
-           , lightPosition;
-
-varying vec3 f_normal
-           , f_lightDirection
-           , f_eyeDirection
-           , f_data
-           , f_position;
+
+uniform float vectorScale, tubeScale;
+uniform mat4 model, view, projection, inverseModel;
+uniform vec3 eyePosition, lightPosition;
+
+varying vec3 f_normal, f_lightDirection, f_eyeDirection, f_data, f_position;
 varying vec4 f_color;
 varying vec2 f_uv;
 
@@ -35,7 +26,7 @@ void main() {
   cameraCoordinate.xyz /= cameraCoordinate.w;
   f_lightDirection = lightPosition - cameraCoordinate.xyz;
   f_eyeDirection   = eyePosition - cameraCoordinate.xyz;
-  f_normal = normalize((vec4(normal,0.0) * inverseModel).xyz);
+  f_normal = normalize((vec4(normal, 0.0) * inverseModel).xyz);
 
   // vec4 m_position  = model * vec4(tubePosition, 1.0);
   vec4 t_position  = view * tubePosition;

lib/tubemesh.js

@@ -1,13 +1,9 @@
 'use strict'
 
-var DEFAULT_VERTEX_NORMALS_EPSILON = 1e-6; // may be too large if triangles are very small
-var DEFAULT_FACE_NORMALS_EPSILON = 1e-6;
-
 var createShader  = require('gl-shader')
 var createBuffer  = require('gl-buffer')
 var createVAO     = require('gl-vao')
 var createTexture = require('gl-texture2d')
-var normals       = require('normals')
 var multiply      = require('gl-mat4/multiply')
 var invert        = require('gl-mat4/invert')
 var ndarray       = require('ndarray')
@@ -34,7 +30,6 @@ function SimplicialMesh(gl
   , triangleIds
   , triangleColors
   , triangleUVs
-  , triangleNormals
   , triangleVAO
   , edgePositions
   , edgeIds
@@ -63,7 +58,6 @@ function SimplicialMesh(gl
   this.trianglePositions = trianglePositions
   this.triangleVectors   = triangleVectors
   this.triangleColors    = triangleColors
-  this.triangleNormals   = triangleNormals
   this.triangleUVs       = triangleUVs
   this.triangleIds       = triangleIds
   this.triangleVAO       = triangleVAO
@@ -295,18 +289,6 @@ proto.update = function(params) {
   this.positions = positions
   this.vectors   = vectors
 
-  //Compute normals
-  var vertexNormals = params.vertexNormals
-  var cellNormals   = params.cellNormals
-  var vertexNormalsEpsilon = params.vertexNormalsEpsilon === void(0) ? DEFAULT_VERTEX_NORMALS_EPSILON : params.vertexNormalsEpsilon
-  var faceNormalsEpsilon = params.faceNormalsEpsilon === void(0) ? DEFAULT_FACE_NORMALS_EPSILON : params.faceNormalsEpsilon
-  if(params.useFacetNormals && !cellNormals) {
-    cellNormals = normals.faceNormals(cells, positions, faceNormalsEpsilon)
-  }
-  if(!cellNormals && !vertexNormals) {
-    vertexNormals = normals.vertexNormals(cells, positions, vertexNormalsEpsilon)
-  }
-
   //Compute colors
   var vertexColors    = params.vertexColors
   var cellColors      = params.cellColors
@@ -553,14 +535,6 @@ fill_loop:
           }
           tUVs.push(uv[0], uv[1])
 
-          var q
-          if(vertexNormals) {
-            q = vertexNormals[v]
-          } else {
-            q = cellNormals[i]
-          }
-          tNor.push(q[0], q[1], q[2])
-
           tIds.push(i)
         }
         triangleCount += 1
@@ -590,7 +564,6 @@ fill_loop:
   this.triangleVectors.update(tVec)
   this.triangleColors.update(tCol)
   this.triangleUVs.update(tUVs)
-  this.triangleNormals.update(tNor)
   this.triangleIds.update(new Uint32Array(tIds))
 }
 
@@ -761,7 +734,6 @@ proto.dispose = function() {
   this.triangleVectors.dispose()
   this.triangleColors.dispose()
   this.triangleUVs.dispose()
-  this.triangleNormals.dispose()
   this.triangleIds.dispose()
 
   this.edgeVAO.dispose()
@@ -786,7 +758,7 @@ function createMeshShader(gl) {
   shader.attributes.position.location = 0
   shader.attributes.color.location    = 2
   shader.attributes.uv.location       = 3
-  shader.attributes.vector.location   = 5
+  shader.attributes.vector.location   = 4
   return shader
 }
 
@@ -795,7 +767,7 @@ function createPickShader(gl) {
   var shader = createShader(gl, pickShader.vertex, pickShader.fragment, null, pickShader.attributes)
   shader.attributes.position.location = 0
   shader.attributes.id.location       = 1
-  shader.attributes.vector.location   = 5
+  shader.attributes.vector.location   = 4
   return shader
 }
 
@@ -819,7 +791,6 @@ function createSimplicialMesh(gl, params) {
   var triangleVectors   = createBuffer(gl)
   var triangleColors    = createBuffer(gl)
   var triangleUVs       = createBuffer(gl)
-  var triangleNormals   = createBuffer(gl)
   var triangleIds       = createBuffer(gl)
   var triangleVAO       = createVAO(gl, [
     { buffer: trianglePositions,
@@ -839,10 +810,6 @@ function createSimplicialMesh(gl, params) {
       type: gl.FLOAT,
       size: 2
     },
-    { buffer: triangleNormals,
-      type: gl.FLOAT,
-      size: 3
-    },
     { buffer: triangleVectors,
       type: gl.FLOAT,
       size: 4
@@ -918,7 +885,6 @@ function createSimplicialMesh(gl, params) {
     , triangleIds
     , triangleColors
     , triangleUVs
-    , triangleNormals
     , triangleVAO
     , edgePositions
     , edgeIds

package-lock.json

@@ -17,9 +17,9 @@
     "gl-vec4": "^1.0.1",
     "glsl-inverse": "^1.0.0",
     "glsl-out-of-range": "^1.0.4",
+    "glsl-specular-cook-torrance": "^2.0.1",
     "glslify": "^7.0.0",
     "ndarray": "^1.0.18",
-    "normals": "^1.1.0",
     "simplicial-complex-contour": "^1.0.2",
     "typedarray-pool": "^1.1.0"
   },
@@ -29,7 +29,6 @@
     "canvas-fit": "^1.5.0",
     "chttps": "^1.0.6",
     "gl-axes3d": "^1.5.2",
-    "gl-mesh3d": "^2.1.1",
     "gl-select-static": "^2.0.4",
     "gl-spikes3d": "^1.0.9"
   },