@openglobus/og 0.14.3 → 0.14.4

package/src/og/index.js

@@ -37,16 +37,18 @@ 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 {
+    EarthQuadTreeStrategy,
+    MarsQuadTreeStrategy,
+    QuadTreeStrategy,
+    quadTreeStrategyType,
+    Wgs84QuadTreeStrategy
+} from './quadTree/index.js';
 
 import pkg from "../../package.json";
 
 const { Handler } = webgl, { Control } = control;
-const { Layer } = layer;
+const { Layer, Vector, XYZ} = layer;
 const {
     EntityCollection,
     Entity
@@ -65,6 +67,8 @@ export {
     utils,
     input,
     Layer,
+    XYZ,
+    Vector,
     layer,
     terrain,
     Control,

package/src/og/quadTree/Node.js

@@ -235,7 +235,7 @@ class Node {
             let eye = cam.eye;
             let horizonDist = eye.length2() - this.planet.ellipsoid._b2;
 
-            let altVis = seg.tileZoom > 19 || (seg.tileZoom < 4 && !seg.terrainReady) || seg.tileZoom < 2;
+            let altVis = seg.tileZoom > 19 || (seg.tileZoom < 5 && !seg.terrainReady) || seg.tileZoom < 2;
 
             if (h > 21000) {
                 altVis = altVis || eye.distance2(seg._sw) < horizonDist || eye.distance2(seg._nw) < horizonDist || eye.distance2(seg._ne) < horizonDist || eye.distance2(seg._se) < horizonDist;

package/src/og/quadTree/index.js

@@ -0,0 +1,12 @@
+import { EarthQuadTreeStrategy } from "./EarthQuadTreeStrategy.js";
+import { MarsQuadTreeStrategy } from "./MarsQuadTreeStrategy.js";
+import { Wgs84QuadTreeStrategy } from "./Wgs84QuadTreeStrategy.js";
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js";
+
+const quadTreeStrategyType = {
+    earth: EarthQuadTreeStrategy,
+    mars: MarsQuadTreeStrategy,
+    wgs84: Wgs84QuadTreeStrategy
+}
+
+export { quadTreeStrategyType, QuadTreeStrategy,  Wgs84QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy };

package/src/og/renderer/Renderer.js

@@ -54,6 +54,9 @@ let __depthCallbackCounter__ = 0;
  * @fires og.RendererEvents#touchleave
  * @fires og.RendererEvents#touchenter
  */
+
+let __resizeTimeout;
+
 class Renderer {
     constructor(handler, params) {
         params = params || {};
@@ -80,8 +83,6 @@ class Renderer {
 
         this.brightThreshold = 0.9;
 
-        this.backgroundColor = params.backgroundColor || new Vec3(115 / 255, 203 / 255, 249 / 255);
-
         /**
          * Render nodes drawing queue.
          * @private
@@ -480,8 +481,13 @@ class Renderer {
         }
 
         this.handler.ONCANVASRESIZE = () => {
-            this.resize();
+            this._resizeStart();
             this.events.dispatch(this.events.resize, this.handler.canvas);
+            clearTimeout(__resizeTimeout);
+            __resizeTimeout = setTimeout(() => {
+                this._resizeEnd();
+                this.events.dispatch(this.events.resizeend, this.handler.canvas);
+            }, 500);
         };
 
         this._screenFrameCornersBuffer = this.handler.createArrayBuffer(
@@ -501,6 +507,10 @@ class Renderer {
         this.fontAtlas.initFont("arial", arial.data, arial.image);
     }
 
+    resize() {
+        this._resizeEnd();
+    }
+
     setCurrentScreen(screenName) {
         this._currentOutput = screenName;
         if (this.screenTexture[screenName]) {
@@ -508,22 +518,24 @@ class Renderer {
         }
     }
 
-    resize() {
+    _resizeStart() {
         let c = this.handler.canvas;
-        this.activeCamera.setAspectRatio(c.width / c.height);
-        this.sceneFramebuffer.setSize(c.width, c.height);
 
-        this.blitFramebuffer &&
-        this.blitFramebuffer.setSize(c.width, c.height, true);
+        this.activeCamera.setAspectRatio(c.width / c.height);
+        this.sceneFramebuffer.setSize(c.width * 0.5, c.height * 0.5);
+        this.blitFramebuffer && this.blitFramebuffer.setSize(c.width * 0.5, c.height * 0.5, true);
+    }
 
-        this.toneMappingFramebuffer &&
-        this.toneMappingFramebuffer.setSize(c.width, c.height, true);
+    _resizeEnd() {
+        let c = this.handler.canvas;
 
-        this.depthFramebuffer &&
-        this.depthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
+        this.activeCamera.setAspectRatio(c.width / c.height);
+        this.sceneFramebuffer.setSize(c.width, c.height);
+        this.blitFramebuffer && this.blitFramebuffer.setSize(c.width, c.height, true);
 
-        this.screenDepthFramebuffer &&
-        this.screenDepthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
+        this.toneMappingFramebuffer && this.toneMappingFramebuffer.setSize(c.width, c.height, true);
+        this.depthFramebuffer && this.depthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
+        this.screenDepthFramebuffer && this.screenDepthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
 
         if (this.handler.gl.type === "webgl") {
             this.screenTexture.screen = this.sceneFramebuffer.textures[0];
@@ -540,6 +552,36 @@ class Renderer {
         this.setCurrentScreen(this._currentOutput);
     }
 
+    // resize() {
+    //     let c = this.handler.canvas;
+    //
+    //     this.activeCamera.setAspectRatio(c.width / c.height);
+    //
+    //     this.sceneFramebuffer.setSize(c.width, c.height);
+    //
+    //     this.blitFramebuffer && this.blitFramebuffer.setSize(c.width, c.height, true);
+    //
+    //     this.toneMappingFramebuffer && this.toneMappingFramebuffer.setSize(c.width, c.height, true);
+    //
+    //     this.depthFramebuffer && this.depthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
+    //
+    //     this.screenDepthFramebuffer && this.screenDepthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
+    //
+    //     if (this.handler.gl.type === "webgl") {
+    //         this.screenTexture.screen = this.sceneFramebuffer.textures[0];
+    //         this.screenTexture.picking = this.pickingFramebuffer.textures[0];
+    //         this.screenTexture.depth = this.screenDepthFramebuffer.textures[0];
+    //         this.screenTexture.frustum = this.depthFramebuffer.textures[0];
+    //     } else {
+    //         this.screenTexture.screen = this.toneMappingFramebuffer.textures[0];
+    //         this.screenTexture.picking = this.pickingFramebuffer.textures[0];
+    //         this.screenTexture.depth = this.screenDepthFramebuffer.textures[0];
+    //         this.screenTexture.frustum = this.depthFramebuffer.textures[0];
+    //     }
+    //
+    //     this.setCurrentScreen(this._currentOutput);
+    // }
+
     removeNode(renderNode) {
         renderNode.remove();
     }

package/src/og/renderer/RendererEvents.js

@@ -899,6 +899,12 @@ const EVENT_NAMES = [
      */
     "resize",
 
+    /**
+     * Triggered when screen is resized.
+     * @event og.RendererEvents#resizeend
+     */
+    "resizeend",
+
     /**
      * Mouse enters the work screen
      * @event og.RendererEvents#mouseenter

package/src/og/scene/Planet.js

@@ -422,6 +422,10 @@ export class Planet extends RenderNode {
 
         this._terrainCompleted = false;
         this._terrainCompletedActivated = false;
+
+        this._collectRenderNodesIsActive = true;
+
+        this._skipPreRender = false;
     }
 
     static getBearingNorthRotationQuat(cartesian) {
@@ -724,6 +728,11 @@ export class Planet extends RenderNode {
             this._terrainCompletedActivated = false;
         });
 
+        this.renderer.events.on("resizeend", () => {
+            this._renderCompletedActivated = false;
+            this._terrainCompletedActivated = false;
+        });
+
         // Initialize texture coordinates buffer pool
         this._textureCoordsBufferCache = [];
 
@@ -966,8 +975,6 @@ export class Planet extends RenderNode {
         // clearing all node list
         this._renderedNodes.length = 0;
         this._renderedNodes = [];
-
-        this._clearRenderNodesInFrustum();
     }
 
     _clearRenderNodesInFrustum() {
@@ -983,13 +990,12 @@ export class Planet extends RenderNode {
      */
     _collectRenderNodes() {
         let cam = this.camera;
-
         this._lodSize = math.lerp(cam.slope < 0.0 ? 0.0 : cam.slope, this._curLodSize, this._minLodSize);
-
         cam._insideSegment = null;
 
         // clear first
         this._clearRenderedNodeList();
+        this._clearRenderNodesInFrustum();
 
         this._viewExtent.southWest.set(180, 180);
         this._viewExtent.northEast.set(-180, -180);
@@ -1012,6 +1018,7 @@ export class Planet extends RenderNode {
                 temp2 = [];
 
             this._clearRenderNodesInFrustum();
+            this._renderedNodes = [];
 
             for (var i = 0, len = temp.length; i < len; i++) {
                 var ri = temp[i];
@@ -1035,7 +1042,6 @@ export class Planet extends RenderNode {
                 temp2[i].renderTree(cam, this.maxCurrZoom, null);
             }
         }
-
     }
 
     _globalPreDraw() {
@@ -1097,6 +1103,16 @@ export class Planet extends RenderNode {
         this._terrainCompleted = true;
     }
 
+    lockQuadTree() {
+        this._collectRenderNodesIsActive = false;
+        this.camera.setTerrainCollisionActivity(false);
+    }
+
+    unlockQuadTree() {
+        this._collectRenderNodesIsActive = true;
+        this.camera.setTerrainCollisionActivity(true);
+    }
+
     /**
      * @protected
      */
@@ -1110,7 +1126,7 @@ export class Planet extends RenderNode {
         let frustumIndex = cam.getCurrentFrustum(), firstPass = frustumIndex === cam.FARTHEST_FRUSTUM_INDEX;
 
         if (firstPass) {
-            if (this._skipPreRender) {
+            if (this._skipPreRender && this._collectRenderNodesIsActive) {
                 this._collectRenderNodes();
             }
             this._skipPreRender = true;

package/types/camera/PlanetCamera.d.ts

@@ -82,6 +82,8 @@ export class PlanetCamera extends Camera {
     _numFrames: number;
     _completeCallback: any;
     _flying: boolean;
+    _checkTerrainCollision: boolean;
+    setTerrainCollisionActivity(isActive: any): void;
     eyeNorm: Vec3;
     updateGeodeticPosition(): void;
     /**

package/types/control/UIhelpers.d.ts

@@ -10,4 +10,4 @@ export function nodesToArray(nodeList: any): any[];
 export function setAllCSSclass(CSSclass: any, nodeArray: any): any;
 export function allMenuBtnOFF(): void;
 export function allDialogsHide(): void;
-export function btnClickHandler(btn_id: any, dialog_id: any, dialog_selector: any, btn_icon_id: any): void;
+export function btnClickHandler(btn_id: any, dialog_id: any, dialog_selector: any, btn_icon_id: any, callback: any): void;

package/types/control/index.d.ts

@@ -11,10 +11,13 @@ import { ToggleWireframe } from "./ToggleWireframe.js";
 import { TouchNavigation } from "./TouchNavigation.js";
 import { SimpleNavigation } from "./SimpleNavigation.js";
 import { ShowFps } from "./ShowFps.js";
+import { ScaleControl } from "./ScaleControl.js";
 import { Sun } from "./Sun.js";
 import { ZoomControl } from "./ZoomControl.js";
 import { MouseWheelZoomControl } from "./MouseWheelZoomControl.js";
 import { Lighting } from "./Lighting.js";
 import { Ruler } from "./ruler/Ruler.js";
+import { SimpleSkyBackground } from "./SimpleSkyBackground.js";
+import { Selection } from "./selection/Selection.js";
 import { LayerAnimation } from "./LayerAnimation.js";
-export { Control, CompassButton, DebugInfo, EarthNavigation, EarthCoordinates, GeoImageDragControl, KeyboardNavigation, LayerSwitcher, MouseNavigation, ToggleWireframe, TouchNavigation, SimpleNavigation, ShowFps, Sun, ZoomControl, MouseWheelZoomControl, Lighting, Ruler, LayerAnimation };
+export { Control, CompassButton, DebugInfo, EarthNavigation, EarthCoordinates, GeoImageDragControl, KeyboardNavigation, LayerSwitcher, MouseNavigation, ToggleWireframe, TouchNavigation, SimpleNavigation, ShowFps, ScaleControl, Sun, ZoomControl, MouseWheelZoomControl, Lighting, Ruler, SimpleSkyBackground, Selection, LayerAnimation };

package/types/control/selection/Selection.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Activate Selection
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ * @param {Array} [options.activationIconClasses] - array with a list of classes to change the button icons
+ * @param {boolean} [options.ignoreTerrain=false].
+ * @param {function} options.onSelect - callback (extent) => {} where extent is selected extent array [minLon,minLat,maxLon,maxLat]
+ * @param {boolean} [options.autoSelectionHide=false] - clear selection rectangle  after passing extent to callback
+ * @example:
+ * to use bootstrap icons, include
+ *  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css">
+ *
+ * new Selection({
+ *       activationIconClasses: ['bi', 'bi-bounding-box-circles'],
+ *       ignoreTerrain: false,
+ *       autoSelectionHide:true,
+ *       onSelect: (extent) => {
+ *
+ *           var vectorSource = new ol.source.Vector({
+ *               format: new GeoJSON(),
+ *               url: function (extent) {
+ *                   return 'https://snap.ogs.trieste.it/geoserver/snap/ows?service=WFS&' +
+ *                           'version=1.1.0&request=GetFeature&typename=snap:all_dataset_segy_view&' +
+ *                           'outputFormat=application/json&srsname=EPSG:4326&' +
+ *                           'bbox=' + extent.join(',') + ',EPSG:4326';
+ *               },
+ *               strategy: function (extent, resolution) {
+ *                   if (this.resolution && this.resolution != resolution) {
+ *                       this.loadedExtentsRtree_.clear();
+ *                   }
+ *                   return [extent];
+ *               }
+ *           });
+ *
+ *           vectorSource.loadFeatures(extent);
+ *
+ *           console.log(extent);
+ *
+ *       }
+ *   });
+ */
+export class Selection extends Control {
+    constructor(options?: {});
+    _activationIconClasses: any;
+    _selectorScene: SelectionScene;
+    set ignoreTerrain(arg: any);
+    createSelectorButton(): void;
+}
+import { Control } from "../Control.js";
+import { SelectionScene } from "./SelectionScene.js";

package/types/control/selection/SelectionScene.d.ts

@@ -0,0 +1,35 @@
+export class SelectionScene extends RenderNode {
+    constructor(options?: {});
+    _ignoreTerrain: any;
+    _onSelect: any;
+    _autoSelectionHide: any;
+    _planet: any;
+    _startLonLat: any;
+    _heading: number;
+    _propsLabel: Entity;
+    _trackEntity: Entity;
+    _cornerEntity: Entity[];
+    _trackLayer: Vector;
+    _cornersLayer: Vector;
+    set ignoreTerrain(arg: any);
+    bindPlanet(planet: any): void;
+    init(): void;
+    _activate(): void;
+    _onMouseMove_: any;
+    _onMouseLdown_: any;
+    _onMouseLup_: any;
+    _deactivate(): void;
+    _onMouseLdown(e: any): void;
+    _onMouseLup(e: any): void;
+    _pickedCorner: any;
+    _anchorLonLat: any;
+    _drawLine(startLonLat: any, endLonLat: any, startPos: any): void;
+    _onMouseMove(e: any): void;
+    clear(): void;
+    getScale(cart: any): number;
+    frame(): void;
+    get ellipsoid(): any;
+}
+import { RenderNode } from "../../scene/RenderNode.js";
+import { Entity } from "../../entity/Entity.js";
+import { Vector } from "../../layer/Vector.js";

package/types/index.d.ts

@@ -8,6 +8,8 @@ import * as mercator from "./mercator.js";
 import * as utils from "./utils/shared.js";
 import { input } from "./input/input.js";
 export const Layer: typeof layer.Layer;
+export const XYZ: typeof layer.XYZ;
+export const Vector: typeof layer.Vector;
 import * as layer from "./layer/index.js";
 import * as terrain from "./terrain/index.js";
 export const Control: typeof control.Control;
@@ -42,9 +44,9 @@ import * as entity from "./entity/index.js";
 export const Entity: typeof entity.Entity;
 import { Geoid } from "./terrain/Geoid.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 { QuadTreeStrategy } from "./quadTree/index.js";
+import { MarsQuadTreeStrategy } from "./quadTree/index.js";
+import { EarthQuadTreeStrategy } from "./quadTree/index.js";
+import { Wgs84QuadTreeStrategy } from "./quadTree/index.js";
+import { quadTreeStrategyType } from "./quadTree/index.js";
 export { bv, jd, math, mercator, utils, input, layer, terrain, control, webgl, wgs84, Camera, Ellipsoid, PlanetCamera, Globe, LightSource, Renderer, Clock, Events, Extent, LonLat, scene, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, entity, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, quadTreeStrategyType };

package/types/quadTree/index.d.ts

@@ -0,0 +1,10 @@
+export namespace quadTreeStrategyType {
+    export { EarthQuadTreeStrategy as earth };
+    export { MarsQuadTreeStrategy as mars };
+    export { Wgs84QuadTreeStrategy as wgs84 };
+}
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js";
+import { Wgs84QuadTreeStrategy } from "./Wgs84QuadTreeStrategy.js";
+import { MarsQuadTreeStrategy } from "./MarsQuadTreeStrategy.js";
+import { EarthQuadTreeStrategy } from "./EarthQuadTreeStrategy.js";
+export { QuadTreeStrategy, Wgs84QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy };

package/types/renderer/Renderer.d.ts

@@ -1,36 +1,3 @@
-/**
- * Represents high level WebGL context interface that starts WebGL handler working in real time.
- * @class
- * @param {Handler} handler - WebGL handler context.
- * @param {Object} [params] - Renderer parameters:
- * @fires og.RendererEvents#draw
- * @fires og.RendererEvents#resize
- * @fires og.RendererEvents#mousemove
- * @fires og.RendererEvents#mousestop
- * @fires og.RendererEvents#lclick
- * @fires og.RendererEvents#rclick
- * @fires og.RendererEvents#mclick
- * @fires og.RendererEvents#ldblclick
- * @fires og.RendererEvents#rdblclick
- * @fires og.RendererEvents#mdblclick
- * @fires og.RendererEvents#lup
- * @fires og.RendererEvents#rup
- * @fires og.RendererEvents#mup
- * @fires og.RendererEvents#ldown
- * @fires og.RendererEvents#rdown
- * @fires og.RendererEvents#mdown
- * @fires og.RendererEvents#lhold
- * @fires og.RendererEvents#rhold
- * @fires og.RendererEvents#mhold
- * @fires og.RendererEvents#mousewheel
- * @fires og.RendererEvents#touchstart
- * @fires og.RendererEvents#touchend
- * @fires og.RendererEvents#touchcancel
- * @fires og.RendererEvents#touchmove
- * @fires og.RendererEvents#doubletouch
- * @fires og.RendererEvents#touchleave
- * @fires og.RendererEvents#touchenter
- */
 export class Renderer {
     constructor(handler: any, params: any);
     /**
@@ -49,7 +16,6 @@ export class Renderer {
     gamma: number;
     whitepoint: number;
     brightThreshold: number;
-    backgroundColor: any;
     /**
      * Render nodes drawing queue.
      * @private
@@ -230,8 +196,10 @@ export class Renderer {
     };
     _screenFrameCornersBuffer: any;
     outputTexture: any;
-    setCurrentScreen(screenName: any): void;
     resize(): void;
+    setCurrentScreen(screenName: any): void;
+    _resizeStart(): void;
+    _resizeEnd(): void;
     removeNode(renderNode: any): void;
     /**
      * Adds render node to the renderer.

package/types/scene/Planet.d.ts

@@ -251,6 +251,8 @@ export class Planet extends RenderNode {
     _renderCompletedActivated: boolean;
     _terrainCompleted: boolean;
     _terrainCompletedActivated: boolean;
+    _collectRenderNodesIsActive: boolean;
+    _skipPreRender: boolean;
     set diffuse(arg: any);
     set ambient(arg: any);
     set specular(arg: any);
@@ -349,7 +351,6 @@ export class Planet extends RenderNode {
     clearIndexesCache(): void;
     _preRender(): void;
     _preLoad(): void;
-    _skipPreRender: boolean;
     /**
      * Creates default textures first for nirth pole and whole globe and second for south pole.
      * @public
@@ -392,6 +393,8 @@ export class Planet extends RenderNode {
      */
     public frame(): void;
     _checkRendercompleted(): void;
+    lockQuadTree(): void;
+    unlockQuadTree(): void;
     /**
      * @protected
      */

package/src/og/utils/quadTreeType.js

@@ -1,11 +0,0 @@
-"use strict";
-
-import { EarthQuadTreeStrategy } from "../quadTree/EarthQuadTreeStrategy.js";
-import { MarsQuadTreeStrategy } from "../quadTree/MarsQuadTreeStrategy.js";
-import { Wgs84QuadTreeStrategy } from "../quadTree/Wgs84QuadTreeStrategy.js";
-
-export const quadTreeStrategyType = {
-    earth: EarthQuadTreeStrategy,
-    mars: MarsQuadTreeStrategy,
-    wgs84: Wgs84QuadTreeStrategy
-}

package/types/utils/quadTreeType.d.ts

@@ -1,8 +0,0 @@
-export namespace quadTreeStrategyType {
-    export { EarthQuadTreeStrategy as earth };
-    export { MarsQuadTreeStrategy as mars };
-    export { Wgs84QuadTreeStrategy as wgs84 };
-}
-import { EarthQuadTreeStrategy } from "../quadTree/EarthQuadTreeStrategy.js";
-import { MarsQuadTreeStrategy } from "../quadTree/MarsQuadTreeStrategy.js";
-import { Wgs84QuadTreeStrategy } from "../quadTree/Wgs84QuadTreeStrategy.js";