@openglobus/og 0.22.2 → 0.23.0

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

@@ -13,6 +13,32 @@ import { IRayParams, Ray } from "./Ray";
 import { Strip, IStripParams } from "./Strip";
 import { Vector, VectorEventsType } from "../layer/Vector";
 import { EntityCollectionNode } from "../quadTree/EntityCollectionNode";
+import { Quat } from "../math/Quat";
+/**
+ * Interface for Entity parameters.
+ * @typedef {Object} IEntityParams
+ * @property {string} [name] - Name of the entity.
+ * @property {any} [properties] - Additional properties of the entity.
+ * @property {Vec3 | NumberArray3} [cartesian] - Cartesian position.
+ * @property {LonLat | NumberArray3 | NumberArray2} [lonlat] - Geographic coordinates.
+ * @property {number} [altitude] - Altitude.
+ * @property {boolean} [visibility] - Visibility flag.
+ * @property {Billboard | IBillboardParams} [billboard] - Billboard object or parameters.
+ * @property {Label | ILabelParams} [label] - Label object or parameters.
+ * @property {Polyline | IPolylineParams} [polyline] - Polyline object or parameters.
+ * @property {Ray | IRayParams} [ray] - Ray object or parameters.
+ * @property {PointCloud | IPointCloudParams} [pointCloud] - Point cloud object or parameters.
+ * @property {Geometry | IGeometryParams} [geometry] - Geometry object or parameters.
+ * @property {GeoObject | IGeoObjectParams} [geoObject] - Geo object or parameters.
+ * @property {Strip | IStripParams} [strip] - Strip object or parameters.
+ * @property {boolean} [independentPicking] - Independent picking flag.
+ * @property {boolean} [relativePosition] - Parent relative position flag, otherwise position is absolute.
+ * @property {number} [pitch] - Rotation around local X-axis.
+ * @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.
+ */
 export interface IEntityParams {
     name?: string;
     properties?: any;
@@ -29,25 +55,41 @@ export interface IEntityParams {
     geoObject?: GeoObject | IGeoObjectParams;
     strip?: Strip | IStripParams;
     independentPicking?: boolean;
+    relativePosition?: boolean;
+    pitch?: number;
+    yaw?: number;
+    roll?: number;
+    scale?: number | Vec3 | NumberArray3;
+    forceGlobalPosition?: boolean;
+    localPosition?: Vec3 | NumberArray3;
 }
 /**
  * Entity instances aggregate multiple forms of visualization into a single high-level object.
  * They can be created manually and added to entity collection.
  *
  * @class
- * @param {Object} [options] - Entity options:
- * @param {string} [options.name] - A human-readable name to display to users. It does not have to be unique.
- * @param {Vec3|Array.<number>} [options.cartesian] - Spatial entities like billboard, label etc. cartesian position.
- * @param {LonLat} [options.lonlat] - Geodetic coordinates for an entities like billboard, label etc.
- * @param {boolean} [options.aground] - True for entities that have to be placed on the relief.
- * @param {boolean} [options.visibility] - Entity visibility.
- * @param {*} [options.billboard] - Billboard options(see {@link Billboard}).
- * @param {*} [options.label] - Label options(see {@link Label}).
- * @param {*} [options.polyline] - Polyline options(see {@link Polyline}).
- * @param {*} [options.ray] - Ray options(see {@link Ray}).
- * @param {*} [options.pointCloud] - Point cloud options(see {@link PointCloud}).
- * @param {*} [options.geometry] - Geometry options (see {@link Geometry}), available for vector layer only.
- * @param {*} [options.properties] - Entity custom properties.
+ * @param {IEntityParams} [options] - Entity options:
+ * @param {string} [options.name] - Name of the entity.
+ * @param {any} [options.properties] - Additional properties of the entity.
+ * @param {Vec3 | NumberArray3} [options.cartesian] - Cartesian position.
+ * @param {LonLat | NumberArray3 | NumberArray2} [options.lonlat] - Geographic coordinates.
+ * @param {number} [options.altitude] - Altitude.
+ * @param {boolean} [options.visibility] - Visibility flag.
+ * @param {Billboard | IBillboardParams} [options.billboard] - Billboard object or parameters.
+ * @param {Label | ILabelParams} [options.label] - Label object or parameters.
+ * @param {Polyline | IPolylineParams} [options.polyline] - Polyline object or parameters.
+ * @param {Ray | IRayParams} [options.ray] - Ray object or parameters.
+ * @param {PointCloud | IPointCloudParams} [options.pointCloud] - Point cloud object or parameters.
+ * @param {Geometry | IGeometryParams} [options.geometry] - Geometry object or parameters.
+ * @param {GeoObject | IGeoObjectParams} [options.geoObject] - Geo object or parameters.
+ * @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 | Vec3 | NumberArray3} [options.scale] - Scaling factor.
+ * @param {boolean} [options.forceGlobalPosition] - Forces global position for children entities make them the same position as the parent.
  */
 declare class Entity {
     static __counter__: number;
@@ -68,7 +110,8 @@ declare class Entity {
      * @public
      * @type {Array.<Entity>}
      */
-    childrenNodes: Entity[];
+    childEntities: Entity[];
+    forceGlobalPosition: boolean;
     /**
      * Parent entity.
      * @public
@@ -81,6 +124,14 @@ declare class Entity {
      * @type {Vec3}
      */
     _cartesian: Vec3;
+    /**
+     * Entity cartesian is equal root entity absolute cartesian.
+     * @protected
+     * @type {Vec3}
+     */
+    protected _rootCartesian: Vec3;
+    protected _localPosition: Vec3;
+    protected _absoluteLocalPosition: Vec3;
     /**
      * Geodetic entity coordinates.
      * @public
@@ -186,23 +237,79 @@ 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;
+    protected _scale: Vec3;
+    protected _qFrame: Quat;
+    protected _qRot: Quat;
+    _absoluteQRot: Quat;
     constructor(options?: IEntityParams);
+    /**
+     * Returns root entity object.
+     * @public
+     * @return {Entity}
+     */
+    get rootEntity(): Entity;
+    /**
+     * Sets relative position property
+     * @param isRelative
+     */
+    set relativePosition(isRelative: boolean);
+    /**
+     * Gets relative position property
+     * @public
+     * @returns{boolean}
+     */
+    get relativePosition(): boolean;
+    /**
+     * Gets current entity collection container.
+     * @public
+     * @returns {EntityCollection | null}
+     */
+    get entityCollection(): EntityCollection | null;
+    /**
+     * Gets entity uniq id
+     * @public
+     * @returns {number}
+     */
     get id(): number;
+    /**
+     * Checks if the given entity is equal to the current entity.
+     * @param {Entity} entity - The entity to compare.
+     * @returns {boolean} True if entities are equal, otherwise false.
+     */
     isEqual(entity: Entity): boolean;
+    /**
+     * Gets the layer index of the entity.
+     * @returns {number} The layer index.
+     */
     get layerIndex(): number;
+    /**
+     * Gets the instance class name of the entity.
+     * @returns {string} The instance name "Entity".
+     */
     get instanceName(): string;
     protected _createOptionFeature<T, K>(featureName: string, options?: T | K): T | null;
+    /**
+     * Gets the collection index of the entity.
+     * @returns {number} The entity collection index.
+     */
     getCollectionIndex(): number;
     /**
      * Adds current entity into the specified entity collection.
      * @public
      * @param {EntityCollection | Vector} collection - Specified entity collection or vector layer.
-     * @param {Boolean} [rightNow=false] - Entity insertion option for vector layer.
+     * @param {boolean} [rightNow=false] - Entity insertion option for vector layer.
      * @returns {Entity} - This object.
      */
-    addTo(collection: EntityCollection | Vector, rightNow?: boolean): this;
+    addTo(collection: EntityCollection | Vector, rightNow?: boolean): Entity;
     /**
-     * Removes current entity from collection and layer.
+     * Removes current entity from its collection or layer.
      * @public
      */
     remove(): void;
@@ -224,6 +331,150 @@ declare class Entity {
      * @param {Vec3} cartesian - Cartesian position in 3d space.
      */
     setCartesian3v(cartesian: Vec3): void;
+    /**
+     * Gets scale factor
+     * @public
+     * @returns {Vec3}
+     */
+    getScale(): Vec3;
+    /**
+     * Sets XYZ axis scale for the inner object such as GeoObject
+     * @public
+     * @param {Vec3} scale - Scale factor
+     */
+    setScale3v(scale: Vec3): void;
+    /**
+     * Sets scale for the inner object such as GeoObject
+     * @public
+     * @param {number} val - Scale factor
+     */
+    setScale(val: number): void;
+    /**
+     * Gets the absolute rotation direction of the entity.
+     * @public
+     * @returns {Quat} The absolute rotation quaternion.
+     */
+    getAbsoluteRotation(): Quat;
+    /**
+     * Gets the local rotation of the entity. For the root entity it is equal to the absolute rotation.
+     * @public
+     * @returns {Quat} The rotation quaternion.
+     */
+    getRotation(): Quat;
+    /**
+     * Rotates the entity to look at a given point in world coordinates.
+     * @public
+     * @param {Vec3} cart - The target position to look at.
+     */
+    setLook3v(cart: Vec3): void;
+    /**
+     * Rotates the entity to look at a given geographic coordinate.
+     * @public
+     * @param {LonLat} lonLat - The longitude and latitude to look at.
+     */
+    setLookLonLat(lonLat: LonLat): void;
+    /**
+     * Sets the absolute rotation of the entity.
+     * @public
+     * @param {Quat} rot - The new absolute rotation quaternion.
+     */
+    setAbsoluteRotation(rot: Quat): void;
+    /**
+     * Sets the local rotation of the entity.
+     * @param {Quat} rot - The new rotation quaternion.
+     */
+    setRotation(rot: Quat): void;
+    /**
+     * Sets the pitch rotation of the entity.
+     * @param {number} val - The new pitch angle in degrees.
+     */
+    setPitch(val: number): void;
+    /**
+     * Sets the yaw rotation of the entity.
+     * @param {number} val - The new yaw angle in degrees.
+     */
+    setYaw(val: number): void;
+    /**
+     * Sets the roll rotation of the entity.
+     * @public
+     * @param {number} val - The new roll angle in degrees.
+     */
+    setRoll(val: number): void;
+    /**
+     * Gets the pitch angle of the entity.
+     * @public
+     * @returns {number} The pitch angle in degrees.
+     */
+    getPitch(): number;
+    /**
+     * Gets the yaw angle of the entity.
+     * @public
+     * @returns {number} The yaw angle in degrees.
+     */
+    getYaw(): number;
+    /**
+     * Gets the roll angle of the entity.
+     * @public
+     * @returns {number} The roll angle in degrees.
+     */
+    getRoll(): number;
+    /**
+     * Sets the absolute pitch of the entity.
+     * @public
+     * @param {number} val - The absolute pitch angle in degrees.
+     */
+    setAbsolutePitch(val: number): void;
+    /**
+     * Sets the absolute yaw of the entity.
+     * @public
+     * @param {number} val - The absolute yaw angle in degrees.
+     */
+    setAbsoluteYaw(val: number): void;
+    /**
+     * Sets the absolute roll of the entity.
+     * @public
+     * @param {number} val - The absolute roll angle in degrees.
+     */
+    setAbsoluteRoll(val: number): void;
+    /**
+     * Gets the absolute pitch angle of the entity.
+     * @public
+     * @returns {number} The absolute pitch angle in degrees.
+     */
+    getAbsolutePitch(): number;
+    /**
+     * Gets the absolute yaw angle of the entity.
+     * @public
+     * @returns {number} The absolute yaw angle in degrees.
+     */
+    getAbsoluteYaw(): number;
+    /**
+     * Gets the absolute roll angle of the entity.
+     * @public
+     * @returns {number} The absolute roll angle in degrees.
+     */
+    getAbsoluteRoll(): number;
+    protected _getScaleByDistance(): number;
+    /**
+     * Sets the absolute cartesian position of the entity.
+     * @public
+     * @param {number} x - X coordinate.
+     * @param {number} y - Y coordinate.
+     * @param {number} z - Z coordinate.
+     */
+    setAbsoluteCartesian(x: number, y: number, z: number): void;
+    /**
+     * Sets the absolute cartesian position of the entity using a Vec3.
+     * @public
+     * @param {Vec3} absolutCartesian - The absolute cartesian position.
+     */
+    setAbsoluteCartesian3v(absolutCartesian: Vec3): void;
+    /**
+     * Returns absolute cartesian position.
+     * @public
+     * @returns {Vec3} -
+     */
+    getAbsoluteCartesian(): Vec3;
     /**
      * Sets entity cartesian position.
      * @public
@@ -231,7 +482,9 @@ declare class Entity {
      * @param {number} y - 3d space Y - position.
      * @param {number} z - 3d space Z - position.
      */
-    setCartesian(x?: number, y?: number, z?: number): void;
+    setCartesian(x: number, y: number, z: number): void;
+    protected _updatePitchYawRoll(): void;
+    _updateAbsolutePosition(): void;
     /**
      * Sets entity cartesian position without event dispatching.
      * @public
@@ -239,6 +492,7 @@ declare class Entity {
      * @param {boolean} skipLonLat - skip geodetic calculation.
      */
     _setCartesian3vSilent(cartesian: Vec3, skipLonLat?: boolean): void;
+    protected _updateLonLat(): void;
     /**
      * Gets entity geodetic coordinates.
      * @public
@@ -248,7 +502,7 @@ declare class Entity {
     /**
      * Sets geodetic coordinates of the entity point object.
      * @public
-     * @param {LonLat} lonlat - WGS84 coordinates.
+     * @param {LonLat} lonlat - coordinates.
      */
     setLonLat(lonlat: LonLat): void;
     /**
@@ -333,6 +587,11 @@ declare class Entity {
      * @returns {Strip} -
      */
     setStrip(strip: Strip): Strip;
+    /**
+     * Gets layer container
+     * @public
+     * @returns {Vector | null}
+     */
     get layer(): Vector | null;
     get rendererEvents(): VectorEventsType | EntityCollectionEvents | null;
     /**

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

@@ -5,7 +5,7 @@ import { Ellipsoid } from "../ellipsoid/Ellipsoid";
 import { EntityCollectionNode } from "../quadTree/EntityCollectionNode";
 import { GeoObjectHandler } from "./GeoObjectHandler";
 import { LabelHandler } from "./LabelHandler";
-import { NumberArray3 } from "../math/Vec3";
+import { Vec3, NumberArray3 } from "../math/Vec3";
 import { PointCloudHandler } from "./PointCloudHandler";
 import { PolylineHandler } from "./PolylineHandler";
 import { RayHandler } from "./RayHandler";
@@ -23,6 +23,7 @@ interface IEntityCollectionParams {
     opacity?: number;
     useLighting?: boolean;
     entities?: Entity[];
+    depthOrder?: number;
 }
 /**
  * An observable collection of og.Entity instances where each entity has a unique id.
@@ -80,12 +81,6 @@ declare class EntityCollection {
      * @readonly
      */
     protected __id: number;
-    /**
-     * Render node collections array index.
-     * @protected
-     * @type {number}
-     */
-    protected _renderNodeIndex: number;
     /**
      * Render node context.
      * @public
@@ -186,12 +181,15 @@ declare class EntityCollection {
     _layer?: Vector;
     _quadNode?: EntityCollectionNode;
     _useLighting: number;
+    protected _depthOrder: number;
     constructor(options?: IEntityCollectionParams);
+    get depthOrder(): number;
+    set depthOrder(depghOrder: number);
     isEmpty(): boolean;
     get id(): number;
     get useLighting(): boolean;
     set useLighting(f: boolean);
-    isEqual(ec: EntityCollection): boolean;
+    isEqual(ec: EntityCollection | null): boolean;
     /**
      * Sets collection visibility.
      * @public
@@ -252,7 +250,7 @@ declare class EntityCollection {
      * @param {Entity} entity - Entity.
      * @returns {boolean} -
      */
-    belongs(entity: Entity): boolean | null;
+    belongs(entity: Entity): boolean;
     protected _removeRecursively(entity: Entity): void;
     /**
      * Removes entity from this collection.
@@ -286,6 +284,7 @@ declare class EntityCollection {
      * @param {RenderNode} renderNode
      */
     bindRenderNode(renderNode: RenderNode): void;
+    protected _onChangeRelativeCenter: (c: Vec3) => void;
     /**
      * Updates coordinates all lonLat entities in collection after collection attached to the planet node.
      * @protected