@openglobus/og 0.16.0 → 0.16.1

package/src/og/shaders/ray.js

@@ -27,13 +27,14 @@ export function rayScreen() {
         },
         vertexShader:
             `precision highp float;
-            attribute vec2 a_vertices;
+
+            attribute vec4 a_rgba;
             attribute vec3 a_startPosHigh;
             attribute vec3 a_startPosLow;
             attribute vec3 a_endPosHigh;
             attribute vec3 a_endPosLow;
+            attribute vec2 a_vertices;
             attribute float a_thickness;
-            attribute vec4 a_rgba;
 
             varying vec4 v_rgba;
 
@@ -48,38 +49,31 @@ export function rayScreen() {
 
                 v_rgba = vec4(a_rgba.rgb, a_rgba.a * uOpacity);
 
-                vec3 camPos = eyePositionHigh + eyePositionLow;
-
-                vec3 startPos = a_startPosHigh + a_startPosLow;
-                float length = length((a_endPosHigh + a_endPosLow) - startPos);
-                vec3 direction = normalize((a_endPosHigh + a_endPosLow) - startPos);
-                vec3 vertPos = startPos + a_vertices.y * direction * length;
+                vec3 v = (a_endPosHigh - a_startPosHigh) + (a_endPosLow - a_startPosLow);
 
-                vec3 look = vertPos - camPos;
-                vec3 up = normalize(direction);
+                vec3 look = (a_startPosHigh - eyePositionHigh) + (a_startPosLow - eyePositionLow) + v * a_vertices.y;
+                vec3 up = normalize(normalize(v));
                 vec3 right = normalize(cross(look,up));
  
-                float dist = dot(camPos - vertPos, vec3(viewMatrix[0][2], viewMatrix[1][2], viewMatrix[2][2]));
+                float dist = dot(look, vec3(viewMatrix[0][2], viewMatrix[1][2], viewMatrix[2][2]));
                 float focalSize = 2.0 * dist * resolution;
-                vec3 rr = right * a_thickness * focalSize * a_vertices.x;
+                vec3 vert = right * a_thickness * focalSize * a_vertices.x;
 
-                vec3 highDiff = -eyePositionHigh;
-                vec3 lowDiff = rr - eyePositionLow;
+                vec3 highDiff;
+                vec3 lowDiff;
 
                 if(a_vertices.y == 0.0){
-                    highDiff += a_startPosHigh;
-                    lowDiff += a_startPosLow;
+                    highDiff = a_startPosHigh - eyePositionHigh;
+                    vert += a_startPosLow - eyePositionLow;
                 }else{
-                    highDiff += a_endPosHigh;
-                    lowDiff += a_endPosLow;
+                    highDiff = a_endPosHigh - eyePositionHigh;
+                    vert += a_endPosLow - eyePositionLow;
                 }
 
                 mat4 viewMatrixRTE = viewMatrix;
                 viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
-
-                vec4 pos = viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
                 
-                gl_Position = projectionMatrix * pos;
+                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + vert, 1.0);
             }`,
         fragmentShader:
             `precision highp float;