@openglobus/og 0.23.0 → 0.24.0

package/lib/@openglobus/js/Globe.d.ts

@@ -33,7 +33,6 @@ export interface IGlobeParams {
     transitionOpacityEnabled?: boolean;
     terrain?: EmptyTerrain;
     controls?: Control[];
-    useEarthNavigation?: boolean;
     minSlope?: number;
     sun?: {
         active?: boolean;

package/lib/@openglobus/js/camera/Camera.d.ts

@@ -6,6 +6,7 @@ import { Renderer } from "../renderer/Renderer";
 import { Vec2, NumberArray2 } from "../math/Vec2";
 import { Vec3 } from "../math/Vec3";
 import { Sphere } from "../bv/Sphere";
+import { Quat } from "../math/Quat";
 type CameraEvents = ["viewchange", "moveend"];
 export interface ICameraParams {
     eye?: Vec3;
@@ -89,22 +90,28 @@ declare class Camera {
     protected _normalMatrix: Mat3;
     /**
      * Camera right vector.
-     * @public
+     * @protected
      * @type {Vec3}
      */
     _r: Vec3;
     /**
      * Camera up vector.
-     * @public
+     * @protected
      * @type {Vec3}
      */
     _u: Vec3;
     /**
      * Camera backward vector.
-     * @public
+     * @protected
      * @type {Vec3}
      */
     _b: Vec3;
+    /**
+     * Camera forward vector.
+     * @protected
+     * @type {Vec3}
+     */
+    _f: Vec3;
     protected _pr: Vec3;
     protected _pu: Vec3;
     protected _pb: Vec3;
@@ -208,23 +215,40 @@ declare class Camera {
      */
     slide(du: number, dv: number, dn: number): void;
     /**
-     * Roll the camera to the angle in degrees
+     * Roll the camera to the angle in radians
+     * @public
+     * @param {number} angle - Delta roll angle in radians
+     */
+    setRoll(angle: number): void;
+    /**
+     * Pitch the camera to the angle in radians
      * @public
-     * @param {number} angle - Delta roll angle in degrees
+     * @param {number} angle - Delta pitch angle in radians
      */
-    roll(angle: number): void;
+    setPitch(angle: number): void;
     /**
-     * Pitch the camera to the angle in degrees
+     * Yaw the camera to the angle in radians
      * @public
-     * @param {number} angle - Delta pitch angle in degrees
+     * @param {number} angle - Delta yaw angle in radians
+     */
+    setYaw(angle: number): void;
+    setPitchYawRoll(pitch: number, yaw: number, roll: number): void;
+    getPitch(): number;
+    getYaw(): number;
+    getRoll(): number;
+    /**
+     * Returns camera quaternion
      */
-    pitch(angle: number): void;
+    getRotation(): Quat;
+    setRotation(rot: Quat, up?: Vec3, right?: Vec3, back?: Vec3): void;
+    rotate(rot: Quat): void;
     /**
-     * Yaw the camera to the angle in degrees
+     * Returns normal vector direction to the unprojected screen point from camera eye
      * @public
-     * @param {number} angle - Delta yaw angle in degrees
+     * @param {Vec2} pos - Screen X coordinate
+     * @returns {Vec3} - Direction vector
      */
-    yaw(angle: number): void;
+    unproject2v(pos: Vec2): Vec3;
     /**
      * Returns normal vector direction to the unprojected screen point from camera eye
      * @public
@@ -239,7 +263,16 @@ declare class Camera {
      * @param {Vec3} v - Cartesian 3d coordinates
      * @returns {Vec2} - Screen point coordinates
      */
-    project(v: Vec3): Vec2;
+    project3v(v: Vec3): Vec2;
+    /**
+     * Gets projected 3d point to the 2d screen coordinates
+     * @public
+     * @param {number} x - X coordinate
+     * @param {number} y - Y coordinate
+     * @param {number} z - Z coordinate
+     * @returns {Vec2} - Screen point coordinates
+     */
+    project(x: number, y: number, z: number): Vec2;
     /**
      * Rotates camera around center point
      * @public
@@ -249,7 +282,7 @@ declare class Camera {
      * @param {Vec3} [center] - Point that the camera rotates around
      * @param {Vec3} [up] - Camera up vector
      */
-    rotateAround(angle: number, isArc?: boolean, center?: Vec3 | null, up?: Vec3 | null): void;
+    rotateAround(angle: number, isArc?: boolean, center?: Vec3, up?: Vec3): void;
     /**
      * Rotates camera around center point by horizontal.
      * @public
@@ -259,7 +292,7 @@ declare class Camera {
      * @param {Vec3} [center] - Point that the camera rotates around.
      * @param {Vec3} [up] - Camera up vector.
      */
-    rotateHorizontal(angle: number, isArc?: boolean, center?: Vec3 | null, up?: Vec3 | null): void;
+    rotateHorizontal(angle: number, isArc?: boolean, center?: Vec3, up?: Vec3): void;
     /**
      * Rotates camera around center point by vertical.
      * @param {number} angle - Rotation angle in radians.

package/lib/@openglobus/js/camera/PlanetCamera.d.ts

@@ -228,7 +228,20 @@ declare class PlanetCamera extends Camera {
     checkFly(): void;
     checkTerrainCollision(): Vec3 | undefined;
     getSurfaceVisibleDistance(d: number): number;
+    /**
+     * should be yje same as getYaw
+     */
     getHeading(): number;
     isVisible(poi: Vec3): boolean;
+    getPitch(): number;
+    /**
+     * should be the same as getHeading
+     */
+    getYaw(): number;
+    getRoll(): number;
+    setPitch(a: number): void;
+    setYaw(a: number): void;
+    setRoll(a: number): void;
+    setPitchYawRoll(pitch: number, yaw: number, roll: number): void;
 }
 export { PlanetCamera };

package/lib/@openglobus/js/control/MouseNavigation.d.ts

@@ -1,64 +1,75 @@
 import { Control, IControlParams } from "./Control";
-import { Key } from "../Lock";
+import { IMouseState } from "../renderer/RendererEvents";
 import { Quat } from "../math/Quat";
 import { Sphere } from "../bv/Sphere";
-import { Vec3 } from "../math/Vec3";
 import { Vec2 } from "../math/Vec2";
-import { Planet } from "../scene/Planet";
-import { PlanetCamera } from "../camera/PlanetCamera";
-import { IMouseState } from "../renderer/RendererEvents";
-export interface IStepForward {
-    eye: Vec3;
-    v: Vec3;
-    u: Vec3;
-    n: Vec3;
-}
-interface IMouseNavigationParams extends IControlParams {
-    minSlope?: number;
+import { Vec3 } from "../math/Vec3";
+interface IEarthNavigationParams extends IControlParams {
+    speed?: number;
+    fixedUp?: boolean;
 }
-/**
- * Mouse planet camera dragging control.
- */
 export declare class MouseNavigation extends Control {
-    protected grabbedPoint: Vec3;
-    protected _eye0: Vec3;
-    protected pointOnEarth: Vec3;
-    protected earthUp: Vec3;
-    inertia: number;
-    protected grabbedSpheroid: Sphere;
-    protected qRot: Quat;
-    protected scaleRot: number;
-    protected distDiff: number;
-    protected stepsCount: number;
-    protected stepsForward: IStepForward[] | null;
-    protected stepIndex: number;
-    protected _lmbDoubleClickActive: boolean;
-    minSlope: number;
+    speed: number;
+    force: Vec3;
+    force_h: number;
+    force_v: number;
+    vel: Vec3;
+    vel_h: number;
+    vel_v: number;
+    mass: number;
+    vel_roll: number;
+    force_roll: number;
+    protected _lookPos: Vec3 | undefined;
+    protected _grabbedPoint: Vec3 | null;
+    protected _targetZoomPoint: Vec3 | null;
+    protected _targetDragPoint: Vec3 | null;
+    protected _targetRotationPoint: Vec3 | null;
+    protected _grabbedSphere: Sphere;
     protected _wheelDirection: number;
-    protected _keyLock: Key;
-    protected _deactivate: boolean;
+    protected _currScreenPos: Vec2;
+    protected _tUp: Vec3;
+    protected _tRad: number;
     protected _shiftBusy: boolean;
-    constructor(options?: IMouseNavigationParams);
-    static getMovePointsFromPixelTerrain(cam: PlanetCamera, planet: Planet, stepsCount: number, delta: number, point: Vec2, forward: boolean, dir?: Vec3 | null): IStepForward[] | undefined;
+    protected fixedUp: boolean;
+    protected _curPitch: number;
+    protected _curYaw: number;
+    protected _curRoll: number;
+    protected _rot: Quat;
+    protected _eye0: Vec3;
+    protected _grabbedCameraHeight: number;
+    protected _newEye: Vec3;
+    protected _isTouchPad: boolean;
+    protected _velInertia: number;
+    protected _hold: boolean;
+    protected _prevVel: Vec3;
+    protected _screenPosIsChanged: boolean;
+    protected _rotHDir: number;
+    protected _rotVDir: number;
+    constructor(options?: IEarthNavigationParams);
+    oninit(): void;
     onactivate(): void;
     ondeactivate(): void;
-    activateDoubleClickZoom(): void;
-    deactivateDoubleClickZoom(): void;
-    protected onMouseEnter(e: IMouseState): void;
-    protected onMouseLeave(): void;
-    protected onMouseWheel(e: IMouseState): void;
-    oninit(): void;
-    protected onMouseLeftButtonDoubleClick(e: IMouseState): void;
-    protected onMouseLeftButtonClick(): void;
-    stopRotation(): void;
-    protected onMouseLeftButtonUp(e: IMouseState): void;
-    protected onMouseLeftButtonDown(e: IMouseState): void;
-    protected onMouseRightButtonClick(e: IMouseState): void;
-    protected onMouseRightButtonDown(e: IMouseState): void;
-    onShiftFree(): void;
-    protected onMouseMove(e: IMouseState): void;
     protected onDraw(): void;
-    lockPlanet(skipTerrain?: boolean): void;
-    freePlanet(): void;
+    _onShiftFree: () => void;
+    protected _onMouseMove: (e: IMouseState) => void;
+    protected _onMouseEnter: (e: IMouseState) => void;
+    protected _onMouseLeave: () => void;
+    protected _onRHold: (e: IMouseState) => void;
+    protected _handleRotation(): void;
+    protected _onRDown: (e: IMouseState) => void;
+    protected _getTargetPoint(p: Vec2): Vec3 | null;
+    protected _onMouseWheel: (e: IMouseState) => void;
+    protected _onLDown: (e: IMouseState) => void;
+    protected _onLHold: (e: IMouseState) => void;
+    protected _onLUp: (e: IMouseState) => void;
+    protected _handleDrag(): void;
+    protected _corrRoll(): void;
+    protected _handleZoom(): void;
+    protected _updateVel(): void;
+    protected _updateVel_h(): void;
+    protected _updateVel_v(): void;
+    protected _updateVel_roll(): void;
+    protected get dt(): number;
+    stop(): void;
 }
 export {};

package/lib/@openglobus/js/control/OldMouseNavigation.d.ts

@@ -0,0 +1,64 @@
+import { Control, IControlParams } from "./Control";
+import { Key } from "../Lock";
+import { Quat } from "../math/Quat";
+import { Sphere } from "../bv/Sphere";
+import { Vec3 } from "../math/Vec3";
+import { Vec2 } from "../math/Vec2";
+import { Planet } from "../scene/Planet";
+import { PlanetCamera } from "../camera/PlanetCamera";
+import { IMouseState } from "../renderer/RendererEvents";
+export interface IStepForward {
+    eye: Vec3;
+    v: Vec3;
+    u: Vec3;
+    n: Vec3;
+}
+interface IMouseNavigationParams extends IControlParams {
+    minSlope?: number;
+}
+/**
+ * Mouse planet camera dragging control.
+ */
+export declare class OldMouseNavigation extends Control {
+    protected grabbedPoint: Vec3;
+    protected _eye0: Vec3;
+    protected pointOnEarth: Vec3;
+    protected earthUp: Vec3;
+    inertia: number;
+    protected grabbedSpheroid: Sphere;
+    protected qRot: Quat;
+    protected scaleRot: number;
+    protected distDiff: number;
+    protected stepsCount: number;
+    protected stepsForward: IStepForward[] | null;
+    protected stepIndex: number;
+    protected _lmbDoubleClickActive: boolean;
+    minSlope: number;
+    protected _wheelDirection: number;
+    protected _keyLock: Key;
+    protected _deactivate: boolean;
+    protected _shiftBusy: boolean;
+    constructor(options?: IMouseNavigationParams);
+    static getMovePointsFromPixelTerrain(cam: PlanetCamera, planet: Planet, stepsCount: number, delta: number, point: Vec2, forward: boolean, dir?: Vec3 | null): IStepForward[] | undefined;
+    onactivate(): void;
+    ondeactivate(): void;
+    activateDoubleClickZoom(): void;
+    deactivateDoubleClickZoom(): void;
+    protected onMouseEnter(e: IMouseState): void;
+    protected onMouseLeave(): void;
+    protected onMouseWheel(e: IMouseState): void;
+    oninit(): void;
+    protected onMouseLeftButtonDoubleClick(e: IMouseState): void;
+    protected onMouseLeftButtonClick(): void;
+    stopRotation(): void;
+    protected onMouseLeftButtonUp(e: IMouseState): void;
+    protected onMouseLeftButtonDown(e: IMouseState): void;
+    protected onMouseRightButtonClick(e: IMouseState): void;
+    protected onMouseRightButtonDown(e: IMouseState): void;
+    onShiftFree(): void;
+    protected onMouseMove(e: IMouseState): void;
+    protected onDraw(): void;
+    lockPlanet(skipTerrain?: boolean): void;
+    freePlanet(): void;
+}
+export {};

package/lib/@openglobus/js/control/index.d.ts

@@ -3,14 +3,13 @@ export * from "./Control";
 export * from "./DebugInfo";
 export * from "./DrawingSwitcher";
 export * from "./EarthCoordinates";
-export * from "./EarthNavigation";
 export * from "./GeoImageDragControl";
 export * from "./KeyboardNavigation";
 export * from "./LayerAnimation";
 export * from "./LayerSwitcher";
 export * from "./Lighting";
+export * from "./OldMouseNavigation";
 export * from "./MouseNavigation";
-export * from "./MouseWheelZoomControl";
 export * from "./RulerSwitcher";
 export * from "./ScaleControl";
 export * from "./ShowFps";

package/lib/@openglobus/js/entity/Entity.d.ts

@@ -37,7 +37,8 @@ import { Quat } from "../math/Quat";
  * @property {number} [yaw] - Rotation around local Y-axis.
  * @property {number} [roll] - Rotation around local Z-axis.
  * @property {number | Vec3 | NumberArray3} [scale] - Scaling factor.
- * @property {boolean} [forceGlobalPosition] - Forces global position for children entities make them the same position as the parent.
+ * @property {boolean} [forceGlobalPosition] - Forces global position for entity make the same position as its parent.
+ * @property {boolean} [forceGlobalRotation] - Forces global rotation for the entity make the same rotation as its parent.
  */
 export interface IEntityParams {
     name?: string;
@@ -61,6 +62,8 @@ export interface IEntityParams {
     roll?: number;
     scale?: number | Vec3 | NumberArray3;
     forceGlobalPosition?: boolean;
+    forceGlobalRotation?: boolean;
+    forceGlobalScale?: boolean;
     localPosition?: Vec3 | NumberArray3;
 }
 /**
@@ -85,11 +88,13 @@ export interface IEntityParams {
  * @param {Strip | IStripParams} [options.strip] - Strip object or parameters.
  * @param {boolean} [options.independentPicking] - Independent picking flag.
  * @param {boolean} [options.relativePosition] - Parent relative position flag, otherwise position is absolute.
- * @param {number} [options.pitch] - Rotation around local X-axis.
- * @param {number} [options.yaw] - Rotation around local Y-axis.
- * @param {number} [options.roll] - Rotation around local Z-axis.
+ * @param {number} [options.pitch] - Rotation around local X-axis in radians.
+ * @param {number} [options.yaw] - Rotation around local Y-axis in radians.
+ * @param {number} [options.roll] - Rotation around local Z-axis in radians.
  * @param {number | Vec3 | NumberArray3} [options.scale] - Scaling factor.
- * @param {boolean} [options.forceGlobalPosition] - Forces global position for children entities make them the same position as the parent.
+ * @param {boolean} [options.forceGlobalPosition] - Forces global position for the entity make the same position as its parent.
+ * @param {boolean} [options.forceGlobalRotation] - Forces global rotation for the entity make the same rotation as its parent.
+ * @param {boolean} [options.forceGlobalScale] - Forces global scale for the entity make the same scale as its parent.
  */
 declare class Entity {
     static __counter__: number;
@@ -112,6 +117,8 @@ declare class Entity {
      */
     childEntities: Entity[];
     forceGlobalPosition: boolean;
+    forceGlobalRotation: boolean;
+    forceGlobalScale: boolean;
     /**
      * Parent entity.
      * @public
@@ -238,9 +245,6 @@ declare class Entity {
     strip: Strip | null;
     _nodePtr?: EntityCollectionNode;
     protected _relativePosition: boolean;
-    protected _pitch: number;
-    protected _yaw: number;
-    protected _roll: number;
     protected _pitchRad: number;
     protected _yawRad: number;
     protected _rollRad: number;
@@ -386,72 +390,72 @@ declare class Entity {
     setRotation(rot: Quat): void;
     /**
      * Sets the pitch rotation of the entity.
-     * @param {number} val - The new pitch angle in degrees.
+     * @param {number} val - The new pitch angle in radians.
      */
     setPitch(val: number): void;
     /**
      * Sets the yaw rotation of the entity.
-     * @param {number} val - The new yaw angle in degrees.
+     * @param {number} val - The new yaw angle in radians.
      */
     setYaw(val: number): void;
     /**
      * Sets the roll rotation of the entity.
      * @public
-     * @param {number} val - The new roll angle in degrees.
+     * @param {number} val - The new roll angle in radians.
      */
     setRoll(val: number): void;
     /**
      * Gets the pitch angle of the entity.
      * @public
-     * @returns {number} The pitch angle in degrees.
+     * @returns {number} The pitch angle in radians.
      */
     getPitch(): number;
     /**
      * Gets the yaw angle of the entity.
      * @public
-     * @returns {number} The yaw angle in degrees.
+     * @returns {number} The yaw angle in radians.
      */
     getYaw(): number;
     /**
      * Gets the roll angle of the entity.
      * @public
-     * @returns {number} The roll angle in degrees.
+     * @returns {number} The roll angle in radians.
      */
     getRoll(): number;
     /**
      * Sets the absolute pitch of the entity.
      * @public
-     * @param {number} val - The absolute pitch angle in degrees.
+     * @param {number} val - The absolute pitch angle in radians.
      */
     setAbsolutePitch(val: number): void;
     /**
      * Sets the absolute yaw of the entity.
      * @public
-     * @param {number} val - The absolute yaw angle in degrees.
+     * @param {number} val - The absolute yaw angle in radians.
      */
     setAbsoluteYaw(val: number): void;
     /**
      * Sets the absolute roll of the entity.
      * @public
-     * @param {number} val - The absolute roll angle in degrees.
+     * @param {number} val - The absolute roll angle in radians.
      */
     setAbsoluteRoll(val: number): void;
     /**
      * Gets the absolute pitch angle of the entity.
      * @public
-     * @returns {number} The absolute pitch angle in degrees.
+     * @returns {number} The absolute pitch angle in radians.
      */
     getAbsolutePitch(): number;
     /**
      * Gets the absolute yaw angle of the entity.
      * @public
-     * @returns {number} The absolute yaw angle in degrees.
+     * @returns {number} The absolute yaw angle in radians.
      */
     getAbsoluteYaw(): number;
     /**
      * Gets the absolute roll angle of the entity.
      * @public
-     * @returns {number} The absolute roll angle in degrees.
+     * @returns {number} The absolute roll angle in radians.
      */
     getAbsoluteRoll(): number;
     protected _getScaleByDistance(): number;

package/lib/@openglobus/js/entity/GeoObject.d.ts

@@ -13,9 +13,6 @@ export declare const LOCAL_FORWARD: Vec3;
  * @property {string} [objSrc] - Source url of the 3D object.
  * @property {string} [tag] - Unique instancing drawing identifier tag.
  * @property {Vec3 | NumberArray3} [position] - Position in Cartesian coordinates.
- * @property {number} [pitch] - Rotation around X-axis in degrees.
- * @property {number} [yaw] - Rotation around Y-axis in degrees.
- * @property {number} [roll] - Rotation around Z-axis in degrees.
  * @property {number | Vec3 | NumberArray3} [scale] - Scale of the object.
  * @property {Vec3 | NumberArray3} [translate] - Translation offset.
  * @property {Vec4 | NumberArray4 | string} [color] - RGBA color or HTML color string.
@@ -26,9 +23,6 @@ export interface IGeoObjectParams {
     objSrc?: string;
     tag?: string;
     position?: Vec3 | NumberArray3;
-    pitch?: number;
-    yaw?: number;
-    roll?: number;
     scale?: number | Vec3 | NumberArray3;
     translate?: Vec3 | NumberArray3;
     color?: Vec4 | NumberArray4 | string;
@@ -42,9 +36,6 @@ export interface IGeoObjectParams {
  * @param {string} [options.objSrc] - Source url of the 3D object.
  * @param {string} [options.tag] - Unique instancing drawing identifier tag.
  * @param {Vec3 | NumberArray3} [options.position] - Position in Cartesian coordinates.
- * @param {number} [options.pitch=0] - Rotation around X-axis in degrees.
- * @param {number} [options.yaw=0] - Rotation around Y-axis in degrees.
- * @param {number} [options.roll=0] - Rotation around Z-axis in degrees.
  * @param {number | Vec3 | NumberArray3} [options.scale=1] - Scale of the object.
  * @param {Vec3 | NumberArray3} [options.translate] - Translation offset.
  * @param {Vec4 | NumberArray4 | string} [options.color] - RGBA color or HTML color string.

package/lib/@openglobus/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/@openglobus/js/math/Mat3.d.ts

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

package/lib/@openglobus/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/@openglobus/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/@openglobus/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/@openglobus/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;
 }