Changeset 20770

Timestamp:

06/18/16 16:37:38 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Generalizing property recovery function. Property renames. Addressing canvas stretching in 2d orthographic views. Preserving view angles in between perspective changes.

File:

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

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

@@ -50 +50 @@
         canvas.zoomLast = canvas.zoomFactor;
         canvas.cameraMatrix = mat4.create();
-        canvas.translation = options.getfieldvalue('centeroffset',[0,0,0.0]);
+        canvas.translation = options.getfieldvalue('origin',[0,0,0.0]);
         canvas.rotationAzimuthBounds = options.getfieldvalue('azlim',[0,360]);
         canvas.rotationElevationBounds = options.getfieldvalue('ellim',[-180,180]);
@@ -61 +61 @@
         canvas.movieIncrement = true;
         canvas.moviefps = options.getfieldvalue('moviefps',5);
-
-        if (canvas.twod) {
-                canvas.rotationAzimuthBounds = [0,0];
-                canvas.rotationElevationBounds = [90,90];
-                canvas.rotationDefault = [0,90];
-                canvas.rotation = canvas.rotationDefault;
-        }
         
         // Add event listeners for canvas
@@ -396 +389 @@
         var azimuthRotationMatrix = mat4.create();
         var elevationRotationMatrix = mat4.create();
+        var aspectRatio = canvas.clientWidth / canvas.clientHeight;
 
         if (canvas.twod) {
-                mat4.ortho(pMatrix, -1/canvas.zoomFactor, 1/canvas.zoomFactor, -1/canvas.zoomFactor, 1/canvas.zoomFactor, -1.0, 10000.0);
+                mat4.ortho(pMatrix, -1*aspectRatio/canvas.zoomFactor, 1*aspectRatio/canvas.zoomFactor, -1*aspectRatio/canvas.zoomFactor, 1*aspectRatio/canvas.zoomFactor, -1.0, 10000.0);
         }
         else {
-                mat4.perspective(pMatrix, 60 * Math.PI / 180, canvas.clientWidth / canvas.clientHeight, 0.001, 10000.0);
+                mat4.perspective(pMatrix, 60 * Math.PI / 180, aspectRatio, 0.001, 10000.0);
         }
         
@@ -409 +403 @@
         
         //Calculate rotation around camera focal point about worldspace origin
-        mat4.rotate(azimuthRotationMatrix, azimuthRotationMatrix, radians(canvas.rotation[0]), [0, 1, 0]);
-        mat4.rotate(elevationRotationMatrix, elevationRotationMatrix, radians(canvas.rotation[1]), [1, 0, 0]);
-        mat4.multiply(rotationMatrix, elevationRotationMatrix, azimuthRotationMatrix);
+        if (canvas.twod) {
+                mat4.rotate(azimuthRotationMatrix, azimuthRotationMatrix, radians(canvas.rotation[0]), [0, 1, 0]);
+                mat4.rotate(elevationRotationMatrix, elevationRotationMatrix, radians(canvas.rotation[1]), [1, 0, 0]);
+                mat4.multiply(rotationMatrix, elevationRotationMatrix, azimuthRotationMatrix);
+        }
+        else {
+                mat4.rotate(azimuthRotationMatrix, azimuthRotationMatrix, radians(0), [0, 1, 0]);
+                mat4.rotate(elevationRotationMatrix, elevationRotationMatrix, radians(90), [1, 0, 0]);
+                mat4.multiply(rotationMatrix, elevationRotationMatrix, azimuthRotationMatrix);
+        }
         
         //Apply rotation and scaling transform