Changeset 19727

Timestamp:

11/16/15 16:55:06 (9 years ago)

Author:

Eric.Larour

Message:

CHG: shuffling the code order.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_unit.js (modified) (3 diffs)
• webgl.js (modified) (2 diffs)

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

@@ -9 +9 @@
         //edgecolor
         edgecolor=options.getfieldvalue('edgecolor','none');
+        
+        /*First initialize webgl for the corresponding canvas: */
+        var canvas=document.getElementById(options.getfieldvalue('canvasid'));
+
+        //Initialize the GL context: 
+        var gl=initWebGL(canvas);
+
+        // Only continue if WebGL is available and working
+
+        if (gl) {
+                // Set clear color to black, fully opaque
+                gl.clearColor(0.0, 0.0, 0.0, 1.0);
+                // Enable depth testing
+                gl.enable(gl.DEPTH_TEST);
+                // Near things obscure far things
+                gl.depthFunc(gl.LEQUAL);
+                // Clear the color as well as the depth buffer.
+                gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+        }
 
         switch(datatype){
@@ -42 +61 @@
                 case 2:
 
-                        
-
                         if (elements[0].length==6){ //prisms
                                 /*A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
@@ -60 +77 @@
                         }
                         else{
-                                
-                                var canvas=document.getElementById(options.getfieldvalue('canvasid'));
-
-                                //Initialize the GL context: 
-                                var gl=initWebGL(canvas);
-
-                                // Only continue if WebGL is available and working
-
-                                if (gl) {
-                                        // Set clear color to black, fully opaque
-                                        gl.clearColor(0.0, 0.0, 0.0, 1.0);
-                                        // Enable depth testing
-                                        gl.enable(gl.DEPTH_TEST);
-                                        // Near things obscure far things
-                                        gl.depthFunc(gl.LEQUAL);
-                                        // Clear the color as well as the depth buffer.
-                                        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-                                }
                                 
                                 /*A=elements(:,1); B=elements(:,2); C=elements(:,3); 

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

@@ -1 @@
-function initWebGL(canvas) {
+/*This is where we have all our webgl relevant functionality for the plotting routines: */
+function initWebGL(canvas) { //{{{
         gl = null;
 
@@ -15 +16 @@
 
         return gl;
-}
+} //}}}