Changeset 19904

Timestamp:

12/16/15 21:18:09 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Adding zoombounds option to js plots.

File:

• issm/trunk-jpl/src/m/plot/webgl.js (modified) (4 diffs)

issm/trunk-jpl/src/m/plot/webgl.js

@@ -34 +34 @@
         // Add context state variables
         canvas.zoomFactor = options.getfieldvalue('zoomfactor',-.52);
-        canvas.zoomFactorMax = options.getfieldvalue('zoomfactor',-.52);
+        canvas.zoomBounds = options.getfieldvalue('zoombounds',[0,-.52]);
         canvas.cameraMatrix = mat4.create();
 
@@ -68 +68 @@
         return bufferArray;
 } //}}}
-function createSolidTexture(gl, r, g, b, a) {
-    var data = new Uint8Array([r, g, b, a]);
-    var texture = gl.createTexture();
-    gl.bindTexture(gl.TEXTURE_2D, texture);
-    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE, data);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-        gl.bindTexture(gl.TEXTURE_2D, null);
-    return texture;
-}
 function initTexture(gl,imageSource) { //{{{
         var texture = gl.createTexture();
@@ -147 +137 @@
         return modelMatrix;
 } //}}}
-function rgb(value, min, max,cmap) { //{{{
-        
-        var normalizedValue;
-                                        
-        var colorbar=colorbars[cmap];
-
-        value = clamp(value, min, max);
-        if((max-min)!=0) normalizedValue = (value - min) / (max - min);
-        else normalizedValue = value;
-
-        var index = clamp(Math.round(normalizedValue * colorbar.length), 0, colorbar.length - 1);
-        return colorbar[index];
-} //}}}
 function clamp(value, min, max) { //{{{
         return Math.max(min, Math.min(value, max));
@@ -293 +270 @@
         var e = window.event || e; // old IE support
         var delta = 1/10 * clamp((e.scale || e.wheelDelta || -e.detail), -1, 1);
-        canvas.zoomFactor = clamp(canvas.zoomFactor + -delta * canvas.zoomFactor,canvas.zoomFactorMax,0);
+        canvas.zoomFactor = clamp(canvas.zoomFactor + delta * canvas.zoomFactor,canvas.zoomBounds[0],canvas.zoomBounds[1]);
 } //}}}
 //}}}