@openglobus/og 0.18.5 → 0.19.1

package/lib/js/shaders/drawnode.js

@@ -299,7 +299,8 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
             ambient: "vec3",
             specular: "vec4",
             camHeight: "float",
-            nightTextureCoefficient: "float"
+            nightTextureCoefficient: "float",
+            transitionOpacity: "float"
         }, attributes: {
             aVertexPositionHigh: "vec3",
             aVertexPositionLow: "vec3",
@@ -373,6 +374,8 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
 
             uniform int samplerCount;
             uniform float nightTextureCoefficient;
+            
+            uniform float transitionOpacity;
                 
             uniform float camHeight;
 
@@ -424,8 +427,10 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
                 vec4 lightWeighting = vec4(ambient + diffuse * diffuseLightWeighting + night, 1.0);
                 
                 diffuseColor = texture( defaultTexture, vTextureCoord.xy );
+                
                 if( samplerCount == 0 ) {
                     diffuseColor = diffuseColor * lightWeighting + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
@@ -434,29 +439,34 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
                 blend(diffuseColor, samplerArr[0], tileOffsetArr[0], layerOpacityArr[0]);
                 if( samplerCount == 1 ) {                
                     diffuseColor = diffuseColor * lightWeighting + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[1], tileOffsetArr[1], layerOpacityArr[1]);
                 if( samplerCount == 2 ) {
                     diffuseColor = diffuseColor * lightWeighting + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[2], tileOffsetArr[2], layerOpacityArr[2]);
                 if( samplerCount == 3 ) {
                     diffuseColor = diffuseColor * lightWeighting + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[3], tileOffsetArr[3], layerOpacityArr[3]);
                 if( samplerCount == 4 ) {
                     diffuseColor = diffuseColor * lightWeighting + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[4], tileOffsetArr[4], layerOpacityArr[4]);
                 diffuseColor = diffuseColor * lightWeighting + vec4(spec, 0.0);
+                diffuseColor *= transitionOpacity;
             }`
     });
 }
@@ -486,7 +496,8 @@ export function drawnode_screen_wl_webgl2Atmos() {
             scatteringTexture: "sampler2D",
             camHeight: "float",
             nightTextureCoefficient: "float",
-            maxMinOpacity: "vec2"
+            maxMinOpacity: "vec2",
+            transitionOpacity: "float"
         }, attributes: {
             aVertexPositionHigh: "vec3",
             aVertexPositionLow: "vec3",
@@ -566,6 +577,8 @@ export function drawnode_screen_wl_webgl2Atmos() {
             
             uniform vec2 maxMinOpacity;                
             uniform float camHeight;
+            
+            uniform float transitionOpacity;
 
             in vec4 vTextureCoord;
             in vec3 v_vertex;
@@ -749,6 +762,7 @@ export function drawnode_screen_wl_webgl2Atmos() {
                 diffuseColor = texture( defaultTexture, vTextureCoord.xy );
                 if( samplerCount == 0 ) {
                     diffuseColor = mix(diffuseColor * lightWeighting, atmosColor, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
@@ -757,29 +771,34 @@ export function drawnode_screen_wl_webgl2Atmos() {
                 blend(diffuseColor, samplerArr[0], tileOffsetArr[0], layerOpacityArr[0]);
                 if( samplerCount == 1 ) {                
                     diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[1], tileOffsetArr[1], layerOpacityArr[1]);
                 if( samplerCount == 2 ) {
                     diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[2], tileOffsetArr[2], layerOpacityArr[2]);
                 if( samplerCount == 3 ) {
                     diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[3], tileOffsetArr[3], layerOpacityArr[3]);
                 if( samplerCount == 4 ) {
                     diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor *= transitionOpacity;
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[4], tileOffsetArr[4], layerOpacityArr[4]);
                 diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
+                diffuseColor *= transitionOpacity;
             }`
     });
 }

package/lib/js/shaders/geoObject.js

@@ -38,7 +38,6 @@ export const geo_object = () => new Program("geo_object", {
             attribute float aUseTexture;
             attribute vec2 aTexCoord;
             
-            uniform float uUseTexture;
             uniform vec3 uScaleByDistance;
             uniform mat4 projectionMatrix;
             uniform mat4 viewMatrix;
@@ -51,7 +50,6 @@ export const geo_object = () => new Program("geo_object", {
             varying vec3 v_vertex;           
             varying vec4 vColor;
             varying float vDispose;
-            varying float vUseTexture;
             varying vec2 vTexCoords;
             
             const float PI = 3.141592653589793;
@@ -64,22 +62,25 @@ export const geo_object = () => new Program("geo_object", {
                    return;
                 }
             
-                vUseTexture = uUseTexture;
                 vColor = aColor;
                 vTexCoords = aTexCoord;
               
-                float roll = aPitchRoll.y;
+                float cos_roll = cos(aPitchRoll.y);
+                float sin_roll = sin(aPitchRoll.y);
+                
                 mat3 rotZ = mat3(
-                     vec3(cos(roll), sin(roll), 0.0),
-                     vec3(-sin(roll), cos(roll), 0.0), 
+                     vec3(cos_roll, sin_roll, 0.0),
+                     vec3(-sin_roll, cos_roll, 0.0), 
                      vec3(0.0, 0.0, 1.0) 
                 );
 
-                float pitch = aPitchRoll.x;
+                float cos_pitch = cos(aPitchRoll.x);
+                float sin_pitch = sin(aPitchRoll.x);
+
                 mat3 rotX = mat3(
                     vec3(1.0, 0.0, 0.0),
-                    vec3(0.0, cos(pitch), sin(pitch)), 
-                    vec3(0.0, -sin(pitch), cos(pitch)) 
+                    vec3(0.0, cos_pitch, sin_pitch), 
+                    vec3(0.0, -sin_pitch, cos_pitch) 
                );
 
                 vec3 position = aPositionHigh + aPositionLow;
@@ -125,13 +126,13 @@ export const geo_object = () => new Program("geo_object", {
                 uniform vec3 lightsParamsv[MAX_POINT_LIGHTS * 3];
                 uniform float lightsParamsf[MAX_POINT_LIGHTS];                
                 uniform sampler2D uTexture;
-                
+                uniform float uUseTexture;
+                            
                 varying vec3 cameraPosition;
                 varying vec3 v_vertex;                
                 varying vec4 vColor;
                 varying vec3 vNormal;
                 varying vec2 vTexCoords;
-                varying float vUseTexture;
                 
                 void main(void) {                
                     vec3 normal = normalize(vNormal);
@@ -144,7 +145,8 @@ export const geo_object = () => new Program("geo_object", {
                     float diffuseLightWeighting = max(dot(normal, lightDir), 0.0);
                     vec3 lightWeighting = lightsParamsv[0] + lightsParamsv[1] * diffuseLightWeighting + lightsParamsv[2] * specularLightWeighting;
                     vec4 tColor = texture2D(uTexture, vTexCoords);
-                    if(vUseTexture > 0.0){
+                    
+                    if(uUseTexture > 0.0) {
                         gl_FragColor = vec4(tColor.rgb * lightWeighting, tColor.a);
                     } else {
                         gl_FragColor = vec4(vColor.rgb * lightWeighting, vColor.a);
@@ -200,19 +202,23 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
             
                  vColor = aPickingColor;
                
-                 float roll = aPitchRoll.y;
-                 mat3 rotZ = mat3(
-                      vec3(cos(roll), sin(roll), 0.0),
-                      vec3(-sin(roll), cos(roll), 0.0), 
-                      vec3(0.0, 0.0, 1.0) 
-                 );
- 
-                 float pitch = aPitchRoll.x;
-                 mat3 rotX = mat3(
-                     vec3(1.0, 0.0, 0.0),
-                     vec3(0.0, cos(pitch), sin(pitch)), 
-                     vec3(0.0, -sin(pitch), cos(pitch)) 
+                float cos_roll = cos(aPitchRoll.y);
+                float sin_roll = sin(aPitchRoll.y);
+                
+                mat3 rotZ = mat3(
+                     vec3(cos_roll, sin_roll, 0.0),
+                     vec3(-sin_roll, cos_roll, 0.0), 
+                     vec3(0.0, 0.0, 1.0) 
                 );
+
+                float cos_pitch = cos(aPitchRoll.x);
+                float sin_pitch = sin(aPitchRoll.x);
+
+                mat3 rotX = mat3(
+                    vec3(1.0, 0.0, 0.0),
+                    vec3(0.0, cos_pitch, sin_pitch), 
+                    vec3(0.0, -sin_pitch, cos_pitch) 
+               );
  
                  vec3 position = aPositionHigh + aPositionLow;
                  vec3 cameraPosition = eyePositionHigh + eyePositionLow;

package/lib/js/terrain/GlobusTerrain.js

@@ -47,7 +47,7 @@ class GlobusTerrain extends EmptyTerrain {
         this.name = name || "openglobus";
         this.url = options.url || "https://{s}.srtm3.openglobus.org/{z}/{y}/{x}.ddm";
         this.gridSizeByZoom = options.gridSizeByZoom || [
-            64, 32, 32, 16, 16, 8, 8, 8, 8, 16, 16, 16, 16, 32, 32, 16, 8, 4, 2, 2, 2, 2, 2, 2
+            64, 32, 32, 16, 16, 8, 8, 8, 16, 16, 16, 32, 32, 32, 32, 16, 8, 4, 2, 2, 2, 2, 2, 2
         ];
         this._heightFactor = options.heightFactor != undefined ? options.heightFactor : 1.0;
         this.noDataValues = options.noDataValues || [];

package/lib/js/utils/shared.d.ts

@@ -78,6 +78,7 @@ export declare function binarySearchFast(arr: number[] | TypedArray, x: number):
  */
 export declare function binarySearch(ar: any[], el: any, compare_fn: Function): number;
 /**
+ * @todo: replace any with generic
  * Binary insertion that uses binarySearch algorithm.
  * @param {any[]} ar - The sorted array to insert.
  * @param {any} el - The item to insert.

package/lib/js/utils/shared.js

@@ -292,6 +292,7 @@ export function binarySearch(ar, el, compare_fn) {
     return -m - 1;
 }
 /**
+ * @todo: replace any with generic
  * Binary insertion that uses binarySearch algorithm.
  * @param {any[]} ar - The sorted array to insert.
  * @param {any} el - The item to insert.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.18.5",
+  "version": "0.19.1",
   "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"
@@ -47,7 +47,7 @@
     "jsdoc": "^4.0.2",
     "lint-staged": "^14.0.1",
     "local-web-server": "^5.3.0",
-    "postcss": "^8.4.29",
+    "postcss": "^8.4.31",
     "prettier": "^3.0.3",
     "rollup": "^3.29.2",
     "rollup-plugin-copy": "^3.5.0",