Changeset 19906

Timestamp:

12/16/15 21:44:34 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Code cleanup for webgl.js.

File:

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

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

@@ -137 +137 @@
         return modelMatrix;
 } //}}}
-function clamp(value, min, max) { //{{{
-        return Math.max(min, Math.min(value, max));
-} //}}}
 //}}}
 //{{{ Shader Loading
@@ -269 +266 @@
         e.preventDefault();
         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.zoomBounds[1],canvas.zoomBounds[0]);
-        console.log(canvas.zoomFactor);
+        var delta = 1/10 * Math.max(-1, Math.min(e.scale || e.wheelDelta || -e.detail, 1));
+        canvas.zoomFactor = Math.max(canvas.zoomBounds[1], Math.min(canvas.zoomFactor - delta * canvas.zoomFactor, canvas.zoomBounds[0]));
 } //}}}
 //}}}