Changeset 19921

Timestamp:

01/02/16 22:12:26 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Implementing canvasoffset option and persistent camera rotations on plotmodel redraws.

File:

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

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

@@ -38 +38 @@
         canvas.zoomLast = canvas.zoomFactor;
         canvas.cameraMatrix = mat4.create();
-        canvas.translation = [0,0];
+        canvas.translation = [0,0,options.getfieldvalue('centeroffset',0.25)];
         canvas.rotationAzimuthBounds = options.getfieldvalue('azimuthbounds',[0,360]);
         canvas.rotationElevationBounds = options.getfieldvalue('elevationbounds',[-180,180]);
         canvas.rotationDefault = options.getfieldvalue('view',[0,90]); //0 azimuth - up is north, 90 elevation - looking straight down
-        canvas.rotation = canvas.rotationDefault;
+        canvas.rotation = queryView(canvas);
         canvas.controlsensitivity = 1;
 
@@ -163 +163 @@
         return Math.max(min, Math.min(value, max));
 } //}}}
+function queryView(canvas) { //{{{
+        if (canvas.rotation) {
+                return canvas.rotation;
+        }
+        return canvas.rotationDefault;
+} //}}}
 //}}}
 //{{{ Shader Loading
@@ -360 +366 @@
         
         //Apply worldspace translation
-        mat4.translate(translateMatrix, translateMatrix, [canvas.translation[0], 0.0, canvas.translation[1]]);
+        mat4.translate(translateMatrix, translateMatrix, [canvas.translation[0], canvas.translation[2], canvas.translation[1]]);
         mat4.multiply(vMatrix, translateMatrix, vMatrix);
         
@@ -456 +462 @@
         
         var drawPassNumber = 2;
-        for (var i = drawPassNumber - 1; i >= 0; i--) {
+        for (var i = drawPassNumber - 1; i > 0; i--) {
                 for (var node in nodes) {
                         if (nodes[node]["drawOrder"] == i) {