@openglobus/og 0.10.2 → 0.10.5

package/src/og/quadTree/Node.js

@@ -32,8 +32,7 @@ import {
 
 import { MAX_NORMAL_ZOOM } from "../segment/Segment.js";
 
-const DOT_VIS = 0.3;
-const VISIBLE_HEIGHT = 3000000.0;
+const VISIBLE_HEIGHT = 1400000.0;
 
 let _tempHigh = new Vec3(),
     _tempLow = new Vec3();
@@ -255,7 +254,7 @@ Node.prototype.renderTree = function (cam, maxZoom, terrainReadySegment, stopLoa
             }
         }
     } else {
-        let commonFrustumFlag = 1 << (numFrustums - 1 - 1); //Math.pow(2, numFrustums - 1) - 1;
+        let commonFrustumFlag = 1 << (numFrustums - 1 - 1);
         for (let i = 0; commonFrustumFlag && i < numFrustums; i++) {
             if (seg.terrainReady) {
                 if (frustums[i].containsBox(seg.bbox)) {
@@ -332,12 +331,13 @@ Node.prototype.prepareForRendering = function (
     } else {
         if (seg.tileZoom < 2) {
             this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
+        } else if (seg.tileZoom > MAX_NORMAL_ZOOM) {
+            this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
         } else if (
-            seg.tileZoom < MAX_NORMAL_ZOOM &&
-            (seg._swNorm.dot(cam.eyeNorm) > DOT_VIS ||
-                seg._nwNorm.dot(cam.eyeNorm) > DOT_VIS ||
-                seg._neNorm.dot(cam.eyeNorm) > DOT_VIS ||
-                seg._seNorm.dot(cam.eyeNorm) > DOT_VIS)
+            seg._swNorm.dot(cam._n) > 0.0 ||
+            seg._nwNorm.dot(cam._n) > 0.0 ||
+            seg._neNorm.dot(cam._n) > 0.0 ||
+            seg._seNorm.dot(cam._n) > 0.0
         ) {
             this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
         } else {

package/src/og/quadTree/quadTree.js

@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
 export const VISIBLE_DISTANCE = 3570.0;
-export const MAX_RENDERED_NODES = 500;
+export const MAX_RENDERED_NODES = 700;
 
 export const NW = 0;
 export const NE = 1;
@@ -25,40 +25,44 @@ export const OPSIDE = [S, W, N, E];
 /**
  * First index is {N,E,S,W} and second is {NW,NE,SW,SE}
  */
-export const NEIGHBOUR =
-    [[-1, -1, NW, NE],
+export const NEIGHBOUR = [
+    [-1, -1, NW, NE],
     [NE, -1, SE, -1],
     [SW, SE, -1, -1],
-    [-1, NW, -1, SW]];
+    [-1, NW, -1, SW]
+];
 
 /**
  * Neighbor's oposite part. For example oposite side
  * on the east neighbor side is: [S][SE] = NE
  */
-export const OPPART =
-    [[SW, SE, NW, NE],
+export const OPPART = [
+    [SW, SE, NW, NE],
     [NE, NW, SE, SW],
     [SW, SE, NW, NE],
-    [NE, NW, SE, SW]];
+    [NE, NW, SE, SW]
+];
 
 /**
  * Neighbos's opside array order. For example NW node
  * by E side array index is 0, SE node by S side is 1.
  */
-export const NOPSORD =
-    [[0, 1, 0, 1],
+export const NOPSORD = [
+    [0, 1, 0, 1],
     [0, 0, 1, 1],
     [0, 1, 0, 1],
-    [0, 0, 1, 1]];
+    [0, 0, 1, 1]
+];
 
 /**
  * First index is {NW,NE,SW,SE}, another one is {N,E,S,W}
  */
-export const COMSIDE =
-    [[true, false, false, true],
+export const COMSIDE = [
+    [true, false, false, true],
     [true, true, false, false],
     [false, false, true, true],
-    [false, true, true, false]];
+    [false, true, true, false]
+];
 
 /**
  * Gets segment part left to right or up to downo ffset against neighbour side.
@@ -66,8 +70,8 @@ export const COMSIDE =
  */
 export const PARTOFFSET = [
     /*     N  E  S  W */
-    /*NW*/[0, 1, 0, 0],
-    /*NE*/[1, 0, 0, 0],
-    /*SW*/[0, 1, 0, 1],
-    /*SE*/[1, 1, 1, 1]
+    /*NW*/ [0, 1, 0, 0],
+    /*NE*/ [1, 0, 0, 0],
+    /*SW*/ [0, 1, 0, 1],
+    /*SE*/ [1, 1, 1, 1]
 ];

package/src/og/renderer/RendererEvents.js

@@ -301,33 +301,38 @@ class RendererEvents extends Events {
     }
 
     /**
-     * @private
+     * @protected
      */
-    onMouseMove(event, sys) {
-        let b = sys.buttons;
-
-        if (b & LB_M) {
-            this.mouseState.leftButtonDown = true;
+    updateButtonsStates(buttons) {
+        var ms = this.mouseState;
+        if (buttons & LB_M) {
+            ms.leftButtonDown = true;
         } else {
-            this.mouseState.leftButtonHold = false;
-            this.mouseState.leftButtonDown = false;
+            ms.leftButtonHold = false;
+            ms.leftButtonDown = false;
         }
 
-        if (b & RB_M) {
-            this.mouseState.rightButtonDown = true;
+        if (buttons & RB_M) {
+            ms.rightButtonDown = true;
         } else {
-            this.mouseState.rightButtonHold = false;
-            this.mouseState.rightButtonDown = false;
+            ms.rightButtonHold = false;
+            ms.rightButtonDown = false;
         }
 
-        if (b & MB_M) {
-            this.mouseState.middleButtonDown = true;
+        if (buttons & MB_M) {
+            ms.middleButtonDown = true;
         } else {
-            this.mouseState.middleButtonHold = false;
-            this.mouseState.middleButtonDown = false;
+            ms.middleButtonHold = false;
+            ms.middleButtonDown = false;
         }
+    }
 
+    /**
+     * @private
+     */
+    onMouseMove(event, sys) {
         var ms = this.mouseState;
+        this.updateButtonsStates(sys.buttons)
         ms.sys = event;
 
         let ex = event.clientX,

package/src/og/scene/Planet.js

@@ -24,7 +24,7 @@ import { PlanetCamera } from "../camera/PlanetCamera.js";
 import { RenderNode } from "./RenderNode.js";
 import { Segment } from "../segment/Segment.js";
 import { SegmentLonLat } from "../segment/SegmentLonLat.js";
-import { PlainSegmentWorker } from "../segment/PlainSegmentWorker.js";
+import { PlainSegmentWorker } from "../utils/PlainSegmentWorker.js";
 import { TerrainWorker } from "../utils/TerrainWorker.js";
 import { VectorTileCreator } from "../utils/VectorTileCreator.js";
 import { wgs84 } from "../ellipsoid/wgs84.js";
@@ -174,6 +174,9 @@ class Planet extends RenderNode {
          */
         this.camera = null;
 
+        this._minAltitude = options.minAltitude;
+        this._maxAltitude = options.maxAltitude;
+
         /**
          * Screen mouse pointer projected to planet cartesian position.
          * @public
@@ -699,7 +702,9 @@ class Planet extends RenderNode {
         this.camera = this.renderer.activeCamera = new PlanetCamera(this, {
             eye: new Vec3(0, 0, 28000000),
             look: new Vec3(0, 0, 0),
-            up: new Vec3(0, 1, 0)
+            up: new Vec3(0, 1, 0),
+            minAltitude: this._minAltitude,
+            maxAltitude: this._maxAltitude
         });
 
         this.camera.update();
@@ -800,11 +805,11 @@ class Planet extends RenderNode {
         this._quadTree.renderNode();
         this._normalMapCreator.drawSingle(this._quadTree.segment);
 
-        for (var i = 0; i < this._quadTree.nodes.length; i++) {
-            this._quadTree.nodes[i].segment.createPlainSegment();
-            this._quadTree.nodes[i].renderNode(true);
-            this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
-        }
+        //for (var i = 0; i < this._quadTree.nodes.length; i++) {
+        //    this._quadTree.nodes[i].segment.createPlainSegment();
+        //    this._quadTree.nodes[i].renderNode(true);
+        //    this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
+        //}
 
         this._quadTreeNorth.createChildrenNodes();
         this._quadTreeNorth.segment.createPlainSegment();

package/src/og/segment/Segment.js

@@ -31,8 +31,6 @@ var _RenderingSlice = function (p) {
     };
 };
 
-//const BSPHERERADIUSEXT = 2;
-
 /**
  * Planet segment Web Mercator tile class that stored and rendered with quad tree.
  * @class
@@ -1002,7 +1000,7 @@ Segment.prototype.createBoundsByExtent = function () {
     var coord_ne = ellipsoid.geodeticToCartesian(extent.northEast.lon, extent.northEast.lat);
 
     // check for zoom
-    if (this.tileZoom < MAX_NORMAL_ZOOM) {
+    if (this.tileZoom <= MAX_NORMAL_ZOOM) {
         var coord_nw = ellipsoid.geodeticToCartesian(extent.southWest.lon, extent.northEast.lat);
         var coord_se = ellipsoid.geodeticToCartesian(extent.northEast.lon, extent.southWest.lat);
 
@@ -1039,7 +1037,7 @@ Segment.prototype.createBoundsByParent = function () {
             this.bsphere.center.z = pn.segment.bsphere.center.z;
             this.bsphere.radius = pn.segment.bsphere.radius;
 
-            if (this.tileZoom < MAX_NORMAL_ZOOM) {
+            if (this.tileZoom <= MAX_NORMAL_ZOOM) {
                 let i0 = gridSize * offsetY;
                 let j0 = gridSize * offsetX;
 

package/src/og/utils/FontAtlas.js

@@ -188,6 +188,7 @@ class FontAtlas {
                 };
 
                 img.src = `${srcDir}/${data.pages[0]}`;
+                img.crossOrigin = "Anonymous";
             })
             .catch(err => {
                 def.reject();