Changeset 20205

Timestamp:

02/17/16 15:11:07 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Bug fixes for plot_mesh, fixing default plot centering, globe support for mesh3d plot surfaces.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_manager.js (modified) (2 diffs)
• plot_mesh.js (modified) (1 diff)
• plot_overlay.js (modified) (2 diffs)
• plot_unit.js (modified) (3 diffs)
• webgl.js (modified) (2 diffs)

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

@@ -98 +98 @@
                                 break;
                         case 'mesh':
-                                plot_mesh(md,options,canvas,gl,nodes["main"]);
+                                plot_mesh(md,options,canvas,gl,canvas.nodes["data"+String(canvas.datalength)]);
                                 break;
                         case 'none':
@@ -227 +227 @@
         
         //Draw into the canvas if needed:
-        if (requestDrawing)     draw(gl,options,canvas,canvas.nodes);
+        if (requestDrawing)     draw(gl,options,canvas);
 }

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

@@ -16 +16 @@
         
         //Process data and model
-        var x = md.mesh.x;
-        var y = md.mesh.y;
-        var z = [].fill(md.mesh.x.length);
-        var elements = md.mesh.elements;
+        var meshresults = processmesh(md,[],options);
+        var x = meshresults[0]; 
+        var y = meshresults[1]; 
+        var z = meshresults[2]; 
+        var elements = meshresults[3]; 
+        var is2d = meshresults[4]; 
+        var isplanet = meshresults[5];
+        var is3d = md.mesh.classname() == 'mesh3dsurface'; //use meshresults once behvaior can be verified
         
-        if (md.geometry.surface) {
+        if (!is3d && md.geometry.surface) {
                 z = md.geometry.surface;
         }

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

@@ -24 +24 @@
         var is2d = meshresults[4]; 
         var isplanet = meshresults[5];
-        var is3d = (md.mesh.classname() == 'mesh3dsurface');    //use is2d/isplanet once verified to work with mesh3dsurface
+        var is3d = (md.mesh.classname() == 'mesh3dsurface'); //use meshresults once behvaior can be verified
         
         if (!is3d && md.geometry.surface) {
@@ -50 +50 @@
         node["shader"] = gl["shaders"][node["shaderName"]]["program"];
         node["scale"] = [scale, scale, scale*options.getfieldvalue('heightscale',1)];
-        node["translation"] = [(xmin + xmax) / (-2 / scale), (ymin + ymax) / (-2 / scale), (zmin + zmax) / (2 / scale)];
+        node["translation"] = [(xmin + xmax) / (-2 / scale), (ymin + ymax) / (-2 / scale), (zmin + zmax) / (-2 / scale)];
         node["modelMatrix"] = recalculateModelMatrix(node);
         node["texture"] = initTexture(gl,options.getfieldvalue('image'));
-        node["alpha"] = options.getfieldvalue('outeralpha',.9);
+        node["alpha"] = options.getfieldvalue('outeralpha',0.9);
         node["overlay"] = false;
         node["drawOrder"] = 1;

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

@@ -26 +26 @@
         var is2d = meshresults[4]; 
         var isplanet = meshresults[5];
-        var is3d = (md.mesh.classname() == 'mesh3dsurface');    //use is2d/isplanet once verified to work with mesh3dsurface
+        var is3d = md.mesh.classname() == 'mesh3dsurface'; //use meshresults once behvaior can be verified
         
         var     dataresults = processdata(md,data,options);
@@ -67 +67 @@
         node["enabled"] = options.getfieldvalue('nodata','off') == 'off';
         
-        console.log(node["translation"]);
-        
         switch(datatype){
                 //element plot {{{
@@ -95 +93 @@
                                 vertices.itemSize = 3;
                                 texcoords.itemSize = 2;
-                                var height = vec3.create();
-                                var heightscale = options.getfieldvalue('heightscale',1);
+                                //var height = vec3.create();
+                                //var heightscale = options.getfieldvalue('heightscale',1);
                                 for(var i = 0; i < x.length; i++){
-                                        vec3.normalize(height, vec3.fromValues(x[i], y[i], z[i])); //fix to use normalized earth radius instead of radius+ height
-                                        vec3.scale(height, height, heightscale);
-                                        vertices[vertices.length] = x[i] + height[0];
-                                        vertices[vertices.length] = y[i] + height[1];
-                                        vertices[vertices.length] = z[i] + height[2];
+                                        //vec3.normalize(height, vec3.fromValues(x[i], y[i], z[i])); //fix to use normalized earth radius instead of radius+ height
+                                        //vec3.scale(height, height, heightscale);
+                                        vertices[vertices.length] = x[i];
+                                        vertices[vertices.length] = y[i];
+                                        vertices[vertices.length] = z[i];
 
                                         texcoords[texcoords.length] = 0.5;

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

@@ -38 +38 @@
         canvas.zoomLast = canvas.zoomFactor;
         canvas.cameraMatrix = mat4.create();
-        canvas.translation = options.getfieldvalue('centeroffset',[0,0,0.25]);
+        canvas.translation = options.getfieldvalue('centeroffset',[0,0,0.0]);
         canvas.rotationAzimuthBounds = options.getfieldvalue('azimuthbounds',[0,360]);
         canvas.rotationElevationBounds = options.getfieldvalue('elevationbounds',[-180,180]);
@@ -477 +477 @@
                 
         // Skip drawing of new frame if any texture is not yet loaded
+        var nodes = canvas.nodes;
         for (var node in nodes) {
                 if (nodes[node]["texture"] && !nodes[node]["texture"]["isLoaded"]) {