@openglobus/og 0.13.7 → 0.13.10

package/src/og/math/Vec3.js

@@ -194,7 +194,7 @@ export class Vec3 {
      * @returns {Vec3} -
      */
     static lerp(v1, v2, l) {
-        return Vec3(v1.x + (v2.x - v1.x) * l, v1.y + (v2.y - v1.y) * l, v1.z + (v2.z - v1.z) * l);
+        return new Vec3(v1.x + (v2.x - v1.x) * l, v1.y + (v2.y - v1.y) * l, v1.z + (v2.z - v1.z) * l);
     }
 
     /**

package/src/og/math.js

@@ -135,12 +135,12 @@ export function isPowerOfTwo(x) {
  * @param {number} x - Input value.
  * @returns {number} -
  */
-export function nextHighestPowerOfTwo(x) {
+export function nextHighestPowerOfTwo(x, maxValue = 4096) {
     --x;
     for (var i = 1; i < 32; i <<= 1) {
         x = x | (x >> i);
     }
-    return x + 1;
+    return (x + 1) > maxValue ? maxValue : x + 1
 }
 
 /**
@@ -200,15 +200,15 @@ export function mod(m, n) {
  * @returns {number} -
  */
 export function zeroTwoPI(a) {
-    var mod = mod(a, TWO_PI);
-    if (Math.abs(mod) < EPSILON14 && Math.abs(a) > EPSILON14) {
+    const res = mod(a, TWO_PI);
+    if (Math.abs(res) < EPSILON14 && Math.abs(a) > EPSILON14) {
         return TWO_PI;
     }
-    return mod;
+    return res;
 }
 
 /**
- * Returns 0.0 if x is smaller then edge and otherwise 1.0.
+ * Returns 0.0 if x is smaller than edge and otherwise 1.0.
  * @function
  * @param {number} edge -
  * @param {number} x - Value to edge.

package/src/og/quadTree/Node.js

@@ -75,8 +75,7 @@ class Node {
         this.sideSizeLog2 = [0, 0, 0, 0];
         this.ready = false;
         this.neighbors = [[], [], [], []];
-        this.equalizedNeighborId = [-1, -1, -1, -1];
-        this.equalizedNeighborGridSize = [-1, -1, -1, -1];
+        this.equalizedSideWithNodeId = [this.nodeId, this.nodeId, this.nodeId, this.nodeId];
         this.nodes = [null, null, null, null];
         this.segment = new SegmentPrototype(this, planet, tileZoom, extent);
         this._cameraInside = false;
@@ -284,7 +283,7 @@ class Node {
             } else if (
                 seg.terrainReady &&
                 seg.tileZoom < planet.terrain._maxNodeZoom &&
-                (!maxZoom || maxZoom && cam.projectedSize(seg.bsphere.center, seg.bsphere.radius) > this.planet._maxLodSize)) {
+                (!maxZoom || cam.projectedSize(seg.bsphere.center, seg.bsphere.radius) > this.planet._maxLodSize)) {
                 this.traverseNodes(cam, maxZoom, seg, stopLoading);
             } else if (altVis) {
                 seg.passReady = maxZoom ? seg.terrainReady : false;
@@ -639,6 +638,9 @@ class Node {
             let tempVertices, tempVerticesHigh, tempVerticesLow, noDataVertices;
 
             this.appliedTerrainNodeId = pn.nodeId;
+            this.equalizedSideWithNodeId[N] = this.equalizedSideWithNodeId[E] =
+                this.equalizedSideWithNodeId[S] = this.equalizedSideWithNodeId[W] = this.appliedTerrainNodeId;
+
 
             let gridSize = pn.segment.gridSize / dZ2,
                 gridSizeExt = pn.segment.fileGridSize / dZ2;
@@ -819,6 +821,8 @@ class Node {
                     seg.terrainVerticesLow = tempVerticesLow;
 
                     this.appliedTerrainNodeId = this.nodeId;
+                    this.equalizedSideWithNodeId[N] = this.equalizedSideWithNodeId[E] =
+                        this.equalizedSideWithNodeId[S] = this.equalizedSideWithNodeId[W] = this.appliedTerrainNodeId;
 
                     if (pn.segment.terrainExists) {
                         seg.terrainExists = true;
@@ -883,9 +887,7 @@ class Node {
     clearTree() {
         var state = this.getState();
 
-        if (state === NOTRENDERING) {
-            this.destroyBranches();
-        } else if (state === RENDERING) {
+        if (state === NOTRENDERING || state === RENDERING) {
             this.destroyBranches();
         } else {
             for (var i = 0; i < this.nodes.length; i++) {

package/src/og/renderer/Renderer.js

@@ -15,7 +15,6 @@ import { FontAtlas } from "../utils/FontAtlas.js";
 import { TextureAtlas } from "../utils/TextureAtlas.js";
 import * as arial from "../arial.js";
 import { depth } from "../shaders/depth.js";
-import { ARIAL_FONT_B64 } from "../res/images.js";
 import { LabelWorker } from "../entity/LabelWorker.js";
 
 let __pickingCallbackCounter__ = 0;
@@ -478,7 +477,7 @@ class Renderer {
             };
         }
 
-        this.handler.onCanvasResize = () => {
+        this.handler.ONCANVASRESIZE = () => {
             this.resize();
             this.events.dispatch(this.events.resize, this.handler.canvas);
         };
@@ -497,7 +496,7 @@ class Renderer {
 
         this.outputTexture = this.screenTexture.screen;
 
-        this.fontAtlas.initFont("arial", arial.data, ARIAL_FONT_B64);
+        this.fontAtlas.initFont("arial", arial.data, arial.image);
     }
 
     setCurrentScreen(screenName) {