@openglobus/og 0.23.0 → 0.24.0

package/lib/js/entity/InstanceData.js

@@ -156,17 +156,20 @@ export class InstanceData {
     }
     createColorTexture(image) {
         if (this._geoObjectHandler && this._geoObjectHandler._renderer) {
-            this._colorTexture = this._geoObjectHandler._renderer.handler.createTextureDefault(image);
+            let h = this._geoObjectHandler._renderer.handler;
+            this._colorTexture = h.createTextureDefault(image, null, h.gl.REPEAT);
         }
     }
     createNormalTexture(image) {
         if (this._geoObjectHandler && this._geoObjectHandler._renderer) {
-            this._normalTexture = this._geoObjectHandler._renderer.handler.createTextureDefault(image);
+            let h = this._geoObjectHandler._renderer.handler;
+            this._normalTexture = h.createTextureDefault(image, null, h.gl.REPEAT);
         }
     }
     createMetallicRoughnessTexture(image) {
         if (this._geoObjectHandler && this._geoObjectHandler._renderer) {
-            this._metallicRoughnessTexture = this._geoObjectHandler._renderer.handler.createTextureDefault(image);
+            let h = this._geoObjectHandler._renderer.handler;
+            this._metallicRoughnessTexture = h.createTextureDefault(image, null, h.gl.REPEAT);
         }
     }
     clear() {

package/lib/js/input/MouseHandler.d.ts

@@ -1,6 +1,7 @@
 export type MouseEventExt = MouseEvent & {
     wheelDelta?: number;
     deltaY?: number;
+    isTouchPad?: boolean;
 };
 export interface MouseHandlerEvent {
     button?: number;

package/lib/js/input/MouseHandler.js

@@ -1,3 +1,13 @@
+function _checkTouchPad(e) {
+    //@ts-ignore
+    if (e.deltaMode !== 0) {
+        return false;
+    }
+    //@ts-ignore
+    return Math.abs(e.deltaY) < 50;
+    //@ts-ignore
+    //return e.wheelDeltaY ? e.wheelDeltaY === -3 * e.deltaY : e.deltaMode === 0
+}
 class MouseHandler {
     constructor(htmlObject) {
         this._htmlObject = htmlObject;
@@ -13,11 +23,12 @@ class MouseHandler {
                 //     callback.call(sender, event);
                 //     event.preventDefault();
                 // }, false);
-                this._htmlObject.addEventListener('wheel', function (event) {
+                this._htmlObject.addEventListener('wheel', (event) => {
                     let delta = event.deltaY || event.detail || event.wheelDelta || 0;
                     if (event.wheelDelta == undefined) {
                         event.wheelDelta = delta * (-120);
                     }
+                    event.isTouchPad = _checkTouchPad(event);
                     callback.call(sender, event);
                     event.preventDefault();
                 }, false);

package/lib/js/math/Mat3.d.ts

@@ -67,7 +67,7 @@ export declare class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4(): Mat4;
+    getMat4(): Mat4;
 }
 /**
  * Mat3 factory.

package/lib/js/math/Mat3.js

@@ -106,7 +106,7 @@ export class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4() {
+    getMat4() {
         let res = new Mat4();
         let b = res._m;
         let a = this._m;

package/lib/js/math/Mat4.d.ts

@@ -37,6 +37,15 @@ export declare class Mat4 {
      * @returns {Mat4} -
      */
     static identity(): Mat4;
+    /**
+     * Get rotation matrix around the point
+     * @public
+     * @param {number} angle - Rotation angle in radians
+     * @param {Vec3} [center] - Point that the camera rotates around
+     * @param {Vec3} [up] - Camera up vector
+     */
+    static getRotationAroundPoint(angle: number, center?: Vec3, up?: Vec3): Mat4;
+    static getRotation(angle: number, up?: Vec3): Mat4;
     /**
      * Sets column-major order array matrix.
      * @public
@@ -62,7 +71,7 @@ export declare class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3(): Mat3;
+    getMat3(): Mat3;
     /**
      * Multiply to 3d vector.
      * @public

package/lib/js/math/Mat4.js

@@ -45,6 +45,22 @@ export class Mat4 {
         res._m[15] = 1;
         return res;
     }
+    /**
+     * Get rotation matrix around the point
+     * @public
+     * @param {number} angle - Rotation angle in radians
+     * @param {Vec3} [center] - Point that the camera rotates around
+     * @param {Vec3} [up] - Camera up vector
+     */
+    static getRotationAroundPoint(angle, center = Vec3.ZERO, up = Vec3.UP) {
+        let rot = Mat4.getRotation(angle, up);
+        let tr = new Mat4().setIdentity().translate(center);
+        let ntr = new Mat4().setIdentity().translate(center.negateTo());
+        return tr.mul(rot).mul(ntr);
+    }
+    static getRotation(angle, up = Vec3.UP) {
+        return new Mat4().setRotation(up, angle);
+    }
     /**
      * Sets column-major order array matrix.
      * @public
@@ -94,7 +110,7 @@ export class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3() {
+    getMat3() {
         let res = new Mat3();
         let a = this._m, b = res._m;
         b[0] = a[0];

package/lib/js/math/Plane.d.ts

@@ -9,7 +9,9 @@ import { Line3 } from "./Line3";
 declare class Plane {
     p: Vec3;
     n: Vec3;
-    constructor(p: Vec3, n: Vec3);
+    constructor(p?: Vec3, n?: Vec3);
+    setByPoints(v0: Vec3, v1: Vec3, v2: Vec3): Plane;
+    static fromPoints(v0: Vec3, v1: Vec3, v2: Vec3): Plane;
     set(p: Vec3, n: Vec3): void;
     getNormal(): Vec3;
     distance(p: Vec3): number;

package/lib/js/math/Plane.js

@@ -12,7 +12,17 @@ const INTERSECT = 2;
 class Plane {
     constructor(p, n) {
         this.p = p ? p.clone() : new Vec3();
-        this.n = n ? n.clone() : this.p.normal();
+        this.n = n ? n.clone() : (this.p.isZero() ? Vec3.UP : this.p.getNormal());
+    }
+    setByPoints(v0, v1, v2) {
+        let u = Vec3.sub(v1, v0);
+        let v = Vec3.sub(v2, v0);
+        this.n = u.cross(v);
+        this.p.copy(v0);
+        return this;
+    }
+    static fromPoints(v0, v1, v2) {
+        return new Plane().setByPoints(v0, v1, v2);
     }
     set(p, n) {
         this.p.copy(p);

package/lib/js/math/Quat.d.ts

@@ -298,6 +298,7 @@ export declare class Quat {
      * Returns quaternion and vector production.
      * @public
      * @param {Vec3} v - 3d Vector.
+     * @param {Vec3} res - result output vector.
      * @returns {Vec3} -
      */
     mulVec3Res(v: Vec3, res: Vec3): Vec3;

package/lib/js/math/Quat.js

@@ -617,6 +617,7 @@ export class Quat {
      * Returns quaternion and vector production.
      * @public
      * @param {Vec3} v - 3d Vector.
+     * @param {Vec3} res - result output vector.
      * @returns {Vec3} -
      */
     mulVec3Res(v, res) {

package/lib/js/math/Ray.d.ts

@@ -45,7 +45,7 @@ export declare class Ray {
      */
     getPoint(distance: number): Vec3;
     /**
-     * Returns ray hit a triange result.
+     * Returns ray hit a triangle result.
      * @public
      * @param {Vec3} v0 - First triangle corner coordinate.
      * @param {Vec3} v1 - Second triangle corner coordinate.
@@ -54,17 +54,13 @@ export declare class Ray {
      * @returns {number} - Hit code, could 0 - og.Ray.OUTSIDE, 1 - og.Ray.INSIDE,
      *      2 - og.Ray.INPLANE and 3 - og.Ray.AWAY(ray goes away from triangle).
      */
-    hitTriangle(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number;
+    hitTriangleRes(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number;
     /**
-     * Gets a ray hit a plane result. If the ray cross the plane returns 1 - og.Ray.INSIDE otherwise returns 0 - og.Ray.OUTSIDE.
-     * @public
-     * @param {Vec3} v0 - First plane point.
-     * @param {Vec3} v1 - Second plane point.
-     * @param {Vec3} v2 - Third plane point.
-     * @param {Vec3} res - Hit point object pointer that stores hit result.
-     * @returns {number}
+     * Finds the intersection of the ray with a plane.
+     * @param {Plane} plane - The plane to intersect with.
+     * @returns {Vec3 | null} The intersection point or null if no intersection.
      */
-    hitPlane(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number;
+    hitPlaneRes(plane: Plane, res: Vec3): number;
     /**
      * Returns a ray hit sphere coordiante. If there isn't hit returns null.
      * @public
@@ -73,10 +69,4 @@ export declare class Ray {
      */
     hitSphere(sphere: Sphere): Vec3 | null;
     hitBox(box: Box): void;
-    /**
-     * Finds the intersection of the ray with a plane.
-     * @param {Plane} plane - The plane to intersect with.
-     * @returns {Vec3 | null} The intersection point or null if no intersection.
-     */
-    hitPlane2(plane: Plane, res: Vec3): number;
 }

package/lib/js/math/Ray.js

@@ -48,7 +48,7 @@ export class Ray {
         return Vec3.add(this.origin, this.direction.scaleTo(distance));
     }
     /**
-     * Returns ray hit a triange result.
+     * Returns ray hit a triangle result.
      * @public
      * @param {Vec3} v0 - First triangle corner coordinate.
      * @param {Vec3} v1 - Second triangle corner coordinate.
@@ -57,7 +57,7 @@ export class Ray {
      * @returns {number} - Hit code, could 0 - og.Ray.OUTSIDE, 1 - og.Ray.INSIDE,
      *      2 - og.Ray.INPLANE and 3 - og.Ray.AWAY(ray goes away from triangle).
      */
-    hitTriangle(v0, v1, v2, res) {
+    hitTriangleRes(v0, v1, v2, res) {
         let u = v1.sub(v0);
         let v = v2.sub(v0);
         let n = u.cross(v);
@@ -101,37 +101,61 @@ export class Ray {
         }
         return Ray.INSIDE;
     }
+    // /**
+    //  * Gets a ray hit a plane result. If the ray cross the plane returns 1 - og.Ray.INSIDE otherwise returns 0 - og.Ray.OUTSIDE.
+    //  * @public
+    //  * @param {Vec3} v0 - First plane point.
+    //  * @param {Vec3} v1 - Second plane point.
+    //  * @param {Vec3} v2 - Third plane point.
+    //  * @param {Vec3} res - Hit point object pointer that stores hit result.
+    //  * @returns {number}
+    //  */
+    // public hitPlaneRes(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number {
+    //     let u = Vec3.sub(v1, v0);
+    //     let v = Vec3.sub(v2, v0);
+    //     let n = u.cross(v);
+    //
+    //     let w0 = Vec3.sub(this.origin, v0);
+    //     let a = -n.dot(w0);
+    //     let b = n.dot(this.direction);
+    //
+    //     // ray is  parallel to the plane
+    //     if (Math.abs(b) < EPS10) {
+    //         if (a === 0) {
+    //             return Ray.OUTSIDE;
+    //         }
+    //     }
+    //
+    //     let r = a / b;
+    //
+    //     if (r < 0) {
+    //         return Ray.OUTSIDE;
+    //     }
+    //
+    //     let d = this.direction.scaleTo(r);
+    //
+    //     // intersect point of ray and plane
+    //     res.x = this.origin.x + d.x;
+    //     res.y = this.origin.y + d.y;
+    //     res.z = this.origin.z + d.z;
+    //
+    //     return Ray.INSIDE;
+    // }
     /**
-     * Gets a ray hit a plane result. If the ray cross the plane returns 1 - og.Ray.INSIDE otherwise returns 0 - og.Ray.OUTSIDE.
-     * @public
-     * @param {Vec3} v0 - First plane point.
-     * @param {Vec3} v1 - Second plane point.
-     * @param {Vec3} v2 - Third plane point.
-     * @param {Vec3} res - Hit point object pointer that stores hit result.
-     * @returns {number}
+     * Finds the intersection of the ray with a plane.
+     * @param {Plane} plane - The plane to intersect with.
+     * @returns {Vec3 | null} The intersection point or null if no intersection.
      */
-    hitPlane(v0, v1, v2, res) {
-        let u = Vec3.sub(v1, v0);
-        let v = Vec3.sub(v2, v0);
-        let n = u.cross(v);
-        let w0 = Vec3.sub(this.origin, v0);
-        let a = -n.dot(w0);
-        let b = n.dot(this.direction);
-        // ray is  parallel to the plane
-        if (Math.abs(b) < EPS10) {
-            if (a === 0) {
-                return Ray.OUTSIDE;
-            }
-        }
-        let r = a / b;
-        if (r < 0) {
+    hitPlaneRes(plane, res) {
+        const d = this.direction.dot(plane.n);
+        if (Math.abs(d) < EPS10) {
             return Ray.OUTSIDE;
         }
-        let d = this.direction.scaleTo(r);
-        // intersect point of ray and plane
-        res.x = this.origin.x + d.x;
-        res.y = this.origin.y + d.y;
-        res.z = this.origin.z + d.z;
+        const t = plane.p.sub(this.origin).dot(plane.n) / d;
+        if (t < 0) {
+            return Ray.AWAY;
+        }
+        res.copy(this.getPoint(t));
         return Ray.INSIDE;
     }
     /**
@@ -184,21 +208,4 @@ export class Ray {
         // TODO
         //
     }
-    /**
-     * Finds the intersection of the ray with a plane.
-     * @param {Plane} plane - The plane to intersect with.
-     * @returns {Vec3 | null} The intersection point or null if no intersection.
-     */
-    hitPlane2(plane, res) {
-        const d = this.direction.dot(plane.n);
-        if (Math.abs(d) < EPS10) {
-            return Ray.OUTSIDE;
-        }
-        const t = plane.p.sub(this.origin).dot(plane.n) / d;
-        if (t < 0) {
-            return Ray.AWAY;
-        }
-        res.copy(this.getPoint(t));
-        return Ray.INSIDE;
-    }
 }

package/lib/js/math/Vec2.d.ts

@@ -92,6 +92,15 @@ export declare class Vec2 {
      * @returns {Vec2}
      */
     static orthoNormalize(normal: Vec2, tangent: Vec2): Vec2;
+    /**
+     * Get projection of the vector to plane where n - normal to the plane.
+     * @static
+     * @param {Vec2} b - Vector to project.
+     * @param {Vec2} n - Plane normal.
+     * @param {Vec2} [def] - Default value for non existed result.
+     * @returns {Vec2} -
+     */
+    static proj_b_to_plane(b: Vec2, n: Vec2, def?: Vec3): Vec2;
     /**
      * Converts to 3d vector, third value is 0.0.
      * @public
@@ -221,10 +230,17 @@ export declare class Vec2 {
     clear(): Vec2;
     /**
      * Returns normalized vector.
+     * @deprecated
      * @public
      * @returns {Vec2}
      */
     normal(): Vec2;
+    /**
+     * Returns normalized vector.
+     * @public
+     * @returns {Vec2}
+     */
+    getNormal(): Vec2;
     /**
      * Normalize current vector.
      * @public
@@ -299,6 +315,12 @@ export declare class Vec2 {
      * @returns {Vec2}
      */
     slerp(v2: Vec2, t: number): Vec2;
+    /**
+     * Returns true if vector's values are zero.
+     * @public
+     * @returns {boolean} -
+     */
+    isZero(): boolean;
 }
 /**
  * Vector 2d object creator.

package/lib/js/math/Vec2.js

@@ -122,6 +122,21 @@ export class Vec2 {
         normal.scale(tangent.dot(normal));
         return tangent.sub(normal).normalize();
     }
+    /**
+     * Get projection of the vector to plane where n - normal to the plane.
+     * @static
+     * @param {Vec2} b - Vector to project.
+     * @param {Vec2} n - Plane normal.
+     * @param {Vec2} [def] - Default value for non existed result.
+     * @returns {Vec2} -
+     */
+    static proj_b_to_plane(b, n, def) {
+        let res = b.sub(n.scaleTo(n.dot(b) / n.dot(n)));
+        if (def && res.isZero()) {
+            return new Vec2(def.x, def.y);
+        }
+        return res;
+    }
     /**
      * Converts to 3d vector, third value is 0.0.
      * @public
@@ -302,10 +317,19 @@ export class Vec2 {
     }
     /**
      * Returns normalized vector.
+     * @deprecated
      * @public
      * @returns {Vec2}
      */
     normal() {
+        return this.getNormal();
+    }
+    /**
+     * Returns normalized vector.
+     * @public
+     * @returns {Vec2}
+     */
+    getNormal() {
         let res = new Vec2();
         res.copy(this);
         let length = 1.0 / res.length();
@@ -450,6 +474,14 @@ export class Vec2 {
         }
         return Vec2.add(this.scale(scale0), v2.scale(scale1));
     }
+    /**
+     * Returns true if vector's values are zero.
+     * @public
+     * @returns {boolean} -
+     */
+    isZero() {
+        return !(this.x || this.y);
+    }
 }
 /**
  * Vector 2d object creator.

package/lib/js/renderer/Renderer.js

@@ -319,6 +319,8 @@ class Renderer {
         });
         this.pickingFramebuffer.init();
         this.depthFramebuffer = new Framebuffer(this.handler, {
+            width: 640,
+            height: 480,
             targets: [{
                     internalFormat: "RGBA",
                     type: "UNSIGNED_BYTE",
@@ -430,7 +432,7 @@ class Renderer {
         this.blitFramebuffer && this.blitFramebuffer.setSize(c.width, c.height, true);
         this.toneMappingFramebuffer && this.toneMappingFramebuffer.setSize(c.width, c.height, true);
         this.screenDepthFramebuffer && this.screenDepthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
-        this.depthFramebuffer && this.depthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
+        //this.depthFramebuffer && this.depthFramebuffer.setSize(c.clientWidth, c.clientHeight, true);
         if (this.handler.gl.type === "webgl") {
             this.screenTexture.screen = this.sceneFramebuffer.textures[0];
             this.screenTexture.picking = this.pickingFramebuffer.textures[0];
@@ -662,7 +664,7 @@ class Renderer {
         e.dispatch(e.draw, this);
         let frustums = this.activeCamera.frustums;
         let pointerEvent = e.pointerEvent();
-        let mouseHold = e.mouseState.leftButtonDown || e.mouseState.rightButtonDown;
+        let mouseFree = !e.mouseState.leftButtonDown && !e.mouseState.rightButtonDown;
         // Rendering scene nodes and entityCollections
         let rn = this._renderNodesArr;
         let k = frustums.length;
@@ -683,7 +685,7 @@ class Renderer {
             }
             this._drawEntityCollections(0);
             e.dispatch(e.drawtransparent, this);
-            if (pointerEvent && !mouseHold) {
+            if (pointerEvent && mouseFree) {
                 this._drawPickingBuffer(0);
             }
             this._drawDepthBuffer(0);
@@ -698,7 +700,7 @@ class Renderer {
             while (k--) {
                 this.activeCamera.setCurrentFrustum(k);
                 this._drawEntityCollections(i);
-                if (pointerEvent && !mouseHold) {
+                if (pointerEvent && mouseFree) {
                     this._drawPickingBuffer(i);
                 }
                 this._drawDepthBuffer(i);
@@ -707,10 +709,12 @@ class Renderer {
         }
         sceneFramebuffer.deactivate();
         this.blitFramebuffer && sceneFramebuffer.blitTo(this.blitFramebuffer, 0);
-        if (pointerEvent) {
+        if (pointerEvent && mouseFree) {
             this._readPickingBuffer();
         }
-        this._readDepthBuffer();
+        if (mouseFree) {
+            this._readDepthBuffer();
+        }
         // Tone mapping followed by rendering on the screen
         this._fnScreenFrame();
         e.dispatch(e.postdraw, this);

package/lib/js/renderer/RendererEvents.d.ts

@@ -111,6 +111,7 @@ export interface IMouseState extends IBaseInputState {
     wheelDelta: number;
     /** JavaScript mouse system event message. */
     sys: MouseEvent | null;
+    isTouchPad: boolean;
 }
 export interface ITouchState extends IBaseInputState {
     /** Touch has ended right now.*/

package/lib/js/renderer/RendererEvents.js

@@ -71,7 +71,8 @@ class RendererEvents extends Events {
             wheelDelta: 0,
             sys: null,
             pickingObject: null,
-            renderer: renderer
+            renderer: renderer,
+            isTouchPad: false
         };
         this.touchState = {
             moving: false,
@@ -195,6 +196,7 @@ class RendererEvents extends Events {
      * @protected
      */
     onMouseWheel(event) {
+        this.mouseState.isTouchPad = event.isTouchPad || false;
         this.mouseState.sys = event;
         this.mouseState.wheelDelta = event.wheelDelta || 0;
     }

package/lib/js/scene/Planet.d.ts

@@ -631,5 +631,9 @@ export declare class Planet extends RenderNode {
     getHeightDefault(lonLat: LonLat): Promise<number>;
     getHeightAboveELL(lonLat: LonLat): Promise<number>;
     onremove(): void;
+    /**
+     * @todo: refactor with events or something better
+     */
+    stopDragging(): void;
 }
 export {};

package/lib/js/scene/Planet.js

@@ -771,7 +771,7 @@ export class Planet extends RenderNode {
             this._renderedNodes = [];
             for (let i = 0, len = temp.length; i < len; i++) {
                 let ri = temp[i];
-                let ht = ri.segment.centerNormal.dot(cam._b);
+                let ht = ri.segment.centerNormal.dot(cam.getBackward());
                 if (ri.segment.tileZoom === this.maxCurrZoom || ht < HORIZON_TANGENT) {
                     this._renderedNodes.push(ri);
                     let k = 0, inFrustum = ri.inFrustum;
@@ -1347,7 +1347,7 @@ export class Planet extends RenderNode {
      * @returns {Vec2} - Screen coordinates.
      */
     getPixelFromCartesian(coords) {
-        return this.renderer.activeCamera.project(coords);
+        return this.renderer.activeCamera.project3v(coords);
     }
     /**
      * Project geodetic coordinates to screen space.
@@ -1358,7 +1358,7 @@ export class Planet extends RenderNode {
     getPixelFromLonLat(lonlat) {
         let coords = this.ellipsoid.lonLatToCartesian(lonlat);
         if (coords) {
-            return this.renderer.activeCamera.project(coords);
+            return this.renderer.activeCamera.project3v(coords);
         }
     }
     /**
@@ -1551,6 +1551,27 @@ export class Planet extends RenderNode {
         this.quadTreeStrategy.destroyBranches();
         this._renderedNodes = [];
     }
+    // function checkTerrainCollision(entity) {
+    //     let _tempTerrPoint = new Vec3();
+    //     let nodes = globus.planet._renderedNodes;
+    //     for (let j = 0; j < nodes.length; j++) {
+    //         let seg = nodes[j].segment;
+    //         if (seg && seg._extentLonLat.isInside(entity.getLonLat())) {
+    //             seg.getEntityTerrainPoint(entity, _tempTerrPoint);
+    //             entity.setCartesian3v(_tempTerrPoint);
+    //             break;
+    //         }
+    //     }
+    // }
+    /**
+     * @todo: refactor with events or something better
+     */
+    stopDragging() {
+        if (this.renderer && this.renderer.controls.EarthNavigation) {
+            //@ts-ignore
+            this.renderer.controls.EarthNavigation.stop();
+        }
+    }
 }
 const PLANET_EVENTS = [
     /**

package/lib/js/segment/Segment.js

@@ -175,25 +175,25 @@ class Segment {
             _v0.set(verts[ind_v0], verts[ind_v0 + 1], verts[ind_v0 + 2]);
             _v1.set(verts[ind_v0 + 3], verts[ind_v0 + 4], verts[ind_v0 + 5]);
             _v2.set(verts[ind_v2], verts[ind_v2 + 1], verts[ind_v2 + 2]);
-            let d = _ray.hitTriangle(_v0, _v1, _v2, res);
+            let d = _ray.hitTriangleRes(_v0, _v1, _v2, res);
             if (d === Ray.INSIDE) {
                 return xyz.distance(res);
             }
             else if (d === Ray.AWAY) {
                 _rayEx.set(xyz, norm);
-                let d = _rayEx.hitTriangle(_v0, _v1, _v2, res);
+                let d = _rayEx.hitTriangleRes(_v0, _v1, _v2, res);
                 if (d === Ray.INSIDE) {
                     return -xyz.distance(res);
                 }
             }
             _v3.set(verts[ind_v2 + 3], verts[ind_v2 + 4], verts[ind_v2 + 5]);
-            d = _ray.hitTriangle(_v1, _v3, _v2, res);
+            d = _ray.hitTriangleRes(_v1, _v3, _v2, res);
             if (d === Ray.INSIDE) {
                 return xyz.distance(res);
             }
             else if (d === Ray.AWAY) {
                 _rayEx.set(xyz, norm);
-                let d = _rayEx.hitTriangle(_v1, _v3, _v2, res);
+                let d = _rayEx.hitTriangleRes(_v1, _v3, _v2, res);
                 if (d === Ray.INSIDE) {
                     return -xyz.distance(res);
                 }

package/lib/js/terrain/GlobusTerrain.js

@@ -173,11 +173,11 @@ class GlobusTerrain extends EmptyTerrain {
         let v0 = new Vec3(tileData.extent.southWest.lon + size * j, h0, tileData.extent.northEast.lat - size * i - size), v1 = new Vec3(v0.x + size, h1, v0.z), v2 = new Vec3(v0.x, h2, v0.z + size), v3 = new Vec3(v0.x + size, h3, v0.z + size);
         let xyz = new Vec3(merc.lon, 100000.0, merc.lat), ray = new Ray(xyz, new Vec3(0, -1, 0));
         let res = new Vec3();
-        let d = ray.hitTriangle(v0, v1, v2, res);
+        let d = ray.hitTriangleRes(v0, v1, v2, res);
         if (d === Ray.INSIDE) {
             return res.y;
         }
-        d = ray.hitTriangle(v1, v3, v2, res);
+        d = ray.hitTriangleRes(v1, v3, v2, res);
         if (d === Ray.INSIDE) {
             return res.y;
         }