@openglobus/og 0.18.2 → 0.18.4

package/lib/js/control/Atmosphere.js

@@ -30,7 +30,7 @@ export class Atmosphere extends Control {
         this.planet && this.planet.events.off("draw", this._drawBackground);
     }
     _drawAtmosphereTextures() {
-        let width = 256, height = 128;
+        let width = 1024, height = 1024;
         this._transmittanceBuffer = new Framebuffer(this.renderer.handler, {
             width: width,
             height: height,
@@ -142,7 +142,7 @@ function atmosphereBackgroundShader() {
                 gl_Position = vec4(corners, 0.0, 1.0);
             }`,
         fragmentShader: `                                   
-            precision highp float;
+            precision lowp float;
             
             ${atmos.COMMON}
             
@@ -242,7 +242,7 @@ function atmosphereBackgroundShader() {
                     if (offset > 0.0) {
                         // intersection of camera ray with atmosphere
                         rayOrigin = cameraPosition + rayDirection * offset;
-                    }
+                    }                   
                     
                     float height = length(rayOrigin) - BOTTOM_RADIUS;
                     float rayAngle = dot(rayOrigin, rayDirection) / length(rayOrigin);
@@ -258,12 +258,13 @@ function atmosphereBackgroundShader() {
                     
                     bool hitGround = intersectSphere(cameraPosition, rayDirection, BOTTOM_RADIUS, distanceToGround) && distanceToGround > 0.0;
                     
-                    if(intersectSphere(cameraPosition, rayDirection, BOTTOM_RADIUS - 15000.0, distanceToGround) && hitGround){
+                    if(intersectSphere(cameraPosition, rayDirection, BOTTOM_RADIUS - 15000.0, distanceToGround) && hitGround)
+                    {
                         discard;
                     }
                     
                     float segmentLength = ((hitGround ? distanceToGround : distanceToSpace) - max(offset, 0.0)) / float(SAMPLE_COUNT);
-                            
+                                                                    
                     float t = segmentLength * 0.5;
                     
                     vec3 transmittanceCamera; 
@@ -276,17 +277,13 @@ function atmosphereBackgroundShader() {
                         vec3 up = position / length(position);
                         float rayAngle = dot(up, rayDirection);
                         float lightAngle = dot(up, lightDirection);
-                        // shadow is ommitted because it can create banding artifacts with low sample counts
-                        // float distanceToGround;
-                        // float shadow = intersectSphere(position, lightDirection, BOTTOM_RADIUS, distanceToGround) && distanceToGround >= 0.0 ? 0.0 : 1.0;         
-                        float shadow = 1.0;
                         vec3 transmittanceToSpace = transmittanceFromTexture(height, cameraBelow ? -rayAngle : rayAngle);
                         transmittanceCamera = cameraBelow ? (transmittanceToSpace / transmittanceFromCameraToSpace) : (transmittanceFromCameraToSpace / transmittanceToSpace);
                         transmittanceLight = transmittanceFromTexture(height, lightAngle);
                         vec2 opticalDensity = exp(-height / rayleighMieHeights);
                         vec3 scatteredLight = transmittanceLight * (rayleighScatteringCoefficient * opticalDensity.x * rayleighPhase + mieScatteringCoefficient * opticalDensity.y * miePhase);
                         scatteredLight += multipleScatteringContributionFromTexture(height, lightAngle) * (rayleighScatteringCoefficient * opticalDensity.x + mieScatteringCoefficient * opticalDensity.y);  
-                        light += shadow * transmittanceCamera * scatteredLight * segmentLength;
+                        light += transmittanceCamera * scatteredLight * segmentLength;
                         t += segmentLength;
                     }
                     

package/lib/js/entity/LabelWorker.js

@@ -20,10 +20,10 @@ class LabelWorker extends BaseWorker {
     make(data) {
         let label = data.label, handler = data.handler;
         if (handler._entityCollection) {
-            if (this._workerQueue.length) {
-                let w = this._workerQueue.pop();
-                let labelData = label.serializeWorkerData(this._sourceId);
-                if (labelData) {
+            let labelData = label.serializeWorkerData(this._sourceId);
+            if (labelData) {
+                if (this._workerQueue.length) {
+                    let w = this._workerQueue.pop();
                     this._source.set(this._sourceId, data);
                     label._lockId = this._sourceId;
                     this._sourceId++;
@@ -33,9 +33,9 @@ class LabelWorker extends BaseWorker {
                         labelData.buffer,
                     ]);
                 }
-            }
-            else {
-                this._pendingQueue.push(data);
+                else {
+                    this._pendingQueue.push(data);
+                }
             }
         }
     }

package/lib/js/input/KeyboardHandler.js

@@ -116,6 +116,8 @@ class KeyboardHandler {
         return this._currentlyPressedKeys[keyCode];
     }
     handleKeyDown() {
+        // If you want to get a key code just uncomment and check console
+        //console.log(this._event!.keyCode);
         this._anykeyCallback && this._anykeyCallback.callback.call(this._anykeyCallback.sender, this._event);
         this._currentlyPressedKeys[this._event.keyCode] = true;
         for (let ch in this._charkeysCallbacks) {

package/lib/js/input/input.js

@@ -1,4 +1,7 @@
 export const input = {
+    MB_LEFT: 0,
+    MB_RIGHT: 2,
+    MB_MIDDLE: 1,
     KEY_CTRL: 17,
     KEY_ALT: 18,
     KEY_SHIFT: 16,
@@ -34,9 +37,11 @@ export const input = {
     KEY_F1: 112,
     KEY_MINUS: 173,
     KEY_APOSTROPHE: 192,
-    MB_LEFT: 0,
-    MB_RIGHT: 2,
-    MB_MIDDLE: 1,
     KEY_BACK_SLASH: 220,
+    KEY_MORE: 190,
+    KEY_SLASH: 191,
+    KEY_LESS: 188,
+    KEY_LEFT_SQUARE_BRACKET: 219,
+    KEY_RIGHT_SQUARE_BRACKET: 221,
     KEY_SINGLE_QUOTE: 222
 };

package/lib/js/scene/Planet.js

@@ -112,7 +112,7 @@ export class Planet extends RenderNode {
         this._ambient = new Float32Array([a.x, a.y, a.z]);
         this._diffuse = new Float32Array([d.x, d.y, d.z]);
         this._specular = new Float32Array([s.x, s.y, s.z, shininess]);
-        this._maxGridSize = Math.log2(options.maxGridSize || 128);
+        this._maxGridSize = Math.log2(options.maxGridSize || 256);
         this.SLICE_SIZE = 4;
         this.SLICE_SIZE_4 = this.SLICE_SIZE * 4;
         this.SLICE_SIZE_3 = this.SLICE_SIZE * 3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.18.2",
+  "version": "0.18.4",
   "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers, and 3D objects. It uses the WebGL technology, open source, and completely free.",
   "directories": {
     "example": "./sandbox"