@openglobus/og 0.15.3 → 0.15.5

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

@@ -32,7 +32,10 @@ const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="iso-8859-1"?>
  */
 class RulerSwitcher extends Control {
     constructor(options = {}) {
-        super(options);
+        super({
+            name: "RulerSwitcher",
+            ...options
+        });
 
         this.ruler = new Ruler({
             ignoreTerrain: options.ignoreTerrain

package/src/og/control/SimpleNavigation.js

@@ -1,128 +1,123 @@
-"use strict";
-
-import { input } from "../input/input.js";
-import { Control } from "./Control.js";
-
-/**
- * Simple keyboard camera navigation with W,S,A,D and shift keys to fly around the scene.
- * @class
- * @extends {Control}
- * @param {Object} [options] - Control options.
- */
-class SimpleNavigation extends Control {
-    constructor(options) {
-        options = options || {};
-        super(options);
-
-        this.camera = null;
-        this.speed = options.speed || 1.0;
-    }
-
-    onactivate() {}
-
-    ondeactivate() {}
-
-    oninit() {
-        this.camera = this.renderer.activeCamera;
-        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.onCameraTurnLeft, this);
-        this.renderer.events.on("keypress", input.KEY_RIGHT, this.onCameraTurnRight, this);
-        this.renderer.events.on("keypress", input.KEY_Q, this.onCameraRollLeft, this);
-        this.renderer.events.on("keypress", input.KEY_E, this.onCameraRollRight, this);
-    }
-
-    onCameraMoveForward() {
-        if (this._active) {
-            var camera = this.camera;
-            camera.slide(0, 0, -this.speed);
-            camera.update();
-        }
-    }
-
-    onCameraMoveBackward() {
-        if (this._active) {
-            var camera = this.camera;
-            camera.slide(0, 0, this.speed);
-            camera.update();
-        }
-    }
-
-    onCameraStrifeLeft() {
-        if (this._active) {
-            var camera = this.camera;
-            camera.slide(-this.speed, 0, 0);
-            camera.update();
-        }
-    }
-
-    onCameraStrifeRight() {
-        if (this._active) {
-            var camera = this.camera;
-            camera.slide(this.speed, 0, 0);
-            camera.update();
-        }
-    }
-
-    onCameraLookUp() {
-        if (this._active) {
-            var cam = this.camera;
-            cam.pitch(0.5);
-            cam.update();
-        }
-    }
-
-    onCameraLookDown() {
-        if (this._active) {
-            var cam = this.camera;
-            cam.pitch(-0.5);
-            cam.update();
-        }
-    }
-
-    onCameraTurnLeft() {
-        if (this._active) {
-            var cam = this.camera;
-            cam.yaw(0.5);
-            cam.update();
-        }
-    }
-
-    onCameraTurnRight() {
-        if (this._active) {
-            var cam = this.camera;
-            cam.yaw(-0.5);
-            cam.update();
-        }
-    }
-
-    onCameraRollLeft() {
-        if (this._active) {
-            var cam = this.camera;
-            cam.roll(-0.5);
-            cam.update();
-        }
-    }
-
-    onCameraRollRight() {
-        if (this._active) {
-            var cam = this.camera;
-            cam.roll(0.5);
-            cam.update();
-        }
-    }
-}
-
-/**
- * Creates simple navigation control instance.
- */
-export function simpleNavigation(options) {
-    return new SimpleNavigation(options);
-}
-
-export { SimpleNavigation };
-
+"use strict";
+
+import { input } from "../input/input.js";
+import { Control } from "./Control.js";
+
+/**
+ * Simple keyboard camera navigation with W,S,A,D and shift keys to fly around the scene.
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+class SimpleNavigation extends Control {
+    constructor(options = {}) {
+        super({ autoActivate: true, ...options });
+
+        this.camera = null;
+        this.speed = options.speed || 1.0;
+    }
+
+    oninit() {
+        this.camera = this.renderer.activeCamera;
+        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.onCameraTurnLeft, this);
+        this.renderer.events.on("keypress", input.KEY_RIGHT, this.onCameraTurnRight, this);
+        this.renderer.events.on("keypress", input.KEY_Q, this.onCameraRollLeft, this);
+        this.renderer.events.on("keypress", input.KEY_E, this.onCameraRollRight, this);
+    }
+
+    onCameraMoveForward() {
+        if (this._active) {
+            var camera = this.camera;
+            camera.slide(0, 0, -this.speed);
+            //camera.update();
+        }
+    }
+
+    onCameraMoveBackward() {
+        if (this._active) {
+            var camera = this.camera;
+            camera.slide(0, 0, this.speed);
+            //camera.update();
+        }
+    }
+
+    onCameraStrifeLeft() {
+        if (this._active) {
+            var camera = this.camera;
+            camera.slide(-this.speed, 0, 0);
+            //camera.update();
+        }
+    }
+
+    onCameraStrifeRight() {
+        if (this._active) {
+            var camera = this.camera;
+            camera.slide(this.speed, 0, 0);
+            //camera.update();
+        }
+    }
+
+    onCameraLookUp() {
+        if (this._active) {
+            var cam = this.camera;
+            cam.pitch(0.5);
+            //cam.update();
+        }
+    }
+
+    onCameraLookDown() {
+        if (this._active) {
+            var cam = this.camera;
+            cam.pitch(-0.5);
+            //cam.update();
+        }
+    }
+
+    onCameraTurnLeft() {
+        if (this._active) {
+            var cam = this.camera;
+            cam.yaw(0.5);
+            //cam.update();
+        }
+    }
+
+    onCameraTurnRight() {
+        if (this._active) {
+            var cam = this.camera;
+            cam.yaw(-0.5);
+            //cam.update();
+        }
+    }
+
+    onCameraRollLeft() {
+        if (this._active) {
+            var cam = this.camera;
+            cam.roll(-0.5);
+            //cam.update();
+        }
+    }
+
+    onCameraRollRight() {
+        if (this._active) {
+            var cam = this.camera;
+            cam.roll(0.5);
+            //cam.update();
+        }
+    }
+}
+
+/**
+ * Creates simple navigation control instance.
+ */
+export function simpleNavigation(options) {
+    return new SimpleNavigation(options);
+}
+
+export { SimpleNavigation };
+

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

@@ -0,0 +1,12 @@
+import { Ruler } from "../ruler/Ruler.js";
+import { HeightRulerScene } from "./HeightRulerScene.js";
+
+export class HeightRuler extends Ruler {
+    constructor(options) {
+        super({ ...options });
+        this._rulerScene = new HeightRulerScene({
+            name: `heightRulerScene:${this._id}`,
+            ignoreTerrain: false
+        });
+    }
+}