@openglobus/og 0.11.5 → 0.12.0

package/src/og/control/ShowFps.js

@@ -2,10 +2,10 @@
  * @module og/control/ShowFps
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { print2d } from '../utils/shared.js';
+import { Control } from "./Control.js";
+import { print2d } from "../utils/shared.js";
 
 /**
  * Frame per second(FPS) display control.
@@ -19,15 +19,20 @@ class ShowFps extends Control {
     }
 
     oninit() {
-        var d = document.createElement('div');
-        d.className = 'defaultText ';
+        var d = document.createElement("div");
+        d.className = "defaultText ";
         d.id = "ogShowFpsControl";
         document.body.appendChild(d);
         this.renderer.events.on("draw", this._draw, this);
     }
-    
+
     _draw() {
-        print2d("ogShowFpsControl", (1000.0 / this.renderer.handler.deltaTime).toFixed(1), this.renderer.handler.canvas.clientWidth - 60, 0);
+        print2d(
+            "ogShowFpsControl",
+            (1000.0 / this.renderer.handler.deltaTime).toFixed(1),
+            this.renderer.handler.canvas.clientWidth - 60,
+            0
+        );
     }
 }
 

package/src/og/control/SimpleNavigation.js

@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { input } from '../input/input.js';
+import { Control } from "./Control.js";
+import { input } from "../input/input.js";
 
 /**
  * Simple keyboard camera navigation with W,S,A,D and shift keys to fly around the scene.
@@ -18,11 +18,9 @@ class SimpleNavigation extends Control {
         this.speed = options.speed || 1.0;
     }
 
-    onactivate() {
-    }
+    onactivate() {}
 
-    ondeactivate() {
-    }
+    ondeactivate() {}
 
     oninit() {
         this.camera = this.renderer.activeCamera;

package/src/og/control/Sun.js

@@ -2,13 +2,13 @@
  * @module og/control/Sun
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { getSunPosition } from '../astro/earth.js';
-import { LightSource } from '../light/LightSource.js';
-import { Quat } from '../math/Quat.js';
-import { Vec3 } from '../math/Vec3.js';
+import { Control } from "./Control.js";
+import { getSunPosition } from "../astro/earth.js";
+import { LightSource } from "../light/LightSource.js";
+import { Quat } from "../math/Quat.js";
+import { Vec3 } from "../math/Vec3.js";
 
 const ACTIVATION_HEIGHT = 12079000.0;
 /**
@@ -72,7 +72,6 @@ class Sun extends Control {
     }
 
     oninit() {
-
         this.planet.lightEnabled = true;
 
         // sunlight initialization
@@ -113,19 +112,24 @@ class Sun extends Control {
                 var n = cam.eye.normal(),
                     u = cam.getForward();
 
-                u.scale(Math.sign(cam._v.dot(n))); // up
+                u.scale(Math.sign(cam._u.dot(n))); // up
 
                 if (cam.slope > 0.99) {
-                    u = cam._v;
+                    u = cam._u;
                 }
 
                 var tu = Vec3.proj_b_to_plane(u, n, u).normalize().scale(this.offsetVertical);
-                var tr = Vec3.proj_b_to_plane(cam._u, n, cam._u).normalize().scale(this.offsetHorizontal); // right
+                var tr = Vec3.proj_b_to_plane(cam._r, n, cam._r)
+                    .normalize()
+                    .scale(this.offsetHorizontal); // right
                 var d = tu.add(tr);
                 var pos = cam.eye.add(d);
                 if (this._k > 0) {
                     this._k -= 0.01;
-                    let rot = Quat.getRotationBetweenVectors(this.sunlight._position.normal(), pos.normal());
+                    let rot = Quat.getRotationBetweenVectors(
+                        this.sunlight._position.normal(),
+                        pos.normal()
+                    );
                     let r = rot.slerp(Quat.IDENTITY, this._k).normalize();
                     this.sunlight.setPosition3v(r.mulVec3(this.sunlight._position));
                 } else {
@@ -135,11 +139,17 @@ class Sun extends Control {
                 this._k = 1;
                 if (this._f > 0) {
                     this._f -= 0.01;
-                    let rot = Quat.getRotationBetweenVectors(this.sunlight._position.normal(), getSunPosition(this._currDate).normal());
+                    let rot = Quat.getRotationBetweenVectors(
+                        this.sunlight._position.normal(),
+                        getSunPosition(this._currDate).normal()
+                    );
                     let r = rot.slerp(Quat.IDENTITY, this._f).normalize();
                     this.sunlight.setPosition3v(r.mulVec3(this.sunlight._position));
                 } else {
-                    if ((Math.abs(this._currDate - this._prevDate) > 0.00034 && this._active) || this._lightOn) {
+                    if (
+                        (Math.abs(this._currDate - this._prevDate) > 0.00034 && this._active) ||
+                        this._lightOn
+                    ) {
                         this._lightOn = false;
                         this._prevDate = this._currDate;
                         this.sunlight.setPosition3v(getSunPosition(this._currDate));
@@ -157,4 +167,4 @@ export function sun(options) {
     return Sun(options);
 }
 
-export { Sun };
+export { Sun };

package/src/og/control/ToggleWireframe.js

@@ -2,10 +2,10 @@
  * @module og/control/ToggleWireframe
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { input } from '../input/input.js';
+import { Control } from "./Control.js";
+import { input } from "../input/input.js";
 
 /**
  * Planet GL draw mode(TRIANGLE_STRIP/LINE_STRING) changer.

package/src/og/control/TouchNavigation.js

@@ -2,16 +2,16 @@
  * @module og/control/TouchNavigation
  */
 
-'use strict';
+"use strict";
 
-import * as math from '../math.js';
-import { Control } from './Control.js';
-import { Key } from '../Lock.js';
-import { LonLat } from '../LonLat.js';
-import { Quat } from '../math/Quat.js';
-import { Ray } from '../math/Ray.js';
-import { Sphere } from '../bv/Sphere.js';
-import { Vec3 } from '../math/Vec3.js';
+import * as math from "../math.js";
+import { Control } from "./Control.js";
+import { Key } from "../Lock.js";
+import { LonLat } from "../LonLat.js";
+import { Quat } from "../math/Quat.js";
+import { Ray } from "../math/Ray.js";
+import { Sphere } from "../bv/Sphere.js";
+import { Vec3 } from "../math/Vec3.js";
 
 class Touch {
     constructor() {
@@ -21,8 +21,12 @@ class Touch {
         this.prev_y = 0;
         this.grabbedPoint = new Vec3();
         this.grabbedSpheroid = new Sphere();
-        this.dX = function () { return this.x - this.prev_x; };
-        this.dY = function () { return this.y - this.prev_y; };
+        this.dX = function () {
+            return this.x - this.prev_x;
+        };
+        this.dY = function () {
+            return this.y - this.prev_y;
+        };
     }
 }
 
@@ -69,11 +73,9 @@ class TouchNavigation extends Control {
     }
 
     onTouchStart(e) {
-
         this._touching = true;
 
         if (e.sys.touches.length === 2) {
-
             var t0 = this.touches[0],
                 t1 = this.touches[1];
 
@@ -90,7 +92,10 @@ class TouchNavigation extends Control {
             t1.grabbedPoint = this.planet.getCartesianFromPixelTerrain(t1, true);
 
             // this.planet._viewChanged = true;
-            this.pointOnEarth = this.planet.getCartesianFromPixelTerrain(this.renderer.handler.getCenter(), true);
+            this.pointOnEarth = this.planet.getCartesianFromPixelTerrain(
+                this.renderer.handler.getCenter(),
+                true
+            );
 
             if (this.pointOnEarth) {
                 this.earthUp = this.pointOnEarth.normal();
@@ -101,7 +106,6 @@ class TouchNavigation extends Control {
                 t1.grabbedSpheroid.radius = t1.grabbedPoint.length();
                 this.stopRotation();
             }
-
         } else if (e.sys.touches.length === 1) {
             this._startTouchOne(e);
         }
@@ -141,12 +145,13 @@ class TouchNavigation extends Control {
         var p = this.planet.getCartesianFromPixelTerrain(this.touches[0], true);
         if (p) {
             var g = this.planet.ellipsoid.cartesianToLonLat(p);
-            this.planet.flyLonLat(new LonLat(g.lon, g.lat, this.renderer.activeCamera.eye.distance(p) * 0.57));
+            this.planet.flyLonLat(
+                new LonLat(g.lon, g.lat, this.renderer.activeCamera.eye.distance(p) * 0.57)
+            );
         }
     }
 
     onTouchEnd(e) {
-
         if (e.sys.touches.length === 0) {
             this._touching = false;
         }
@@ -155,21 +160,20 @@ class TouchNavigation extends Control {
             this._startTouchOne(e);
         }
 
-        if ((Math.abs(this.touches[0].x - this.touches[0].prev_x) < 3) &&
-            (Math.abs(this.touches[0].y - this.touches[0].prev_y) < 3)) {
+        if (
+            Math.abs(this.touches[0].x - this.touches[0].prev_x) < 3 &&
+            Math.abs(this.touches[0].y - this.touches[0].prev_y) < 3
+        ) {
             this.scaleRot = 0;
         }
     }
 
-    onTouchCancel(e) {
-    }
+    onTouchCancel(e) {}
 
     onTouchMove(e) {
-
         var cam = this.renderer.activeCamera;
 
         if (e.sys.touches.length === 2) {
-
             this.renderer.controlsBag.scaleRot = 1;
 
             var t0 = this.touches[0],
@@ -191,9 +195,14 @@ class TouchNavigation extends Control {
             t1.x = e.sys.touches.item(1).clientX - e.sys.offsetLeft;
             t1.y = e.sys.touches.item(1).clientY - e.sys.offsetTop;
 
-            if ((t0.dY() > 0 && t1.dY() > 0) || (t0.dY() < 0 && t1.dY() < 0) ||
-                (t0.dX() > 0 && t1.dX() > 0) || (t0.dX() < 0 && t1.dX() < 0)) {
-                var l = 0.5 / cam.eye.distance(this.pointOnEarth) * cam._lonLat.height * math.RADIANS;
+            if (
+                (t0.dY() > 0 && t1.dY() > 0) ||
+                (t0.dY() < 0 && t1.dY() < 0) ||
+                (t0.dX() > 0 && t1.dX() > 0) ||
+                (t0.dX() < 0 && t1.dX() < 0)
+            ) {
+                var l =
+                    (0.5 / cam.eye.distance(this.pointOnEarth)) * cam._lonLat.height * math.RADIANS;
                 if (l > 0.007) l = 0.007;
                 cam.rotateHorizontal(l * t0.dX(), false, this.pointOnEarth, this.earthUp);
                 cam.rotateVertical(l * t0.dY(), this.pointOnEarth, true);
@@ -202,9 +211,7 @@ class TouchNavigation extends Control {
             }
 
             this.scaleRot = 0;
-
         } else if (e.sys.touches.length === 1) {
-
             var t = this.touches[0];
 
             t.prev_x = t.x;
@@ -223,7 +230,10 @@ class TouchNavigation extends Control {
 
             if (targetPoint) {
                 if (cam.slope > 0.2) {
-                    this.qRot = Quat.getRotationBetweenVectors(targetPoint.normal(), t.grabbedPoint.normal());
+                    this.qRot = Quat.getRotationBetweenVectors(
+                        targetPoint.normal(),
+                        t.grabbedPoint.normal()
+                    );
                     var rot = this.qRot;
                     cam.eye = rot.mulVec3(cam.eye);
                     cam._v = rot.mulVec3(cam._v);
@@ -250,7 +260,6 @@ class TouchNavigation extends Control {
     }
 
     onDraw(e) {
-
         this.renderer.controlsBag.scaleRot = this.scaleRot;
 
         if (this._touching) {
@@ -281,7 +290,9 @@ class TouchNavigation extends Control {
             this.scaleRot = 0;
         } else {
             r.controlsBag.scaleRot = this.scaleRot;
-            var rot = this.qRot.slerp(Quat.IDENTITY, 1 - this.scaleRot * this.scaleRot * this.scaleRot).normalize();
+            var rot = this.qRot
+                .slerp(Quat.IDENTITY, 1 - this.scaleRot * this.scaleRot * this.scaleRot)
+                .normalize();
             if (!(rot.x || rot.y || rot.z)) {
                 this.scaleRot = 0;
             }
@@ -305,4 +316,4 @@ class TouchNavigation extends Control {
     }
 }
 
-export { TouchNavigation };
+export { TouchNavigation };

package/src/og/control/ZoomControl.js

@@ -2,10 +2,10 @@
  * @module og/control/ZoomControl
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { Key } from '../Lock.js';
+import { Control } from "./Control.js";
+import { Key } from "../Lock.js";
 
 /**
  * Planet zoom buttons control.
@@ -27,13 +27,13 @@ class ZoomControl extends Control {
     }
 
     oninit() {
-        var zoomDiv = document.createElement('div'),
-            btnZoomIn = document.createElement('button'),
-            btnZoomOut = document.createElement('button');
+        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.className = "ogZoomControl";
+        btnZoomIn.className = "ogZoomButton ogZoomIn";
+        btnZoomOut.className = "ogZoomButton ogZoomOut";
 
         zoomDiv.appendChild(btnZoomIn);
         zoomDiv.appendChild(btnZoomOut);
@@ -46,23 +46,40 @@ class ZoomControl extends Control {
         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(); });
+        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);
@@ -72,12 +89,11 @@ class ZoomControl extends Control {
         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);
@@ -87,7 +103,6 @@ class ZoomControl extends Control {
     }
 
     stopZoom() {
-
         this._move = 0;
 
         this.planet.layerLock.free(this._keyLock);
@@ -96,12 +111,13 @@ class ZoomControl extends Control {
     }
 
     _draw(e) {
-
         var cam = this.renderer.activeCamera;
 
         if (this._move !== 0) {
-            var d = cam.eye.distance(
-                this.planet.getCartesianFromPixelTerrain(this._targetPoint, true)) * 0.075;
+            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();

package/src/og/control/index.js

@@ -13,6 +13,7 @@ import { SimpleNavigation } from "./SimpleNavigation.js";
 import { ShowFps } from "./ShowFps.js";
 import { Sun } from "./Sun.js";
 import { ZoomControl } from "./ZoomControl.js";
+import { MouseWheelZoomControl } from "./MouseWheelZoomControl.js";
 import { Lighting } from "./Lighting.js";
 
 export {
@@ -31,5 +32,6 @@ export {
     ShowFps,
     Sun,
     ZoomControl,
+    MouseWheelZoomControl,
     Lighting
 };