Merge pull request #10 from gl-vis/vertexIntensityBounds

add `vertexIntensityBounds` param
gl-vis · Jun 1, 2017 · 6861cfc · 6861cfc
2 parents 1dfcb27 + 894b143
commit 6861cfc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,8 @@ Creates a simplicial complex that can be drawn directly in a WebGL context.
     + `vertexUVs`
     + `cellUVs`
     + `vertexIntensity`
+    + `colormap`
+    + `vertexIntensityBounds` intensity range for the colormap
     + `cellIntensity`
     + `cellColors` A list of per cell color attributes
     + `meshColor` A constant color for the entire mesh
@@ -100,4 +102,4 @@ Epsilon for face normals calculation
 Opacity
 
 # Credits
-(c) 2013-2015 Mikola Lysenko. MIT License
+(c) 2013-2015 Mikola Lysenko. MIT License
diff --git a/mesh.js b/mesh.js
@@ -323,10 +323,15 @@ proto.update = function(params) {
   var intensityHi     = -Infinity
   if(!vertexUVs && !cellUVs) {
     if(vertexIntensity) {
-      for(var i=0; i<vertexIntensity.length; ++i) {
-        var f = vertexIntensity[i]
-        intensityLo = Math.min(intensityLo, f)
-        intensityHi = Math.max(intensityHi, f)
+      if(params.vertexIntensityBounds) {
+        intensityLo = +params.vertexIntensityBounds[0]
+        intensityHi = +params.vertexIntensityBounds[1]
+      } else {
+        for(var i=0; i<vertexIntensity.length; ++i) {
+          var f = vertexIntensity[i]
+          intensityLo = Math.min(intensityLo, f)
+          intensityHi = Math.max(intensityHi, f)
+        }
       }
     } else if(cellIntensity) {
       for(var i=0; i<cellIntensity.length; ++i) {

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "colormap": "^2.1.0",
     "gl-buffer": "^2.0.8",
     "gl-mat4": "^1.0.0",
-    "gl-shader": "^4.0.5",
+    "gl-shader": "4.2.0",
     "gl-texture2d": "^2.0.8",
     "gl-vao": "^1.1.3",
     "glsl-specular-cook-torrance": "^2.0.1",