Changeset 19745

Timestamp:

11/17/15 17:02:22 (9 years ago)

Author:

dlcheng

Message:

CHG: Removing test101 webgl dependencies

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_unit.js (modified) (1 diff)
• webgl.js (modified) (6 diffs)

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

@@ -20 +20 @@
         //}}}
 
-        //load the shaders: 
-        loadShaders(gl);
-        
         //Initialize the buffer structure: 
         node = Node(gl,options);

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

@@ -1 +1 @@
 /*This is where we have all our webgl relevant functionality for the plotting routines: */
-var shaders = {};
 //{{{ GL Initialization
 function initWebGL(canvas,options) { //{{{
@@ -27 +26 @@
         gl.enableVertexAttribArray(0);
         gl.enableVertexAttribArray(1);
+
+        // Load shaders and store them in gl object
+        gl.shaders = loadShaders(gl);
 
         // Add context state variables
@@ -68 +70 @@
 
         node= {buffers:[],
-                shader:shaders["colored"]["program"],
+                shader:gl.shaders["colored"]["program"],
                 draw:null,
                 hideOcean:false,
@@ -128 +130 @@
 //{{{ Shader Loading
 function loadShaders(gl) { //{{{
-        var shader_name_array = ["colored"];
-        //var shaders = {};
-        for (var i = 0; i < shader_name_array.length; i++) {
-                loadShader(gl,shader_name_array[i]);
-        }
-        //return shaders; 
-} //}}}
-function loadShader(gl,shaderName) { //{{{
-        //var shader = {loaded:false, vsh:{}, fsh:{}};
+        // TODO: Subsitute shaders["colored"] with shaderColored
+        shaderName = "colored";
+        shaders = {};
         shaders[shaderName] = {loaded:false, vsh:{}, fsh:{}};
-        $.ajax({
-                url: "webgl/shaders/" + shaderName + ".vsh",
-                async: false,
-                dataType: "script"
-        });
-        $.ajax({
-                url: "webgl/shaders/" + shaderName + ".fsh",
-                async: false,
-                dataType: "script"
-        });
+        shaders["colored"]["vsh"]["string"] = `
+                attribute vec3 aVertexPosition;
+                attribute vec4 aVertexColor;
+
+                uniform mat4 uMVPMatrix;
+                uniform float uAlpha;
+
+                varying vec4 vColor;
+
+                void main(void) {
+                        gl_Position = uMVPMatrix * vec4(aVertexPosition.xyz, 1.0);
+                        vColor = vec4(aVertexColor.xyz, uAlpha);
+                }
+        `;
+        shaders["colored"]["fsh"]["string"] = `
+                precision mediump float;
+
+                varying vec4 vColor;
+
+                void main(void) {
+                        gl_FragColor = vColor;
+                }
+        `;
 
         shaders[shaderName]["vsh"]["shader"] = getShaderByString(gl, shaders[shaderName]["vsh"]["string"], "vsh");
@@ -190 +199 @@
         }
         shaders[shaderName]["loaded"] = true;
-        //return shader;
+        return shaders;
 } //}}}
 function getShaderByString(gl,str,type) { //{{{
@@ -213 +222 @@
 
         return shader;
-} //}}}
-function functionToString(functionVariable) { //{{{
-        //Workaround for loading text files - store as multiline comment in function, then strip string from function once loaded
-        return functionVariable.toString().replace(/^[^\/]+\/\*!?/, '').replace(/\*\/[^\/]+$/, '');
 } //}}}
 function nameFromLine(line) { //{{{