@openglobus/og 0.22.2 → 0.24.0

package/lib/js/control/geoObjectEditor/MoveAxisEntity.js

@@ -0,0 +1,107 @@
+import { Entity } from "../../entity/Entity";
+import { Vec3 } from "../../math/Vec3";
+import { SEL_X_COLOR, SEL_Y_COLOR, SEL_Z_COLOR, X_COLOR, Y_COLOR, Z_COLOR } from "./colors";
+import { ArrowEntity } from "./ArrowEntity";
+import { RADIANS } from "../../math";
+export class MoveAxisEntity extends Entity {
+    constructor(params = {}) {
+        super(params);
+        this._size = params.size != undefined ? params.size : 1.0;
+        this.childEntities = [];
+        this._init();
+    }
+    _init() {
+        let arrowX = new ArrowEntity({
+            color: X_COLOR,
+            yaw: 0,
+            pitch: 0,
+            roll: 90 * RADIANS,
+            properties: {
+                opName: "move_x",
+                noEdit: true,
+                style: {
+                    color: X_COLOR,
+                    selectColor: SEL_X_COLOR
+                }
+            }
+        });
+        let arrowY = new ArrowEntity({
+            color: Y_COLOR,
+            yaw: 0,
+            pitch: 0,
+            roll: 0,
+            properties: {
+                opName: "move_y",
+                noEdit: true,
+                style: {
+                    color: Y_COLOR,
+                    selectColor: SEL_Y_COLOR
+                }
+            }
+        });
+        let arrowZ = new ArrowEntity({
+            color: Z_COLOR,
+            yaw: 0,
+            pitch: 90 * RADIANS,
+            roll: 0,
+            properties: {
+                opName: "move_z",
+                noEdit: true,
+                style: {
+                    color: Z_COLOR,
+                    selectColor: SEL_Z_COLOR
+                }
+            }
+        });
+        this.appendChild(arrowX);
+        this.appendChild(arrowY);
+        this.appendChild(arrowZ);
+        this.setSize(this._size);
+    }
+    setSize(size) {
+        this.childEntities[0].setSize(size);
+        this.childEntities[1].setSize(size);
+        this.childEntities[2].setSize(size);
+    }
+    setPitch(a) {
+        let line = this.childEntities[0];
+        let tip = line.childEntities[0];
+        line.setPitch(a);
+        tip.setPitch(a);
+        line = this.childEntities[1];
+        tip = line.childEntities[0];
+        line.setPitch(a);
+        tip.setPitch(a);
+        line = this.childEntities[2];
+        tip = line.childEntities[0];
+        line.setPitch(a + 90);
+        tip.setPitch(a + 90);
+    }
+    setYaw(a) {
+        let line = this.childEntities[0];
+        let tip = line.childEntities[0];
+        line.setYaw(a);
+        tip.setYaw(a);
+        line = this.childEntities[1];
+        tip = line.childEntities[0];
+        line.setYaw(a);
+        tip.setYaw(a);
+        line = this.childEntities[2];
+        tip = line.childEntities[0];
+        line.setYaw(a);
+        tip.setYaw(a);
+    }
+    setRoll(a) {
+        let line = this.childEntities[0];
+        let tip = line.childEntities[0];
+        line.setRoll(a + 90);
+        tip.setRoll(a + 90);
+        line = this.childEntities[1];
+        tip = line.childEntities[0];
+        line.setRoll(a);
+        tip.setRoll(a);
+    }
+    getY() {
+        return this.childEntities[1].getAbsoluteRotation().mulVec3(Vec3.UP).normalize();
+    }
+}

package/lib/js/control/geoObjectEditor/MovePlaneEntity.d.ts

@@ -0,0 +1,7 @@
+import { Entity, IEntityParams } from "../../entity/Entity";
+export interface IMovePlaneEntityParams extends IEntityParams {
+}
+export declare class MovePlaneEntity extends Entity {
+    constructor(params?: IMovePlaneEntityParams);
+    private _init;
+}

package/lib/js/control/geoObjectEditor/MovePlaneEntity.js

@@ -0,0 +1,31 @@
+import { Entity } from "../../entity/Entity";
+import { Object3d } from "../../Object3d";
+import { SEL_XZ_COLOR, XZ_COLOR } from "./colors";
+const planeObj = Object3d.createPlane(1, 1, -0.5, 0, 0.5);
+export class MovePlaneEntity extends Entity {
+    constructor(params = {}) {
+        super(params);
+        this._init();
+    }
+    _init() {
+        let planeXZ = new Entity({
+            independentPicking: true,
+            scale: 0.025,
+            forceGlobalPosition: true,
+            geoObject: {
+                color: XZ_COLOR,
+                tag: "plane",
+                object3d: planeObj
+            },
+            properties: {
+                opName: "move_xz",
+                noEdit: true,
+                style: {
+                    color: XZ_COLOR,
+                    selectColor: SEL_XZ_COLOR
+                }
+            }
+        });
+        this.appendChild(planeXZ);
+    }
+}

package/lib/js/control/geoObjectEditor/RotateEntity.d.ts

@@ -0,0 +1,9 @@
+import { Entity, IEntityParams } from "../../entity/Entity";
+import { Vec3 } from "../../math/Vec3";
+export interface IRotationEntityParams extends IEntityParams {
+}
+export declare class RotateEntity extends Entity {
+    constructor(params?: IRotationEntityParams);
+    private _init;
+    setCartesian3v(cart: Vec3, yaw?: number): void;
+}

package/lib/js/control/geoObjectEditor/RotateEntity.js

@@ -0,0 +1,105 @@
+import { Entity } from "../../entity/Entity";
+import { Vec3 } from "../../math/Vec3";
+import { RADIANS } from "../../math";
+import { Quat } from "../../math/Quat";
+import { SEL_X_COLOR, SEL_Y_COLOR, SEL_Z_COLOR, X_COLOR, Y_COLOR, Z_COLOR } from "./colors";
+const SEG_SIZE = 360;
+const VISIBLESPHERE_DOT_THRESHOLD = 0.95;
+const pitchCoords = new Array(SEG_SIZE);
+const yawCoords = new Array(SEG_SIZE);
+const rollCoords = new Array(SEG_SIZE);
+export class RotateEntity extends Entity {
+    constructor(params = {}) {
+        super(params);
+        this._init();
+    }
+    _init() {
+        const length = SEG_SIZE;
+        let pitch = new Entity({
+            independentPicking: true,
+            polyline: {
+                path3v: [Array.from({ length }, (_, i) => new Vec3())],
+                thickness: 3.1,
+                color: X_COLOR,
+                isClosed: true
+            },
+            properties: {
+                opName: "rotate_pitch",
+                noEdit: true,
+                style: {
+                    color: X_COLOR,
+                    selectColor: SEL_X_COLOR
+                }
+            }
+        });
+        let yaw = new Entity({
+            independentPicking: true,
+            polyline: {
+                path3v: [Array.from({ length }, (_, i) => new Vec3())],
+                thickness: 2.5,
+                color: Y_COLOR,
+                isClosed: true
+            },
+            properties: {
+                opName: "rotate_yaw",
+                noEdit: true,
+                style: {
+                    color: Y_COLOR,
+                    selectColor: SEL_Y_COLOR
+                }
+            }
+        });
+        let roll = new Entity({
+            independentPicking: true,
+            polyline: {
+                path3v: [Array.from({ length }, (_, i) => new Vec3())],
+                thickness: 2.5,
+                color: Z_COLOR,
+                isClosed: true
+            },
+            properties: {
+                opName: "rotate_roll",
+                noEdit: true,
+                style: {
+                    color: Z_COLOR,
+                    selectColor: SEL_Z_COLOR
+                }
+            }
+        });
+        this.appendChild(pitch);
+        this.appendChild(yaw);
+        this.appendChild(roll);
+    }
+    setCartesian3v(cart, yaw = 0) {
+        super.setCartesian3v(cart);
+        if (this._entityCollection && this._entityCollection.renderNode) {
+            let rn = this._entityCollection.renderNode;
+            let cam = rn.renderer.activeCamera;
+            let qNorthFrame = rn.getFrameRotation(cart).conjugate();
+            let r = cam.eye.distance(cart) * 0.15;
+            let qp = Quat.xRotation(0);
+            let qy = Quat.yRotation(yaw);
+            let qr = Quat.zRotation(0);
+            let qRot = qr.mul(qp).mul(qy).mul(rn.getFrameRotation(cart)).conjugate();
+            for (let i = 0, j = 0, step = 360 / SEG_SIZE; i < SEG_SIZE; i += step, j++) {
+                let a = i * RADIANS, cos_a = Math.cos(a), sin_a = Math.sin(a);
+                let pitch_p = qRot.mulVec3(new Vec3(0, sin_a, cos_a)).normalize().scale(r).add(cart);
+                let yaw_p = qNorthFrame.mulVec3(new Vec3(cos_a, 0, sin_a)).normalize().scale(r).add(cart);
+                let roll_p = qRot.mulVec3(new Vec3(cos_a, sin_a, 0)).normalize().scale(r).add(cart);
+                pitchCoords[j] = pitch_p;
+                yawCoords[j] = yaw_p;
+                rollCoords[j] = roll_p;
+            }
+            this.childEntities[0].polyline.setPath3v([pitchCoords], undefined, true);
+            this.childEntities[1].polyline.setPath3v([yawCoords], undefined, true);
+            this.childEntities[2].polyline.setPath3v([rollCoords], undefined, true);
+            // Gets whole circle visibility
+            let dir_pitch = qRot.mulVec3(new Vec3(1, 0, 0)).normalize();
+            let dir_yaw = qNorthFrame.mulVec3(new Vec3(0, 1, 0)).normalize();
+            let dir_roll = qRot.mulVec3(new Vec3(0, 0, 1)).normalize();
+            this.childEntities[0].polyline.setVisibleSphere(cart, Math.abs(dir_pitch.dot(cam.getForward())) > VISIBLESPHERE_DOT_THRESHOLD ? 0.0 : r);
+            this.childEntities[1].polyline.setVisibleSphere(cart, Math.abs(dir_yaw.dot(cam.getForward())) > VISIBLESPHERE_DOT_THRESHOLD ? 0.0 : r);
+            this.childEntities[2].polyline.setVisibleSphere(cart, Math.abs(dir_roll.dot(cam.getForward())) > VISIBLESPHERE_DOT_THRESHOLD ? 0.0 : r);
+        }
+    }
+}

package/lib/js/control/geoObjectEditor/colors.d.ts

@@ -0,0 +1,8 @@
+export declare const X_COLOR = "rgb(253,77,77)";
+export declare const SEL_X_COLOR = "rgb(248,115,115)";
+export declare const Y_COLOR = "rgb(73,73,239)";
+export declare const SEL_Y_COLOR = "rgb(90,90,253)";
+export declare const Z_COLOR = "rgb(26,122,26)";
+export declare const SEL_Z_COLOR = "rgb(55,191,55)";
+export declare const XZ_COLOR = "rgba(255,255,255,0.8)";
+export declare const SEL_XZ_COLOR = "rgba(255,255,255,1.0)";

package/lib/js/control/geoObjectEditor/colors.js

@@ -0,0 +1,8 @@
+export const X_COLOR = "rgb(253,77,77)";
+export const SEL_X_COLOR = "rgb(248,115,115)";
+export const Y_COLOR = "rgb(73,73,239)";
+export const SEL_Y_COLOR = "rgb(90,90,253)";
+export const Z_COLOR = "rgb(26,122,26)";
+export const SEL_Z_COLOR = "rgb(55,191,55)";
+export const XZ_COLOR = "rgba(255,255,255,0.8)";
+export const SEL_XZ_COLOR = "rgba(255,255,255,1.0)";

package/lib/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";
@@ -27,3 +26,5 @@ export * from "./selection/Selection";
 export * from "./timeline/TimelineControl";
 export * from "./elevationProfile/ElevationProfileControl";
 export * from "./AtmosphereConfig";
+export * from "./geoObjectEditor/GeoObjectEditor";
+export * from "./CameraLock";

package/lib/js/control/index.js

@@ -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";
@@ -27,3 +26,5 @@ export * from "./selection/Selection";
 export * from "./timeline/TimelineControl";
 export * from "./elevationProfile/ElevationProfileControl";
 export * from "./AtmosphereConfig";
+export * from "./geoObjectEditor/GeoObjectEditor";
+export * from "./CameraLock";

package/lib/js/control/timeline/TimelineControl.js

@@ -63,12 +63,14 @@ class TimelineControl extends Control {
             this.renderer && this.renderer.handler.defaultClock.setDate(d);
         });
         this._timelineView.events.on("startdrag", () => {
+            this.planet?.sun.stop();
             this.renderer && this.renderer.controls.mouseNavigation.deactivate();
         });
         this._timelineView.events.on("stopdrag", () => {
             this.renderer && this.renderer.controls.mouseNavigation.activate();
         });
         this._timelineView.events.on("startdragcurrent", () => {
+            this.planet?.sun.stop();
             this.renderer && this.renderer.controls.mouseNavigation.deactivate();
         });
         this._timelineView.events.on("stopdragcurrent", () => {

package/lib/js/control/visibleExtent/Segment.js

@@ -240,25 +240,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);
                 }