@openglobus/og 0.22.1 → 0.23.0

package/lib/js/scene/RenderNode.js

@@ -1,4 +1,5 @@
 import { BaseNode } from "./BaseNode";
+import { Quat } from "../math/Quat";
 /**
  * Render node is a logical part of a render mechanism. Represents scene rendering.
  * For example one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
@@ -18,14 +19,16 @@ class RenderNode extends BaseNode {
         this.show = true;
         this._isActive = true;
         this.lightEnabled = false;
-        this._lights = [];
-        this._lightsNames = [];
-        this._lightsPositions = [];
-        this._lightsParamsv = [];
-        this._lightsParamsf = [];
+        this._lightPosition = new Float32Array([100, 100, 100]);
+        this._lightParams = new Float32Array(9);
+        this._lightShininess = 100.0;
         this.entityCollections = [];
+        this._entityCollectionsByDepthOrder = [];
         this._pickingId = -1;
     }
+    getFrameRotation(cartesian) {
+        return Quat.IDENTITY;
+    }
     /**
      * Adds node to the current hierarchy.
      * @public
@@ -87,8 +90,17 @@ class RenderNode extends BaseNode {
      * @returns {RenderNode} -
      */
     addEntityCollection(entityCollection, isHidden) {
-        entityCollection.addTo(this, isHidden);
-        return this;
+        if (!entityCollection.renderNode) {
+            entityCollection.renderNode = this;
+            if (!isHidden) {
+                this.entityCollections.push(entityCollection);
+                this.updateEntityCollectionsDepthOrder();
+            }
+            //@ts-ignore
+            this.ellipsoid && entityCollection._updateGeodeticCoordinates(this.ellipsoid);
+            entityCollection.bindRenderNode(this);
+            entityCollection.events.dispatch(entityCollection.events.add, this);
+        }
     }
     /**
      * Removes entity collection.
@@ -96,7 +108,29 @@ class RenderNode extends BaseNode {
      * @param {EntityCollection} entityCollection - Entity collection for remove.
      */
     removeEntityCollection(entityCollection) {
-        entityCollection.remove();
+        for (let i = 0; i < this.entityCollections.length; i++) {
+            if (this.entityCollections[i].isEqual(entityCollection)) {
+                this.entityCollections.splice(i, 1);
+                this.updateEntityCollectionsDepthOrder();
+                return;
+            }
+        }
+    }
+    updateEntityCollectionsDepthOrder() {
+        let grouped = { 0: [] };
+        for (const ec of this.entityCollections) {
+            if (ec.getVisibility()) {
+                if (!grouped[ec.depthOrder]) {
+                    grouped[ec.depthOrder] = [];
+                }
+                grouped[ec.depthOrder].push(ec);
+            }
+        }
+        this._entityCollectionsByDepthOrder.length = 0;
+        this._entityCollectionsByDepthOrder = [];
+        this._entityCollectionsByDepthOrder = Object.keys(grouped)
+            .sort((a, b) => Number(a) - Number(b))
+            .map(key => grouped[Number(key)]);
     }
     /**
      * Adds point light source.
@@ -108,24 +142,6 @@ class RenderNode extends BaseNode {
         light.addTo(this);
         return this;
     }
-    /**
-     * Gets light object by its name.
-     * @public
-     * @param {string} name - Point light name.
-     * @returns {LightSource}
-     */
-    getLightByName(name) {
-        let li = this._lightsNames.indexOf(name);
-        return this._lights[li];
-    }
-    /**
-     * Removes light source.
-     * @public
-     * @param {LightSource} light - Light source object.
-     */
-    removeLight(light) {
-        light.remove();
-    }
     /**
      * Calls render frame node's callback. Used in renderer.
      * @public
@@ -181,34 +197,26 @@ class RenderNode extends BaseNode {
             this.childNodes[i].setDrawMode(mode);
         }
     }
-    /**
-     * IMPORTANT: This function have to be called manually in each render node frame callback, before drawing scene geometry.
-     * @public
-     */
-    transformLights() {
-        for (let i = 0; i < this._lights.length; i++) {
-            let ii = i * 3;
-            let tp;
-            tp = this._lights[i]._position;
-            this._lightsPositions[ii] = tp.x;
-            this._lightsPositions[ii + 1] = tp.y;
-            this._lightsPositions[ii + 2] = tp.z;
-        }
-        // for (let i = 0; i < this._lights.length; i++) {
-        //     var ii = i * 4;
-        //     var tp;
-        //     if (this._lights[i].directional) {
-        //         tp = r.activeCamera._normalMatrix.mulVec(this._lights[i]._position);
-        //         this._lightsTransformedPositions[ii + 3] = 0;
-        //     } else {
-        //         tp = r.activeCamera._viewMatrix.mulVec3(this._lights[i]._position);
-        //         this._lightsTransformedPositions[ii + 3] = 1;
-        //     }
-        //     this._lightsTransformedPositions[ii] = tp.x;
-        //     this._lightsTransformedPositions[ii + 1] = tp.y;
-        //     this._lightsTransformedPositions[ii + 2] = tp.z;
-        // }
-    }
+    // /**
+    //  * IMPORTANT: This function have to be called manually in each render node frame callback, before drawing scene geometry.
+    //  * @public
+    //  */
+    // public transformLights() {
+    //     // for (let i = 0; i < this._lights.length; i++) {
+    //     //     var ii = i * 4;
+    //     //     var tp;
+    //     //     if (this._lights[i].directional) {
+    //     //         tp = r.activeCamera._normalMatrix.mulVec(this._lights[i]._position);
+    //     //         this._lightsTransformedPositions[ii + 3] = 0;
+    //     //     } else {
+    //     //         tp = r.activeCamera._viewMatrix.mulVec3(this._lights[i]._position);
+    //     //         this._lightsTransformedPositions[ii + 3] = 1;
+    //     //     }
+    //     //     this._lightsTransformedPositions[ii] = tp.x;
+    //     //     this._lightsTransformedPositions[ii + 1] = tp.y;
+    //     //     this._lightsTransformedPositions[ii + 2] = tp.z;
+    //     // }
+    // }
     updateBillboardsTexCoords() {
         for (let i = 0; i < this.entityCollections.length; i++) {
             this.entityCollections[i].billboardHandler.refreshTexCoordsArr();
@@ -234,7 +242,9 @@ class RenderNode extends BaseNode {
         if (this.show) {
             //this.lightEnabled && this.transformLights();
             this.preFrame();
-            this.drawEntityCollections(this.entityCollections);
+            for (let i = 0; i < this._entityCollectionsByDepthOrder.length; i++) {
+                this.drawEntityCollections(this._entityCollectionsByDepthOrder[i], i);
+            }
         }
     }
     _drawNodes() {
@@ -247,8 +257,8 @@ class RenderNode extends BaseNode {
             this.frame();
         }
     }
-    drawEntityCollections(ec) {
-        this.renderer.enqueueEntityCollectionsToDraw(ec);
+    drawEntityCollections(ec, depthOrder = 0) {
+        this.renderer.enqueueEntityCollectionsToDraw(ec, depthOrder);
     }
     /**
      * Draw entity collections picking frame.
@@ -295,7 +305,9 @@ class RenderNode extends BaseNode {
         }
     }
     _entityCollectionPickingCallback() {
-        this.drawPickingEntityCollections(this.entityCollections);
+        // for (let i = 0; i < this._entityCollectionsByDepthOrder.length; i++) {
+        //     this.drawPickingEntityCollections(this._entityCollectionsByDepthOrder[i]);
+        // }
     }
 }
 export { RenderNode };

package/lib/js/shaders/depth.js

@@ -2,7 +2,7 @@ import { Program } from '../webgl/Program';
 export function depth() {
     return new Program("depth", {
         uniforms: {
-            depthTexture: "sampler2d"
+            depthTexture: "sampler2D"
         },
         attributes: {
             corners: "vec2"
@@ -21,8 +21,6 @@ export function depth() {
 
             precision highp float;
 
-            #define MAX_FRUSTUMS 4
-
             uniform sampler2D depthTexture;
            
             in vec2 tc;
@@ -31,8 +29,7 @@ export function depth() {
 
             float LinearizeDepth(in vec2 uv)
             {
-                float depth = texture(depthTexture, tc).x;
-                return depth;//(2.0 * zNear) / (zFar + zNear - depth * (zFar - zNear));
+                return texture(depthTexture, tc).r;
             }
             
             void main(void) {

package/lib/js/shaders/drawnode.d.ts

@@ -1,5 +1,6 @@
 import { AtmosphereParameters } from "./atmos";
 import { Program } from "../webgl/Program";
+export declare const ENCODE24 = "vec3 encode24(highp float f) {\n                float F = abs(f);\n                float s = step( 0.0, -f );\n                float e = floor( log2(F) );\n                float m = exp2(- e) * F;\n                e = floor( log2(F) + 127.0 ) + floor( log2(m) );\n                return vec3(\n                    ( 128.0 * s + floor( e * exp2(-1.0) ) ) / 255.0,\n                    ( 128.0 * mod( e, 2.0 ) + mod( floor( m * 128.0 ), 128.0 ) ) / 255.0,\n                    floor( mod( floor( m * exp2( 23.0 - 8.0) ), exp2(8.0) ) ) / 255.0);\n            }";
 export declare function drawnode_screen_nl(): Program;
 export declare function drawnode_screen_wl_webgl1NoAtmos(): Program;
 export declare function drawnode_screen_wl_webgl2NoAtmos(): Program;

package/lib/js/shaders/drawnode.js

@@ -19,6 +19,17 @@ const DEF_BLEND_PICKING = `#define blendPicking(DEST, OFFSET, SAMPLER, MASK, COL
     p = texture2D(MASK, tc); \
     DEST = mix(DEST, vec4(max(COLOR.rgb, p.rgb), OPACITY), (t.a == 0.0 ? 0.0 : 1.0) * COLOR.a);`;
 const SLICE_SIZE = 4;
+export const ENCODE24 = `vec3 encode24(highp float f) {
+                float F = abs(f);
+                float s = step( 0.0, -f );
+                float e = floor( log2(F) );
+                float m = exp2(- e) * F;
+                e = floor( log2(F) + 127.0 ) + floor( log2(m) );
+                return vec3(
+                    ( 128.0 * s + floor( e * exp2(-1.0) ) ) / 255.0,
+                    ( 128.0 * mod( e, 2.0 ) + mod( floor( m * 128.0 ), 128.0 ) ) / 255.0,
+                    floor( mod( floor( m * exp2( 23.0 - 8.0) ), exp2(8.0) ) ) / 255.0);
+            }`;
 export function drawnode_screen_nl() {
     return new Program("drawnode_screen_nl", {
         uniforms: {
@@ -117,7 +128,7 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
             uNormalMap: "sampler2d",
             nightTexture: "sampler2d",
             specularTexture: "sampler2d",
-            lightsPositions: "vec3",
+            lightPosition: "vec3",
             diffuse: "vec3",
             ambient: "vec3",
             specular: "vec4",
@@ -172,7 +183,6 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
         fragmentShader: `
             precision highp float;
             
-            #define MAX_POINT_LIGHTS 1
             #define SLICE_SIZE ${SLICE_SIZE + 1}
 
             uniform vec4 specular;
@@ -186,7 +196,7 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
             uniform sampler2D samplerArr[SLICE_SIZE];
 
             uniform vec4 tileOffsetArr[SLICE_SIZE];
-            uniform vec3 lightsPositions[MAX_POINT_LIGHTS];
+            uniform vec3 lightPosition;
             uniform float layerOpacityArr[SLICE_SIZE];
 
             uniform int samplerCount;
@@ -209,7 +219,7 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
                                                
             void main(void) {
             
-                sunPos = lightsPositions[0];
+                sunPos = lightPosition;
                                 
                 vec3 texNormal = texture2D(uNormalMap, vTextureCoord.zw).rgb;
                 vec3 normal = normalize((texNormal - 0.5) * 2.0);
@@ -293,7 +303,7 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
             uNormalMap: "sampler2d",
             nightTexture: "sampler2d",
             specularTexture: "sampler2d",
-            lightsPositions: "vec3",
+            lightPosition: "vec3",
             diffuse: "vec3",
             ambient: "vec3",
             specular: "vec4",
@@ -353,7 +363,7 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
 
             precision highp float;
             
-            #define MAX_POINT_LIGHTS 1
+
             #define SLICE_SIZE ${SLICE_SIZE + 1}
 
             uniform vec4 specular;
@@ -367,7 +377,7 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
             uniform sampler2D samplerArr[SLICE_SIZE];
 
             uniform vec4 tileOffsetArr[SLICE_SIZE];
-            uniform vec3 lightsPositions[MAX_POINT_LIGHTS];
+            uniform vec3 lightPosition;
             uniform float layerOpacityArr[SLICE_SIZE];
 
             uniform int samplerCount;
@@ -395,7 +405,7 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
                                                
             void main(void) {
             
-                sunPos = lightsPositions[0];
+                sunPos = lightPosition;
                                 
                 vec3 texNormal = texture(uNormalMap, vTextureCoord.zw).rgb;
                 vec3 normal = normalize((texNormal - 0.5) * 2.0);
@@ -486,7 +496,7 @@ export function drawnode_screen_wl_webgl2Atmos(atmosParams) {
             uNormalMap: "sampler2d",
             nightTexture: "sampler2d",
             specularTexture: "sampler2d",
-            lightsPositions: "vec3",
+            lightPosition: "vec3",
             diffuse: "vec3",
             ambient: "vec3",
             specular: "vec4",
@@ -549,14 +559,13 @@ export function drawnode_screen_wl_webgl2Atmos(atmosParams) {
 
             precision highp float;
             
-            #define MAX_POINT_LIGHTS 1
             #define SLICE_SIZE ${SLICE_SIZE + 1}
 
             uniform vec4 specular;
             uniform vec3 diffuse;
             uniform vec3 ambient;
 
-            uniform vec3 lightsPositions[MAX_POINT_LIGHTS];
+            uniform vec3 lightPosition;
 
             uniform sampler2D uNormalMap;
             uniform sampler2D nightTexture;
@@ -720,7 +729,7 @@ export function drawnode_screen_wl_webgl2Atmos(atmosParams) {
 
             void main(void) {
             
-                sunPos = lightsPositions[0];
+                sunPos = lightPosition;
                                 
                 vec3 texNormal = texture(uNormalMap, vTextureCoord.zw).rgb;
                 vec3 normal = normalize((texNormal - 0.5) * 2.0);
@@ -908,50 +917,34 @@ export function drawnode_heightPicking() {
             uniform vec3 eyePositionHigh;
             uniform vec3 eyePositionLow;
             uniform float height;
-
-            varying vec3 eyePosition;
-            varying vec3 vertexPosition;
+            
+            varying vec4 vert;
 
             void main(void) {
 
-                // This code is works for Mac Chrome and Safari
-                // any other code probably will produce jittering
-
                 mat4 viewMatrixRTE = viewMatrix;
                 viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
 
-                mat4 m = projectionMatrix * viewMatrixRTE;
-
                 vec3 nh = height * normalize(aVertexPositionHigh + aVertexPositionLow);
 
-                eyePosition = eyePositionHigh + eyePositionLow;
-                vertexPosition = aVertexPositionHigh + aVertexPositionLow;
+                vec3 eyePosition = eyePositionHigh + eyePositionLow;
+                vec3 vertexPosition = aVertexPositionHigh + aVertexPositionLow;
 
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
                 vec3 lowDiff = aVertexPositionLow - eyePositionLow + nh;
                 
-                gl_Position =  m * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);         
+                vert = viewMatrixRTE * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
+                
+                gl_Position =  projectionMatrix * vert;         
             }`,
         fragmentShader: `precision highp float;
+            
+            varying vec4 vert;
 
-            varying vec3 eyePosition;
-            varying vec3 vertexPosition;
-
-            vec3 encode24(highp float f) {
-                float F = abs(f);
-                float s = step( 0.0, -f );
-                float e = floor( log2(F) );
-                float m = exp2(- e) * F;
-                e = floor( log2(F) + 127.0 ) + floor( log2(m) );
-                return vec3(
-                    ( 128.0 * s + floor( e * exp2(-1.0) ) ) / 255.0,
-                    ( 128.0 * mod( e, 2.0 ) + mod( floor( m * 128.0 ), 128.0 ) ) / 255.0,
-                    floor( mod( floor( m * exp2( 23.0 - 8.0) ), exp2(8.0) ) ) / 255.0);
-            }
+            ${ENCODE24}
 
             void main(void) {
-                float range = distance(eyePosition, vertexPosition);
-                gl_FragColor = vec4(encode24(range), 1.0);
+                gl_FragColor = vec4(encode24(length(vert.xyz)), 1.0);
             }`
     });
 }
@@ -963,14 +956,17 @@ export function drawnode_depth() {
             height: "float",
             eyePositionHigh: "vec3",
             eyePositionLow: "vec3",
-            frustumPickingColor: "vec3"
+            frustumPickingColor: "float"
         }, attributes: {
-            aVertexPositionHigh: "vec3", aVertexPositionLow: "vec3"
+            aVertexPositionHigh: "vec3",
+            aVertexPositionLow: "vec3"
         },
-        vertexShader: `precision highp float;
+        vertexShader: `#version 300 es
+            
+            precision highp float;
 
-            attribute vec3 aVertexPositionHigh;
-            attribute vec3 aVertexPositionLow;
+            in vec3 aVertexPositionHigh;
+            in vec3 aVertexPositionLow;
 
             uniform mat4 projectionMatrix;
             uniform mat4 viewMatrix;
@@ -980,10 +976,6 @@ export function drawnode_depth() {
 
             void main(void) {
 
-                // @hack
-                // This code is works for Mac Chrome and Safari
-                // any other code probably will produce jittering
-
                 mat4 viewMatrixRTE = viewMatrix;
                 viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
 
@@ -999,11 +991,18 @@ export function drawnode_depth() {
                 
                 gl_Position =  m * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);    
             }`,
-        fragmentShader: `precision highp float;
-            uniform vec3 frustumPickingColor;
+        fragmentShader: `#version 300 es
+            
+            precision highp float;
+            
+            uniform float frustumPickingColor;
+
+            layout(location = 0) out vec4 frustumColor;
+            layout(location = 1) out vec4 depthColor;
 
             void main(void) {
-                gl_FragColor = vec4(frustumPickingColor, 1.0);
-            } `
+                frustumColor = vec4(frustumPickingColor, frustumPickingColor, frustumPickingColor, 1.0);
+                depthColor = vec4(gl_FragCoord.z, gl_FragCoord.z, gl_FragCoord.z, 1.0);
+            }`
     });
 }

package/lib/js/shaders/geoObject.d.ts

@@ -1,3 +1,4 @@
 import { Program } from "../webgl/Program";
 export declare const geo_object: () => Program;
 export declare const geo_object_picking: () => Program;
+export declare const geo_object_depth: () => Program;