Changeset 19772

Timestamp:

11/20/15 12:40:13 (9 years ago)

Author:

dlcheng

Message:

CHG:Fixing zoom behavior and hotfix for broken plot_mesh in test101.html

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_mesh.js (modified) (1 diff)
• webgl.js (modified) (2 diffs)

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

@@ -16 +16 @@
         var scale;
         //Process data and model
-        var x = md.x;
-        var y = md.y;
+        var x = md.mesh.x;
+        var y = md.mesh.y;
         var z = [0.0];
-        var elements = md.elements;
+        var elements = md.mesh.elements;
         //}}}
 

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

@@ -32 +32 @@
         // Add context state variables
         canvas.zoomFactor = options.getfieldvalue('zoomfactor',-.52);
+        canvas.zoomFactorMax = options.getfieldvalue('zoomfactor',-.52);
         canvas.cameraMatrix = mat4.create();
 
@@ -235 +236 @@
         var e = window.event || e; // old IE support
         var delta = 1/10 * clamp((e.scale || e.wheelDelta || -e.detail), -1, 1);
-        canvas.zoomFactor = canvas.zoomFactor + -delta * canvas.zoomFactor;
+        canvas.zoomFactor = clamp(canvas.zoomFactor + -delta * canvas.zoomFactor,canvas.zoomFactorMax,0);
 } //}}}
 //}}}