@openglobus/og 0.15.4 → 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/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/ellipsoid/Ellipsoid.js

@@ -409,19 +409,36 @@ class Ellipsoid {
         return new Vec3(pX * m_X, pY * m_Y, pZ * m_Z);
     }
 
+    /**
+     * Converts 3d cartesian coordinates to geodetic
+     * @param {Vec3} cart - Cartesian coordiantes
+     * @returns {LonLat} - Geodetic coordinates
+     */
     cartesianToLonLat(cart) {
-
         let p = this.projToSurface(cart);
-
         let n = this.getSurfaceNormal3v(p),
             h = cart.sub(p);
-
         return new LonLat(
             Math.atan2(n.x, n.z) * DEGREES,
             Math.asin(n.y) * DEGREES,
             Math.sign(h.dot(cart)) * h.length()
         );
     }
+    /**
+     * Converts 3d cartesian coordinates to geodetic
+     * @param {Vec3} cart - Cartesian coordiantes
+     * @param {LonLat} res - Link geodetic coordinates variable
+     * @returns {LonLat} - Geodetic coordinates
+     */
+    cartesianToLonLatRes(cart, res) {
+        let p = this.projToSurface(cart);
+        let n = this.getSurfaceNormal3v(p),
+            h = cart.sub(p);
+        res.lon = Math.atan2(n.x, n.z) * DEGREES;
+        res.lat = Math.asin(n.y) * DEGREES;
+        res.height = Math.sign(h.dot(cart)) * h.length();
+        return res;
+    }
 
     /**
      * Gets ellipsoid surface normal.

package/src/og/layer/Vector.js

@@ -757,12 +757,13 @@ class Vector extends Layer {
                                 if (seg._extent.isInside(ll)) {
                                     let cart = p._path3v[c_j][c_j_h];
                                     seg.getTerrainPoint(cart, ll, res);
-                                    p.setPoint3v(
-                                        res.addA(res.normal().scale((rtg && p.altitude) || 0.0)),
-                                        c_j_h,
-                                        c_j,
-                                        true
-                                    );
+                                    let alt = (rtg && p.altitude) || 0.0;
+                                    if (alt) {
+                                        let n = this._planet.ellipsoid.getSurfaceNormal3v(res);
+                                        p.setPoint3v(res.addA(n.scale(alt)), c_j_h, c_j, true);
+                                    } else {
+                                        p.setPoint3v(res, c_j_h, c_j, true);
+                                    }
                                     break;
                                 }
                             }

package/src/og/layer/XYZ.js

@@ -44,7 +44,7 @@ class XYZ extends Layer {
      * @param {string} name - Layer name.
      * @param {*} options
      */
-    constructor(name, options) {
+    constructor(name, options = {}) {
         super(name, options);
 
         this.events.registerNames(EVENT_NAMES);
@@ -316,7 +316,7 @@ class XYZ extends Layer {
     clearMaterial(material) {
         if (material.isReady && material.textureExists) {
             !material.texture.default &&
-                material.segment.handler.gl.deleteTexture(material.texture);
+            material.segment.handler.gl.deleteTexture(material.texture);
             material.texture = null;
 
             if (material.image) {

package/src/og/quadTree/EntityCollectionNode.js

@@ -282,9 +282,15 @@ class EntityCollectionNode {
     }
 
     alignEntityToTheGround(entity, segment) {
-        var res = new Vec3();
+        let res = new Vec3();
         segment.getEntityTerrainPoint(entity, res);
-        entity._setCartesian3vSilent(res.addA(res.normal().scale((Number(this.layer.relativeToGround) && entity._altitude) || 0.0)));
+        let alt = (Number(this.layer.relativeToGround) && entity._altitude) || 0.0;
+        if (alt) {
+            let n = this.layer._planet.ellipsoid.getSurfaceNormal3v(res);
+            entity._setCartesian3vSilent(res.addA(n.scale(alt)));
+        } else {
+            entity._setCartesian3vSilent(res);
+        }
     }
 
     isVisible() {

package/src/og/renderer/Renderer.js

@@ -783,6 +783,7 @@ class Renderer {
         // Rendering scene nodes and entityCollections
         let rn = this._renderNodesArr;
         let k = frustums.length;
+
         while (k--) {
             this.activeCamera.setCurrentFrustum(k);
             gl.clear(gl.DEPTH_BUFFER_BIT);

package/src/og/scene/Planet.js

@@ -1142,7 +1142,14 @@ export class Planet extends RenderNode {
         }
 
         if (this.camera.isFirstPass) {
+            this.camera.updateGeodeticPosition();
             this._firstPASS();
+            this.camera.checkTerrainCollision();
+            this.camera.update();
+
+            // Here is the planet node dispatches a draw event before
+            // rendering begins and we have got render nodes.
+            this.events.dispatch(this.events.draw, this);
         }
 
         this.drawEntityCollections(this._frustumEntityCollections);
@@ -1196,10 +1203,6 @@ export class Planet extends RenderNode {
         }
         this._skipPreRender = true;
 
-        // Here is the planet node dispatches a draw event before
-        // rendering begins and we have got render nodes.
-        this.events.dispatch(this.events.draw, this);
-
         this.transformLights();
 
         this._normalMapCreator.frame();
@@ -1546,7 +1549,8 @@ export class Planet extends RenderNode {
         gl.uniform3fv(shu.frustumPickingColor, cam.frustum._pickingColorU);
 
         // drawing planet nodes
-        var rn = this._renderedNodesInFrustum[cam.getCurrentFrustum()], sl = this._visibleTileLayerSlices;
+        let rn = this._renderedNodesInFrustum[cam.getCurrentFrustum()],
+            sl = this._visibleTileLayerSlices;
 
         let i = rn.length;
         while (i--) {