@openglobus/og 0.13.10 → 0.14.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.13.10",
+  "version": "0.14.10",
   "description": "[OpenGlobus](https://www.openglobus.org/) is a javascript 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"
@@ -81,4 +81,4 @@
     "globe",
     "og"
   ]
-}
+}

package/src/og/Globe.js

@@ -69,7 +69,8 @@ const PLANET_NAME_PREFIX = "globus_planet_";
  * @param {Number} [options.maxEqualZoomAltitude=15000000.0] - Maximal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomAltitude=10000.0] - Minimal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomCameraSlope=0.8] - Minimal camera slope above te globe where segments on the screen bacame the same zoom level
- * @param {Number} [options.loadingBatchSize=12] -
+ * @param {Number} [options.loadingBatchSize=12] - 
+ * @param {Number} [options.quadTreeStrategyPrototype] - Prototype of quadTree. QuadTreeStrategy for Earth is default.
  */
 
 class Globe {
@@ -128,13 +129,12 @@ class Globe {
                 context: {
                     alpha: false,
                     antialias: false,
-                    powerPreference: "high-performance",
                     premultipliedAlpha: true
                 }
             }), {
-                autoActivate: false,
-                backgroundColor: createColorRGB(options.backgroundColor, new Vec3(115 / 255, 203 / 255, 249 / 255))
-            }
+            autoActivate: false,
+            backgroundColor: createColorRGB(options.backgroundColor, new Vec3(115 / 255, 203 / 255, 249 / 255))
+        }
         );
         this.renderer.initialize();
         this.renderer.div = this.div;
@@ -158,6 +158,13 @@ class Globe {
          */
         this._planetName = options.name ? options.name : PLANET_NAME_PREFIX + Globe._staticCounter;
 
+        /**
+         * quad tree type.
+         * @private
+         * @type {Number}
+         */
+        this._quadTreeType = options.quadTreeType;
+
         if (options.atmosphere) {
             /**
              * Render node renders a planet.
@@ -178,7 +185,8 @@ class Globe {
                 maxEqualZoomAltitude: options.maxEqualZoomAltitude,
                 minEqualZoomAltitude: options.minEqualZoomAltitude,
                 minEqualZoomCameraSlope: options.minEqualZoomCameraSlope,
-                loadingBatchSize: options.loadingBatchSize
+                quadTreeStrategyPrototype: options.quadTreeStrategyPrototype,
+                maxLoadingRequests: options.maxLoadingRequests
             });
         }
 

package/src/og/control/Sun.js

@@ -10,7 +10,6 @@ import { LightSource } from "../light/LightSource.js";
 import { Quat } from "../math/Quat.js";
 import { Vec3 } from "../math/Vec3.js";
 
-const ACTIVATION_HEIGHT = 12079000.0;
 /**
  * Real Sun geocentric position control that place the Sun on the right place by the Earth.
  * @class
@@ -39,6 +38,8 @@ class Sun extends Control {
          */
         // this._isCameraSunlight = false;
 
+        this.activationHeight = options.activationHeight || 12079000.0;
+
         this.offsetVertical = options.offsetVertical || -5000000;
 
         this.offsetHorizontal = options.offsetHorizontal || 5000000;
@@ -106,7 +107,7 @@ class Sun extends Control {
         this._currDate = this._clockPtr.currentDate;
         if (!this._stopped) {
             var cam = this.renderer.activeCamera;
-            if (cam.getHeight() < ACTIVATION_HEIGHT || !this._active) {
+            if (cam.getHeight() < this.activationHeight || !this._active) {
                 this._lightOn = true;
                 this._f = 1;
                 var n = cam.eye.normal(),

package/src/og/entity/GeometryHandler.js

@@ -1030,9 +1030,9 @@ class GeometryHandler {
     _updatePlanet() {
         var p = this._layer._planet;
         if (p) {
-            this._refreshPlanetNode(p._quadTree);
-            this._refreshPlanetNode(p._quadTreeNorth);
-            this._refreshPlanetNode(p._quadTreeSouth);
+            p.quadTreeStrategy.quadTreeList.forEach(quadTree => {
+                this._refreshPlanetNode(quadTree);
+            });
         }
         this._updatedGeometryArr.length = 0;
         this._updatedGeometryArr = [];

package/src/og/entity/LabelHandler.js

@@ -85,8 +85,7 @@ class LabelHandler extends BillboardHandler {
     }
 
     _addLabelToArrays(label) {
-        this._renderer.labelWorker.make(label);
-        console.time(`label${label.id}`)
+        this._renderer.labelWorker.make({ handler: this, label: label });
     }
 
     assignFontAtlas(label) {
@@ -122,8 +121,6 @@ class LabelHandler extends BillboardHandler {
             label.update();
 
             this.refresh();
-            console.timeEnd(`label${label.id}`)
-            console.log(label)
         }
     }
 

package/src/og/entity/LabelWorker.js

@@ -14,33 +14,30 @@ class LabelWorker extends BaseWorker {
     }
 
     _onMessage(e) {
+        let s = this._source.get(e.data.id);
 
-        let label = this._source.get(e.data.id);
-
-        if (label._lockId === LOCK_UPDATE) {
+        if (s.label._lockId === LOCK_UPDATE) {
             requestAnimationFrame(() => {
-                this.make(label);
+                this.make({ handler: s.handler, label: s.label });
             });
         } else {
-            label._handler.workerCallback(e.data, label);
+            s.handler.workerCallback(e.data, s.label);
         }
 
         this._source.delete(e.data.id);
-        super._onMessage(e)
-
-        this.check();
     }
 
 
-    make() {
-        const label = arguments[0],
-        handler = label._handler;
+    make(data) {
+        let label = data.label,
+            handler = data.handler;
+
         if (handler._entityCollection) {
 
             if (this._workerQueue.length) {
                 var w = this._workerQueue.pop();
 
-                this._source.set(this._id, label);
+                this._source.set(this._id, data);
 
                 let labelData = new Float32Array([
                     /*0*/this._id++,
@@ -67,7 +64,7 @@ class LabelWorker extends BaseWorker {
                     labelData.buffer,
                 ]);
             } else {
-                this._pendingQueue.push(label);
+                this._pendingQueue.push(data);
             }
         }
     }

package/src/og/index.js

@@ -1,96 +1,107 @@
-'use strict';
-
-import * as jd from './astro/jd.js';
-import * as math from './math.js';
-import * as mercator from './mercator.js';
-import * as utils from './utils/shared.js';
-
-import * as control from './control/index.js';
-import * as layer from './layer/index.js';
-import * as bv from './bv/index.js';
-import * as scene from './scene/index.js';
-import * as entity from './entity/index.js';
-import * as webgl from './webgl/index.js';
-import * as terrain from './terrain/index.js';
-
-import { Globe } from './Globe.js';
-
-import { Geoid } from './terrain/Geoid.js';
-
-import { input } from './input/input.js';
-
-import { Ellipsoid, wgs84 } from './ellipsoid/index.js';
-
-import { Camera, PlanetCamera } from './camera/index.js';
-
-import { Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4 } from './math/index.js';
-
-import { Renderer } from './renderer/Renderer.js';
-
-import { LightSource } from './light/LightSource.js';
-
-import { Clock } from './Clock.js';
-import { Events } from './Events.js';
-import { Extent } from './Extent.js';
-import { LonLat } from './LonLat.js';
-import { RenderNode } from './scene/RenderNode.js';
-
-import { Popup } from './Popup.js';
-
-import pkg from "../../package.json";
-
-const { Handler } = webgl, { Control } = control;
-const { Layer } = layer;
-const {
-    EntityCollection,
-    Entity
-} = entity;
-
-const version = {
-    version: pkg.version
-};
-
-export {
-    version,
-    bv,
-    jd,
-    math,
-    mercator,
-    utils,
-    input,
-    Layer,
-    layer,
-    terrain,
-    Control,
-    control,
-    webgl,
-    wgs84,
-    Camera,
-    Ellipsoid,
-    PlanetCamera,
-    Globe,
-    LightSource,
-    EntityCollection,
-    Handler,
-    Renderer,
-    Clock,
-    Events,
-    Extent,
-    LonLat,
-    scene,
-    RenderNode,
-    Line2,
-    Line3,
-    Mat3,
-    Mat4,
-    Plane,
-    Quat,
-    Ray,
-    Vec2,
-    Vec3,
-    Vec4,
-    entity,
-    Entity,
-    Geoid,
-    Popup
+'use strict';
+
+import * as jd from './astro/jd.js';
+import * as math from './math.js';
+import * as mercator from './mercator.js';
+import * as utils from './utils/shared.js';
+
+import * as control from './control/index.js';
+import * as layer from './layer/index.js';
+import * as bv from './bv/index.js';
+import * as scene from './scene/index.js';
+import * as entity from './entity/index.js';
+import * as webgl from './webgl/index.js';
+import * as terrain from './terrain/index.js';
+
+import { Globe } from './Globe.js';
+
+import { Geoid } from './terrain/Geoid.js';
+
+import { input } from './input/input.js';
+
+import { Ellipsoid, wgs84 } from './ellipsoid/index.js';
+
+import { Camera, PlanetCamera } from './camera/index.js';
+
+import { Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4 } from './math/index.js';
+
+import { Renderer } from './renderer/Renderer.js';
+
+import { LightSource } from './light/LightSource.js';
+
+import { Clock } from './Clock.js';
+import { Events } from './Events.js';
+import { Extent } from './Extent.js';
+import { LonLat } from './LonLat.js';
+import { RenderNode } from './scene/RenderNode.js';
+
+import { Popup } from './Popup.js';
+
+import { QuadTreeStrategy } from './quadTree/QuadTreeStrategy.js';
+import { MarsQuadTreeStrategy } from './quadTree/MarsQuadTreeStrategy.js';
+import { EarthQuadTreeStrategy } from './quadTree/EarthQuadTreeStrategy.js';
+import { Wgs84QuadTreeStrategy } from './quadTree/Wgs84QuadTreeStrategy.js';
+import { quadTreeStrategyType } from './utils/quadTreeType.js';
+
+import pkg from "../../package.json";
+
+const { Handler } = webgl, { Control } = control;
+const { Layer } = layer;
+const {
+    EntityCollection,
+    Entity
+} = entity;
+
+const version = {
+    version: pkg.version
+};
+
+export {
+    version,
+    bv,
+    jd,
+    math,
+    mercator,
+    utils,
+    input,
+    Layer,
+    layer,
+    terrain,
+    Control,
+    control,
+    webgl,
+    wgs84,
+    Camera,
+    Ellipsoid,
+    PlanetCamera,
+    Globe,
+    LightSource,
+    EntityCollection,
+    Handler,
+    Renderer,
+    Clock,
+    Events,
+    Extent,
+    LonLat,
+    scene,
+    RenderNode,
+    Line2,
+    Line3,
+    Mat3,
+    Mat4,
+    Plane,
+    Quat,
+    Ray,
+    Vec2,
+    Vec3,
+    Vec4,
+    entity,
+    Entity,
+    Geoid,
+    Popup,
+    QuadTreeStrategy,
+    MarsQuadTreeStrategy,
+    EarthQuadTreeStrategy,
+    Wgs84QuadTreeStrategy,
+    quadTreeStrategyType
 };

package/src/og/layer/GeoVideo.js

@@ -156,6 +156,7 @@ class GeoVideo extends BaseGeoImage {
                 }
             } else {
                 this._video = document.createElement("video");
+                this._video.crossOrigin = "Anonymous";
                 let that = this;
                 this._video.addEventListener("canplay", function () {
                     that._onCanPlay(this);

package/src/og/layer/Layer.js

@@ -545,9 +545,10 @@ class Layer {
             let p = this._planet,
                 maxZoom = Math.max(...this._preLoadZoomLevels);
 
-            this._preLoadRecursive(p._quadTreeSouth, maxZoom);
-            this._preLoadRecursive(p._quadTreeNorth, maxZoom);
-            this._preLoadRecursive(p._quadTree, maxZoom);
+            for (let i = 0, len = p.quadTreeStrategy.quadTreeList.length; i < len; i++) {
+                this._preLoadRecursive(p.quadTreeStrategy.quadTreeList[i], maxZoom);
+            }
+
         }
     }
 
@@ -654,24 +655,24 @@ class Layer {
     redraw() {
         if (this._planet) {
             this._planet._quadTree.traverseTree((n) => {
-                    if (n.segment.materials[this._id]) {
-                        n.segment.materials[this._id].clear();
-                    }
+                if (n.segment.materials[this._id]) {
+                    n.segment.materials[this._id].clear();
                 }
+            }
             );
 
             this._planet._quadTreeNorth.traverseTree((n) => {
-                    if (n.segment.materials[this._id]) {
-                        n.segment.materials[this._id].clear();
-                    }
+                if (n.segment.materials[this._id]) {
+                    n.segment.materials[this._id].clear();
                 }
+            }
             );
 
             this._planet._quadTreeSouth.traverseTree((n) => {
-                    if (n.segment.materials[this._id]) {
-                        n.segment.materials[this._id].clear();
-                    }
+                if (n.segment.materials[this._id]) {
+                    n.segment.materials[this._id].clear();
                 }
+            }
             );
         }
     }

package/src/og/layer/XYZ.js

@@ -9,6 +9,7 @@ import { EPSG3857 } from "../proj/EPSG3857.js";
 import { Layer } from "./Layer.js";
 import { stringTemplate } from "../utils/shared.js";
 import { RENDERING } from "../quadTree/quadTree.js";
+import { EPSG4326 } from "../proj/EPSG4326.js";
 
 /**
  * Represents an imagery tiles source provider.
@@ -143,7 +144,7 @@ class XYZ extends Layer {
     }
 
     _checkSegment(segment) {
-        return segment._projection.id === EPSG3857.id;
+        return segment._projection.id === this._planet.quadTreeStrategy.projection.id;// EPSG4326.id;// EPSG3857.id;
     }
 
     /**
@@ -251,7 +252,7 @@ class XYZ extends Layer {
     applyMaterial(material, forceLoading) {
         if (material.isReady) {
             return material.texOffset;
-        } else if (material.segment.tileZoom <= this.minNativeZoom) {
+        } else if (material.segment.tileZoom < this.minNativeZoom) {
             material.textureNotExists();
         } else {
 
@@ -317,7 +318,7 @@ class XYZ extends Layer {
     clearMaterial(material) {
         if (material.isReady && material.textureExists) {
             !material.texture.default &&
-            material.segment.handler.gl.deleteTexture(material.texture);
+                material.segment.handler.gl.deleteTexture(material.texture);
             material.texture = null;
 
             if (material.image) {

package/src/og/quadTree/EarthQuadTreeStrategy.js

@@ -0,0 +1,29 @@
+"use strict";
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js"
+import * as mercator from "../mercator.js";
+import { Segment } from "../segment/Segment.js";
+import { SegmentLonLat } from "../segment/SegmentLonLat.js";
+import * as quadTree from "../quadTree/quadTree.js";
+import { Extent } from "../Extent.js";
+import { Node } from "../quadTree/Node.js";
+
+export class EarthQuadTreeStrategy extends QuadTreeStrategy {
+    constructor(options = {}) {
+        super(options);
+        this.name = "earth";
+    }
+
+    init() {
+        this._quadTreeList = [
+            new Node(Segment, this.planet, quadTree.NW, null, 0, 0,
+                Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34])
+            ),
+            new Node(SegmentLonLat, this.planet, quadTree.NW, null, 0, 0,
+                Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90])
+            ),
+            new Node(SegmentLonLat, this.planet, quadTree.NW, null, 0, 0,
+                Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT])
+            )
+        ];
+    }
+}

package/src/og/quadTree/MarsQuadTreeStrategy.js

@@ -0,0 +1,27 @@
+"use strict";
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js"
+import { SegmentLonLatWgs84 } from "../segment/SegmentLonLatWgs84.js";
+import * as quadTree from "../quadTree/quadTree.js";
+import { Extent } from "../Extent.js";
+import { Node } from "../quadTree/Node.js";
+import { EPSG4326 } from "../proj/EPSG4326.js";
+
+
+export class MarsQuadTreeStrategy extends QuadTreeStrategy {
+    constructor(options = {}) {
+        super(options);
+        this.name = "mars";
+        this.projection = EPSG4326;
+    }
+
+    init() {
+        let earthQuadTreeSouth = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0,
+            Extent.createFromArray([-180, -90, 0, 90])
+        );
+        let earthQuadTreeWest = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0,
+            Extent.createFromArray([0, -90, 180, 90])
+        );
+        this._quadTreeList.push(earthQuadTreeSouth);
+        this._quadTreeList.push(earthQuadTreeWest);
+    }
+}