@openglobus/og 0.12.4 → 0.13.0

package/src/og/control/ZoomControl.js

@@ -1,132 +1,132 @@
-/**
- * @module og/control/ZoomControl
- */
-
-"use strict";
-
-import { Control } from "./Control.js";
-import { Key } from "../Lock.js";
-
-/**
- * Planet zoom buttons control.
- * @class
- * @extends {Control}
- * @params {Object} [options] - Control options.
- */
-class ZoomControl extends Control {
-    constructor(options) {
-        super(options);
-
-        options = options || {};
-
-        this._keyLock = new Key();
-
-        this.planet = null;
-
-        this._move = 0;
-    }
-
-    oninit() {
-        var zoomDiv = document.createElement("div"),
-            btnZoomIn = document.createElement("button"),
-            btnZoomOut = document.createElement("button");
-
-        zoomDiv.className = "ogZoomControl";
-        btnZoomIn.className = "ogZoomButton ogZoomIn";
-        btnZoomOut.className = "ogZoomButton ogZoomOut";
-
-        zoomDiv.appendChild(btnZoomIn);
-        zoomDiv.appendChild(btnZoomOut);
-
-        this.renderer.div.appendChild(zoomDiv);
-
-        btnZoomIn.addEventListener("mousedown", (e) => this.zoomIn());
-        btnZoomIn.addEventListener("mouseup", (e) => this.stopZoom());
-
-        btnZoomOut.addEventListener("mousedown", (e) => this.zoomOut());
-        btnZoomOut.addEventListener("mouseup", (e) => this.stopZoom());
-
-        btnZoomIn.addEventListener("touchstart", (e) => {
-            e.preventDefault();
-            this.zoomIn();
-        });
-        btnZoomIn.addEventListener("touchend", (e) => {
-            e.preventDefault();
-            this.stopZoom();
-        });
-        btnZoomIn.addEventListener("touchcancel", (e) => {
-            e.preventDefault();
-            this.stopZoom();
-        });
-
-        btnZoomOut.addEventListener("touchstart", (e) => {
-            e.preventDefault();
-            this.zoomOut();
-        });
-        btnZoomOut.addEventListener("touchend", (e) => {
-            e.preventDefault();
-            this.stopZoom();
-        });
-        btnZoomOut.addEventListener("touchcancel", (e) => {
-            e.preventDefault();
-            this.stopZoom();
-        });
-
-        this.renderer.events.on("draw", this._draw, this);
-    }
-
-    /**
-     * Planet zoom in.
-     * @public
-     */
-    zoomIn() {
-        this.planet.layerLock.lock(this._keyLock);
-        this.planet.terrainLock.lock(this._keyLock);
-        this.planet._normalMapCreator.lock(this._keyLock);
-
-        this._targetPoint = this.renderer.getCenter();
-
-        this._move = 1;
-    }
-
-    /**
-     * Planet zoom out.
-     * @public
-     */
-    zoomOut() {
-        this.planet.layerLock.lock(this._keyLock);
-        this.planet.terrainLock.lock(this._keyLock);
-        this.planet._normalMapCreator.lock(this._keyLock);
-
-        this._targetPoint = this.renderer.getCenter();
-        this._move = -1;
-    }
-
-    stopZoom() {
-        this._move = 0;
-
-        this.planet.layerLock.free(this._keyLock);
-        this.planet.terrainLock.free(this._keyLock);
-        this.planet._normalMapCreator.free(this._keyLock);
-    }
-
-    _draw(e) {
-        var cam = this.renderer.activeCamera;
-
-        if (this._move !== 0) {
-            var d =
-                cam.eye.distance(
-                    this.planet.getCartesianFromPixelTerrain(this._targetPoint, true)
-                ) * 0.075;
-            cam.eye.addA(cam.getForward().scale(this._move * d));
-            cam.checkTerrainCollision();
-            cam.update();
-        }
-    }
-}
-
-export function zoomControl(options) {
-    return new ZoomControl(options);
-}
-
-export { ZoomControl };
+/**
+ * @module og/control/ZoomControl
+ */
+
+"use strict";
+
+import { Control } from "./Control.js";
+import { Key } from "../Lock.js";
+
+/**
+ * Planet zoom buttons control.
+ * @class
+ * @extends {Control}
+ * @params {Object} [options] - Control options.
+ */
+class ZoomControl extends Control {
+    constructor(options) {
+        super(options);
+
+        options = options || {};
+
+        this._keyLock = new Key();
+
+        this.planet = null;
+
+        this._move = 0;
+    }
+
+    oninit() {
+        var zoomDiv = document.createElement("div"),
+            btnZoomIn = document.createElement("button"),
+            btnZoomOut = document.createElement("button");
+
+        zoomDiv.className = "ogZoomControl";
+        btnZoomIn.className = "ogZoomButton ogZoomIn";
+        btnZoomOut.className = "ogZoomButton ogZoomOut";
+
+        zoomDiv.appendChild(btnZoomIn);
+        zoomDiv.appendChild(btnZoomOut);
+
+        this.renderer.div.appendChild(zoomDiv);
+
+        btnZoomIn.addEventListener("mousedown", (e) => this.zoomIn());
+        btnZoomIn.addEventListener("mouseup", (e) => this.stopZoom());
+
+        btnZoomOut.addEventListener("mousedown", (e) => this.zoomOut());
+        btnZoomOut.addEventListener("mouseup", (e) => this.stopZoom());
+
+        btnZoomIn.addEventListener("touchstart", (e) => {
+            e.preventDefault();
+            this.zoomIn();
+        });
+        btnZoomIn.addEventListener("touchend", (e) => {
+            e.preventDefault();
+            this.stopZoom();
+        });
+        btnZoomIn.addEventListener("touchcancel", (e) => {
+            e.preventDefault();
+            this.stopZoom();
+        });
+
+        btnZoomOut.addEventListener("touchstart", (e) => {
+            e.preventDefault();
+            this.zoomOut();
+        });
+        btnZoomOut.addEventListener("touchend", (e) => {
+            e.preventDefault();
+            this.stopZoom();
+        });
+        btnZoomOut.addEventListener("touchcancel", (e) => {
+            e.preventDefault();
+            this.stopZoom();
+        });
+
+        this.renderer.events.on("draw", this._draw, this);
+    }
+
+    /**
+     * Planet zoom in.
+     * @public
+     */
+    zoomIn() {
+        this.planet.layerLock.lock(this._keyLock);
+        this.planet.terrainLock.lock(this._keyLock);
+        this.planet._normalMapCreator.lock(this._keyLock);
+
+        this._targetPoint = this.renderer.getCenter();
+
+        this._move = 1;
+    }
+
+    /**
+     * Planet zoom out.
+     * @public
+     */
+    zoomOut() {
+        this.planet.layerLock.lock(this._keyLock);
+        this.planet.terrainLock.lock(this._keyLock);
+        this.planet._normalMapCreator.lock(this._keyLock);
+
+        this._targetPoint = this.renderer.getCenter();
+        this._move = -1;
+    }
+
+    stopZoom() {
+        this._move = 0;
+
+        this.planet.layerLock.free(this._keyLock);
+        this.planet.terrainLock.free(this._keyLock);
+        this.planet._normalMapCreator.free(this._keyLock);
+    }
+
+    _draw(e) {
+        var cam = this.renderer.activeCamera;
+
+        if (this._move !== 0) {
+            let pos = this.planet.getCartesianFromPixelTerrain(this._targetPoint);
+            if (pos) {
+                let d = cam.eye.distance(pos) * 0.035;
+                cam.eye.addA(cam.getForward().scale(this._move * d));
+                cam.checkTerrainCollision();
+                cam.update();
+            }
+        }
+    }
+}
+
+export function zoomControl(options) {
+    return new ZoomControl(options);
+}
+
+export { ZoomControl };

package/src/og/control/visibleExtent/Segment.js

@@ -1,17 +1,17 @@
 "use strict";
 
-import * as mercator from "../mercator.js";
-import { N, E, S, W, OPSIDE, NOTRENDERING } from "../quadTree/quadTree.js";
-import { EPSG3857 } from "../proj/EPSG3857.js";
-import { Extent } from "../Extent.js";
-import { Layer } from "../layer/Layer.js";
-import { LonLat } from "../LonLat.js";
-import { Ray } from "../math/Ray.js";
-import { Sphere } from "../bv/Sphere.js";
-import { Box } from "../bv/Box.js";
-import { Vec3 } from "../math/Vec3.js";
-import * as segmentHelper from "../segment/segmentHelper.js";
-import { getMatrixSubArray } from "../utils/shared.js";
+import * as mercator from "../../mercator.js";
+import { N, E, S, W, OPSIDE, NOTRENDERING } from "../../quadTree/quadTree.js";
+import { EPSG3857 } from "../../proj/EPSG3857.js";
+import { Extent } from "../../Extent.js";
+import { Layer } from "../../layer/Layer.js";
+import { LonLat } from "../../LonLat.js";
+import { Ray } from "../../math/Ray.js";
+import { Sphere } from "../../bv/Sphere.js";
+import { Box } from "../../bv/Box.js";
+import { Vec3 } from "../../math/Vec3.js";
+import * as segmentHelper from "../../segment/segmentHelper.js";
+import { getMatrixSubArray } from "../../utils/shared.js";
 
 export const MAX_NORMAL_ZOOM = 7;