@openglobus/og 0.17.2 → 0.18.0

package/src/{og/shaders/bloom.js → shaders/bloom.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import {Program} from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function bloom() {
+export function bloom(): Program {
     return new Program("bloom", {
         uniforms: {
             uTextureOriginal: "sampler2d",

package/src/{og/shaders/blur.js → shaders/blur.ts}

@@ -1,10 +1,7 @@
-'use strict';
+import {Program} from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function buildKernel(sigma) {
-
-    function gauss(x, sigma) {
+export function buildKernel(sigma: number): number[] {
+    function gauss(x: number, sigma: number) {
         return Math.exp(-(x * x) / (2.0 * sigma * sigma));
     }
 
@@ -26,7 +23,7 @@ export function buildKernel(sigma) {
     return values;
 }
 
-export function blur() {
+export function blur(): Program {
 
     return new Program("blur", {
         uniforms: {

package/src/{og/shaders/depth.js → shaders/depth.ts}

@@ -1,6 +1,4 @@
-'use strict';
-
-import { Program } from '../webgl/Program.js';
+import { Program } from '../webgl/Program';
 
 export function depth() {
     return new Program("depth", {

package/src/{og/shaders/drawnode.js → shaders/drawnode.ts}

@@ -1,8 +1,6 @@
-"use strict";
-
-import { Program } from "../webgl/Program.js";
-import * as atmos from "./atmos.js";
-import { UTILS } from './utils.js';
+import * as atmos from "./atmos";
+import {Program} from "../webgl/Program";
+import {UTILS} from './utils';
 
 // REMEMBER!
 // src*(1)+dest*(1-src.alpha)
@@ -30,7 +28,7 @@ const DEF_BLEND_PICKING = `#define blendPicking(DEST, OFFSET, SAMPLER, MASK, COL
 
 const SLICE_SIZE = 4;
 
-export function drawnode_screen_nl() {
+export function drawnode_screen_nl(): Program {
     return new Program("drawnode_screen_nl", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -44,12 +42,12 @@ export function drawnode_screen_nl() {
             defaultTexture: "sampler2d",
             height: "float"
         }, attributes: {
-            aVertexPositionHigh: "vec3", 
-            aVertexPositionLow: "vec3", 
+            aVertexPositionHigh: "vec3",
+            aVertexPositionLow: "vec3",
             aTextureCoord: "vec2"
         },
 
-        vertexShader: 
+        vertexShader:
             `precision highp float;
             
             attribute vec3 aVertexPositionHigh;
@@ -114,7 +112,7 @@ export function drawnode_screen_nl() {
     });
 }
 
-export function drawnode_screen_wl_webgl1NoAtmos() {
+export function drawnode_screen_wl_webgl1NoAtmos(): Program {
     return new Program("drawnode_screen_wl", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -299,7 +297,7 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
     });
 }
 
-export function drawnode_screen_wl_webgl2NoAtmos() {
+export function drawnode_screen_wl_webgl2NoAtmos(): Program {
     return new Program("drawnode_screen_wl", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -492,7 +490,7 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
 }
 
 
-export function drawnode_screen_wl_webgl2Atmos() {
+export function drawnode_screen_wl_webgl2Atmos(): Program {
     return new Program("drawnode_screen_wl", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -823,7 +821,7 @@ export function drawnode_screen_wl_webgl2Atmos() {
     });
 }
 
-export function drawnode_colorPicking() {
+export function drawnode_colorPicking(): Program {
     return new Program("drawnode_colorPicking", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -840,7 +838,7 @@ export function drawnode_colorPicking() {
             aVertexPositionHigh: "vec3", aVertexPositionLow: "vec3", aTextureCoord: "vec2"
         },
 
-        vertexShader: 
+        vertexShader:
             `precision highp float;
             
             attribute vec3 aVertexPositionHigh;
@@ -872,7 +870,7 @@ export function drawnode_colorPicking() {
                 gl_Position = m * vec4(highDiff + lowDiff, 1.0);
             }`,
 
-        fragmentShader: 
+        fragmentShader:
             `precision highp float;
             #define SLICE_SIZE ${SLICE_SIZE + 1}
             uniform vec4 tileOffsetArr[SLICE_SIZE];
@@ -909,7 +907,7 @@ export function drawnode_colorPicking() {
     });
 }
 
-export function drawnode_heightPicking() {
+export function drawnode_heightPicking(): Program {
     return new Program("drawnode_heightPicking", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -921,7 +919,7 @@ export function drawnode_heightPicking() {
             aVertexPositionHigh: "vec3", aVertexPositionLow: "vec3"
         },
 
-        vertexShader: 
+        vertexShader:
             `precision highp float;
 
             attribute vec3 aVertexPositionHigh;
@@ -957,7 +955,7 @@ export function drawnode_heightPicking() {
                 gl_Position =  m * vec4(highDiff + lowDiff, 1.0);         
             }`,
 
-        fragmentShader: 
+        fragmentShader:
             `precision highp float;
 
             varying vec3 eyePosition;
@@ -982,7 +980,7 @@ export function drawnode_heightPicking() {
     });
 }
 
-export function drawnode_depth() {
+export function drawnode_depth(): Program {
     return new Program("drawnode_depth", {
         uniforms: {
             projectionMatrix: "mat4",
@@ -995,7 +993,7 @@ export function drawnode_depth() {
             aVertexPositionHigh: "vec3", aVertexPositionLow: "vec3"
         },
 
-        vertexShader: 
+        vertexShader:
             `precision highp float;
 
             attribute vec3 aVertexPositionHigh;
@@ -1029,7 +1027,7 @@ export function drawnode_depth() {
                 gl_Position =  m * vec4(highDiff + lowDiff, 1.0);    
             }`,
 
-        fragmentShader: 
+        fragmentShader:
             `precision highp float;
             uniform vec3 frustumPickingColor;
 

package/src/{og/shaders/geoObject.js → shaders/geoObject.ts}

@@ -1,8 +1,6 @@
-"use strict";
+import {Program} from "../webgl/Program";
 
-import { Program } from "../webgl/Program.js";
-
-export const geo_object = () =>
+export const geo_object = (): Program =>
     new Program("geo_object", {
         uniforms: {
             viewMatrix: "mat4",
@@ -25,13 +23,13 @@ export const geo_object = () =>
             aVertexNormal: "vec3",
             aTexCoord: "vec2",
 
-            aPositionHigh: { type: "vec3", divisor: 1 },
-            aPositionLow: { type: "vec3", divisor: 1 },
-            aDirection: { type: "vec3", divisor: 1 },
-            aPitchRoll: { type: "vec2", divisor: 1 },
-            aColor: { type: "vec4", divisor: 1 },
-            aScale: { type: "float", divisor: 1 },
-            aDispose: { type: "float", divisor: 1 }
+            aPositionHigh: {type: "vec3", divisor: 1},
+            aPositionLow: {type: "vec3", divisor: 1},
+            aDirection: {type: "vec3", divisor: 1},
+            aPitchRoll: {type: "vec2", divisor: 1},
+            aColor: {type: "vec4", divisor: 1},
+            aScale: {type: "float", divisor: 1},
+            aDispose: {type: "float", divisor: 1}
         },
         vertexShader:
             `precision highp float;
@@ -163,7 +161,7 @@ export const geo_object = () =>
                 }`
     });
 
-export const geo_object_picking = () =>
+export const geo_object_picking = (): Program =>
     new Program("geo_object_picking", {
         uniforms: {
             viewMatrix: "mat4",
@@ -175,13 +173,13 @@ export const geo_object_picking = () =>
         },
         attributes: {
             aVertexPosition: "vec3",
-            aPositionHigh: { type: "vec3", divisor: 1 },
-            aPositionLow: { type: "vec3", divisor: 1 },
-            aDirection: { type: "vec3", divisor: 1 },
-            aPitchRoll: { type: "vec2", divisor: 1 },
-            aPickingColor: { type: "vec3", divisor: 1 },
-            aScale: { type: "float", divisor: 1 },
-            aDispose: { type: "float", divisor: 1 }
+            aPositionHigh: {type: "vec3", divisor: 1},
+            aPositionLow: {type: "vec3", divisor: 1},
+            aDirection: {type: "vec3", divisor: 1},
+            aPitchRoll: {type: "vec2", divisor: 1},
+            aPickingColor: {type: "vec3", divisor: 1},
+            aScale: {type: "float", divisor: 1},
+            aDispose: {type: "float", divisor: 1}
         },
         vertexShader: `precision highp float;
 

package/src/{og/shaders/label.js → shaders/label.ts}

@@ -1,6 +1,4 @@
-'use strict';
-
-import { Program } from '../webgl/Program.js';
+import {Program} from '../webgl/Program';
 
 const DEFINE = `
 #define EMPTY -1.0
@@ -16,7 +14,7 @@ const ROTATE2D =
            sin(angle), cos(angle));
      }`;
 
-export function label_webgl2() {
+export function label_webgl2(): Program {
     return new Program("label", {
         uniforms: {
             viewport: "vec2",
@@ -234,7 +232,7 @@ export function label_webgl2() {
     });
 }
 
-export function label_screen() {
+export function label_screen(): Program {
     return new Program("label", {
         uniforms: {
             viewport: "vec2",
@@ -472,7 +470,7 @@ export function label_screen() {
     });
 }
 
-export function labelPicking() {
+export function labelPicking(): Program {
     return new Program("labelPicking", {
         uniforms: {
             viewport: "vec2",

package/src/{og/shaders/lumFilter.js → shaders/lumFilter.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import { Program } from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function lumFilter() {
+export function lumFilter(): Program {
     return new Program("lumFilter", {
         uniforms: {
             texture: "sampler2d",

package/src/{og/shaders/pickingMask.js → shaders/pickingMask.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import {Program} from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function pickingMask() {
+export function pickingMask(): Program {
     return new Program("pickingMask", {
         uniforms: {
             offset: "vec2"

package/src/{og/shaders/pointCloud.js → shaders/pointCloud.ts}

@@ -1,19 +1,16 @@
-'use strict';
-
-import { Program } from '../webgl/Program.js';
-import { types } from '../webgl/types.js';
+import { Program } from '../webgl/Program';
 
 //Picking is the same
-export function pointCloud() {
+export function pointCloud(): Program {
     return new Program("pointCloud", {
         uniforms: {
-            projectionViewMatrix: { type: types.MAT4 },
-            opacity: { type: types.FLOAT },
-            pointSize: { type: types.FLOAT }
+            projectionViewMatrix: "mat4",
+            opacity: "float",
+            pointSize: "float"
         },
         attributes: {
-            coordinates: { type: types.VEC3, enableArray: true },
-            colors: { type: types.VEC3, enableArray: true }
+            coordinates: "vec3",
+            colors: "vec3"
         },
         vertexShader:
             `attribute vec3 coordinates;

package/src/{og/shaders/polyline.js → shaders/polyline.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import { Program } from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function polyline_screen() {
+export function polyline_screen(): Program {
     return new Program("polyline_screen", {
         uniforms: {
             viewport: "vec2",
@@ -184,202 +182,7 @@ export function polyline_screen() {
     });
 }
 
-// export function polyline_screen() {
-//     return new Program("polyline_screen", {
-//         uniforms: {
-//             viewport: "vec2",
-//             proj: "mat4",
-//             view: "mat4",
-//             eyePositionHigh: "vec3",
-//             eyePositionLow: "vec3",
-//             uFloatParams: "vec2",
-//             thickness: "float",
-//             opacity: "float",
-//             depthOffset: "float"
-//         },
-//         attributes: {
-//             prevHigh: "vec3",
-//             currentHigh: "vec3",
-//             nextHigh: "vec3",
-//
-//             prevLow: "vec3",
-//             currentLow: "vec3",
-//             nextLow: "vec3",
-//
-//             order: "float",
-//
-//             color: "vec4"
-//         },
-//
-//         vertexShader:
-//             `#version 300 es
-//
-//                 precision highp float;
-//
-//                 in vec3 prevHigh;
-//                 in vec3 currentHigh;
-//                 in vec3 nextHigh;
-//
-//                 in vec3 prevLow;
-//                 in vec3 currentLow;
-//                 in vec3 nextLow;
-//
-//                 in float order;
-//
-//                 in vec4 color;
-//
-//                 uniform float thickness;
-//                 uniform mat4 proj;
-//                 uniform mat4 view;
-//                 uniform vec2 viewport;
-//                 uniform vec3 eyePositionHigh;
-//                 uniform vec3 eyePositionLow;
-//                 uniform float opacity;
-//                 uniform float depthOffset;
-//
-//                 out vec4 vColor;
-//                 out vec3 vPos;
-//                 out vec3 uCamPos;
-//
-//                 const float NEAR = -1.0;
-//
-//                 vec2 getIntersection(vec2 start1, vec2 end1, vec2 start2, vec2 end2){
-//                     vec2 dir = end2 - start2;
-//                     vec2 perp = vec2(-dir.y, dir.x);
-//                     float d2 = dot(perp, start2);
-//                     float seg = dot(perp, start1) - d2;
-//                     float prl = seg - dot(perp, end1) + d2;
-//                     if(prl > -1.0 && prl < 1.0){
-//                         return start1;
-//                     }
-//                     float u = seg / prl;
-//                     return start1 + u * (end1 - start1);
-//                 }
-//
-//                 vec2 project(vec4 p){
-//                     return (0.5 * p.xyz / p.w + 0.5).xy * viewport;
-//                 }
-//
-//                 void main(){
-//
-//                     uCamPos = eyePositionHigh + eyePositionLow;
-//
-//                     vColor = vec4(color.rgb, color.a * opacity);
-//
-//                     vec3 current = currentHigh + currentLow;
-//
-//                     vPos = current;
-//
-//                     mat4 viewMatrixRTE = view;
-//                     viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
-//
-//                     vec3 highDiff, lowDiff;
-//
-//                     highDiff = currentHigh - eyePositionHigh;
-//                     lowDiff = currentLow - eyePositionLow;
-//                     vec4 vCurrent = viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
-//
-//                     highDiff = prevHigh - eyePositionHigh;
-//                     lowDiff = prevLow - eyePositionLow;
-//                     vec4 vPrev = viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
-//
-//                     highDiff = nextHigh - eyePositionHigh;
-//                     lowDiff = nextLow - eyePositionLow;
-//                     vec4 vNext = viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
-//
-//                     /*Clip near plane, the point behind view plane*/
-//                     if(vCurrent.z > NEAR) {
-//                         if(vPrev.z < NEAR && abs(order) == 1.0){
-//                             vCurrent = vPrev + (vCurrent - vPrev) * (NEAR - vPrev.z) / (vCurrent.z - vPrev.z);
-//                         } else if(vNext.z < NEAR && abs(order) == 2.0){
-//                             vCurrent = vNext + (vCurrent - vNext) * (NEAR - vNext.z) / (vCurrent.z - vNext.z);
-//                         }
-//                     }
-//
-//                     vec4 dCurrent = proj * vCurrent;
-//                     vec2 _next = project(proj * vNext);
-//                     vec2 _prev = project(proj * vPrev);
-//                     vec2 _current = project(dCurrent);
-//
-//                     if(_prev == _current){
-//                         if(_next == _current){
-//                             _next = _current + vec2(1.0, 0.0);
-//                             _prev = _current - _next;
-//                         }else{
-//                             _prev = _current + normalize(_current - _next);
-//                         }
-//                     }
-//
-//                     if(_next == _current){
-//                         _next = _current + normalize(_current - _prev);
-//                     }
-//
-//                     vec2 sNext = _next,
-//                          sCurrent = _current,
-//                          sPrev = _prev;
-//
-//                     vec2 dirNext = normalize(sNext - sCurrent);
-//                     vec2 dirPrev = normalize(sPrev - sCurrent);
-//                     float dotNP = dot(dirNext, dirPrev);
-//
-//                     vec2 normalNext = normalize(vec2(-dirNext.y, dirNext.x));
-//                     vec2 normalPrev = normalize(vec2(dirPrev.y, -dirPrev.x));
-//
-//                     float d = thickness * sign(order);
-//
-//                     vec2 m;
-//                     if(dotNP >= 0.99991){
-//                         m = sCurrent - normalPrev * d;
-//                     }else{
-//                         m = getIntersection( sCurrent + normalPrev * d, sPrev + normalPrev * d,
-//                                 sCurrent + normalNext * d, sNext + normalNext * d );
-//
-//                         if( dotNP > 0.5 && dot(dirNext + dirPrev, m - sCurrent) < 0.0 ){
-//                             float occw = order * sign(dirNext.x * dirPrev.y - dirNext.y * dirPrev.x);
-//                             if(occw == -1.0){
-//                                 m = sCurrent + normalPrev * d;
-//                             }else if(occw == 1.0){
-//                                 m = sCurrent + normalNext * d;
-//                             }else if(occw == -2.0){
-//                                 m = sCurrent + normalNext * d;
-//                             }else if(occw == 2.0){
-//                                 m = sCurrent + normalPrev * d;
-//                             }
-//                         }else if(distance(sCurrent, m) > min(distance(sCurrent, sNext), distance(sCurrent, sPrev))){
-//                             m = sCurrent + normalNext * d;
-//                         }
-//                     }
-//
-//                     gl_Position = vec4((2.0 * m / viewport - 1.0) * dCurrent.w, dCurrent.z + depthOffset, dCurrent.w);
-//                 }`,
-//
-//         fragmentShader:
-//             `#version 300 es
-//
-//                 precision highp float;
-//
-//                 uniform vec2 uFloatParams;
-//
-//                 layout(location = 0) out vec4 diffuseColor;
-//                 layout(location = 1) out vec4 normalColor;
-//                 layout(location = 2) out vec4 distanceColor;
-//
-//                 in vec3 uCamPos;
-//                 in vec4 vColor;
-//                 in vec3 vPos;
-//
-//                 void main() {
-//                     vec3 look = vPos - uCamPos;
-//                     float lookLength = length(look);
-//                     float a = vColor.a * step(lookLength, sqrt(dot(uCamPos,uCamPos) - uFloatParams[0]) + sqrt(dot(vPos,vPos) - uFloatParams[0]));
-//                     diffuseColor = vec4(vColor.rgb, a);
-//                     normalColor = vec4(1.0);
-//                     distanceColor = vec4(1.0);
-//                 }`
-//     });
-// }
-
-export function polyline_picking() {
+export function polyline_picking(): Program {
     return new Program("polyline_picking", {
         uniforms: {
             viewport: "vec2",

package/src/{og/shaders/ray.js → shaders/ray.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import {Program} from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function rayScreen() {
+export function rayScreen(): Program {
     return new Program("rayScreen", {
         uniforms: {
             projectionMatrix: "mat4",

package/src/{og/shaders/screenFrame.js → shaders/screenFrame.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import {Program} from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function screenFrame() {
+export function screenFrame(): Program {
     return new Program("screenFrame", {
         uniforms: {
             texture: "sampler2d"

package/src/{og/shaders/skybox.js → shaders/skybox.ts}

@@ -1,17 +1,15 @@
-'use strict';
+import {Program} from '../webgl/Program';
+import {types} from '../webgl/types';
 
-import { Program } from '../webgl/Program.js';
-import { types } from '../webgl/types.js';
-
-export function skybox() {
+export function skybox(): Program {
     return new Program("skybox", {
         uniforms: {
-            projectionViewMatrix: { type: types.MAT4 },
-            uSampler: { type: types.SAMPLERCUBE },
-            pos: { type: types.VEC3 }
+            projectionViewMatrix: {type: types.MAT4},
+            uSampler: {type: types.SAMPLERCUBE},
+            pos: {type: types.VEC3}
         },
         attributes: {
-            aVertexPosition: { type: types.VEC3, enableArray: true }
+            aVertexPosition: {type: types.VEC3, enableArray: true}
         },
         vertexShader:
             `attribute vec3 aVertexPosition;

package/src/{og/shaders/toneMapping.js → shaders/toneMapping.ts}

@@ -1,8 +1,6 @@
-'use strict';
+import {Program} from '../webgl/Program';
 
-import { Program } from '../webgl/Program.js';
-
-export function toneMapping() {
+export function toneMapping(): Program {
     return new Program("toneMapping", {
         uniforms: {
             hdrBuffer: "sampler2d",

package/src/{og/shaders/utils.js → shaders/utils.ts}

@@ -1,5 +1,3 @@
-'use strict';
-
 export const UTILS = `
     float getLerpValue(in float min, in float max, in float between)
     {