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

shaders/anaglyph_frag.glsl

@@ -6,8 +6,7 @@ uniform mat3 colorMatrixLeft;
 uniform mat3 colorMatrixRight;
 
 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) {
@@ -19,18 +18,12 @@ float dev( float c ) {
 }
 
 void main() {
-
   vec2 uv = vUv;
 
   vec4 colorL = lin(texture2D(mapLeft, 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,4 +1,5 @@
 varying vec2 vUv;
+
 void main() {
   vUv = vec2(uv.x, uv.y);
   gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);