@openglobus/og 0.20.3 → 0.21.0

package/README.md

@@ -5,7 +5,7 @@
 
 English | [简体中文](README_CN.md) | [Portuguese-BR](README_pt-BR.md)
 
-[Openglobus](https://www.openglobus.org/) is a typescript/javascript library designed to display interactive 3D maps and other geospatial data at a
+[openglobus](https://www.openglobus.org/) is a typescript/javascript library designed to display interactive 3D maps and other geospatial data at a
 scale from planet to bee.
 
 It supports various high-resolution terrain providers, imagery layers, renders thousands of 3D objects, provides

package/lib/@openglobus/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/@openglobus/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/@openglobus/js/entity/EntityCollection.d.ts

@@ -21,6 +21,7 @@ interface IEntityCollectionParams {
     scaleByDistance?: NumberArray3;
     pickingScale?: number;
     opacity?: number;
+    useLighting?: boolean;
     entities?: Entity[];
 }
 /**
@@ -184,8 +185,11 @@ declare class EntityCollection {
      */
     _layer?: Vector;
     _quadNode?: EntityCollectionNode;
+    _useLighting: number;
     constructor(options?: IEntityCollectionParams);
     get id(): number;
+    get useLighting(): boolean;
+    set useLighting(f: boolean);
     isEqual(ec: EntityCollection): boolean;
     /**
      * Sets collection visibility.

package/lib/@openglobus/js/entity/GeoObject.d.ts

@@ -45,6 +45,9 @@ declare class GeoObject {
     protected _pitch: number;
     protected _yaw: number;
     protected _roll: number;
+    protected _pitchRad: number;
+    protected _yawRad: number;
+    protected _rollRad: number;
     protected _scale: Vec3;
     /**
      * RGBA color.
@@ -52,7 +55,8 @@ declare class GeoObject {
      * @type {Vec4}
      */
     _color: Vec4;
-    _direction: Vec3;
+    _qRot: Quat;
+    protected _direction: Vec3;
     _handler: GeoObjectHandler | null;
     _handlerIndex: number;
     _tagData: InstanceData | null;
@@ -68,7 +72,6 @@ declare class GeoObject {
     getPitch(): number;
     getYaw(): number;
     getRoll(): number;
-    getDirection(): Vec3;
     get object3d(): Object3d;
     get vertices(): number[];
     get normals(): number[];
@@ -147,6 +150,7 @@ declare class GeoObject {
      * @param {Vec3} color - Picking color.
      */
     setPickingColor3v(color: Vec3): void;
-    updateDirection(): void;
+    updateRotation(): void;
+    getDirection(): Vec3;
 }
 export { GeoObject };

package/lib/@openglobus/js/entity/GeoObjectHandler.d.ts

@@ -4,6 +4,7 @@ import { GeoObject } from "./GeoObject";
 import { Planet } from "../scene/Planet";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
+import { Quat } from "../math/Quat";
 import { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
 import { Object3d } from "../Object3d";
 declare class InstanceData {
@@ -14,24 +15,22 @@ declare class InstanceData {
     _texture: WebGLTextureExt | null;
     _textureSrc: string | null;
     _objectSrc?: string;
-    _pitchRollArr: number[] | TypedArray;
     _sizeArr: number[] | TypedArray;
     _vertexArr: number[] | TypedArray;
     _positionHighArr: number[] | TypedArray;
     _positionLowArr: number[] | TypedArray;
-    _directionArr: number[] | TypedArray;
+    _qRotArr: number[] | TypedArray;
     _rgbaArr: number[] | TypedArray;
     _normalsArr: number[] | TypedArray;
     _indicesArr: number[] | TypedArray;
     _pickingColorArr: number[] | TypedArray;
     _visibleArr: number[] | TypedArray;
     _texCoordArr: number[] | TypedArray;
-    _pitchRollBuffer: WebGLBufferExt | null;
     _sizeBuffer: WebGLBufferExt | null;
     _vertexBuffer: WebGLBufferExt | null;
     _positionHighBuffer: WebGLBufferExt | null;
     _positionLowBuffer: WebGLBufferExt | null;
-    _directionBuffer: WebGLBufferExt | null;
+    _qRotBuffer: WebGLBufferExt | null;
     _rgbaBuffer: WebGLBufferExt | null;
     _normalsBuffer: WebGLBufferExt | null;
     _indicesBuffer: WebGLBufferExt | null;
@@ -45,13 +44,12 @@ declare class InstanceData {
     clear(): void;
     _deleteBuffers(): void;
     createVertexBuffer(): void;
-    createPitchRollBuffer(): void;
     createVisibleBuffer(): void;
     createSizeBuffer(): void;
     createTexCoordBuffer(): void;
     createPositionBuffer(): void;
     createRgbaBuffer(): void;
-    createDirectionBuffer(): void;
+    createQRotBuffer(): void;
     createNormalsBuffer(): void;
     createIndicesBuffer(): void;
     createPickingColorBuffer(): void;
@@ -84,12 +82,11 @@ declare class GeoObjectHandler {
     drawPicking(): void;
     protected _pickingPASS(): void;
     _loadDataTagTexture(tagData: InstanceData): Promise<void>;
-    setDirectionArr(tagData: InstanceData, tagDataIndex: number, direction: Vec3): void;
+    setQRotArr(tagData: InstanceData, tagDataIndex: number, qRot: Quat): void;
     setVisibility(tagData: InstanceData, tagDataIndex: number, visibility: boolean): void;
     setPositionArr(tagData: InstanceData, tagDataIndex: number, positionHigh: Vec3, positionLow: Vec3): void;
     setRgbaArr(tagData: InstanceData, tagDataIndex: number, rgba: Vec4): void;
     setPickingColorArr(tagData: InstanceData, tagDataIndex: number, color: Vec3): void;
-    setPitchRollArr(tagData: InstanceData, tagDataIndex: number, pitch: number, roll: number): void;
     setScaleArr(tagData: InstanceData, tagDataIndex: number, scale: Vec3): void;
     protected _updateTag(dataTag: InstanceData): void;
     update(): void;

package/lib/@openglobus/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/@openglobus/js/layer/Vector.d.ts

@@ -19,6 +19,7 @@ export interface IVectorParams extends ILayerParams {
     pickingScale?: number;
     scaleByDistance?: NumberArray3;
     labelMaxLetters?: number;
+    useLighting?: boolean;
 }
 type VectorEventsList = [
     "draw",
@@ -44,6 +45,7 @@ export type VectorEventsType = EventsHandler<VectorEventsList> & EventsHandler<L
  *      First index - near distance to the entity, after entity becomes full scale.
  *      Second index - far distance to the entity, when entity becomes zero scale.
  *      Third index - far distance to the entity, when entity becomes invisible.
+ *      Use [1.0, 1.0, 1.0] for real sized objects
  * @param {number} [options.nodeCapacity=30] - Maximum entities quantity in the tree node. Rendering optimization parameter. 30 is default.
  * @param {boolean} [options.async=true] - Asynchronous vector data handling before rendering. True for optimization huge data.
  * @param {boolean} [options.clampToGround = false] - Clamp vector data to the ground.
@@ -121,7 +123,10 @@ declare class Vector extends Layer {
     polygonOffsetUnits: number;
     _secondPASS: EntityCollectionNode[];
     protected _labelMaxLetters: number;
+    protected _useLighting: boolean;
     constructor(name?: string | null, options?: IVectorParams);
+    get useLighting(): boolean;
+    set useLighting(f: boolean);
     get labelMaxLetters(): number;
     get instanceName(): string;
     protected _bindPicking(): void;

package/lib/@openglobus/js/math/Quat.d.ts

@@ -118,6 +118,7 @@ export declare class Quat {
      * @returns {Quat} -
      */
     static getRotationBetweenVectorsUp(source: Vec3, dest: Vec3, up: Vec3): Quat;
+    static setFromEulerAngles(pitch: number, yaw: number, roll: number): Quat;
     /**
      * Returns true if the components are zero.
      * @public

package/lib/@openglobus/js/terrain/GlobusTerrain.d.ts

@@ -19,6 +19,8 @@ type TileData = {
     extent: Extent | null;
 };
 /**
+ * @deprecated
+ * Use GlobusRgbTerrain
  * Class that loads segment elevation data, converts it to the array and passes it to the planet segment.
  * @class
  * @extends {GlobusTerrain}

package/lib/@openglobus/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 };