Changeset 19869

Timestamp:

12/09/15 18:21:40 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Fixing default shaders to use colors instead of textures.

Location:

issm/trunk-jpl/src/m/plot

Files:

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

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

@@ -42 +42 @@
         //Compute scaling: 
         var scale = 1 / (xmax - xmin);
+        node["shaderName"] = "unlit_textured";
         node["scale"] = [scale, scale, scale];
         node["rotation"] = options.getfieldvalue('view',[0,0,0]);

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

@@ -45 +45 @@
         //Compute scaling: 
         var scale = 1 / (xmax - xmin);
+        node["shaderName"] = "unlit_textured";
         node["scale"] = [scale, scale, scale];
         node["rotation"] = options.getfieldvalue('view',[0,0,0]);

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

@@ -103 +103 @@
         //Returns a Node object that contains default display states for webgl object
         return {buffers:[],
-                shader:gl.shaders["unlit_textured"]["program"],
+                shader:gl.shaders["colored"]["program"],
                 draw:null,
                 hideOcean:false,
@@ -119 +119 @@
                 scale:vec3.fromValues(1, 1, 1),
                 modelMatrix:mat4.create(),
-                shaderName:"unlit_textured",
+                shaderName:"colored",
                 overlay:false,
         };