Changeset 20355

Timestamp:

03/25/16 12:16:19 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Fixing inconsistent zooming when approaching zoom bounds.

File:

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

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

@@ -34 +34 @@
         // Add context state variables
         //TODO:Group variables in objects for organization and naming
-        canvas.zoomBounds = options.getfieldvalue('zoombounds',[0,100.0]);
+        canvas.zoomBounds = options.getfieldvalue('zoombounds',[0.001,100.0]);
         canvas.zoomFactor = clamp(options.getfieldvalue('zoomfactor',1.0), canvas.zoomBounds[0], canvas.zoomBounds[1]);
+        console.log(canvas.zoomFactor);
         canvas.zoomLast = canvas.zoomFactor;
         canvas.cameraMatrix = mat4.create();
@@ -363 +364 @@
 function onZoom(ev,canvas,displaylog) { //{{{
         ev.preventDefault();
-        var delta = 1/10 * clamp(ev.scale || ev.wheelDelta || -ev.detail, -1, 1);
-        canvas.zoomFactor = clamp(canvas.zoomFactor + delta / canvas.zoomFactor, canvas.zoomBounds[0], canvas.zoomBounds[1]);
+        var delta = clamp(clamp(ev.scale || ev.wheelDelta || -ev.detail, -1, 1) / (1000  * canvas.zoomFactor), -0.1, 0.1);
+        canvas.zoomFactor = clamp(canvas.zoomFactor + delta, canvas.zoomBounds[0], canvas.zoomBounds[1]);
         
         if (displaylog) console.log(canvas.zoomFactor);