Merge pull request mrdoob#1 from emackey/master

My first pull request, a simple change from highp to mediump for better mobile compatibility.
wdyang · Dec 2, 2011 · 864454a · 864454a
2 parents 27be8b1 + 15ef80d
commit 864454a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/static/index.html b/static/index.html
@@ -60,7 +60,7 @@
 		<script src="js/glsl.js"></script>
 
 		<script id="example" type="x-shader/x-fragment">#ifdef GL_ES
-precision highp float;
+precision mediump float;
 #endif
 
 uniform float time;
@@ -84,7 +84,7 @@
 		<script id="fragmentShader" type="x-shader/x-fragment">
 
 			#ifdef GL_ES
-			precision highp float;
+			precision mediump float;
 			#endif
 
 			uniform vec2 resolution;

diff --git a/static/js/glsl.js b/static/js/glsl.js
@@ -158,7 +158,7 @@ CodeMirror.defineMode("glsl", function(config, parserConfig) {
   }
   var glslKeywords = "if break int case continue return default do " +
     "else struct switch float for unsigned goto while void const signed " +
-    "vec2 vec3 vec4 mat2 mat3 mat4 precision lowp midp highp uniform " +
+    "vec2 vec3 vec4 mat2 mat3 mat4 precision lowp mediump highp uniform " +
     "attribute varying gl_Vertex gl_FragCoord gl_FragColor sampler2D " +
     "samplerCube";
   var glslBuiltins = "radians degrees sin cos tan asin acos atan " +

diff --git a/static/js/helpers.js b/static/js/helpers.js
@@ -29,7 +29,7 @@ function load_url_code() {
 
 	} else {
 
-		readURL( '5d00000100980200000000000000119a48c65ab5aec1f910f780dfdfe473e599a211a90304ab6a650a0bdc710e60d9ef6827f7e37c460aba047c4de9e20bce74f0e6773fe3b4b7d379f6f885aacf345507100f3a9c00b35ece337c99a5b1914781cf1261e20c852069d976e19e0626035accf277b6d605f6f79b5b829acddc05289378c5e94ed5e728c24b0c22e42ddd138eaafc87372557f72d2dd04c4538fde32958381dcc055e8bb8c995f6f131916a68f6a9eae6d314121e0fbcfc26aed27e4a9b352caf72ef1b2d94e7a0c30bb73bdceac95fd45a10ae5d0cba4fb744a5d815c78fe091f2be7dae03592fa89dc80524475f0d296359c067472f2efcf9f2695185e5a5d2a5cdf31d8ea098e48054863d3489cf72c148e9ac8fbb401c229d9e08e9b8ff39ced000' );
+		readURL( '5d000001009a0200000000000000119a48c65ab5aec1f910f780dfdfe473e599a211a90304ab6aa581b342b344db4e71099beb79352b3c442c8dee970ffb4d054491e356b4f55882c2f3554393fe6662cf2c348a3f51dcce7b5760290bbc5c1b937d382ba6cdd0a9b35cf7fd57cebd800501c16f80f61ad4501d00a2ca4e63c8dc38b7b03703cba8d68914c6f2c6598f2f7008faee0e4b4cf4276eea6d0fb93df9188dae5b7f6db2579246363efaf9145f13206ee5b908e90eb4f6e19254a0f4fda81b31c2d3fd00e78e5b5fb5d5e51df87412a667211e121d77f3becd58d5960f9b77d8b826d4c6bce27a589f7158944441ae8fa5a297f23f0e7707f84fcbe0557976aaca9c97b99d3252a8b85b2a4ecb10d9b3cb65f6a5d75240f8bde39ed692b559c61276fe260578' );
 
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ function load_url_code() { @@
     	} else {
-    		readURL( '5d00000100980200000000000000119a48c65ab5aec1f910f780dfdfe473e599a211a90304ab6a650a0bdc710e60d9ef6827f7e37c460aba047c4de9e20bce74f0e6773fe3b4b7d379f6f885aacf345507100f3a9c00b35ece337c99a5b1914781cf1261e20c852069d976e19e0626035accf277b6d605f6f79b5b829acddc05289378c5e94ed5e728c24b0c22e42ddd138eaafc87372557f72d2dd04c4538fde32958381dcc055e8bb8c995f6f131916a68f6a9eae6d314121e0fbcfc26aed27e4a9b352caf72ef1b2d94e7a0c30bb73bdceac95fd45a10ae5d0cba4fb744a5d815c78fe091f2be7dae03592fa89dc80524475f0d296359c067472f2efcf9f2695185e5a5d2a5cdf31d8ea098e48054863d3489cf72c148e9ac8fbb401c229d9e08e9b8ff39ced000' );
+    		readURL( '5d000001009a0200000000000000119a48c65ab5aec1f910f780dfdfe473e599a211a90304ab6aa581b342b344db4e71099beb79352b3c442c8dee970ffb4d054491e356b4f55882c2f3554393fe6662cf2c348a3f51dcce7b5760290bbc5c1b937d382ba6cdd0a9b35cf7fd57cebd800501c16f80f61ad4501d00a2ca4e63c8dc38b7b03703cba8d68914c6f2c6598f2f7008faee0e4b4cf4276eea6d0fb93df9188dae5b7f6db2579246363efaf9145f13206ee5b908e90eb4f6e19254a0f4fda81b31c2d3fd00e78e5b5fb5d5e51df87412a667211e121d77f3becd58d5960f9b77d8b826d4c6bce27a589f7158944441ae8fa5a297f23f0e7707f84fcbe0557976aaca9c97b99d3252a8b85b2a4ecb10d9b3cb65f6a5d75240f8bde39ed692b559c61276fe260578' );
     	}
     }
@@ Expand Down @@