Changeset 19871

Timestamp:

12/09/15 21:07:37 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Fixing default shader behavior for js plot displays.

Location:

issm/trunk-jpl/src/m/plot

Files:

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

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

@@ -277 +277 @@
                                 var cmap = options.getfieldvalue('cmap','jet');
                                 var colorbar = colorbars[cmap];
+                                console.log(cmap, colorbar);
                                 for (var i = 0; i < colorbar.length; i++) {
                                         color = colorbar[colorbar.length-i-1];
@@ -327 +328 @@
                         tURL = tcanvashtml.toDataURL();
                         node["texture"] = initTexture(gl,tURL);
+                        console.log(node["texture"]);
                         /* //{{{
                         if exist(options,'wrapping')

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

@@ -38 +38 @@
         var scale = 1 / (xmax - xmin);
         node["shaderName"] = "colored";
+        node["shader"] = gl["shaders"][node["shaderName"]]["program"];
         node["scale"] = [scale, scale, scale];
         node["translation"] = [(xmin + xmax) / (-2 / scale), (ymin + ymax) / (-2 / scale), (zmin + zmax) / (-2 / scale)];

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

@@ -40 +40 @@
         var scale = 1 / (xmax - xmin);
         node["shaderName"] = "unlit_textured";
+        node["shader"] = gl["shaders"][node["shaderName"]]["program"];
         node["scale"] = [scale, scale, scale];
         node["rotation"] = options.getfieldvalue('view',[0,0,0]);

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

@@ -49 +49 @@
         var scale = 1 / (xmax - xmin);
         node["shaderName"] = "unlit_textured";
+        node["shader"] = gl["shaders"][node["shaderName"]]["program"];
+        console.log(gl["shaders"]);
         node["scale"] = [scale, scale, scale];
         node["rotation"] = options.getfieldvalue('view',[0,0,0]);
         node["translation"] = [(xmin + xmax) / (-2 / scale), (ymin + ymax) / (-2 / scale), (zmin + zmax) / (-2 / scale)];
         node["modelMatrix"] = recalculateModelMatrix(node);
-                                
+        console.log(node);
         //some defaults:
         texcoords.itemSize = 2;
@@ -109 +111 @@
                                 vertices.itemSize = 3;
                                 var cmap=options.getfieldvalue('cmap','jet');
-                                
+                                console.log(datamin,datamax,data);
                                 for(var i = 0; i < x.length; i++){
                                         vertices[vertices.length] = x[i];

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

@@ -92 +92 @@
         gl.bindTexture(gl.TEXTURE_2D, texture);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB, gl.RGB, gl.UNSIGNED_BYTE, texture.image);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, texture.image);
+        gl.generateMipmap(gl.TEXTURE_2D);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST_MIPMAP_LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
         gl.bindTexture(gl.TEXTURE_2D, null);
 } //}}}