@openglobus/og 0.22.2 → 0.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.22.2",
+  "version": "0.24.0",
   "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers, and 3D objects. It uses the WebGL technology, open source, and completely free.",
   "directories": {
     "example": "./sandbox"
@@ -11,7 +11,7 @@
   "scripts": {
     "docs": "jsdoc -r ./src/ -c ./jsdoc.conf.json -d ./docs",
     "serve_docs": "cd docs; ws -p 8088",
-    "serve": "ws -p 3000",
+    "serve": "ws -p 8080",
     "build": "rollup -c --bundleConfigAsCjs",
     "clean": "rm -rf ./lib ./docs",
     "prepublishOnly": "npm run build; npm run gen_js",
@@ -20,7 +20,8 @@
     "test_watch": "jest --env=jsdom --watch",
     "lint": "eslint src/",
     "gen_js": "tsc --build tsconfig.json --declaration",
-    "font": "node ./fonts/index.js"
+    "font": "node ./fonts/index.js",
+    "dev_serve": "npm-run-all --parallel --continue-on-error --race dev serve"
   },
   "repository": {
     "type": "git",
@@ -55,6 +56,7 @@
     "jsdoc-babel": "^0.5.0",
     "lint-staged": "^15.2.10",
     "local-web-server": "^5.4.0",
+    "npm-run-all": "^4.1.5",
     "postcss": "^8.4.45",
     "prettier": "^3.3.3",
     "rollup": "^4.22.4",

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

@@ -1,50 +0,0 @@
-import { Control, IControlParams } from "./Control";
-import { ITouchState } from "../renderer/RendererEvents";
-import { IMouseState } from "../renderer/RendererEvents";
-import { Quat } from "../math/Quat";
-import { Sphere } from "../bv/Sphere";
-import { Vec3 } from "../math/Vec3";
-interface IEarthNavigationParams extends IControlParams {
-}
-declare class TouchExt {
-    x: number;
-    y: number;
-    prev_x: number;
-    prev_y: number;
-    grabbedPoint: Vec3 | null;
-    grabbedSpheroid: Sphere;
-    constructor();
-    dX(): number;
-    dY(): number;
-}
-export declare class EarthNavigation extends Control {
-    protected grabbedPoint: Vec3 | null;
-    protected grabbedDir: Vec3;
-    inertia: number;
-    protected grabbedSpheroid: Sphere;
-    protected _vRot: Quat;
-    protected _hRot: Quat;
-    protected _a: number;
-    protected scaleRot: number;
-    protected currState: number;
-    protected positionState: {
-        h: number;
-        max: number;
-        min: number;
-    }[];
-    protected touches: TouchExt[];
-    constructor(options?: IEarthNavigationParams);
-    switchZoomState(wheelDelta: number): void;
-    protected onMouseWheel(event: IMouseState): void;
-    oninit(): void;
-    onactivate(): void;
-    protected onTouchStart(e: ITouchState): void;
-    protected onTouchEnd(e: ITouchState): void;
-    protected onTouchMove(e: ITouchState): void;
-    protected onMouseLeftButtonClick(e: IMouseState): void;
-    stopRotation(): void;
-    protected onMouseLeftButtonUp(e: IMouseState): void;
-    protected onMouseLeftButtonDown(e: IMouseState): void;
-    protected onDraw(): void;
-}
-export {};

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

@@ -1,44 +0,0 @@
-import { Sphere } from "../bv/Sphere";
-import { Key } from "../Lock";
-import { Quat } from "../math/Quat";
-import { Vec3 } from "../math/Vec3";
-import { Control, IControlParams } from "./Control";
-import { IStepForward } from "./MouseNavigation";
-interface IMouseWheelZoomControl extends IControlParams {
-    minSlope?: number;
-}
-export declare class MouseWheelZoomControl 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;
-    protected minSlope: number;
-    protected _keyLock: Key;
-    protected _deactivate: boolean;
-    protected _move: number;
-    constructor(options?: IMouseWheelZoomControl);
-    oninit(): void;
-    /**
-     * Planet zoom in.
-     * @public
-     */
-    zoomIn(): void;
-    /**
-     * Planet zoom out.
-     * @public
-     */
-    zoomOut(): void;
-    stopRotation(): void;
-    stopZoom(): void;
-    protected _draw(): void;
-}
-export {};

package/lib/js/control/EarthNavigation.d.ts

@@ -1,50 +0,0 @@
-import { Control, IControlParams } from "./Control";
-import { ITouchState } from "../renderer/RendererEvents";
-import { IMouseState } from "../renderer/RendererEvents";
-import { Quat } from "../math/Quat";
-import { Sphere } from "../bv/Sphere";
-import { Vec3 } from "../math/Vec3";
-interface IEarthNavigationParams extends IControlParams {
-}
-declare class TouchExt {
-    x: number;
-    y: number;
-    prev_x: number;
-    prev_y: number;
-    grabbedPoint: Vec3 | null;
-    grabbedSpheroid: Sphere;
-    constructor();
-    dX(): number;
-    dY(): number;
-}
-export declare class EarthNavigation extends Control {
-    protected grabbedPoint: Vec3 | null;
-    protected grabbedDir: Vec3;
-    inertia: number;
-    protected grabbedSpheroid: Sphere;
-    protected _vRot: Quat;
-    protected _hRot: Quat;
-    protected _a: number;
-    protected scaleRot: number;
-    protected currState: number;
-    protected positionState: {
-        h: number;
-        max: number;
-        min: number;
-    }[];
-    protected touches: TouchExt[];
-    constructor(options?: IEarthNavigationParams);
-    switchZoomState(wheelDelta: number): void;
-    protected onMouseWheel(event: IMouseState): void;
-    oninit(): void;
-    onactivate(): void;
-    protected onTouchStart(e: ITouchState): void;
-    protected onTouchEnd(e: ITouchState): void;
-    protected onTouchMove(e: ITouchState): void;
-    protected onMouseLeftButtonClick(e: IMouseState): void;
-    stopRotation(): void;
-    protected onMouseLeftButtonUp(e: IMouseState): void;
-    protected onMouseLeftButtonDown(e: IMouseState): void;
-    protected onDraw(): void;
-}
-export {};

package/lib/js/control/EarthNavigation.js

@@ -1,202 +0,0 @@
-import { Control } from "./Control";
-import { LonLat } from "../LonLat";
-import { Quat } from "../math/Quat";
-import { Ray } from "../math/Ray";
-import { Sphere } from "../bv/Sphere";
-import { Vec2 } from "../math/Vec2";
-import { Vec3 } from "../math/Vec3";
-class TouchExt {
-    constructor() {
-        this.x = 0;
-        this.y = 0;
-        this.prev_x = 0;
-        this.prev_y = 0;
-        this.grabbedPoint = new Vec3();
-        this.grabbedSpheroid = new Sphere();
-    }
-    dX() {
-        return this.x - this.prev_x;
-    }
-    dY() {
-        return this.y - this.prev_y;
-    }
-}
-export class EarthNavigation extends Control {
-    constructor(options = {}) {
-        super(options);
-        this.grabbedPoint = new Vec3();
-        this.grabbedDir = new Vec3();
-        this.inertia = 0.007;
-        this.grabbedSpheroid = new Sphere();
-        this.planet = null;
-        this._vRot = new Quat();
-        this._hRot = new Quat();
-        this._a = 0.0;
-        this.scaleRot = 0;
-        this.currState = 0;
-        this.positionState = [
-            { h: 17119745.303455353, max: 0.98, min: -0.98 },
-            { h: 6866011, max: 0.98, min: -0.98 },
-            { h: 3000000, max: 0.98, min: -0.98 },
-            { h: 1000000, max: 0.98, min: -0.98 },
-            { h: 500000, max: 0.98, min: -0.98 }
-        ];
-        this.touches = [new TouchExt(), new TouchExt()];
-    }
-    switchZoomState(wheelDelta) {
-        this.stopRotation();
-        if (wheelDelta > 0) {
-            this.currState++;
-        }
-        else {
-            this.currState--;
-        }
-        if (this.currState <= 0)
-            this.currState = 0;
-        if (this.currState >= this.positionState.length) {
-            this.currState = this.positionState.length - 1;
-        }
-        this.planet.stopFlying();
-        const ll = this.planet.camera._lonLat;
-        this.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[this.currState].h));
-    }
-    onMouseWheel(event) {
-        this.switchZoomState(event.wheelDelta);
-    }
-    oninit() {
-        this.activate();
-    }
-    onactivate() {
-        let r = this.renderer;
-        r.events.on("mousewheel", this.onMouseWheel, this);
-        r.events.on("lhold", this.onMouseLeftButtonDown, this);
-        r.events.on("ldown", this.onMouseLeftButtonClick, this);
-        r.events.on("lup", this.onMouseLeftButtonUp, this);
-        r.events.on("touchstart", this.onTouchStart, this);
-        r.events.on("touchend", this.onTouchEnd, this);
-        r.events.on("touchmove", this.onTouchMove, this);
-        r.events.on("draw", this.onDraw, this);
-    }
-    onTouchStart(e) {
-        if (e.sys.touches.length == 1) {
-            const t = this.touches[0];
-            t.x = e.sys.touches.item(0).pageX - e.sys.offsetLeft;
-            t.y = e.sys.touches.item(0).pageY - e.sys.offsetTop;
-            t.prev_x = e.sys.touches.item(0).pageX - e.sys.offsetLeft;
-            t.prev_y = e.sys.touches.item(0).pageY - e.sys.offsetTop;
-            // t.grabbedPoint = this.planet!.getCartesianFromPixelTerrain(t, true);
-            t.grabbedPoint = this.planet.getCartesianFromPixelTerrain(new Vec2(t.x, t.y)) || null;
-            if (t.grabbedPoint) {
-                t.grabbedSpheroid.radius = t.grabbedPoint.length();
-                this.stopRotation();
-            }
-        }
-    }
-    onTouchEnd(e) {
-        if (e.sys.touches.length == 0) {
-            this.scaleRot = 1;
-            if (Math.abs(this.touches[0].x - this.touches[0].prev_x) < 3 &&
-                Math.abs(this.touches[0].y - this.touches[0].prev_y) < 3)
-                this.stopRotation();
-        }
-    }
-    onTouchMove(e) {
-        if (e.sys.touches.length == 1) {
-            let cam = this.planet.camera;
-            let t = this.touches[0];
-            t.prev_x = t.x;
-            t.prev_y = t.y;
-            t.x = e.sys.touches.item(0).pageX - e.sys.offsetLeft;
-            t.y = e.sys.touches.item(0).pageY - e.sys.offsetTop;
-            if (!t.grabbedPoint)
-                return;
-            let direction = cam.unproject(t.x, t.y);
-            let targetPoint = new Ray(cam.eye, direction).hitSphere(t.grabbedSpheroid);
-            if (targetPoint) {
-                this._a =
-                    Math.acos(t.grabbedPoint.y / t.grabbedSpheroid.radius) -
-                        Math.acos(targetPoint.y / t.grabbedSpheroid.radius);
-                this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
-                this._hRot = Quat.getRotationBetweenVectors(new Vec3(targetPoint.x, 0.0, targetPoint.z).normal(), new Vec3(t.grabbedPoint.x, 0.0, t.grabbedPoint.z).normal());
-                let rot = this._hRot.mul(this._vRot);
-                let state = this.positionState[this.currState];
-                let lim = rot.mulVec3(cam.eye).normal().dot(Vec3.NORTH);
-                if (lim > state.max || lim < state.min) {
-                    rot = Quat.yRotation(rot.getYaw());
-                }
-                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.NORTH);
-                cam.update();
-            }
-        }
-    }
-    onMouseLeftButtonClick(e) {
-        this.renderer.handler.canvas.classList.add("ogGrabbingPoiner");
-        this.grabbedPoint = this.planet.getCartesianFromMouseTerrain() || null;
-        this.grabbedDir.copy(e.direction);
-        if (this.grabbedPoint) {
-            this.grabbedSpheroid.radius = this.grabbedPoint.length();
-            this.stopRotation();
-        }
-    }
-    stopRotation() {
-        this.scaleRot = 0.0;
-        this._a = 0.0;
-        this._vRot.clear();
-        this._hRot.clear();
-    }
-    onMouseLeftButtonUp(e) {
-        this.scaleRot = 1;
-        this.renderer.handler.canvas.classList.remove("ogGrabbingPoiner");
-        if (Math.abs(e.x - e.prev_x) < 3 && Math.abs(e.y - e.prev_y) < 3)
-            this.stopRotation();
-    }
-    onMouseLeftButtonDown(e) {
-        let cam = this.planet.camera;
-        if (!this.grabbedPoint || cam.isFlying())
-            return;
-        if (this.renderer.events.mouseState.moving) {
-            let targetPoint = new Ray(cam.eye, e.direction).hitSphere(this.grabbedSpheroid);
-            if (targetPoint) {
-                this._a = Math.acos(this.grabbedPoint.y / this.grabbedSpheroid.radius) -
-                    Math.acos(targetPoint.y / this.grabbedSpheroid.radius);
-                let rot = this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
-                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
-                this._hRot = Quat.getRotationBetweenVectors(new Vec3(targetPoint.x, 0.0, targetPoint.z).normal(), new Vec3(this.grabbedPoint.x, 0.0, this.grabbedPoint.z).normal());
-                rot = this._hRot;
-                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
-                cam.update();
-            }
-        }
-        else {
-            this.scaleRot = 0;
-        }
-    }
-    onDraw() {
-        let r = this.renderer;
-        let cam = this.planet.camera;
-        if (r.events.mouseState.leftButtonDown || !this.scaleRot || cam.isFlying())
-            return;
-        this.scaleRot -= this.inertia;
-        if (this.scaleRot <= 0) {
-            this.scaleRot = 0;
-        }
-        else {
-            this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
-            let rot = this._vRot.mul(this._hRot);
-            let lim = rot.mulVec3(cam.eye).normal().dot(Vec3.NORTH);
-            let state = this.positionState[this.currState];
-            if (lim > state.max || lim < state.min) {
-                rot = Quat.yRotation(rot.getYaw());
-            }
-            r.controlsBag.scaleRot = this.scaleRot;
-            rot = rot
-                .slerp(Quat.IDENTITY, 1 - this.scaleRot * this.scaleRot * this.scaleRot)
-                .normalize();
-            if (!(rot.x || rot.y || rot.z)) {
-                this.scaleRot = 0;
-            }
-            cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.NORTH);
-            cam.update();
-        }
-    }
-}