@openglobus/og 0.20.4 → 0.22.0

package/lib/js/entity/GeoObject.js

@@ -27,6 +27,7 @@ class GeoObject {
         this._yawRad = this._yaw * RADIANS;
         this._rollRad = this._roll * RADIANS;
         this._scale = utils.createVector3(options.scale, new Vec3(1, 1, 1));
+        this._translate = utils.createVector3(options.translate, new Vec3());
         this._color = utils.createColorRGBA(options.color);
         this._qRot = Quat.IDENTITY;
         this._handler = null;
@@ -46,6 +47,7 @@ class GeoObject {
             this.setTextureSrc(options.textureSrc);
         }
         this._visibility = (options.visibility != undefined ? options.visibility : true);
+        this._children = [];
         this._direction = new Vec3();
         this._qNorthFrame = new Quat();
     }
@@ -215,6 +217,13 @@ class GeoObject {
     getScale() {
         return this._scale;
     }
+    setTranslate3v(translate) {
+        this._translate.copy(translate);
+        this._handler && this._handler.setTranslateArr(this._tagData, this._tagDataIndex, translate);
+    }
+    getTranslate() {
+        return this._translate;
+    }
     /**
      * Removes geo object from handler.
      * @public

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

@@ -16,6 +16,7 @@ declare class InstanceData {
     _textureSrc: string | null;
     _objectSrc?: string;
     _sizeArr: number[] | TypedArray;
+    _translateArr: number[] | TypedArray;
     _vertexArr: number[] | TypedArray;
     _positionHighArr: number[] | TypedArray;
     _positionLowArr: number[] | TypedArray;
@@ -27,6 +28,7 @@ declare class InstanceData {
     _visibleArr: number[] | TypedArray;
     _texCoordArr: number[] | TypedArray;
     _sizeBuffer: WebGLBufferExt | null;
+    _translateBuffer: WebGLBufferExt | null;
     _vertexBuffer: WebGLBufferExt | null;
     _positionHighBuffer: WebGLBufferExt | null;
     _positionLowBuffer: WebGLBufferExt | null;
@@ -46,6 +48,7 @@ declare class InstanceData {
     createVertexBuffer(): void;
     createVisibleBuffer(): void;
     createSizeBuffer(): void;
+    createTranslateBuffer(): void;
     createTexCoordBuffer(): void;
     createPositionBuffer(): void;
     createRgbaBuffer(): void;
@@ -88,6 +91,7 @@ declare class GeoObjectHandler {
     setRgbaArr(tagData: InstanceData, tagDataIndex: number, rgba: Vec4): void;
     setPickingColorArr(tagData: InstanceData, tagDataIndex: number, color: Vec3): void;
     setScaleArr(tagData: InstanceData, tagDataIndex: number, scale: Vec3): void;
+    setTranslateArr(tagData: InstanceData, tagDataIndex: number, translate: Vec3): void;
     protected _updateTag(dataTag: InstanceData): void;
     update(): void;
     _removeAll(): void;

package/lib/js/entity/GeoObjectHandler.js

@@ -11,6 +11,7 @@ const SIZE_BUFFER = 6;
 const PICKINGCOLOR_BUFFER = 7;
 const VISIBLE_BUFFER = 8;
 const TEXCOORD_BUFFER = 9;
+const TRANSLATE_BUFFER = 10;
 function setParametersToArray(arr, index = 0, length = 0, itemSize = 1, ...params) {
     const currIndex = index * length;
     for (let i = currIndex, len = currIndex + length; i < len; i++) {
@@ -34,6 +35,7 @@ class InstanceData {
         this._texture = null;
         this._textureSrc = null;
         this._sizeArr = [];
+        this._translateArr = [];
         this._vertexArr = [];
         this._positionHighArr = [];
         this._positionLowArr = [];
@@ -45,6 +47,7 @@ class InstanceData {
         this._visibleArr = [];
         this._texCoordArr = [];
         this._sizeBuffer = null;
+        this._translateBuffer = null;
         this._vertexBuffer = null;
         this._positionHighBuffer = null;
         this._positionLowBuffer = null;
@@ -66,6 +69,7 @@ class InstanceData {
         this._buffersUpdateCallbacks[VISIBLE_BUFFER] = this.createVisibleBuffer;
         this._buffersUpdateCallbacks[TEXCOORD_BUFFER] = this.createTexCoordBuffer;
         this._buffersUpdateCallbacks[QROT_BUFFER] = this.createQRotBuffer;
+        this._buffersUpdateCallbacks[TRANSLATE_BUFFER] = this.createTranslateBuffer;
         this._changedBuffers = new Array(this._buffersUpdateCallbacks.length);
     }
     createTexture(image) {
@@ -77,6 +81,7 @@ class InstanceData {
         this.numInstances = 0;
         this.geoObjects = [];
         this._sizeArr = [];
+        this._translateArr = [];
         this._vertexArr = [];
         this._positionHighArr = [];
         this._positionLowArr = [];
@@ -97,6 +102,7 @@ class InstanceData {
             h.deleteTexture(this._texture);
             this._texture = null;
             gl.deleteBuffer(this._sizeBuffer);
+            gl.deleteBuffer(this._translateBuffer);
             gl.deleteBuffer(this._vertexBuffer);
             gl.deleteBuffer(this._positionHighBuffer);
             gl.deleteBuffer(this._positionLowBuffer);
@@ -109,6 +115,7 @@ class InstanceData {
             gl.deleteBuffer(this._texCoordBuffer);
         }
         this._sizeBuffer = null;
+        this._translateBuffer = null;
         this._vertexBuffer = null;
         this._positionHighBuffer = null;
         this._positionLowBuffer = null;
@@ -144,6 +151,15 @@ class InstanceData {
         this._sizeArr = makeArrayTyped(this._sizeArr);
         h.setStreamArrayBuffer(this._sizeBuffer, this._sizeArr);
     }
+    createTranslateBuffer() {
+        let h = this._geoObjectHandler._planet.renderer.handler, numItems = this._translateArr.length / 3;
+        if (!this._translateBuffer || this._translateBuffer.numItems !== numItems) {
+            h.gl.deleteBuffer(this._translateBuffer);
+            this._translateBuffer = h.createStreamArrayBuffer(3, numItems);
+        }
+        this._translateArr = makeArrayTyped(this._translateArr);
+        h.setStreamArrayBuffer(this._translateBuffer, this._translateArr);
+    }
     createTexCoordBuffer() {
         const h = this._geoObjectHandler._planet.renderer.handler;
         h.gl.deleteBuffer(this._texCoordBuffer);
@@ -344,6 +360,11 @@ class GeoObjectHandler {
         y = scale.y;
         z = scale.z;
         tagData._sizeArr = concatArrays(tagData._sizeArr, setParametersToArray([], 0, itemSize, itemSize, x, y, z));
+        let translate = geoObject.getTranslate();
+        x = translate.x;
+        y = translate.y;
+        z = translate.z;
+        tagData._translateArr = concatArrays(tagData._translateArr, setParametersToArray([], 0, itemSize, itemSize, x, y, z));
     }
     _displayPASS() {
         let r = this._planet.renderer, sh = r.handler.programs.geo_object, p = sh._program, u = p.uniforms, a = p.attributes, gl = r.handler.gl, ec = this._entityCollection;
@@ -370,6 +391,8 @@ class GeoObjectHandler {
             gl.vertexAttribPointer(a.qRot, tagData._qRotBuffer.itemSize, gl.FLOAT, false, 0, 0);
             gl.bindBuffer(gl.ARRAY_BUFFER, tagData._sizeBuffer);
             gl.vertexAttribPointer(a.aScale, tagData._sizeBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.bindBuffer(gl.ARRAY_BUFFER, tagData._translateBuffer);
+            gl.vertexAttribPointer(a.aTranslate, tagData._translateBuffer.itemSize, gl.FLOAT, false, 0, 0);
             gl.bindBuffer(gl.ARRAY_BUFFER, tagData._rgbaBuffer);
             gl.vertexAttribPointer(a.aColor, tagData._rgbaBuffer.itemSize, gl.FLOAT, false, 0, 0);
             gl.bindBuffer(gl.ARRAY_BUFFER, tagData._visibleBuffer);
@@ -405,7 +428,7 @@ class GeoObjectHandler {
         let r = this._planet.renderer, sh = r.handler.programs.geo_object_picking, p = sh._program, u = p.uniforms, a = p.attributes, gl = r.handler.gl, ec = this._entityCollection;
         sh.activate();
         gl.uniform3fv(u.uScaleByDistance, ec.scaleByDistance);
-        gl.uniform1f(u.pickingScale, ec.pickingScale);
+        gl.uniform3fv(u.pickingScale, ec.pickingScale);
         gl.uniform3fv(u.eyePositionHigh, r.activeCamera.eyeHigh);
         gl.uniform3fv(u.eyePositionLow, r.activeCamera.eyeLow);
         gl.uniformMatrix4fv(u.projectionMatrix, false, r.activeCamera.getProjectionMatrix());
@@ -419,6 +442,8 @@ class GeoObjectHandler {
             gl.vertexAttribPointer(a.qRot, tagData._qRotBuffer.itemSize, gl.FLOAT, false, 0, 0);
             gl.bindBuffer(gl.ARRAY_BUFFER, tagData._sizeBuffer);
             gl.vertexAttribPointer(a.aScale, tagData._sizeBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.bindBuffer(gl.ARRAY_BUFFER, tagData._translateBuffer);
+            gl.vertexAttribPointer(a.aTranslate, tagData._translateBuffer.itemSize, gl.FLOAT, false, 0, 0);
             gl.bindBuffer(gl.ARRAY_BUFFER, tagData._pickingColorBuffer);
             gl.vertexAttribPointer(a.aPickingColor, tagData._pickingColorBuffer.itemSize, gl.FLOAT, false, 0, 0);
             gl.bindBuffer(gl.ARRAY_BUFFER, tagData._positionHighBuffer);
@@ -478,6 +503,11 @@ class GeoObjectHandler {
         tagData._changedBuffers[SIZE_BUFFER] = true;
         this._updateTag(tagData);
     }
+    setTranslateArr(tagData, tagDataIndex, translate) {
+        setParametersToArray(tagData._translateArr, tagDataIndex, 3, 3, translate.x, translate.y, translate.z);
+        tagData._changedBuffers[TRANSLATE_BUFFER] = true;
+        this._updateTag(tagData);
+    }
     _updateTag(dataTag) {
         if (dataTag.isFree) {
             dataTag.isFree = false;
@@ -566,6 +596,7 @@ class GeoObjectHandler {
         tagData._qRotArr = spliceArray(tagData._qRotArr, tdi * 4, 4);
         tagData._pickingColorArr = spliceArray(tagData._pickingColorArr, tdi * 3, 3);
         tagData._sizeArr = spliceArray(tagData._sizeArr, tdi * 3, 3);
+        tagData._translateArr = spliceArray(tagData._translateArr, tdi * 3, 3);
         tagData._visibleArr = spliceArray(tagData._visibleArr, tdi, 1);
         geoObject._handlerIndex = -1;
         geoObject._handler = null;

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,64 @@ 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;
+            if (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/entity/Label.d.ts

@@ -11,6 +11,7 @@ export interface ILabelParams extends IBaseBillboardParams {
     outlineColor?: string | NumberArray4 | Vec4;
     align?: string;
     isRTL?: boolean;
+    letterSpacing?: number;
 }
 declare const ALIGN: Record<string, number>;
 /**
@@ -84,6 +85,7 @@ declare class Label extends BaseBillboard {
      */
     protected _fontAtlas: FontAtlas | null;
     protected _isRTL: boolean;
+    protected _letterSpacing: number;
     constructor(options?: ILabelParams);
     /**
      * Set label text.
@@ -92,6 +94,18 @@ declare class Label extends BaseBillboard {
      * It can't be bigger than maximum labelHandler _maxLetters value.
      */
     setText(text: string): void;
+    /**
+     * Set text letter spacing.
+     * @public
+     * @param {number} spacing - Letter spacing.
+     */
+    setLetterSpacing(letterSpacing: number): void;
+    /**
+     * Returns label text letter spacing.
+     * @public
+     * @param {number} spacing - Letter spacing.
+     */
+    getLetterSpacing(): number;
     /**
      * Change text direction.
      * @public

package/lib/js/entity/Label.js

@@ -50,6 +50,7 @@ class Label extends BaseBillboard {
         this._fontIndex = 0;
         this._fontAtlas = null;
         this._isRTL = options.isRTL || false;
+        this._letterSpacing = options.letterSpacing || 0;
     }
     /**
      * Set label text.
@@ -60,9 +61,28 @@ class Label extends BaseBillboard {
     setText(text) {
         this._text = text.toString();
         if (this._isReady && this._handler) {
-            this._handler.setText(this._handlerIndex, text, this._fontIndex, this._align, this._isRTL);
+            this._handler.setText(this._handlerIndex, text, this._fontIndex, this._align, this._letterSpacing, this._isRTL);
         }
     }
+    /**
+     * Set text letter spacing.
+     * @public
+     * @param {number} spacing - Letter spacing.
+     */
+    setLetterSpacing(letterSpacing) {
+        this._letterSpacing = letterSpacing;
+        if (this._isReady && this._handler) {
+            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, letterSpacing, this._isRTL);
+        }
+    }
+    /**
+     * Returns label text letter spacing.
+     * @public
+     * @param {number} spacing - Letter spacing.
+     */
+    getLetterSpacing() {
+        return this._letterSpacing;
+    }
     /**
      * Change text direction.
      * @public
@@ -71,7 +91,7 @@ class Label extends BaseBillboard {
     setRtl(isRTL) {
         this._isRTL = isRTL;
         if (this._isReady && this._handler) {
-            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._isRTL);
+            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._letterSpacing, this._isRTL);
         }
     }
     /**
@@ -90,7 +110,7 @@ class Label extends BaseBillboard {
     setAlign(align) {
         this._align = STR2ALIGN[align.trim().toLowerCase()];
         if (this._isReady && this._handler) {
-            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._isRTL);
+            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._letterSpacing, this._isRTL);
         }
         else if (this._lockId !== LOCK_FREE) {
             this._lockId = LOCK_UPDATE;
@@ -260,7 +280,7 @@ class Label extends BaseBillboard {
         this._fontIndex = fontIndex;
         if (this._isReady && this._handler) {
             this._handler.setFontIndexArr(this._handlerIndex, this._fontIndex);
-            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._isRTL);
+            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._letterSpacing, this._isRTL);
         }
         else if (this._lockId !== LOCK_FREE) {
             this._lockId = LOCK_UPDATE;

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

@@ -43,7 +43,7 @@ declare class LabelHandler extends BaseBillboardHandler {
     _displayPASS(): void;
     protected _pickingPASS(): void;
     protected _removeBillboard(label: Label): void;
-    setText(index: number, text: string, fontIndex: number, align: number, isRTL?: boolean): void;
+    setText(index: number, text: string, fontIndex: number, align: number, letterSpacing?: number, isRTL?: boolean): void;
     setPositionArr(index: number, positionHigh: Vec3, positionLow: Vec3): void;
     setPickingColorArr(index: number, color: Vec3): void;
     setSizeArr(index: number, size: number): void;

package/lib/js/entity/LabelHandler.js

@@ -302,7 +302,7 @@ class LabelHandler extends BaseBillboardHandler {
         label._handler = null;
         label._isReady = false;
     }
-    setText(index, text, fontIndex, align, isRTL = false) {
+    setText(index, text, fontIndex, align, letterSpacing = 0, isRTL = false) {
         text = text.normalize('NFKC');
         let fa = this._renderer.fontAtlas.atlasesArr[fontIndex];
         if (!fa)
@@ -380,14 +380,14 @@ class LabelHandler extends BaseBillboardHandler {
             if (k && text[c + 1]) {
                 let kk = k[text[c + 1].charCodeAt(0)];
                 if (kk) {
-                    offset += m.nAdvance + kk;
+                    offset += m.nAdvance + kk + letterSpacing;
                 }
                 else {
-                    offset += m.nAdvance;
+                    offset += m.nAdvance + letterSpacing;
                 }
             }
             else {
-                offset += m.nAdvance;
+                offset += m.nAdvance + letterSpacing;
             }
         }
         // 49/512 - font atlas left border letter offset

package/lib/js/entity/Polyline.js

@@ -1444,7 +1444,7 @@ class Polyline {
             // gl.uniform4fv(shu.color, [this.color.x, this.color.y, this.color.z, this.color.w * this._handler._entityCollection._fadingOpacity]);
             gl.uniform3fv(shu.eyePositionHigh, r.activeCamera.eyeHigh);
             gl.uniform3fv(shu.eyePositionLow, r.activeCamera.eyeLow);
-            gl.uniform2fv(shu.uFloatParams, [rn._planetRadius2 || 0.0, r.activeCamera._tanViewAngle_hradOneByHeight]);
+            //gl.uniform2fv(shu.uFloatParams, [(rn as Planet)._planetRadius2 || 0.0, r.activeCamera!._tanViewAngle_hradOneByHeight]);
             gl.uniform2fv(shu.viewport, [r.handler.canvas.width, r.handler.canvas.height]);
             gl.uniform1f(shu.thickness, this.thickness * 0.5);
             gl.uniform1f(shu.opacity, this._opacity * ec._fadingOpacity);

package/lib/js/index.d.ts

@@ -11,7 +11,7 @@ import * as webgl from './webgl/index';
 export * from './Globe';
 import { Geoid } from './terrain/Geoid';
 import { input } from './input/input';
-import { Ellipsoid, wgs84 } from './ellipsoid/index';
+import { Ellipsoid, wgs84, moon, mars } from './ellipsoid/index';
 import { Camera, PlanetCamera } from './camera/index';
 import { Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4 } from './math/index';
 import { Renderer } from './renderer/Renderer';
@@ -23,11 +23,11 @@ import { LonLat } from './LonLat';
 import { RenderNode } from './scene/RenderNode';
 import { Planet } from './scene/Planet';
 import { Popup } from './Popup';
-import { EarthQuadTreeStrategy, MarsQuadTreeStrategy, QuadTreeStrategy, quadTreeStrategyType, Wgs84QuadTreeStrategy } from './quadTree/index';
+import { EarthQuadTreeStrategy, EquiQuadTreeStrategy, QuadTreeStrategy, quadTreeStrategyType, Wgs84QuadTreeStrategy } from './quadTree/index';
 import { Object3d } from './Object3d';
 import { Handler, Program, Framebuffer, Multisample } from './webgl/index';
 import { Control } from './control/Control';
 export * from './entity/index';
 export * from './layer/index';
 import { EmptyTerrain, GlobusTerrain, RgbTerrain, BilTerrain, GlobusRgbTerrain } from './terrain/index';
-export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };
+export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, moon, mars, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, EquiQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };

package/lib/js/index.js

@@ -11,7 +11,7 @@ import * as webgl from './webgl/index';
 export * from './Globe';
 import { Geoid } from './terrain/Geoid';
 import { input } from './input/input';
-import { Ellipsoid, wgs84 } from './ellipsoid/index';
+import { Ellipsoid, wgs84, moon, mars } from './ellipsoid/index';
 import { Camera, PlanetCamera } from './camera/index';
 import { Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4 } from './math/index';
 import { Renderer } from './renderer/Renderer';
@@ -23,11 +23,11 @@ import { LonLat } from './LonLat';
 import { RenderNode } from './scene/RenderNode';
 import { Planet } from './scene/Planet';
 import { Popup } from './Popup';
-import { EarthQuadTreeStrategy, MarsQuadTreeStrategy, QuadTreeStrategy, quadTreeStrategyType, Wgs84QuadTreeStrategy } from './quadTree/index';
+import { EarthQuadTreeStrategy, EquiQuadTreeStrategy, QuadTreeStrategy, quadTreeStrategyType, Wgs84QuadTreeStrategy } from './quadTree/index';
 import { Object3d } from './Object3d';
 import { Handler, Program, Framebuffer, Multisample } from './webgl/index';
 import { Control } from './control/Control';
 export * from './entity/index';
 export * from './layer/index';
 import { EmptyTerrain, GlobusTerrain, RgbTerrain, BilTerrain, GlobusRgbTerrain } from './terrain/index';
-export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };
+export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, moon, mars, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, EquiQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };

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/Layer.js

@@ -6,7 +6,7 @@ import { Extent } from "../Extent";
 import { LonLat } from "../LonLat";
 import { Material } from "./Material";
 import { Vec3 } from "../math/Vec3";
-const FADING_RATIO = 15.8;
+const FADING_RATIO = 30;
 /**
  * @class
  * Base class; normally only used for creating subclasses and not instantiated in apps.
@@ -181,7 +181,7 @@ class Layer {
                     this._fadingFactor = (opacity - this._opacity) / FADING_RATIO;
                 }
                 else if (opacity < this._opacity) {
-                    this._fadingFactor = (opacity - this._opacity) / FADING_RATIO;
+                    this._fadingFactor = (this._opacity - opacity) / FADING_RATIO;
                 }
             }
             else {
@@ -570,8 +570,11 @@ class Layer {
             return false;
         }
         else {
-            this._fadingOpacity = 0.0;
-            return !this._visibility;
+            this._fadingOpacity -= this._fadingFactor;
+            if (this._fadingOpacity <= 0) {
+                this._fadingOpacity = 0.0;
+            }
+            return false;
         }
     }
     createMaterial(segment) {

package/lib/js/layer/Vector.d.ts

@@ -1,12 +1,11 @@
 import { Entity, IEntityParams } from "../entity/Entity";
 import { EntityCollection } from "../entity/EntityCollection";
-import { EntityCollectionNode, EntityCollectionNodeWGS84 } from "../quadTree/EntityCollectionNode";
+import { EntityCollectionsTreeStrategy } from "../quadTree/EntityCollectionsTreeStrategy";
 import { EventsHandler } from "../Events";
 import { GeometryHandler } from "../entity/GeometryHandler";
 import { ILayerParams, Layer, LayerEventsList } from "./Layer";
 import { NumberArray3 } from "../math/Vec3";
 import { Planet } from "../scene/Planet";
-import { QueueArray } from "../QueueArray";
 import { Material } from "./Material";
 import { NumberArray4 } from "../math/Vec4";
 export interface IVectorParams extends ILayerParams {
@@ -16,7 +15,7 @@ export interface IVectorParams extends ILayerParams {
     relativeToGround?: boolean;
     clampToGround?: boolean;
     async?: boolean;
-    pickingScale?: number;
+    pickingScale?: number | NumberArray3;
     scaleByDistance?: NumberArray3;
     labelMaxLetters?: number;
     useLighting?: boolean;
@@ -75,13 +74,18 @@ declare class Vector extends Layer {
      * @type {NumberArray3} - (exactly 3 entries)
      */
     scaleByDistance: NumberArray3;
-    pickingScale: number;
+    pickingScale: Float32Array;
     /**
      * Asynchronous data handling before rendering.
      * @public
      * @type {boolean}
      */
     async: boolean;
+    /**
+     * Maximum entities quantity in the tree node.
+     * @public
+     */
+    _nodeCapacity: number;
     /**
      * Clamp vector data to the ground.
      * @public
@@ -94,34 +98,18 @@ declare class Vector extends Layer {
      * @type {boolean}
      */
     relativeToGround: boolean;
+    /** todo: combine into one */
     protected _stripEntityCollection: EntityCollection;
     protected _polylineEntityCollection: EntityCollection;
     protected _geoObjectEntityCollection: EntityCollection;
     _geometryHandler: GeometryHandler;
-    /**
-     * Maximum entities quantity in the tree node.
-     * @public
-     */
-    _nodeCapacity: number;
-    /**
-     * @todo: remove, or replace with node strategy
-     */
-    protected _entityCollectionsTree: EntityCollectionNode | null;
-    protected _entityCollectionsTreeNorth: EntityCollectionNodeWGS84 | null;
-    protected _entityCollectionsTreeSouth: EntityCollectionNodeWGS84 | null;
-    _renderingNodes: Record<number, boolean>;
-    _renderingNodesNorth: Record<number, boolean>;
-    _renderingNodesSouth: Record<number, boolean>;
-    protected _counter: number;
-    protected _deferredEntitiesPendingQueue: QueueArray<EntityCollectionNode>;
-    protected _pendingsQueue: Entity[];
+    protected _entityCollectionsTreeStrategy: EntityCollectionsTreeStrategy | null;
     /**
      * Specifies the scale Units for gl.polygonOffset function to calculate depth values, 0.0 is default.
      * @public
      * @type {Number}
      */
     polygonOffsetUnits: number;
-    _secondPASS: EntityCollectionNode[];
     protected _labelMaxLetters: number;
     protected _useLighting: boolean;
     constructor(name?: string | null, options?: IVectorParams);
@@ -198,7 +186,7 @@ declare class Vector extends Layer {
      */
     removeEntities(entities: Entity[]): this;
     /**
-     * TODO: Clear the layer.
+     * Clear the layer.
      * @public
      */
     clear(): void;
@@ -215,12 +203,9 @@ declare class Vector extends Layer {
      * @returns {Vector} - Returns layer instance.
      */
     setEntities(entities: Entity[]): this;
-    /**
-     * @todo: replace to a strategy node collecting algorithm
-     */
     protected _createEntityCollectionsTree(entitiesForTree: Entity[]): void;
     /**
-     * @todo (refactoring) could be used in somethig like bindEntityCollectionQuad(...)
+     * @todo (refactoring) could be used in something like bindEntityCollectionQuad(...)
      * @param entityCollection
      */
     _bindEventsDefault(entityCollection: EntityCollection): void;
@@ -228,8 +213,6 @@ declare class Vector extends Layer {
     protected _collectPolylineCollectionPASS(outArr: EntityCollection[]): void;
     protected _collectGeoObjectCollectionPASS(outArr: EntityCollection[]): void;
     collectVisibleCollections(outArr: EntityCollection[]): void;
-    _queueDeferredNode(node: EntityCollectionNode): void;
-    protected _execDeferredNode(node: EntityCollectionNode): void;
     /**
      * Start to load tile material.
      * @public