@openglobus/og 0.20.4 → 0.21.0

package/lib/js/Globe.d.ts

@@ -130,7 +130,7 @@ declare class Globe {
      * @public
      */
     fadeOut(): void;
-    attachTo(target: HTMLElement | string): void;
+    attachTo(target: HTMLElement | string, isFirst?: boolean): void;
     detach(): void;
     destroy(): void;
 }

package/lib/js/Globe.js

@@ -239,7 +239,7 @@ class Globe {
     fadeOut() {
         this._canvas.style.opacity = "0";
     }
-    attachTo(target) {
+    attachTo(target, isFirst) {
         this.detach();
         let t;
         if (target instanceof HTMLElement) {
@@ -250,7 +250,12 @@ class Globe {
         }
         if (t) {
             this.$target = t;
-            t.appendChild(this.$inner);
+            if (isFirst && this.$target.firstChild) {
+                this.$target.insertBefore(this.$inner, this.$target.firstChild);
+            }
+            else {
+                t.appendChild(this.$inner);
+            }
         }
     }
     detach() {

package/lib/js/Object3d.d.ts

@@ -60,5 +60,6 @@ declare class Object3d {
     static createCube(length?: number, height?: number, depth?: number, xOffset?: number, yOffset?: number, zOffset?: number): Object3d;
     static createArrow(back?: number, height?: number, front?: number): Object3d;
     static loadObj(src: string): Promise<Object3d[]>;
+    merge(other: Object3d): Object3d;
 }
 export { Object3d };

package/lib/js/Object3d.js

@@ -370,5 +370,23 @@ class Object3d {
             texCoords: textures
         }));
     }
+    merge(other) {
+        const mergedVertices = [...this._vertices, ...other.vertices];
+        const mergedNormals = [...this._normals, ...other.normals];
+        const mergedTexCoords = [...this._texCoords, ...other.texCoords];
+        const offset = this._vertices.length / 3;
+        const mergedIndices = [
+            ...this._indices,
+            ...other.indices.map(index => index + offset)
+        ];
+        return new Object3d({
+            name: `${this._name}_${other.name}`,
+            vertices: mergedVertices,
+            texCoords: mergedTexCoords,
+            indices: mergedIndices,
+            normals: mergedNormals,
+            color: this.color
+        });
+    }
 }
 export { Object3d };

package/lib/js/entity/GeometryHandler.d.ts

@@ -1,11 +1,10 @@
 import { Extent } from "../Extent";
-import { Handler } from "../webgl/Handler";
+import { Handler, WebGLBufferExt } from "../webgl/Handler";
 import { Vector } from "../layer/Vector";
 import { Node } from "../quadTree/Node";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
 import { CoordinatesType, Geometry } from "./Geometry";
-import { WebGLBufferExt } from "../webgl/Handler";
 declare class GeometryHandler {
     static __counter__: number;
     protected __id: number;
@@ -80,5 +79,7 @@ declare class GeometryHandler {
     createLineThicknessBuffer(): void;
     createLineStrokesBuffer(): void;
     createLineStrokeColorsBuffer(): void;
+    clear(): void;
+    _deleteBuffers(): void;
 }
 export { GeometryHandler };

package/lib/js/entity/GeometryHandler.js

@@ -682,6 +682,62 @@ class GeometryHandler {
         h.gl.deleteBuffer(this._lineStrokeColorsBuffer);
         this._lineStrokeColorsBuffer = h.createArrayBuffer(new Float32Array(this._lineStrokeColors), 4, this._lineStrokeColors.length / 4);
     }
+    clear() {
+        this._geometries = [];
+        this._polyVerticesHighMerc = [];
+        this._polyVerticesLowMerc = [];
+        this._polyIndexes = [];
+        this._polyColors = [];
+        this._polyPickingColors = [];
+        this._lineVerticesHighMerc = [];
+        this._lineVerticesLowMerc = [];
+        this._lineOrders = [];
+        this._lineIndexes = [];
+        this._lineColors = [];
+        this._linePickingColors = [];
+        this._lineThickness = [];
+        this._lineStrokeColors = [];
+        this._lineStrokes = [];
+        this._deleteBuffers();
+        this._polyVerticesHighBufferMerc = null;
+        this._polyVerticesLowBufferMerc = null;
+        this._polyIndexesBuffer = null;
+        this._polyColorsBuffer = null;
+        this._polyPickingColorsBuffer = null;
+        this._lineVerticesHighBufferMerc = null;
+        this._lineVerticesLowBufferMerc = null;
+        this._lineIndexesBuffer = null;
+        this._lineOrdersBuffer = null;
+        this._lineColorsBuffer = null;
+        this._linePickingColorsBuffer = null;
+        this._lineThicknessBuffer = null;
+        this._lineStrokeColorsBuffer = null;
+        this._lineStrokesBuffer = null;
+        this._updatedGeometryArr = [];
+        this._updatedGeometry = {};
+        this._removeGeometryExtentArr = [];
+        this._removeGeometryExtents = {};
+        this.refresh();
+    }
+    _deleteBuffers() {
+        if (this._layer._planet && this._layer._planet.renderer) {
+            let h = this._layer._planet.renderer.handler, gl = h.gl;
+            gl.deleteBuffer(this._polyVerticesHighBufferMerc);
+            gl.deleteBuffer(this._polyVerticesLowBufferMerc);
+            gl.deleteBuffer(this._polyIndexesBuffer);
+            gl.deleteBuffer(this._polyColorsBuffer);
+            gl.deleteBuffer(this._polyPickingColorsBuffer);
+            gl.deleteBuffer(this._lineVerticesHighBufferMerc);
+            gl.deleteBuffer(this._lineVerticesLowBufferMerc);
+            gl.deleteBuffer(this._lineIndexesBuffer);
+            gl.deleteBuffer(this._lineOrdersBuffer);
+            gl.deleteBuffer(this._lineColorsBuffer);
+            gl.deleteBuffer(this._linePickingColorsBuffer);
+            gl.deleteBuffer(this._lineThicknessBuffer);
+            gl.deleteBuffer(this._lineStrokeColorsBuffer);
+            gl.deleteBuffer(this._lineStrokesBuffer);
+        }
+    }
 }
 GeometryHandler.__counter__ = 0;
 export { GeometryHandler };

package/lib/js/layer/Bing.js

@@ -20,6 +20,7 @@ export class Bing extends XYZ {
             subdomains: ['t0', 't1', 't2', 't3'],
             url: "https://ecn.{s}.tiles.virtualearth.net/tiles/a{quad}.jpeg?n=z&g=7146",
             isBaseLayer: true,
+            textureFilter: "LINEAR",
             maxNativeZoom: 17,
             defaultTextures: [{ color: "#001522" }, { color: "#E4E6F3" }],
             attribution: `<div style="transform: scale(0.8); margin-top:-2px;"><a href="https://www.bing.com" target="_blank"><img style="position: relative; top: 2px;" title="Bing Imagery" src="https://sandcastle.cesium.com/CesiumUnminified/Assets/Images/bing_maps_credit.png"></a> © 2021 Microsoft Corporation</div>`,

package/lib/js/layer/Vector.js

@@ -388,6 +388,7 @@ class Vector extends Layer {
      * @public
      */
     clear() {
+        super.clear();
         let temp = new Array(this._entities.length);
         for (let i = 0; i < temp.length; i++) {
             temp[i] = this._entities[i];
@@ -404,6 +405,7 @@ class Vector extends Layer {
         this._entityCollectionsTree = null;
         this._entityCollectionsTreeNorth = null;
         this._entityCollectionsTreeSouth = null;
+        this._geometryHandler.clear();
     }
     /**
      * Safety entities loop.
@@ -723,7 +725,7 @@ class Vector extends Layer {
     }
     _execDeferredNode(node) {
         this._counter++;
-        setTimeout(() => {
+        requestAnimationFrame(() => {
             node.applyCollection();
             this._counter--;
             if (this._deferredEntitiesPendingQueue.length && this._counter < 1) {
@@ -736,7 +738,7 @@ class Vector extends Layer {
                     }
                 }
             }
-        }, 0);
+        });
     }
     /**
      * Start to load tile material.

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

@@ -7,16 +7,25 @@ export interface IRgbTerrainParams extends IGlobusTerrainParams {
     equalizeNormals?: boolean;
     key?: string;
     imageSize?: number;
+    minHeight?: number;
+    resolution?: number;
 }
 declare class RgbTerrain extends GlobusTerrain {
     protected _imageSize: number;
     protected _ctx: CanvasRenderingContext2D;
     protected _imageDataCache: Record<string, Uint8ClampedArray>;
+    protected _minHeight: number;
+    protected _resolution: number;
     constructor(name: string | null, options?: IRgbTerrainParams);
     static checkNoDataValue(noDataValues: number[] | TypedArray, value: number): boolean;
+    rgb2Height(r: number, g: number, b: number): number;
     isBlur(segment: Segment): boolean;
     protected _createTemporalCanvas(size: number): CanvasRenderingContext2D;
     protected _createHeights(data: HTMLImageElement | ImageBitmap, segment: Segment | null, tileGroup: number, tileX: number, tileY: number, tileZoom: number, extent: Extent, preventChildren: boolean): TypedArray | number[];
     getHeightAsync(lonLat: LonLat, callback: (h: number) => void, zoom?: number): boolean;
+    extractElevationSimple(rgbaData: number[] | TypedArray, noDataValues: number[] | TypedArray, availableParentData: (TypedArray | number[] | null) | undefined, availableParentOffsetX: number, availableParentOffsetY: number, availableZoomDiff: number, skipPositiveHeights: boolean, outCurrenElevations: number[] | TypedArray, heightFactor: number | undefined, imageSize: number): void;
+    extractElevationTilesRgbNonPowerOfTwo(rgbaData: number[] | TypedArray, outCurrenElevations: number[] | TypedArray, heightFactor?: number): void;
+    extractElevationTilesRgb(rgbaData: number[] | TypedArray, heightFactor: number, noDataValues: number[] | TypedArray, availableParentData: (TypedArray | number[] | null) | undefined, availableParentTileX: number, availableParentTileY: number, availableParentTileZoom: number, currentTileX: number, currentTileY: number, currentTileZoom: number, skipPositiveHeights: boolean, outCurrenElevations: number[] | TypedArray, outChildrenElevations: number[][][] | TypedArray[][]): void;
+    extractElevationTilesRgbNoChildren(rgbaData: number[] | TypedArray, heightFactor: number, noDataValues: number[] | TypedArray, availableParentData: (TypedArray | number[] | null) | undefined, availableParentTileX: number, availableParentTileY: number, availableParentTileZoom: number, currentTileX: number, currentTileY: number, currentTileZoom: number, skipPositiveHeights: boolean, outCurrenElevations: number[] | TypedArray): void;
 }
 export { RgbTerrain };