@openglobus/og 0.17.1 → 0.18.0

package/src/{og/entity/GeoObject.js → entity/GeoObject.ts}

@@ -1,35 +1,87 @@
-"use strict";
-
-import { Quat, Vec3 } from "../math/index.js";
-import { Planet } from "../scene/Planet.js";
-import * as utils from "../utils/shared.js";
+import * as utils from "../utils/shared";
+import {Entity} from "./Entity";
+import {Quat, Vec3, Vec4} from "../math/index";
+import {InstanceData} from "./GeoObjectHandler";
+import {NumberArray3} from "../math/Vec3";
+import {NumberArray4} from "../math/Vec4";
+import {Object3d} from "../Object3d";
+import {GeoObjectHandler} from "./GeoObjectHandler";
+
+export interface IGeoObjectParams {
+    object3d: Object3d;
+    tag?: string;
+    position?: Vec3 | NumberArray3;
+    pitch?: number;
+    yaw?: number;
+    roll?: number;
+    scale?: number;
+    color?: Vec4 | NumberArray4 | string;
+}
 
 /**
  * @class
  * @param {Object} options -  Geo object parameters:
- * @param {og.Vec3} [options.position] - Geo object position.
+ * @param {Vec3} [options.position] - Geo object position.
+ *
+ * @todo: GeoObject and GeoObjectHandler provides instanced objects only.
+ * It would be nice if it could provide not instanced rendering loop too.
  */
-
 class GeoObject {
-    constructor(options = {}) {
+    protected _tag: string;
+
+    public instanced: boolean;
+
+    /**
+     * Entity instance that holds this geo object.
+     * @public
+     * @type {Entity}
+     */
+    public _entity: Entity | null;
+
+    /**
+     * Geo object center cartesian position.
+     * @protected
+     * @type {Vec3}
+     */
+    protected _position: Vec3;
+    public _positionHigh: Vec3;
+    public _positionLow: Vec3;
+
+    protected _pitch: number;
+    protected _yaw: number;
+    protected _roll: number;
+
+    protected _scale: number;
+
+    /**
+     * RGBA color.
+     * @public
+     * @type {Vec4}
+     */
+    public _color: Vec4;
+
+    public _direction: Vec3;
+
+    public _handler: GeoObjectHandler | null;
+    public _handlerIndex = -1;
+
+    public _tagData: InstanceData | null;
+    public _tagDataIndex: number;
+
+    protected _object3d: Object3d;
 
-        this.tag = options.tag || "none";
+    protected _visibility: boolean;
+
+    protected _qNorthFrame: Quat;
+
+    constructor(options: IGeoObjectParams) {
+
+        this._tag = options.tag || "none";
 
-        // TODO: not instanced
         this.instanced = true;
 
-        /**
-         * Entity instance that holds this geo object.
-         * @protected
-         * @type {Entity}
-         */
         this._entity = null;
 
-        /**
-         * Geo object center cartesian position.
-         * @protected
-         * @type {og.Vec3}
-         */
         this._position = utils.createVector3(options.position);
 
         this._positionHigh = new Vec3();
@@ -42,14 +94,9 @@ class GeoObject {
 
         this._scale = options.scale || 1.0;
 
-        /**
-         * RGBA color.
-         * @protected
-         * @type {og.Vec4}
-         */
         this._color = utils.createColorRGBA(options.color);
 
-        this._direction = new Vec3(0, 0, 0);
+        this._direction = new Vec3(0, 1, 0);
 
         this._handler = null;
         this._handlerIndex = -1;
@@ -58,45 +105,53 @@ class GeoObject {
         this._tagDataIndex = -1;
 
         this._object3d = options.object3d;
+
+        this._visibility = true;
+
+        this._qNorthFrame = new Quat();
+    }
+
+    public get tag() {
+        return this._tag;
     }
 
-    getPosition() {
+    public getPosition(): Vec3 {
         return this._position;
     }
 
-    getPitch() {
+    public getPitch(): number {
         return this._pitch;
     }
 
-    getYaw() {
+    public getYaw(): number {
         return this._yaw;
     }
 
-    getRoll() {
+    public getRoll(): number {
         return this._roll;
     }
 
-    getDirection() {
+    public getDirection(): Vec3 {
         return this._direction;
     }
 
-    get object3d() {
+    public get object3d(): Object3d {
         return this._object3d;
     }
 
-    get vertices() {
+    public get vertices(): number[] {
         return this._object3d.vertices;
     }
 
-    get normals() {
+    public get normals(): number[] {
         return this._object3d.normals;
     }
 
-    get texCoords() {
+    public get texCoords(): number[] {
         return this._object3d.texCoords;
     }
 
-    get indices() {
+    public get indices(): number[] {
         return this._object3d.indices;
     }
 
@@ -105,7 +160,7 @@ class GeoObject {
      * @public
      * @param {number} a - Billboard opacity.
      */
-    setOpacity(a) {
+    public setOpacity(a: number) {
         this._color.w = a;
         this.setColor(this._color.x, this._color.y, this._color.z, a);
     }
@@ -116,27 +171,27 @@ class GeoObject {
      * @param {number} r - Red.
      * @param {number} g - Green.
      * @param {number} b - Blue.
-     * @param {number} a - Alpha.
+     * @param {number} [a] - Alpha.
      */
-    setColor(r, g, b, a) {
+    public setColor(r: number, g: number, b: number, a?: number) {
         this._color.x = r;
         this._color.y = g;
         this._color.z = b;
         a != undefined && (this._color.w = a);
-        this._handler && this._handler.setRgbaArr(this._tagData, this._tagDataIndex, this._color);
+        this._handler && this._handler.setRgbaArr(this._tagData!, this._tagDataIndex, this._color);
     }
 
     /**
      * Sets color.
      * @public
-     * @param {og.Vec4} color - RGBA vector.
+     * @param {Vec3 | Vec4} color - RGBA vector.
      */
-    setColor4v(color) {
+    public setColor4v(color: Vec3 | Vec4) {
         this._color.x = color.x;
         this._color.y = color.y;
         this._color.z = color.z;
-        color.w != undefined && (this._color.w = color.w);
-        this._handler && this._handler.setRgbaArr(this._tagData, this._tagDataIndex, color);
+        (color as Vec4).w != undefined && (this._color.w = (color as Vec4).w);
+        this._handler && this._handler.setRgbaArr(this._tagData!, this._tagDataIndex, this._color);
     }
 
     /**
@@ -144,9 +199,9 @@ class GeoObject {
      * @public
      * @param {boolean} visibility - Visibility flag.
      */
-    setVisibility(visibility) {
+    public setVisibility(visibility: boolean) {
         this._visibility = visibility;
-        this._handler && this._handler.setVisibility(this._tagData, this._tagDataIndex, visibility);
+        this._handler && this._handler.setVisibility(this._tagData!, this._tagDataIndex, visibility);
     }
 
     /**
@@ -154,7 +209,7 @@ class GeoObject {
      * @public
      * @returns {boolean}
      */
-    getVisibility() {
+    public getVisibility(): boolean {
         return this._visibility;
     }
 
@@ -165,51 +220,51 @@ class GeoObject {
      * @param {number} y - Y coordinate.
      * @param {number} z - Z coordinate.
      */
-    setPosition(x, y, z) {
+    public setPosition(x: number, y: number, z: number) {
         this._position.x = x;
         this._position.y = y;
         this._position.z = z;
         Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
         this._handler &&
-        this._handler.setPositionArr(this._tagData, this._tagDataIndex, this._positionHigh, this._positionLow);
+        this._handler.setPositionArr(this._tagData!, this._tagDataIndex, this._positionHigh, this._positionLow);
         this.updateDirection();
     }
 
     /**
      * Sets geo object position.
      * @public
-     * @param {og.Vec3} position - Cartesian coordinates.
+     * @param {Vec3} position - Cartesian coordinates.
      */
-    setPosition3v(position) {
+    public setPosition3v(position: Vec3) {
         this._position.x = position.x;
         this._position.y = position.y;
         this._position.z = position.z;
         Vec3.doubleToTwoFloats(position, this._positionHigh, this._positionLow);
-        this._handler && this._handler.setPositionArr(this._tagData, this._tagDataIndex, this._positionHigh, this._positionLow);
+        this._handler && this._handler.setPositionArr(this._tagData!, this._tagDataIndex, this._positionHigh, this._positionLow);
         this.updateDirection();
     }
 
-    setYaw(yaw) {
+    public setYaw(yaw: number) {
         this._yaw = yaw;
         this.updateDirection();
     }
 
-    setPitch(pitch) {
+    public setPitch(pitch: number) {
         this._pitch = pitch;
-        this._handler && this._handler.setPitchRollArr(this._tagData, this._tagDataIndex, pitch, this._roll);
+        this._handler && this._handler.setPitchRollArr(this._tagData!, this._tagDataIndex, pitch, this._roll);
     }
 
-    setRoll(roll) {
+    public setRoll(roll: number) {
         this._roll = roll;
-        this._handler && this._handler.setPitchRollArr(this._tagData, this._tagDataIndex, this._pitch, roll);
+        this._handler && this._handler.setPitchRollArr(this._tagData!, this._tagDataIndex, this._pitch, roll);
     }
 
-    setScale(scale) {
+    public setScale(scale: number) {
         this._scale = scale;
-        this._handler && this._handler.setScaleArr(this._tagData, this._tagDataIndex, scale);
+        this._handler && this._handler.setScaleArr(this._tagData!, this._tagDataIndex, scale);
     }
 
-    getScale() {
+    public getScale(): number {
         return this._scale;
     }
 
@@ -217,7 +272,7 @@ class GeoObject {
      * Removes geo object from handler.
      * @public
      */
-    remove() {
+    public remove() {
         this._entity = null;
         this._handler && this._handler.remove(this);
     }
@@ -225,20 +280,20 @@ class GeoObject {
     /**
      * Sets billboard picking color.
      * @public
-     * @param {og.Vec3} color - Picking color.
+     * @param {Vec3} color - Picking color.
      */
-    setPickingColor3v(color) {
-        this._handler && this._handler.setPickingColorArr(this._tagData, this._tagDataIndex, color);
+    public setPickingColor3v(color: Vec3) {
+        this._handler && this._handler.setPickingColorArr(this._tagData!, this._tagDataIndex, color);
     }
 
-    updateDirection() {
+    public updateDirection() {
         if (this._handler && this._handler._planet) {
             this._qNorthFrame = this._handler._planet.getNorthFrameRotation(this._position);
             let qq = Quat.yRotation(this._yaw).mul(this._qNorthFrame).conjugate();
             this._direction = qq.mulVec3(new Vec3(0.0, 0.0, -1.0)).normalize();
-            this._handler.setDirectionArr(this._tagData, this._tagDataIndex, this._direction);
+            this._handler.setDirectionArr(this._tagData!, this._tagDataIndex, this._direction);
         }
     }
 }
 
-export { GeoObject };
+export {GeoObject};