Index: ../trunk-jpl/src/m/plot/plot_unit.js =================================================================== --- ../trunk-jpl/src/m/plot/plot_unit.js (revision 19770) +++ ../trunk-jpl/src/m/plot/plot_unit.js (revision 19771) @@ -1,8 +1,8 @@ -function plot_unit(x,y,z,elements,data,is2d,isplanet,datatype,options,canvas,gl) { +function plot_unit(md,data,options,canvas,gl) { //PLOT_UNIT - unit plot, display data // // Usage: - // plot_unit(x,y,z,elements,data,is2d,isplanet,datatype,options); + // plot_unit(md,data,options,canvas,gl); // // See also: PLOTMODEL, PLOT_MANAGER @@ -17,11 +17,24 @@ var zmin,zmax; var datamin,datamax; var scale; + //Process data and model + var meshresults = processmesh(md,data,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 dataresults = processdata(md,data,options); + var data2 = dataresults[0]; + var datatype = dataresults[1]; //}}} //Initialize the buffer structure: node = Node(gl,options); + //Compute coordinates and data range: xmin = ArrayMin(x); xmax = ArrayMax(x); Index: ../trunk-jpl/src/m/plot/plot_manager.js =================================================================== --- ../trunk-jpl/src/m/plot/plot_manager.js (revision 19770) +++ ../trunk-jpl/src/m/plot/plot_manager.js (revision 19771) @@ -15,6 +15,7 @@ //standard plot: initialize open Gl for each canvas: var canvas=document.getElementById(options.getfieldvalue('canvasid')); + //$.(")").append("body"); // Initialize the GL context: var gl=initWebGL(canvas,options); @@ -86,7 +87,7 @@ break; case 'mesh': //plot_mesh(md,options,nlines,ncols,i); - plot_mesh(md.mesh.x,md.mesh.y,[0.0],md.mesh.elements,2,options,canvas,gl); + plot_mesh(md,options,canvas,gl); break; case 'none': if (!(options.exist('overlay'))){ @@ -208,21 +209,8 @@ } if (typeof data !== 'string'){ - //process data and model - var meshresults = processmesh(md,data,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 dataresults = processdata(md,data,options); - var data2 = dataresults[0]; - var datatype = dataresults[1]; - //plot unit - plot_unit(x,y,z,elements,data2,is2d,isplanet,datatype,options,canvas,gl); + plot_unit(md,data,options,canvas,gl); } //apply all options Index: ../trunk-jpl/src/m/plot/plot_mesh.js =================================================================== --- ../trunk-jpl/src/m/plot/plot_mesh.js (revision 19770) +++ ../trunk-jpl/src/m/plot/plot_mesh.js (revision 19771) @@ -1,6 +1,6 @@ -function plot_mesh(x,y,z,elements,datatype,options,canvas,gl) { +function plot_mesh(md,options,canvas,gl) { // Usage: - // plot_mesh(md,options,nlines,ncols,i); + // plot_mesh(md,options,canvas,gl); // // See also: PLOTMODEL @@ -14,6 +14,11 @@ var ymin,ymax; var zmin,zmax; var scale; + //Process data and model + var x = md.x; + var y = md.y; + var z = [0.0]; + var elements = md.elements; //}}} //Initialize the buffer structure: Index: ../trunk-jpl/src/m/plot/webgl.js =================================================================== --- ../trunk-jpl/src/m/plot/webgl.js (revision 19770) +++ ../trunk-jpl/src/m/plot/webgl.js (revision 19771) @@ -40,7 +40,7 @@ // Firefox canvas.addEventListener("DOMMouseScroll", function (e) {MouseWheelHandler(e,canvas)}, false); // Mobile - //canvas.addEventListener("gesturechange", MousePinchHandler, false); + canvas.addEventListener("gesturechange", MouseWheelHandler, false); } return gl; @@ -232,7 +232,8 @@ function MouseWheelHandler(e,canvas) { //{{{ // prevent scrolling when over canvas e.preventDefault(); - var delta = 1/10 * clamp((e.wheelDelta || -e.detail), -1, 1); + var e = window.event || e; // old IE support + var delta = 1/10 * clamp((e.scale || e.wheelDelta || -e.detail), -1, 1); canvas.zoomFactor = canvas.zoomFactor + -delta * canvas.zoomFactor; } //}}} //}}}