Changeset 19916

Timestamp:

12/28/15 22:12:25 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Altering modelmatrix calculation to work with translations and new camera view

File:

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

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

@@ -122 +122 @@
 } //}}}
 function recalculateModelMatrix(node) { //{{{
+        //TODO: move to 0,0,0, rotate,move back to normal space, then apply transform
         var modelMatrix = mat4.create();
 
@@ -128 +129 @@
         mat4.multiply(modelMatrix, scaleMatrix, modelMatrix);
 
+        var translationMatrix = mat4.create();
+        mat4.translate(translationMatrix, translationMatrix, node["translation"]); //relative translation
+        mat4.multiply(modelMatrix, translationMatrix, modelMatrix);
+        
         var zRotationMatrix = mat4.create();    
         mat4.rotate(zRotationMatrix, zRotationMatrix, node["rotation"][2] * Math.PI/180.0, [0.0, 0.0, 1.0]);
@@ -137 +142 @@
         mat4.rotate(xRotationMatrix, xRotationMatrix, node["rotation"][0] * Math.PI/180.0, [1.0, 0.0, 0.0]);
         mat4.multiply(modelMatrix, xRotationMatrix, modelMatrix);
-
-        var translationMatrix = mat4.create();
-        mat4.translate(translationMatrix, translationMatrix, node["translation"]); //relative translation
-        mat4.multiply(modelMatrix, translationMatrix, modelMatrix);
 
         return modelMatrix;