@openglobus/og 0.23.0 → 0.24.0

package/lib/js/control/geoObjectEditor/GeoObjectEditorScene.js

@@ -1,5 +1,5 @@
 import { createEvents } from '../../Events';
-import { DEGREES, MAX32, RADIANS } from "../../math";
+import { MAX32 } from "../../math";
 import { Plane } from "../../math/Plane";
 import { RenderNode } from '../../scene/RenderNode';
 import { Vec2 } from '../../math/Vec2';
@@ -17,9 +17,9 @@ import { EntityCollection } from "../../entity/EntityCollection";
 function dragSimpleRes(unit, eye, clickDir, direction, p0, res) {
     let p1 = p0.add(Vec3.UP), p2 = p0.add(unit);
     let px = new Vec3();
-    if (new Ray(eye, clickDir).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+    if (new Ray(eye, clickDir).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
         let clickCart = Vec3.proj_b_to_a(px, unit);
-        if (new Ray(eye, direction).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+        if (new Ray(eye, direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
             let dragCart = Vec3.proj_b_to_a(px, unit);
             let dragVec = dragCart.sub(clickCart);
             res.copy(p0.add(dragVec));
@@ -148,9 +148,9 @@ class GeoObjectEditorScene extends RenderNode {
             let p2 = p0.add(cam.getRight());
             let px = new Vec3();
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
-            if (new Ray(cam.eye, clickDir).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
                 let clickCart = Vec3.proj_b_to_a(px, groundNormal);
-                if (new Ray(cam.eye, e.direction).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
                     let dragCart = Vec3.proj_b_to_a(px, groundNormal);
                     let dragVec = dragCart.sub(clickCart);
                     let pos = this._selectedEntityCart.add(dragVec);
@@ -210,8 +210,8 @@ class GeoObjectEditorScene extends RenderNode {
             else {
                 let p1 = p0.add(Vec3.UNIT_X), p2 = p0.add(Vec3.UNIT_Z);
                 let clickCart = new Vec3(), dragCart = new Vec3();
-                if (new Ray(cam.eye, clickDir).hitPlane(p0, p1, p2, clickCart) === Ray.INSIDE) {
-                    if (new Ray(cam.eye, e.direction).hitPlane(p0, p1, p2, dragCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, clickDir).hitPlaneRes(Plane.fromPoints(p0, p1, p2), clickCart) === Ray.INSIDE) {
+                    if (new Ray(cam.eye, e.direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), dragCart) === Ray.INSIDE) {
                         let dragVec = dragCart.sub(clickCart);
                         px = p0.add(dragVec);
                     }
@@ -233,7 +233,7 @@ class GeoObjectEditorScene extends RenderNode {
             let cam = this.renderer.activeCamera;
             let p0 = this._selectedEntityCart;
             let qp = Quat.xRotation(0);
-            let qy = Quat.yRotation(this._selectedEntity.getYaw() * RADIANS);
+            let qy = Quat.yRotation(this._selectedEntity.getYaw());
             let qr = Quat.zRotation(0);
             let qRot = qr.mul(qp).mul(qy).mul(this.getFrameRotation(p0)).conjugate();
             //let norm = qNorthFrame.mulVec3(new Vec3(1, 0, 0)).normalize();
@@ -241,11 +241,11 @@ class GeoObjectEditorScene extends RenderNode {
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
             let pl = new Plane(p0, norm);
             let clickCart = new Vec3(), dragCart = new Vec3();
-            if (new Ray(cam.eye, clickDir).hitPlane2(pl, clickCart) === Ray.INSIDE) {
-                if (new Ray(cam.eye, e.direction).hitPlane2(pl, dragCart) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(pl, clickCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(pl, dragCart) === Ray.INSIDE) {
                     let c0 = clickCart.sub(p0).normalize(), c1 = dragCart.sub(p0).normalize();
                     let sig = Math.sign(c0.cross(c1).dot(norm));
-                    let angle = Math.acos(c0.dot(c1)) * DEGREES;
+                    let angle = Math.acos(c0.dot(c1));
                     let deg = this._selectedEntityPitch + sig * angle;
                     this._selectedEntity.setAbsolutePitch(deg);
                     this.events.dispatch(this.events.pitch, deg, this._selectedEntity);
@@ -263,11 +263,11 @@ class GeoObjectEditorScene extends RenderNode {
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
             let pl = new Plane(p0, norm);
             let clickCart = new Vec3(), dragCart = new Vec3();
-            if (new Ray(cam.eye, clickDir).hitPlane2(pl, clickCart) === Ray.INSIDE) {
-                if (new Ray(cam.eye, e.direction).hitPlane2(pl, dragCart) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(pl, clickCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(pl, dragCart) === Ray.INSIDE) {
                     let c0 = clickCart.sub(p0).normalize(), c1 = dragCart.sub(p0).normalize();
                     let sig = Math.sign(c1.cross(c0).dot(norm));
-                    let angle = Math.acos(c0.dot(c1)) * DEGREES;
+                    let angle = Math.acos(c0.dot(c1));
                     let deg = this._selectedEntityYaw + sig * angle;
                     this._selectedEntity.setAbsoluteYaw(deg);
                     this.events.dispatch(this.events.yaw, deg, this._selectedEntity);
@@ -282,7 +282,7 @@ class GeoObjectEditorScene extends RenderNode {
             let p0 = this._selectedEntityCart;
             let qNorthFrame = this.getFrameRotation(p0).conjugate();
             let qp = Quat.xRotation(0);
-            let qy = Quat.yRotation(this._selectedEntity.getYaw() * RADIANS);
+            let qy = Quat.yRotation(this._selectedEntity.getYaw());
             let qr = Quat.zRotation(0);
             let qRot = qr.mul(qp).mul(qy).mul(this.getFrameRotation(p0)).conjugate();
             //let norm = qNorthFrame.mulVec3(new Vec3(0, 0, 1)).normalize();
@@ -290,11 +290,11 @@ class GeoObjectEditorScene extends RenderNode {
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
             let pl = new Plane(p0, norm);
             let clickCart = new Vec3(), dragCart = new Vec3();
-            if (new Ray(cam.eye, clickDir).hitPlane2(pl, clickCart) === Ray.INSIDE) {
-                if (new Ray(cam.eye, e.direction).hitPlane2(pl, dragCart) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(pl, clickCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(pl, dragCart) === Ray.INSIDE) {
                     let c0 = clickCart.sub(p0).normalize(), c1 = dragCart.sub(p0).normalize();
                     let sig = Math.sign(c0.cross(c1).dot(norm));
-                    let angle = Math.acos(c0.dot(c1)) * DEGREES;
+                    let angle = Math.acos(c0.dot(c1));
                     let deg = this._selectedEntityRoll + sig * angle;
                     this._selectedEntity.setAbsoluteRoll(deg);
                     this.events.dispatch(this.events.roll, deg, this._selectedEntity);

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

@@ -2,6 +2,7 @@ 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);
@@ -14,7 +15,7 @@ export class MoveAxisEntity extends Entity {
             color: X_COLOR,
             yaw: 0,
             pitch: 0,
-            roll: 90,
+            roll: 90 * RADIANS,
             properties: {
                 opName: "move_x",
                 noEdit: true,
@@ -41,7 +42,7 @@ export class MoveAxisEntity extends Entity {
         let arrowZ = new ArrowEntity({
             color: Z_COLOR,
             yaw: 0,
-            pitch: 90,
+            pitch: 90 * RADIANS,
             roll: 0,
             properties: {
                 opName: "move_z",

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

@@ -15,10 +15,7 @@ export class MovePlaneEntity extends Entity {
             geoObject: {
                 color: XZ_COLOR,
                 tag: "plane",
-                object3d: planeObj,
-                yaw: 0,
-                pitch: 0,
-                roll: 0
+                object3d: planeObj
             },
             properties: {
                 opName: "move_xz",

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

@@ -78,7 +78,7 @@ export class RotateEntity extends Entity {
             let qNorthFrame = rn.getFrameRotation(cart).conjugate();
             let r = cam.eye.distance(cart) * 0.15;
             let qp = Quat.xRotation(0);
-            let qy = Quat.yRotation(yaw * RADIANS);
+            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++) {

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";

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";

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);
                 }

package/lib/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/js/entity/Entity.js

@@ -12,7 +12,7 @@ import { Polyline } from "./Polyline";
 import { Ray } from "./Ray";
 import { Strip } from "./Strip";
 import { Quat } from "../math/Quat";
-import { RADIANS, clamp, DEGREES } from "../math";
+import { clamp } from "../math";
 /**
  * Entity instances aggregate multiple forms of visualization into a single high-level object.
  * They can be created manually and added to entity collection.
@@ -35,11 +35,13 @@ import { RADIANS, clamp, DEGREES } from "../math";
  * @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.
  */
 class Entity {
     constructor(options = {}) {
@@ -50,6 +52,8 @@ class Entity {
         this.childEntities = [];
         this.parent = null;
         this.forceGlobalPosition = options.forceGlobalPosition || false;
+        this.forceGlobalRotation = options.forceGlobalRotation || false;
+        this.forceGlobalScale = options.forceGlobalScale || false;
         this._cartesian = utils.createVector3(options.cartesian);
         this._rootCartesian = new Vec3();
         this._localPosition = utils.createVector3(options.localPosition);
@@ -65,12 +69,9 @@ class Entity {
         this._pickingColor = new Vec3(0, 0, 0);
         this._independentPicking = options.independentPicking || false;
         this._relativePosition = options.relativePosition || false;
-        this._pitch = options.pitch || 0;
-        this._yaw = options.yaw || 0;
-        this._roll = options.roll || 0;
-        this._pitchRad = this._pitch * RADIANS;
-        this._yawRad = this._yaw * RADIANS;
-        this._rollRad = this._roll * RADIANS;
+        this._pitchRad = options.pitch || 0;
+        this._yawRad = options.yaw || 0;
+        this._rollRad = options.roll || 0;
         this._scale = utils.createVector3(options.scale, new Vec3(1, 1, 1));
         this._qFrame = Quat.IDENTITY;
         this._qRot = Quat.IDENTITY;
@@ -270,7 +271,13 @@ class Entity {
         this._scale.copy(scale);
         this.geoObject && this.geoObject.setScale3v(this._scale);
         for (let i = 0; i < this.childEntities.length; i++) {
-            this.childEntities[i].setScale3v(this.childEntities[i].getScale());
+            let chi = this.childEntities[i];
+            if (chi.forceGlobalScale) {
+                chi.setScale3v(this._scale);
+            }
+            else {
+                chi.setScale3v(this.childEntities[i].getScale());
+            }
         }
     }
     /**
@@ -282,7 +289,13 @@ class Entity {
         this._scale.set(val, val, val);
         this.geoObject && this.geoObject.setScale(val);
         for (let i = 0; i < this.childEntities.length; i++) {
-            this.childEntities[i].setScale3v(this.childEntities[i].getScale());
+            let chi = this.childEntities[i];
+            if (chi.forceGlobalScale) {
+                chi.setScale(val);
+            }
+            else {
+                chi.setScale3v(this.childEntities[i].getScale());
+            }
         }
     }
     /**
@@ -351,64 +364,61 @@ class Entity {
     }
     /**
      * 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) {
-        this._pitch = val;
-        this._pitchRad = val * RADIANS;
+        this._pitchRad = val;
         this._updateAbsolutePosition();
     }
     /**
      * 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) {
-        this._yaw = val;
-        this._yawRad = val * RADIANS;
+        this._yawRad = val;
         this._updateAbsolutePosition();
     }
     /**
      * 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) {
-        this._roll = val;
-        this._rollRad = val * RADIANS;
+        this._rollRad = val;
         this._updateAbsolutePosition();
     }
     /**
      * Gets the pitch angle of the entity.
      * @public
-     * @returns {number} The pitch angle in degrees.
+     * @returns {number} The pitch angle in radians.
      */
     getPitch() {
-        return this._pitch;
+        return this._pitchRad;
     }
     /**
      * Gets the yaw angle of the entity.
      * @public
-     * @returns {number} The yaw angle in degrees.
+     * @returns {number} The yaw angle in radians.
      */
     getYaw() {
-        return this._yaw;
+        return this._yawRad;
     }
     /**
      * Gets the roll angle of the entity.
      * @public
-     * @returns {number} The roll angle in degrees.
+     * @returns {number} The roll angle in radians.
      */
     getRoll() {
-        return this._roll;
+        return this._rollRad;
     }
     /**
      * 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) {
         if (this._relativePosition) {
-            this._absoluteQRot.setPitchYawRoll(val * RADIANS, this.getAbsoluteYaw() * RADIANS, this.getAbsoluteRoll() * RADIANS, this._qFrame);
+            this._absoluteQRot.setPitchYawRoll(val, this.getAbsoluteYaw(), this.getAbsoluteRoll(), this._qFrame);
             this._updatePitchYawRoll();
         }
         else {
@@ -418,11 +428,11 @@ class Entity {
     /**
      * 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) {
         if (this._relativePosition) {
-            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch() * RADIANS, val * RADIANS, this.getAbsoluteRoll() * RADIANS, this._qFrame);
+            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch(), val, this.getAbsoluteRoll(), this._qFrame);
             this._updatePitchYawRoll();
         }
         else {
@@ -432,11 +442,11 @@ class Entity {
     /**
      * 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) {
         if (this._relativePosition) {
-            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch() * RADIANS, this.getAbsoluteYaw() * RADIANS, val * RADIANS, this._qFrame);
+            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch(), this.getAbsoluteYaw(), val, this._qFrame);
             this._updatePitchYawRoll();
         }
         else {
@@ -446,35 +456,35 @@ class Entity {
     /**
      * 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() {
         if (this.parent && this._relativePosition) {
-            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getPitch() * DEGREES;
+            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getPitch();
         }
-        return this._pitch;
+        return this._pitchRad;
     }
     /**
      * 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() {
         if (this.parent && this._relativePosition) {
-            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getYaw() * DEGREES;
+            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getYaw();
         }
-        return this._yaw;
+        return this._yawRad;
     }
     /**
      * 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() {
         if (this.parent && this._relativePosition) {
-            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getRoll() * DEGREES;
+            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getRoll();
         }
-        return this._roll;
+        return this._rollRad;
     }
     _getScaleByDistance() {
         let scd = 1;
@@ -553,9 +563,9 @@ class Entity {
             this._pitchRad = this._qRot.getPitch();
             this._yawRad = this._qRot.getYaw();
             this._rollRad = this._qRot.getRoll();
-            this._pitch = this._pitchRad * DEGREES;
-            this._yaw = this._yawRad * DEGREES;
-            this._roll = this._rollRad * DEGREES;
+            // this._pitch = this._pitchRad * DEGREES;
+            // this._yaw = this._yawRad * DEGREES;
+            // this._roll = this._rollRad * DEGREES;
             if (this.geoObject) {
                 this.geoObject.setRotation(this._absoluteQRot);
             }
@@ -579,7 +589,12 @@ class Entity {
             if (this._entityCollection && this._entityCollection.renderNode) {
                 this._qFrame = this._entityCollection.renderNode.getFrameRotation(this._cartesian);
             }
-            this._qRot.setPitchYawRoll(this._pitchRad, this._yawRad, this._rollRad, this._qFrame);
+            if (parent && this.forceGlobalRotation) {
+                this._qRot.setPitchYawRoll(parent._pitchRad, parent._yawRad, parent._rollRad, this._qFrame);
+            }
+            else {
+                this._qRot.setPitchYawRoll(this._pitchRad, this._yawRad, this._rollRad, this._qFrame);
+            }
             this._absoluteQRot.copy(this._qRot);
             this._rootCartesian.copy(this._cartesian);
             this._absoluteLocalPosition.copy(this._localPosition);

package/lib/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/js/entity/GeoObject.js

@@ -10,9 +10,6 @@ export const LOCAL_FORWARD = new Vec3(0.0, 0.0, -1.0);
  * @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.