Merge pull request #1 from monfera/64-bit

High precision conversion

Author: monfera

lib/shaders.js

@@ -7,4 +7,4 @@ exports.mitreFragment = glslify('./shaders/mitre-fragment.glsl')
 exports.pickVertex    = glslify('./shaders/pick-vertex.glsl')
 exports.pickFragment  = glslify('./shaders/pick-fragment.glsl')
 exports.fillVertex    = glslify('./shaders/fill-vertex.glsl')
-exports.fillFragment  = glslify('./shaders/fill-fragment.glsl')
+exports.fillFragment  = glslify('./shaders/fill-fragment.glsl')

lib/shaders/baseProject.glsl

@@ -0,0 +1,7 @@
+#pragma glslify: export(project)
+vec2 project(vec2 scHi, vec2 trHi, vec2 scLo, vec2 trLo, vec2 posHi, vec2 posLo) {
+  return scHi * posHi + trHi
+       + scLo * posHi + trLo
+       + scHi * posLo
+       + scLo * posLo;
+}

lib/shaders/dirProject.glsl

@@ -0,0 +1,7 @@
+#pragma glslify: export(project)
+vec2 project(vec2 scHi, vec2 scLo, vec2 posHi, vec2 posLo) {
+  return scHi * posHi
+       + scLo * posHi
+       + scHi * posLo
+       + scLo * posLo;
+}

lib/shaders/fill-fragment.glsl

@@ -4,4 +4,4 @@ uniform vec4 color;
 
 void main() {
   gl_FragColor = vec4(color.rgb * color.a, color.a);
-}
+}

lib/shaders/fill-vertex.glsl

@@ -1,19 +1,18 @@
-precision mediump float;
+precision highp float;
 
-attribute vec2 a, d;
+attribute vec2 aHi, aLo, dHi;
 
-uniform mat3 matrix;
-uniform vec2 projectAxis;
-uniform float projectValue;
-uniform float depth;
+uniform vec2 scaleHi, translateHi, scaleLo, translateLo, projectAxis;
+uniform float projectValue, depth;
+
+#pragma glslify: baseProject = require("./baseProject.glsl")
 
 void main() {
-  vec3 base = matrix * vec3(a, 1);
-  vec2 p = base.xy / base.z;
-  if(d.y < 0.0 || (d.y == 0.0 && d.x < 0.0)) {
+  vec2 p = baseProject(scaleHi, translateHi, scaleLo, translateLo, aHi, aLo);
+  if(dHi.y < 0.0 || (dHi.y == 0.0 && dHi.x < 0.0)) {
     if(dot(p, projectAxis) < projectValue) {
       p = p * (1.0 - abs(projectAxis)) + projectAxis * projectValue;
     }
   }
   gl_Position = vec4(p, depth, 1);
-}
+}

lib/shaders/line-fragment.glsl

@@ -1,4 +1,4 @@
-precision mediump float;
+precision highp float;
 
 uniform vec4 color;
 uniform vec2 screenShape;
@@ -11,4 +11,4 @@ void main() {
   float t = fract(dot(direction, gl_FragCoord.xy) / dashLength);
   vec4 pcolor = color * texture2D(dashPattern, vec2(t, 0.0)).r;
   gl_FragColor = vec4(pcolor.rgb * pcolor.a, pcolor.a);
-}
+}

lib/shaders/line-vertex.glsl

@@ -1,25 +1,24 @@
-precision mediump float;
+precision highp float;
 
-#pragma glslify: inverse = require("glsl-inverse")
+attribute vec2 aHi, aLo, dHi, dLo;
 
-attribute vec2 a, d;
-
-uniform mat3 matrix;
-uniform vec2 screenShape;
+uniform vec2 scaleHi, translateHi, scaleLo, translateLo, screenShape;
 uniform float width;
 
 varying vec2 direction;
 
+#pragma glslify: baseProject = require("./baseProject.glsl")
+#pragma glslify: dirProject = require("./dirProject.glsl")
+
 void main() {
-  vec2 dir = (matrix * vec3(d, 0)).xy;
-  vec3 base = matrix * vec3(a, 1);
-  vec2 n = 0.5 * width *
-    normalize(screenShape.yx * vec2(dir.y, -dir.x)) / screenShape.xy;
+  vec2 p = baseProject(scaleHi, translateHi, scaleLo, translateLo, aHi, aLo);
+  vec2 dir = dirProject(scaleHi, scaleLo, dHi, dLo);
+  vec2 n = 0.5 * width * normalize(screenShape.yx * vec2(dir.y, -dir.x)) / screenShape.xy;
   vec2 tangent = normalize(screenShape.xy * dir);
   if(dir.x < 0.0 || (dir.x == 0.0 && dir.y < 0.0)) {
     direction = -tangent;
   } else {
     direction = tangent;
   }
-  gl_Position = vec4(base.xy/base.z + n, 0, 1);
-}
+  gl_Position = vec4(p + n, 0.0, 1.0);
+}

lib/shaders/mitre-fragment.glsl

@@ -7,4 +7,4 @@ void main() {
     discard;
   }
   gl_FragColor = vec4(color.rgb, color.a);
-}
+}

lib/shaders/mitre-vertex.glsl

@@ -1,13 +1,14 @@
-precision mediump float;
+precision highp float;
 
-attribute vec2 p;
+attribute vec2 aHi, aLo;
 
-uniform mat3  matrix;
-uniform vec2 screenShape;
+uniform vec2 scaleHi, translateHi, scaleLo, translateLo;
 uniform float radius;
 
+#pragma glslify: baseProject = require("./baseProject.glsl")
+
 void main() {
-  vec3 pp = matrix * vec3(p, 1);
-  gl_Position  = vec4(pp.xy, 0, pp.z);
+  vec2 p = baseProject(scaleHi, translateHi, scaleLo, translateLo, aHi, aLo);
+  gl_Position = vec4(p, 0.0, 1.0);
   gl_PointSize = radius;
-}
+}

lib/shaders/pick-fragment.glsl

@@ -22,4 +22,4 @@ void main() {
   fragId.z -= floor(fragId.z / 256.0) * 256.0;
 
   gl_FragColor = fragId / 255.0;
-}
+}