@openglobus/og 0.11.5 → 0.12.0

package/src/og/camera/Frustum.js

@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-import { Mat4 } from '../math/Mat4.js';
+import { Mat4 } from "../math/Mat4.js";
 
 function planeNormalize(plane) {
     var t = 1.0 / Math.sqrt(plane[0] * plane[0] + plane[1] * plane[1] + plane[2] * plane[2]);
@@ -15,9 +15,8 @@ function planeNormalize(plane) {
  * @class
  */
 class Frustum {
-
     /**
-     * @param {*} options 
+     * @param {*} options
      */
     constructor(options = {}) {
         /**
@@ -89,7 +88,8 @@ class Frustum {
          */
         this.far = 0.0;
 
-        this._cameraFrustumIndex = options.cameraFrustumIndex != undefined ? options.cameraFrustumIndex : -1;
+        this._cameraFrustumIndex =
+            options.cameraFrustumIndex != undefined ? options.cameraFrustumIndex : -1;
 
         this.setProjectionMatrix(
             options.fov || 30.0,
@@ -144,15 +144,21 @@ class Frustum {
      * @param {number} far - Far camera distance.
      */
     setProjectionMatrix(angle, aspect, near, far) {
-
-        this.top = near * Math.tan(angle * Math.PI / 360);
+        this.top = near * Math.tan((angle * Math.PI) / 360);
         this.bottom = -this.top;
         this.right = this.top * aspect;
         this.left = -this.right;
         this.near = near;
         this.far = far;
 
-        this._projectionMatrix.setPerspective(this.left, this.right, this.bottom, this.top, near, far);
+        this._projectionMatrix.setPerspective(
+            this.left,
+            this.right,
+            this.bottom,
+            this.top,
+            near,
+            far
+        );
         this._projectionMatrix.inverseTo(this._inverseProjectionMatrix);
     }
 
@@ -162,7 +168,6 @@ class Frustum {
      * @param {Mat4} projectionView - projectionView matrix.
      */
     setViewMatrix(viewMatrix) {
-
         this._projectionViewMatrix = this._projectionMatrix.mul(viewMatrix);
         this._projectionViewMatrix.inverseTo(this._inverseProjectionViewMatrix);
 
@@ -295,11 +300,13 @@ class Frustum {
      * @returns {boolean} -
      */
     containsBox(box) {
-        var result = true, cout, cin;
+        var result = true,
+            cout,
+            cin;
 
         for (var i = 0; i < 6; i++) {
-
-            cout = 0; cin = 0;
+            cout = 0;
+            cin = 0;
 
             for (var k = 0; k < 8 && (cin === 0 || cout === 0); k++) {
                 var d = box.vertices[k].dotArr(this._f[i]) + this._f[i][3];

package/src/og/camera/PlanetCamera.js

@@ -31,26 +31,20 @@ import { Mat4 } from "../math/Mat4.js";
  * @param {Vec3} [options.up] - Camera eye position. Default (0,1,0)
  */
 class PlanetCamera extends Camera {
-
     /**
      * @param {RenderNode} planet - Planet render node.
      * @param {Object} [options] - Planet camera options:
      */
     constructor(planet, options) {
-        super(
-            planet.renderer,
-            Object.assign(
-                {},
-                {
-                    frustums: /*[[100, 10000000]]*/ [
-                        [1, 100 + 0.075],
-                        [100, 1000 + 0.075],
-                        [1000, 1e6 + 10000],
-                        [1e6, 1e9]
-                    ] //[[1, 1e3 + 100], [1e3, 1e6 + 10000], [1e6, 1e9]]*/
-                },
-                options
-            )
+        super(planet.renderer, {
+            frustums: [
+                [1, 100 + 0.075],
+                [100, 1000 + 0.075],
+                [1000, 1e6 + 10000],
+                [1e6, 1e9]
+            ], //[[1, 1e3 + 100], [1e3, 1e6 + 10000], [1e6, 1e9]]*/
+            ...options
+        }
         );
         /**
          * Assigned camera's planet.
@@ -145,7 +139,7 @@ class PlanetCamera extends Camera {
         super.update();
         this.updateGeodeticPosition();
         this.eyeNorm = this.eye.normal();
-        this.slope = this._n.dot(this.eyeNorm);
+        this.slope = this._b.dot(this.eyeNorm);
         this.events.dispatch(this.events.viewchange, this);
     }
 
@@ -388,8 +382,8 @@ class PlanetCamera extends Camera {
         var ground_a = this.planet.ellipsoid.lonLatToCartesian(
             new LonLat(this._lonLat.lon, this._lonLat.lat)
         );
-        var v_a = this._v,
-            n_a = this._n;
+        var v_a = this._u,
+            n_a = this._b;
 
         var lonlat_b = this.planet.ellipsoid.cartesianToLonLat(cartesian);
         var up_b = up || Vec3.UP;
@@ -544,18 +538,18 @@ class PlanetCamera extends Camera {
     }
 
     rotateVertical(angle, center, minSlope = 0) {
-        var rot = new Mat4().setRotation(this._u, angle);
+        var rot = new Mat4().setRotation(this._r, angle);
         var tr = new Mat4().setIdentity().translate(center);
         var ntr = new Mat4().setIdentity().translate(center.negateTo());
         var trm = tr.mul(rot).mul(ntr);
 
         let eye = trm.mulVec3(this.eye);
-        let v = rot.mulVec3(this._v).normalize();
         let u = rot.mulVec3(this._u).normalize();
-        let n = rot.mulVec3(this._n).normalize();
+        let r = rot.mulVec3(this._r).normalize();
+        let b = rot.mulVec3(this._b).normalize();
 
         let eyeNorm = eye.normal();
-        let slope = n.dot(eyeNorm);
+        let slope = b.dot(eyeNorm);
 
         if (minSlope) {
             let dSlope = slope - this.slope;
@@ -563,20 +557,20 @@ class PlanetCamera extends Camera {
             if (slope < minSlope && dSlope < 0) return;
 
             if (
-                (slope > 0.1 && v.dot(eyeNorm) > 0) ||
+                (slope > 0.1 && u.dot(eyeNorm) > 0) ||
                 this.slope <= 0.1 ||
-                this._v.dot(this.eye.normal()) <= 0.0
+                this._u.dot(this.eye.normal()) <= 0.0
             ) {
                 this.eye = eye;
-                this._v = v;
                 this._u = u;
-                this._n = n;
+                this._r = r;
+                this._b = b;
             }
         } else {
             this.eye = eye;
-            this._v = v;
             this._u = u;
-            this._n = n;
+            this._r = r;
+            this._b = b;
         }
     }
 
@@ -593,9 +587,9 @@ class PlanetCamera extends Camera {
             this.planet._normalMapCreator.lock(this._keyLock);
 
             this.eye = this._framesArr[c].eye;
-            this._u = this._framesArr[c].u;
-            this._v = this._framesArr[c].v;
-            this._n = this._framesArr[c].n;
+            this._r = this._framesArr[c].u;
+            this._u = this._framesArr[c].v;
+            this._b = this._framesArr[c].n;
 
             if (this._frameCallback) {
                 this._frameCallback();
@@ -637,15 +631,20 @@ class PlanetCamera extends Camera {
     getHeading() {
         let u = this.eye.normal();
         let f = Vec3.proj_b_to_plane(
-                this.slope >= 0.97 ? this.getUp() : this.getForward(),
-                u
-            ).normalize(),
+            this.slope >= 0.97 ? this.getUp() : this.getForward(),
+            u
+        ).normalize(),
             n = Vec3.proj_b_to_plane(Vec3.UP, u).normalize();
         let res = Math.sign(u.dot(f.cross(n))) * Math.acos(f.dot(n)) * math.DEGREES;
         if (res < 0.0) {
             return 360.0 + res;
         }
         return res;
+    }
+
+    isVisible(poi) {
+        let e = this.eye.length();
+        return this.eye.distance(poi) < Math.sqrt(e * e - this.planet.ellipsoid._a2);
     }
 }
 

package/src/og/control/CompassButton.js

@@ -86,9 +86,8 @@ let svg = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  * @params {Object} [options] - Control options.
  */
 class CompassButton extends Control {
-
     /**
-     * 
+     *
      * @params {Object} [options] - Control options.
      */
     constructor(options) {

package/src/og/control/Control.js

@@ -2,7 +2,7 @@
  * @module og/control/Control
  */
 
-'use strict';
+"use strict";
 
 /**
  * Base control class for implementing renderer controls.
@@ -12,7 +12,6 @@
  * @param {Boolean} [options.autoActivated=true] - If true - calls initialize function after the renderer assigning.
  */
 class Control {
-
     /**
      * @param {Object} [options] - Control activation options:
      */
@@ -77,35 +76,35 @@ class Control {
      * @public
      * @virtual
      */
-    oninit() { }
+    oninit() {}
 
     /**
      * Control renderer assigning function have to be overriden.
      * @public
      * @virtual
      */
-    onadd() { }
+    onadd() {}
 
     /**
      * Control remove function have to be overriden.
      * @public
      * @virtual
      */
-    onremove() { }
+    onremove() {}
 
     /**
      * Control activation function have to be overriden.
      * @public
      * @virtual
      */
-    onactivate() { }
+    onactivate() {}
 
     /**
      * Control deactivation function have to be overriden.
      * @public
      * @virtual
      */
-    ondeactivate() { }
+    ondeactivate() {}
 
     /**
      * Assign renderer to the control.
@@ -130,7 +129,6 @@ class Control {
      * @public
      */
     remove() {
-
         this.onremove && this.onremove();
 
         let r = this.renderer,
@@ -187,4 +185,4 @@ class Control {
     }
 }
 
-export { Control };
+export { Control };

package/src/og/control/DebugInfo.js

@@ -13,7 +13,6 @@ import { Control } from "./Control.js";
  * @param {Object} [options] - Control options.
  */
 class DebugInfo extends Control {
-
     /**
      * @param {Object} [options] - Control options.
      */
@@ -94,8 +93,8 @@ class DebugInfo extends Control {
                     frame: () => p.camera.slope.toFixed(3)
                 },
                 {
-                    label: "lodRatio",
-                    frame: () => p._lodRatio.toFixed(3)
+                    label: "lodSize",
+                    frame: () => Math.round(p.lodSize)
                 },
                 {
                     label: "deltaTime/FPS",

package/src/og/control/EarthNavigation.js

@@ -6,6 +6,7 @@ import { Quat } from "../math/Quat.js";
 import { Ray } from "../math/Ray.js";
 import { Vec3 } from "../math/Vec3.js";
 import { Control } from "./Control.js";
+import { Mat4 } from "../math/Mat4.js";
 
 class Touch {
     constructor() {
@@ -29,6 +30,7 @@ class EarthNavigation extends Control {
         super(options);
 
         this.grabbedPoint = new Vec3();
+        this.grabbedDir = new Vec3();
         this.inertia = 0.007;
         this.grabbedSpheroid = new Sphere();
         this.planet = null;
@@ -39,11 +41,11 @@ class EarthNavigation extends Control {
         this.currState = 0;
 
         this.positionState = [
-            { h: 17119745.303455353, max: 0.99, min: -0.99 },
-            { h: 6866011, max: 0.99, min: -0.99 },
-            { h: 3000000, max: 0.99, min: -0.99 },
-            { h: 1000000, max: 0.99, min: -0.99 },
-            { h: 500000, max: 0.99, min: -0.99 }
+            { h: 17119745.303455353, max: 0.98, min: -0.98 },
+            { h: 6866011, max: 0.98, min: -0.98 },
+            { h: 3000000, max: 0.98, min: -0.98 },
+            { h: 1000000, max: 0.98, min: -0.98 },
+            { h: 500000, max: 0.98, min: -0.98 }
         ];
 
         this.touches = [new Touch(), new Touch()];
@@ -163,9 +165,10 @@ class EarthNavigation extends Control {
         }
     }
 
-    onMouseLeftButtonClick() {
+    onMouseLeftButtonClick(e) {
         this.renderer.handler.gl.canvas.classList.add("ogGrabbingPoiner");
         this.grabbedPoint = this.planet.getCartesianFromMouseTerrain(true);
+        this.grabbedDir.copy(e.direction);
         if (this.grabbedPoint) {
             this.grabbedSpheroid.radius = this.grabbedPoint.length();
             this.stopRotation();
@@ -195,24 +198,30 @@ class EarthNavigation extends Control {
             var targetPoint = new Ray(cam.eye, e.direction).hitSphere(this.grabbedSpheroid);
 
             if (targetPoint) {
-                this._a =
-                    Math.acos(this.grabbedPoint.y / this.grabbedSpheroid.radius) -
+
+                this._a = Math.acos(this.grabbedPoint.y / this.grabbedSpheroid.radius) -
                     Math.acos(targetPoint.y / this.grabbedSpheroid.radius);
 
-                this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
+                let rot = this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
+
+                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
+                //cam.update();
+
                 this._hRot = Quat.getRotationBetweenVectors(
                     new Vec3(targetPoint.x, 0.0, targetPoint.z).normal(),
                     new Vec3(this.grabbedPoint.x, 0.0, this.grabbedPoint.z).normal()
                 );
-                var rot = this._hRot.mul(this._vRot);
 
-                var state = this.positionState[this.currState];
-                var lim = rot.mulVec3(cam.eye).normal().dot(Vec3.UP);
-                if (lim > state.max || lim < state.min) {
-                    rot = Quat.yRotation(rot.getYaw());
-                }
-                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.UP);
-                cam.update();
+                rot = this._hRot;
+
+                //var state = this.positionState[this.currState];
+                //var lim = cam.eye.normal().dot(Vec3.UP);
+
+                //if (lim > state.max || lim < state.min) {
+                //    rot = Quat.yRotation(rot.getYaw());
+                    cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
+                    cam.update();
+                //}
             }
         } else {
             this.scaleRot = 0;

package/src/og/control/KeyboardNavigation.js

@@ -2,12 +2,12 @@
  * @module og/control/KeyboardNavigation
  */
 
-'use strict';
+"use strict";
 
-import * as math from '../math.js';
-import { Control } from './Control.js';
-import { input } from '../input/input.js';
-import { Vec3 } from '../math/Vec3.js';
+import * as math from "../math.js";
+import { Control } from "./Control.js";
+import { input } from "../input/input.js";
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Planet camera keyboard navigation. Use W,S,A,D and left shift key for fly around a planet.
@@ -69,7 +69,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.pitch(15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateVertical(cam._lonLat.height / 3000000 * math.RADIANS, Vec3.ZERO);
+            cam.rotateVertical((cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
         }
         cam.update();
     }
@@ -79,7 +79,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.pitch(-15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateVertical(-cam._lonLat.height / 3000000 * math.RADIANS, Vec3.ZERO);
+            cam.rotateVertical((-cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
         }
         cam.update();
     }
@@ -89,7 +89,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.yaw(15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateHorizontal(cam._lonLat.height / 3000000 * math.RADIANS, false, Vec3.ZERO);
+            cam.rotateHorizontal((cam._lonLat.height / 3000000) * math.RADIANS, false, Vec3.ZERO);
         }
         cam.update();
     }
@@ -99,7 +99,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.yaw(-15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateHorizontal(-cam._lonLat.height / 3000000 * math.RADIANS, false, Vec3.ZERO);
+            cam.rotateHorizontal((-cam._lonLat.height / 3000000) * math.RADIANS, false, Vec3.ZERO);
         }
         cam.update();
     }

package/src/og/control/LayerSwitcher.js

@@ -2,9 +2,9 @@
  * @module og/control/LayerSwitcher
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
+import { Control } from "./Control.js";
 
 /**
  * Simple(OpenLayers like)layer switcher, includes base layers, overlays, geo images etc. groups.
@@ -56,16 +56,16 @@ class LayerSwitcher extends Control {
     }
 
     addSwitcher(type, obj, container, id) {
-        var lineDiv = document.createElement('div');
+        var lineDiv = document.createElement("div");
 
         var that = this;
-        var center = document.createElement('div');
-        center.classList.add('ogViewExtentBtn');
+        var center = document.createElement("div");
+        center.classList.add("ogViewExtentBtn");
         center.onclick = function () {
             that.planet.flyExtent(obj.getExtent());
         };
 
-        var inp = document.createElement('input');
+        var inp = document.createElement("input");
         inp.type = type;
         inp.name = "ogBaseLayerRadiosId" + (id || "");
         inp.checked = obj.getVisibility();
@@ -74,11 +74,12 @@ class LayerSwitcher extends Control {
             obj.setVisibility(this.checked);
         };
 
-        obj.events && obj.events.on("visibilitychange", function (e) {
-            inp.checked = e.getVisibility();
-        });
+        obj.events &&
+            obj.events.on("visibilitychange", function (e) {
+                inp.checked = e.getVisibility();
+            });
 
-        var lbl = document.createElement('label');
+        var lbl = document.createElement("label");
         lbl.className = "ogLayerSwitcherLabel";
         lbl.innerHTML = (obj.name || obj.src || "noname") + "</br>";
 
@@ -94,35 +95,35 @@ class LayerSwitcher extends Control {
     }
 
     createBaseLayersContainer() {
-        var layersDiv = document.createElement('div');
+        var layersDiv = document.createElement("div");
         layersDiv.className = "layersDiv";
         this.dialog.appendChild(layersDiv);
 
-        var baseLayersLbl = document.createElement('div');
+        var baseLayersLbl = document.createElement("div");
         baseLayersLbl.className = "layersDiv";
         baseLayersLbl.innerHTML = "Base Layer";
         layersDiv.appendChild(baseLayersLbl);
 
-        this.baseLayersDiv = document.createElement('div');
+        this.baseLayersDiv = document.createElement("div");
         layersDiv.appendChild(this.baseLayersDiv);
     }
 
     createOverlaysContainer() {
-        var overlaysDiv = document.createElement('div');
+        var overlaysDiv = document.createElement("div");
         overlaysDiv.className = "layersDiv";
         this.dialog.appendChild(overlaysDiv);
 
-        var overlaysLbl = document.createElement('div');
+        var overlaysLbl = document.createElement("div");
         overlaysLbl.className = "layersDiv";
         overlaysLbl.innerHTML = "Overlays";
         overlaysDiv.appendChild(overlaysLbl);
 
-        this.overlaysDiv = document.createElement('div');
+        this.overlaysDiv = document.createElement("div");
         overlaysDiv.appendChild(this.overlaysDiv);
     }
 
     createDialog() {
-        this.dialog = document.createElement('div');
+        this.dialog = document.createElement("div");
         this.dialog.id = "ogLayerSwitcherDialog";
         this.dialog.className = "displayNone";
         this.renderer.div.appendChild(this.dialog);
@@ -138,8 +139,8 @@ class LayerSwitcher extends Control {
     }
 
     createSwitcher() {
-        var button = document.createElement('div');
-        button.className = 'ogLayerSwitcherButton';
+        var button = document.createElement("div");
+        button.className = "ogLayerSwitcherButton";
         button.id = "ogLayerSwitcherButtonMaximize";
         var that = this;
         button.onclick = function (e) {
@@ -155,4 +156,4 @@ class LayerSwitcher extends Control {
     }
 }
 
-export { LayerSwitcher };
+export { LayerSwitcher };