Changeset 19732

Timestamp:

11/17/15 11:40:06 (9 years ago)

Author:

Eric.Larour

Message:

CHG: control background color from options.

Location:

issm/trunk-jpl/src/m/plot

Files:

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

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

@@ -14 +14 @@
 
         // Initialize the GL context: 
-        var gl=initWebGL(canvas);
+        var gl=initWebGL(canvas,options);
 
         // Only continue if WebGL is available and working
-
         if (gl) {
                 loadShaders(gl);
                 var node=loadModel(gl,x,y,z,elements,data);
-                draw(gl,canvas,node);}
+                draw(gl,canvas,node);
+        }
 
         switch(datatype){

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

@@ -2 +2 @@
 var shaders = {};
 //{{{ GL Initialization
-function initWebGL(canvas) { //{{{
+function initWebGL(canvas,options) { //{{{
         gl = null;
 
@@ -19 +19 @@
 
         // Set clear color to black, fully opaque
-        gl.clearColor(0.0, 0.0, 0.0, 1.0);
+        var backgroundcolor=new RGBColor(options.getfieldvalue('backgroundcolor','white'));
+        if(backgroundcolor.ok){
+                gl.clearColor(backgroundcolor.r/255.0, backgroundcolor.g/255.0, backgroundcolor.b/255.0, 1.0);
+        }
+        else throw Error(sprintf("s%s%s\n","initWebGL error message: cound not find out background color for curent canvas ",canvas));
+
         // Enable depth testing
         gl.enable(gl.DEPTH_TEST);
@@ -345 +350 @@
         window.requestAnimationFrame(function(time) {draw(gl,canvas,node)});
         gl.viewport(0, 0, canvas.width, canvas.height);
-        gl.clearColor(0.0, 0.0, 0.0, 1.0);      
         gl.clear(gl.COLOR_BUFFER_BIT);
         updateCameraMatrix(canvas);