Merge branch 'master' of https://github.com/Doodle3D/Doodle3D-Core

shaders/anaglyph_frag.glsl

@@ -5,32 +5,25 @@ varying vec2 vUv;
 uniform mat3 colorMatrixLeft;
 uniform mat3 colorMatrixRight;
 
-float lin( float c ) {
+float lin(float c) {
-  return c <= 0.04045 ? c * 0.0773993808 :
+  return c <= 0.04045 ? c * 0.0773993808 : pow(c * 0.9478672986 + 0.0521327014, 2.4);
-      pow( c * 0.9478672986 + 0.0521327014, 2.4 );
 }
 
-vec4 lin( vec4 c ) {
+vec4 lin(vec4 c) {
-  return vec4( lin( c.r ), lin( c.g ), lin( c.b ), c.a );
+  return vec4(lin(c.r), lin(c.g), lin(c.b), c.a);
 }
 
-float dev( float c ) {
+float dev(float c) {
-  return c <= 0.0031308 ? c * 12.92 : pow( c, 0.41666 ) * 1.055 - 0.055;
+  return c <= 0.0031308 ? c * 12.92 : pow(c, 0.41666) * 1.055 - 0.055;
 }
 
 void main() {
-
   vec2 uv = vUv;
 
-  vec4 colorL = lin( texture2D( mapLeft, uv ) );
+  vec4 colorL = lin(texture2D(mapLeft, uv));
-  vec4 colorR = lin( texture2D( mapRight, uv ) );
+  vec4 colorR = lin(texture2D(mapRight, uv));
 
-  vec3 color = clamp(
+  vec3 color = clamp(colorMatrixLeft * colorL.rgb + colorMatrixRight * colorR.rgb, 0., 1.);
-      colorMatrixLeft * colorL.rgb +
-      colorMatrixRight * colorR.rgb, 0., 1. );
-
-  gl_FragColor = vec4(
-      dev( color.r ), dev( color.g ), dev( color.b ),
-      max( colorL.a, colorR.a ) );
 
+  gl_FragColor = vec4(dev(color.r), dev(color.g), dev(color.b), max(colorL.a, colorR.a));
 }

shaders/anaglyph_vert.glsl

@@ -1,5 +1,6 @@
 varying vec2 vUv;
+
 void main() {
-  vUv = vec2( uv.x, uv.y );
+  vUv = vec2(uv.x, uv.y);
-  gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+  gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
 }