@openglobus/og 0.19.2 → 0.19.4

package/lib/js/scene/Axes.js

@@ -43,13 +43,13 @@ class Axes extends RenderNode {
     }
     createAxesBuffer(gridSize) {
         const vertices = [
-            0.0, 0.0, 0.0, gridSize - 1, 0.0, 0.0,
-            0.0, 0.0, 0.0, 0.0, gridSize - 1, 0.0,
+            0.0, 0.0, 0.0, gridSize - 1, 0.0, 0.0, // x - R
+            0.0, 0.0, 0.0, 0.0, gridSize - 1, 0.0, // y - B  
             0.0, 0.0, 0.0, 0.0, 0.0, gridSize - 1 // z - G
         ];
         const colors = [
-            1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0,
-            0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
+            1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, // x - R
+            0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0, // y - B
             0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0 // z - G
         ];
         this.axesBuffer = this.renderer.handler.createArrayBuffer(new Float32Array(vertices), 3, 6);

package/lib/js/segment/Segment.d.ts

@@ -228,6 +228,7 @@ declare class Segment {
      * @todo: looks like it could be simplified in Segment contructor
      */
     _setExtentLonLat(): void;
+    protected _createExtentNormals(): void;
     createBoundsByExtent(): void;
     createBoundsByParent(): void;
     setBoundingSphere(x: number, y: number, z: number, v: Vec3): void;

package/lib/js/segment/Segment.js

@@ -283,7 +283,8 @@ class Segment {
             this.node.equalizedSideWithNodeId[neighborSide] !== neigborNode.equalizedSideWithNodeId[OPSIDE[neighborSide]];
     }
     equalize() {
-        if (this.tileZoom < 8 || this.gridSize < 2) {
+        // Equalization doesnt work correctly for gridSize equals 2
+        if (this.gridSize < 2) {
             return;
         }
         this.readyToEngage = true;
@@ -621,7 +622,7 @@ class Segment {
     _setExtentLonLat() {
         this._extentLonLat = this._extent.inverseMercator();
     }
-    createBoundsByExtent() {
+    _createExtentNormals() {
         const ellipsoid = this.planet.ellipsoid;
         const extent = this._extentLonLat;
         const coord_sw = ellipsoid.geodeticToCartesian(extent.southWest.lon, extent.southWest.lat);
@@ -632,7 +633,10 @@ class Segment {
         this._nw.copy(coord_nw);
         this._ne.copy(coord_ne);
         this._se.copy(coord_se);
-        this.setBoundingVolume3v(coord_sw, coord_ne);
+    }
+    createBoundsByExtent() {
+        this._createExtentNormals();
+        this.setBoundingVolume3v(this._sw, this._ne);
     }
     createBoundsByParent() {
         let pn = this.node;
@@ -694,6 +698,7 @@ class Segment {
                 else {
                     coords_rb = Vec3.add(vs.scaleTo(1 - vi_x / insideSize), ve.scaleTo(1 - vi_y / insideSize)).addA(v_rb);
                 }
+                this._createExtentNormals();
                 this.setBoundingVolume3v(coords_lt, coords_rb);
             }
         }

package/lib/js/shaders/drawnode.js

@@ -219,10 +219,10 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
                 float maxH = minH * 3.0;
                 float nightCoef = getLerpValue(minH, maxH, camHeight) * nightTextureCoefficient;
                                 
-                if(camHeight > 6000000.0)
-                {
-                    normal = normalize(v_vertex);
-                }
+                // if(camHeight > 6000000.0)
+                // {
+                //     normal = normalize(v_vertex);
+                // }
                                             
                 vec3 lightDir = normalize(sunPos);
                 vec3 viewDir = normalize(cameraPosition - v_vertex);
@@ -406,10 +406,10 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
                 float maxH = minH * 3.0;
                 float nightCoef = getLerpValue(minH, maxH, camHeight) * nightTextureCoefficient;
                                 
-                if(camHeight > 6000000.0)
-                {
-                    normal = normalize(v_vertex);
-                }
+                // if(camHeight > 6000000.0)
+                // {
+                //     normal = normalize(v_vertex);
+                // }
                                             
                 vec3 lightDir = normalize(sunPos);
                 vec3 viewDir = normalize(cameraPosition - v_vertex);
@@ -661,8 +661,12 @@ export function drawnode_screen_wl_webgl2Atmos() {
                 bool hitGround = intersectSphere(camPos, rayDirection, BOTTOM_RADIUS, distanceToGround) && distanceToGround > 0.0;                
                 
                 // Fix black dots on the edge of atmosphere                        
-                if(camHeight < 700000.0 || !hitGround)
-                {                          
+                // if(camHeight < 700000.0 || !hitGround)
+                // {                          
+                //     distanceToGround = distance(camPos, v_vertex * SPHERE_TO_ELLIPSOID_SCALE);
+                // }
+                
+                if(length(v_vertex * SPHERE_TO_ELLIPSOID_SCALE) > BOTTOM_RADIUS){
                     distanceToGround = distance(camPos, v_vertex * SPHERE_TO_ELLIPSOID_SCALE);
                 }
                                                                 
@@ -725,10 +729,10 @@ export function drawnode_screen_wl_webgl2Atmos() {
                 float maxH = minH * 3.0;
                 float nightCoef = getLerpValue(minH, maxH, camHeight) * nightTextureCoefficient;
                                 
-                if(camHeight > 6000000.0)
-                {
-                    normal = normalize(v_vertex);
-                }
+                // if(camHeight > 6000000.0)
+                // {
+                //    normal = normalize(v_vertex);
+                // }
                                             
                 vec3 lightDir = normalize(sunPos);
                 vec3 viewDir = normalize(cameraPosition - v_vertex);

package/lib/js/shaders/geoObject.js

@@ -21,7 +21,7 @@ export const geo_object = () => new Program("geo_object", {
         aDirection: { type: "vec3", divisor: 1 },
         aPitchRoll: { type: "vec2", divisor: 1 },
         aColor: { type: "vec4", divisor: 1 },
-        aScale: { type: "float", divisor: 1 },
+        aScale: { type: "vec3", divisor: 1 },
         aDispose: { type: "float", divisor: 1 }
     },
     vertexShader: `precision highp float;
@@ -33,7 +33,7 @@ export const geo_object = () => new Program("geo_object", {
             attribute vec3 aDirection;
             attribute vec2 aPitchRoll;
             attribute vec4 aColor;
-            attribute float aScale;
+            attribute vec3 aScale;
             attribute float aDispose;
             attribute float aUseTexture;
             attribute vec2 aTexCoord;
@@ -51,7 +51,7 @@ export const geo_object = () => new Program("geo_object", {
             varying vec4 vColor;
             varying float vDispose;
             varying vec2 vTexCoords;
-            varying float useLighting;
+            //varying float useLighting;
             
             const float PI = 3.141592653589793;
             
@@ -69,10 +69,10 @@ export const geo_object = () => new Program("geo_object", {
                 vec3 look = cameraPosition - position;
                 float lookLength = length(look);
 
-                useLighting = 1.0;                
-                if(lookLength > 2000000.0){
-                     useLighting = 0.0;
-                }
+                // useLighting = 1.0;                
+                // if(lookLength > 2000000.0){
+                //      useLighting = 0.0;
+                // }
 
             
                 vColor = aColor;
@@ -118,7 +118,7 @@ export const geo_object = () => new Program("geo_object", {
                 // ... is the same math
                 float scd = uScaleByDistance[2] * clamp(lookLength, uScaleByDistance[0], uScaleByDistance[1]) / uScaleByDistance[0];
                 
-                vec3 vert = modelMatrix * aVertexPosition * aScale * scd;
+                vec3 vert = modelMatrix * (aVertexPosition * aScale) * scd;
                 v_vertex = position + vert;
                 
                 // @hack
@@ -142,13 +142,13 @@ export const geo_object = () => new Program("geo_object", {
                 varying vec4 vColor;
                 varying vec3 vNormal;
                 varying vec2 vTexCoords;
-                varying float useLighting;
+                //varying float useLighting;
                 
                 void main(void) {        
                                         
                     vec3 lightWeighting = vec3(1.0);
                 
-                    if(useLighting != 0.0){
+                    //if(useLighting != 0.0){
                         vec3 normal = normalize(vNormal);
                         vec3 lightDir = normalize(lightsPositions[0]);
                         vec3 viewDir = normalize(cameraPosition - v_vertex);                
@@ -157,7 +157,7 @@ export const geo_object = () => new Program("geo_object", {
                         float specularLightWeighting = pow( reflection, lightsParamsf[0]);                                        
                         float diffuseLightWeighting = max(dot(normal, lightDir), 0.0);
                         lightWeighting = lightsParamsv[0] + lightsParamsv[1] * diffuseLightWeighting + lightsParamsv[2] * specularLightWeighting;
-                    }
+                    //}
                                        
                     if(uUseTexture > 0.0) {
                         vec4 tColor = texture2D(uTexture, vTexCoords);
@@ -183,7 +183,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
         aDirection: { type: "vec3", divisor: 1 },
         aPitchRoll: { type: "vec2", divisor: 1 },
         aPickingColor: { type: "vec3", divisor: 1 },
-        aScale: { type: "float", divisor: 1 },
+        aScale: { type: "vec3", divisor: 1 },
         aDispose: { type: "float", divisor: 1 }
     },
     vertexShader: `precision highp float;
@@ -194,7 +194,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
             attribute vec3 aDirection;
             attribute vec3 aPickingColor;
             attribute vec2 aPitchRoll;
-            attribute float aScale;
+            attribute vec3 aScale;
             attribute float aDispose;
             
             uniform vec3 eyePositionHigh;
@@ -262,7 +262,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
                  // tays in the vert above it affects on Mac Safari jitter
                  float scd = pickingScale * uScaleByDistance[2] * clamp(lookLength, uScaleByDistance[0], uScaleByDistance[1]) / uScaleByDistance[0];
 
-                 vec3 vert = modelMatrix * aVertexPosition * aScale * scd;
+                 vec3 vert = modelMatrix * (aVertexPosition * aScale) * scd;
                  
                  vert += lowDiff;
                                 

package/lib/js/terrain/MapboxTerrain.d.ts

@@ -13,6 +13,7 @@ declare class MapboxTerrain extends GlobusTerrain {
     protected _ctx: CanvasRenderingContext2D;
     protected _imageDataCache: Record<string, Uint8ClampedArray>;
     constructor(name: string | null, options?: IMapboxTerrainParams);
+    static checkNoDataValue(noDataValues: number[] | TypedArray, value: number): boolean;
     isBlur(segment: Segment): boolean;
     protected _createTemporalCanvas(size: number): CanvasRenderingContext2D;
     protected _createHeights(data: HTMLImageElement | ImageBitmap, tileIndex: string, tileX: number, tileY: number, tileZoom: number, extent: Extent, preventChildren: boolean): TypedArray | number[];

package/lib/js/terrain/MapboxTerrain.js

@@ -3,6 +3,7 @@ import { getTileExtent } from "../mercator";
 import { GlobusTerrain } from "./GlobusTerrain";
 import { isPowerOfTwo } from "../math";
 import { Layer } from "../layer/Layer";
+import { binarySearchFast } from "../utils/shared";
 /**
  * The key doesn't work; just an example!
  */
@@ -31,6 +32,12 @@ class MapboxTerrain extends GlobusTerrain {
         this._ctx = this._createTemporalCanvas(this._imageSize);
         this._imageDataCache = {};
     }
+    static checkNoDataValue(noDataValues, value) {
+        if (value > 50000) {
+            return true;
+        }
+        return binarySearchFast(noDataValues, value) !== -1;
+    }
     isBlur(segment) {
         return segment.tileZoom >= 16;
     }

package/lib/js/utils/objParser.js

@@ -10,8 +10,8 @@ export function objParser(text) {
     ];
     // same order as `f` indices
     let vertexData = [
-        [],
-        [],
+        [], // positions
+        [], // texcoords
         [], // normals
     ];
     const materialLibs = [];
@@ -82,7 +82,7 @@ export function objParser(text) {
             }
         },
         s: () => {
-        },
+        }, // smoothing group
         mtllib(parts, unparsedArgs) {
             // the spec says there can be multiple filenames here
             // but many exist with spaces in a single filename

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

@@ -52,8 +52,9 @@ export declare function stringTemplate(template: string, params?: any): string;
 export declare function getHTML(template: string, params?: any): string;
 export declare function parseHTML(htmlStr: string): HTMLElement[];
 export declare function print2d(id: string, text: string, x: number, y: number): void;
+export declare function isNumber(value: any): boolean;
 export declare function defaultString(str?: string, def?: string): string;
-export declare function createVector3(v?: Vec3 | Vec2 | NumberArray3 | NumberArray2 | null, def?: Vec3): Vec3;
+export declare function createVector3(v?: number | Vec3 | Vec2 | NumberArray3 | NumberArray2 | null, def?: Vec3): Vec3;
 export declare function createVector4(v?: Vec4 | NumberArray4 | null, def?: Vec4): Vec4;
 export declare function createColorRGBA(c?: string | NumberArray4 | Vec4 | null, def?: Vec4): Vec4;
 export declare function createColorRGB(c?: string | NumberArray3 | Vec3 | null, def?: Vec3): Vec3;

package/lib/js/utils/shared.js

@@ -145,12 +145,18 @@ export function print2d(id, text, x, y) {
     el.style.left = `${x}px`;
     el.style.top = `${y}px`;
 }
+export function isNumber(value) {
+    return typeof value === 'number';
+}
 export function defaultString(str, def = "") {
     return str ? str.trim() : def;
 }
 export function createVector3(v, def) {
     if (v) {
-        if (v instanceof Vec3) {
+        if (isNumber(v)) {
+            return new Vec3(v, v, v);
+        }
+        else if (v instanceof Vec3) {
             return v.clone();
         }
         else if (v instanceof Array) {

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@openglobus/og",
-  "version": "0.19.2",
+  "version": "0.19.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"
   },
   "main": "./lib/js/index.js",
+  "types": "./lib/js/index.d.ts",
   "style": "./css/og.css",
   "scripts": {
     "docs": "jsdoc -r ./src/ -c ./jsdoc.conf.json -d ./docs",
@@ -32,28 +33,34 @@
   },
   "homepage": "https://www.openglobus.org",
   "devDependencies": {
-    "@babel/preset-env": "^7.22.20",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.3",
-    "@types/jest": "^29.5.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
-    "clean-jsdoc-theme": "^4.2.10",
-    "eslint": "^8.49.0",
+    "@babel/cli": "^7.24.7",
+    "@babel/core": "^7.24.7",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/jest": "^29.5.12",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
+    "clean-jsdoc-theme": "^4.3.0",
+    "eslint": "^8.57.0",
     "jest": "^29.7.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.7.0",
-    "jsdoc": "^4.0.2",
-    "lint-staged": "^14.0.1",
-    "local-web-server": "^5.3.0",
-    "postcss": "^8.4.31",
-    "prettier": "^3.0.3",
-    "rollup": "^3.29.2",
+    "jsdoc": "^4.0.3",
+    "jsdoc-babel": "^0.5.0",
+    "lint-staged": "^15.2.4",
+    "local-web-server": "^5.3.3",
+    "postcss": "^8.4.38",
+    "prettier": "^3.2.5",
+    "rollup": "^4.18.0",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.2.2"
+    "ts-jest": "^29.1.3",
+    "typescript": "^5.4.5"
   },
   "lint-staged": {
     "*.{js,ts}": [