Changeset 19820

Timestamp:

11/25/15 16:48:36 (9 years ago)

Author:

dlcheng

Message:

CHG: Removing js multiline string usage for compatibility.

File:

• issm/trunk-jpl/src/m/plot/webgl.js (modified) (1 diff)

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

@@ -139 +139 @@
         shaders = {};
         shaders[shaderName] = {loaded:false, vsh:{}, fsh:{}};
-        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["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);',
+                '}'].join('\n');
+        shaders["colored"]["fsh"]["string"] =
+                ['precision mediump float;',
+                '',
+                'varying vec4 vColor;',
+                '',
+                'void main(void) {',
+                '       gl_FragColor = vColor;',
+                '}'].join('\n');
 
         shaders[shaderName]["vsh"]["shader"] = getShaderByString(gl, shaders[shaderName]["vsh"]["string"], "vsh");