@openglobus/og 0.15.4 → 0.16.0

package/src/og/camera/PlanetCamera.js

@@ -13,6 +13,7 @@ import { Ray } from "../math/Ray.js";
 import { Vec3 } from "../math/Vec3.js";
 import * as mercator from "../mercator.js";
 import { Camera } from "./Camera.js";
+import { Ellipsoid } from "../ellipsoid/index.js";
 
 /**
  * Planet camera.
@@ -58,7 +59,7 @@ class PlanetCamera extends Camera {
          * @public
          * @type {number}
          */
-        this.minAltitude = options.minAltitude || 5;
+        this.minAltitude = options.minAltitude || 1;
 
         /**
          * Maximal alltitude that camera can reach over the globe.
@@ -102,14 +103,6 @@ class PlanetCamera extends Camera {
          */
         this._insideSegment = null;
 
-        /**
-         * Coordinates that depends on what segment class we are fling over.
-         * It can be WGS84 or Mercator coordinates. Gets in og.quadTree.Node
-         * @protected
-         * @type {LonLat}
-         */
-        this._insideSegmentPosition = new LonLat();
-
         this.slope = 0;
 
         this._keyLock = new Key();
@@ -122,7 +115,7 @@ class PlanetCamera extends Camera {
         this._flying = false;
         this._checkTerrainCollision = true;
 
-        this._velCart = new Vec3(0.0,0.0,0.0);
+        this._velCart = new Vec3(0.0, 0.0, 0.0);
     }
 
     setTerrainCollisionActivity(isActive) {
@@ -144,16 +137,19 @@ class PlanetCamera extends Camera {
         }
 
         super.update();
+
         this.updateGeodeticPosition();
+
         this.eyeNorm = this.eye.normal();
         this.slope = this._b.dot(this.eyeNorm);
+
         this.events.dispatch(this.events.viewchange, this);
     }
 
     updateGeodeticPosition() {
-        this._lonLat = this.planet.ellipsoid.cartesianToLonLat(this.eye);
+        this.planet.ellipsoid.cartesianToLonLatRes(this.eye, this._lonLat);
         if (Math.abs(this._lonLat.lat) <= mercator.MAX_LAT) {
-            this._lonLatMerc = this._lonLat.forwardMercator();
+            LonLat.forwardMercatorRes(this._lonLat, this._lonLatMerc);
         }
     }
 
@@ -163,11 +159,14 @@ class PlanetCamera extends Camera {
      * @param {number} alt - Altitude over the terrain.
      */
     setAltitude(alt) {
-        var n = this.eye.normal();
-        var t = this._terrainPoint;
+
+        let t = this._terrainPoint;
+        let n = this.planet.ellipsoid.getSurfaceNormal3v(this.eye);
+
         this.eye.x = n.x * alt + t.x;
         this.eye.y = n.y * alt + t.y;
         this.eye.z = n.z * alt + t.z;
+
         this._terrainAltitude = alt;
     }
 
@@ -627,12 +626,13 @@ class PlanetCamera extends Camera {
         if (this._insideSegment && this._insideSegment.planet) {
             this._terrainAltitude = this._insideSegment.getTerrainPoint(
                 this.eye,
-                this._insideSegmentPosition,
+                this._lonLatMerc,
                 this._terrainPoint
             );
             if (this._terrainAltitude < this.minAltitude && this._checkTerrainCollision) {
                 this.setAltitude(this.minAltitude);
             }
+            return this._terrainPoint;
         }
     }
 

package/src/og/control/KeyboardNavigation.js

@@ -1,169 +1,153 @@
-/**
- * @module og/control/KeyboardNavigation
- */
-
-"use strict";
-
-import { input } from "../input/input.js";
-import * as math from "../math.js";
-import { Vec3 } from "../math/Vec3.js";
-import { Control } from "./Control.js";
-
-/**
- * Planet camera keyboard navigation. Use W,S,A,D and left shift key for fly around a planet.
- * @class
- * @extends {Control}
- * @param {Object} [options] - Control options.
- */
-
-class KeyboardNavigation extends Control {
-    constructor(options) {
-        options = options || {};
-        super(options);
-        this.step = options.step || 250;
-    }
-
-    oninit() {
-        this.renderer.events.on("keypress", input.KEY_PGUP, this.onCameraMoveForward, this);
-        this.renderer.events.on("keypress", input.KEY_PGDN, this.onCameraMoveBackward, this);
-        this.renderer.events.on("keypress", input.KEY_PLUS, this.onCameraMoveForward, this);
-        this.renderer.events.on("keypress", input.KEY_EQUALS, this.onCameraMoveForward, this);
-        this.renderer.events.on("keypress", input.KEY_MINUS, this.onCameraMoveBackward, this);
-        this.renderer.events.on("keypress", input.KEY_W, this.onCameraMoveForward, this);
-        this.renderer.events.on("keypress", input.KEY_S, this.onCameraMoveBackward, this);
-        this.renderer.events.on("keypress", input.KEY_A, this.onCameraStrifeLeft, this);
-        this.renderer.events.on("keypress", input.KEY_D, this.onCameraStrifeRight, this);
-        this.renderer.events.on("keypress", input.KEY_UP, this.onCameraLookUp, this);
-        this.renderer.events.on("keypress", input.KEY_DOWN, this.onCameraLookDown, this);
-        this.renderer.events.on("keypress", input.KEY_LEFT, this.onCameraLookLeft, this);
-        this.renderer.events.on("keypress", input.KEY_RIGHT, this.onCameraLookRight, this);
-        this.renderer.events.on("keypress", input.KEY_Q, this.onCameraRollLeft, this);
-        this.renderer.events.on("keypress", input.KEY_E, this.onCameraRollRight, this);
-        this.renderer.events.on("keypress", input.KEY_N, this.onCameraRollNorth, this);
-    }
-
-    onCameraMoveForward(event) {
-        var cam = this.renderer.activeCamera;
-        cam.slide(0, 0, -cam._lonLat.height / this.step);
-        cam.checkTerrainCollision();
-        cam.update();
-    }
-
-    onCameraMoveBackward(event) {
-        var cam = this.renderer.activeCamera;
-        cam.slide(0, 0, cam._lonLat.height / this.step);
-        cam.checkTerrainCollision();
-        cam.update();
-    }
-
-    onCameraStrifeLeft(event) {
-        var cam = this.renderer.activeCamera;
-        cam.slide(-cam._lonLat.height / this.step, 0, 0);
-        cam.checkTerrainCollision();
-        cam.update();
-    }
-
-    onCameraStrifeRight(event) {
-        var cam = this.renderer.activeCamera;
-        cam.slide(cam._lonLat.height / this.step, 0, 0);
-        cam.checkTerrainCollision();
-        cam.update();
-    }
-
-    onCameraLookUp(event) {
-        var cam = this.renderer.activeCamera;
-        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.update();
-    }
-
-    onCameraLookDown(event) {
-        var cam = this.renderer.activeCamera;
-        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.update();
-    }
-
-    onCameraLookLeft(event) {
-        var cam = this.renderer.activeCamera;
-        if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.roll(15 / this.renderer.handler.deltaTime);
-        } else {
-            cam.rotateHorizontal((cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
-        }
-        cam.update();
-    }
-
-    onCameraLookRight(event) {
-        var cam = this.renderer.activeCamera;
-        if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.roll(-15 / this.renderer.handler.deltaTime);
-        } else {
-            cam.rotateHorizontal((-cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
-        }
-        cam.update();
-    }
-
-    onCameraTurnLeft(event) {
-        var cam = this.renderer.activeCamera;
-        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.update();
-    }
-
-    onCameraTurnRight(event) {
-        var cam = this.renderer.activeCamera;
-        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.update();
-    }
-
-    // from CompassButton._onClick()
-    onCameraRollNorth(event) {
-      let c = this.planet.getCartesianFromPixelTerrain(this.renderer.handler.getCenter());
-      if (c) {
-        this.planet.flyCartesian(
-          c.normal().scaleTo(c.length() + c.distance(this.planet.camera.eye)),
-          null,
-          null,
-          0,
-          null,
-          null,
-          () => {
-            this.planet.camera.look(c);
-          }
-          );
-      } else {
-        this.planet.flyCartesian(this.planet.camera.eye);
-      }
-    }
-
-    onCameraRollLeft(event) {
-        this.renderer.activeCamera.roll(-15 / this.renderer.handler.deltaTime);
-        this.renderer.activeCamera.update();
-    }
-
-    onCameraRollRight(event) {
-        this.renderer.activeCamera.roll(15 / this.renderer.handler.deltaTime);
-        this.renderer.activeCamera.update();
-    }
-}
-
-export function keyboardNavigation(options) {
-    return new KeyboardNavigation(options);
-}
-
-export { KeyboardNavigation };
-
+/**
+ * @module og/control/KeyboardNavigation
+ */
+
+"use strict";
+
+import { input } from "../input/input.js";
+import * as math from "../math.js";
+import { Vec3 } from "../math/Vec3.js";
+import { Control } from "./Control.js";
+
+/**
+ * Planet camera keyboard navigation. Use W,S,A,D and left shift key for fly around a planet.
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+
+class KeyboardNavigation extends Control {
+    constructor(options) {
+        options = options || {};
+        super(options);
+        this.step = options.step || 250;
+    }
+
+    oninit() {
+        this.renderer.events.on("keypress", input.KEY_PGUP, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_PGDN, this.onCameraMoveBackward, this);
+        this.renderer.events.on("keypress", input.KEY_PLUS, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_EQUALS, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_MINUS, this.onCameraMoveBackward, this);
+        this.renderer.events.on("keypress", input.KEY_W, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_S, this.onCameraMoveBackward, this);
+        this.renderer.events.on("keypress", input.KEY_A, this.onCameraStrifeLeft, this);
+        this.renderer.events.on("keypress", input.KEY_D, this.onCameraStrifeRight, this);
+        this.renderer.events.on("keypress", input.KEY_UP, this.onCameraLookUp, this);
+        this.renderer.events.on("keypress", input.KEY_DOWN, this.onCameraLookDown, this);
+        this.renderer.events.on("keypress", input.KEY_LEFT, this.onCameraLookLeft, this);
+        this.renderer.events.on("keypress", input.KEY_RIGHT, this.onCameraLookRight, this);
+        this.renderer.events.on("keypress", input.KEY_Q, this.onCameraRollLeft, this);
+        this.renderer.events.on("keypress", input.KEY_E, this.onCameraRollRight, this);
+        this.renderer.events.on("keypress", input.KEY_N, this.onCameraRollNorth, this);
+    }
+
+    onCameraMoveForward(event) {
+        var cam = this.renderer.activeCamera;
+        cam.slide(0, 0, -cam._lonLat.height / this.step);
+    }
+
+    onCameraMoveBackward(event) {
+        var cam = this.renderer.activeCamera;
+        cam.slide(0, 0, cam._lonLat.height / this.step);
+    }
+
+    onCameraStrifeLeft(event) {
+        var cam = this.renderer.activeCamera;
+        cam.slide(-cam._lonLat.height / this.step, 0, 0);
+    }
+
+    onCameraStrifeRight(event) {
+        var cam = this.renderer.activeCamera;
+        cam.slide(cam._lonLat.height / this.step, 0, 0);
+    }
+
+    onCameraLookUp(event) {
+        var cam = this.renderer.activeCamera;
+        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);
+        }
+    }
+
+    onCameraLookDown(event) {
+        var cam = this.renderer.activeCamera;
+        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);
+        }
+    }
+
+    onCameraLookLeft(event) {
+        var cam = this.renderer.activeCamera;
+        if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
+            cam.roll(15 / this.renderer.handler.deltaTime);
+        } else {
+            cam.rotateHorizontal((cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
+        }
+    }
+
+    onCameraLookRight(event) {
+        var cam = this.renderer.activeCamera;
+        if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
+            cam.roll(-15 / this.renderer.handler.deltaTime);
+        } else {
+            cam.rotateHorizontal((-cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
+        }
+    }
+
+    onCameraTurnLeft(event) {
+        var cam = this.renderer.activeCamera;
+        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);
+        }
+    }
+
+    onCameraTurnRight(event) {
+        var cam = this.renderer.activeCamera;
+        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);
+        }
+    }
+
+    // from CompassButton._onClick()
+    onCameraRollNorth(event) {
+      let c = this.planet.getCartesianFromPixelTerrain(this.renderer.handler.getCenter());
+      if (c) {
+        this.planet.flyCartesian(
+          c.normal().scaleTo(c.length() + c.distance(this.planet.camera.eye)),
+          null,
+          null,
+          0,
+          null,
+          null,
+          () => {
+            this.planet.camera.look(c);
+          }
+          );
+      } else {
+        this.planet.flyCartesian(this.planet.camera.eye);
+      }
+    }
+
+    onCameraRollLeft(event) {
+        this.renderer.activeCamera.roll(-15 / this.renderer.handler.deltaTime);
+    }
+
+    onCameraRollRight(event) {
+        this.renderer.activeCamera.roll(15 / this.renderer.handler.deltaTime);
+    }
+}
+
+export function keyboardNavigation(options) {
+    return new KeyboardNavigation(options);
+}
+
+export { KeyboardNavigation };
+

package/src/og/control/MouseNavigation.js

@@ -319,10 +319,6 @@ class MouseNavigation extends Control {
                         cam._u = rot.mulVec3(cam._u);
                         cam._r = rot.mulVec3(cam._r);
                         cam._b = rot.mulVec3(cam._b);
-
-                        cam.checkTerrainCollision();
-
-                        cam.update();
                     }
                 } else {
                     var p0 = this.grabbedPoint,
@@ -332,10 +328,6 @@ class MouseNavigation extends Control {
                     var px = new Vec3();
                     if (new Ray(cam.eye, e.direction).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
                         cam.eye = this._eye0.addA(px.subA(p0).negate());
-
-                        cam.checkTerrainCollision();
-
-                        cam.update();
                     }
                 }
             }
@@ -361,10 +353,6 @@ class MouseNavigation extends Control {
             cam.rotateHorizontal(l * (e.x - e.prev_x), false, this.pointOnEarth, this.earthUp);
 
             cam.rotateVertical(l * (e.y - e.prev_y), this.pointOnEarth, this.minSlope);
-
-            cam.checkTerrainCollision();
-
-            cam.update();
         }
     }
 
@@ -405,10 +393,6 @@ class MouseNavigation extends Control {
                 cam._u = sf.v;
                 cam._r = sf.u;
                 cam._b = sf.n;
-
-                cam.checkTerrainCollision();
-
-                cam.update();
             } else {
                 if (this._deactivate) {
                     this._deactivate = false;
@@ -438,10 +422,6 @@ class MouseNavigation extends Control {
                 cam._u = rot.mulVec3(cam._u);
                 cam._r = rot.mulVec3(cam._r);
                 cam._b = rot.mulVec3(cam._b);
-
-                cam.checkTerrainCollision();
-
-                cam.update();
             }
 
             if (cam.eye.distance(prevEye) / cam._terrainAltitude > 0.01) {

package/src/og/control/RulerSwitcher.js

@@ -6,7 +6,7 @@
 
 import { ToggleButton } from "../ui/ToggleButton.js";
 import { Control } from "./Control.js";
-import { Ruler } from "./ruler/Ruler.js";
+import { HeightRuler } from "./heightRuler/HeightRuler.js";
 
 const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
@@ -37,7 +37,7 @@ class RulerSwitcher extends Control {
             ...options
         });
 
-        this.ruler = new Ruler({
+        this.ruler = new HeightRuler({
             ignoreTerrain: options.ignoreTerrain
         });
     }

package/src/og/control/SimpleNavigation.js

@@ -35,7 +35,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(0, 0, -this.speed);
-            camera.update();
+            //camera.update();
         }
     }
 
@@ -43,7 +43,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(0, 0, this.speed);
-            camera.update();
+            //camera.update();
         }
     }
 
@@ -51,7 +51,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(-this.speed, 0, 0);
-            camera.update();
+            //camera.update();
         }
     }
 
@@ -59,7 +59,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(this.speed, 0, 0);
-            camera.update();
+            //camera.update();
         }
     }
 
@@ -67,7 +67,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.pitch(0.5);
-            cam.update();
+            //cam.update();
         }
     }
 
@@ -75,7 +75,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.pitch(-0.5);
-            cam.update();
+            //cam.update();
         }
     }
 
@@ -83,7 +83,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.yaw(0.5);
-            cam.update();
+            //cam.update();
         }
     }
 
@@ -91,7 +91,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.yaw(-0.5);
-            cam.update();
+            //cam.update();
         }
     }
 
@@ -99,7 +99,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.roll(-0.5);
-            cam.update();
+            //cam.update();
         }
     }
 
@@ -107,7 +107,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.roll(0.5);
-            cam.update();
+            //cam.update();
         }
     }
 }

package/src/og/control/ZoomControl.js

@@ -9,12 +9,12 @@ import { Button } from "../ui/Button.js";
 import { Control } from "./Control.js";
 
 const ICON_PLUS_SVG = '<?xml version="1.0"?>' +
-    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">' +
+    '<svg width=24 height=24 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">' +
     '    <path d="M 11 5 L 11 11 L 5 11 L 5 13 L 11 13 L 11 19 L 13 19 L 13 13 L 19 13 L 19 11 L 13 11 L 13 5 L 11 5 z"/>' +
     '</svg>';
 
 const ICON_MINUS_SVG = '<?xml version="1.0"?>' +
-    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">' +
+    '<svg width=24 height=24 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">' +
     '    <path d="M 5 11 L 5 13 L 19 13 L 19 11 L 5 11 z"/>' +
     '</svg>';
 

package/src/og/control/heightRuler/HeightRulerScene.js

@@ -51,7 +51,11 @@ class HeightRulerScene extends RulerScene {
             relativeToGround: false,
             displayInLayerSwitcher: false
         });
+    }
 
+    setVisibility(visibility) {
+        super.setVisibility(visibility);
+        this._geoRulerLayer.setVisibility(visibility);
     }
 
     get deltaLabel() {
@@ -115,7 +119,6 @@ class HeightRulerScene extends RulerScene {
     }
 
     _drawLine(startLonLat, endLonLat, startPos) {
-
         super._drawLine(startLonLat, endLonLat, startPos);
         this._updateHeightRaysAndLabels();
     }
@@ -173,7 +176,8 @@ class HeightRulerScene extends RulerScene {
                 }
             })
         ];
-        this._cornersLayer.addEntities(this._cornerEntity)
+
+        this._cornersLayer.setEntities(this._cornerEntity);
     }
 
     init() {

package/src/og/control/index.js

@@ -1,6 +1,6 @@
 import { CompassButton } from "./CompassButton.js";
 import { Control } from "./Control.js";
-import { DebugInfo } from "./DebugInfo";
+import { DebugInfo } from "./DebugInfo.js";
 import { EarthCoordinates } from "./EarthCoordinates.js";
 import { EarthNavigation } from "./EarthNavigation.js";
 import { GeoImageDragControl } from "./GeoImageDragControl.js";
@@ -22,6 +22,8 @@ import { ToggleWireframe } from "./ToggleWireframe.js";
 import { TouchNavigation } from "./TouchNavigation.js";
 import { ZoomControl } from "./ZoomControl.js";
 
+import { TimelineControl } from "./timeline/TimelineControl.js";
+
 export {
     Control,
     CompassButton,
@@ -45,5 +47,6 @@ export {
     HeightRuler,
     SimpleSkyBackground,
     Selection,
-    LayerAnimation
+    LayerAnimation,
+    TimelineControl
 };