@openglobus/og 0.17.1 → 0.18.0

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

@@ -1,9 +1,20 @@
-'use strict';
-
-import * as shaders from '../shaders/polyline.js';
+import * as shaders from '../shaders/polyline';
+import {EntityCollection} from "./EntityCollection";
+import {Polyline} from "./Polyline";
+import {Renderer} from "../renderer/Renderer";
+import {RenderNode} from "../scene/RenderNode";
 
 class PolylineHandler {
-    constructor(entityCollection) {
+    static __counter__: number = 0;
+    protected __id: number;
+    public _entityCollection: EntityCollection;
+    public pickingEnabled: boolean;
+    protected _renderer: Renderer | null;
+    protected _polylines: Polyline[];
+
+    constructor(entityCollection: EntityCollection) {
+
+        this.__id = PolylineHandler.__counter__++;
 
         this._entityCollection = entityCollection;
 
@@ -11,24 +22,11 @@ class PolylineHandler {
 
         this._polylines = [];
 
-        this.__staticId = PolylineHandler._staticCounter++;
-
         this.pickingEnabled = true;
     }
 
-    static get _staticCounter() {
-        if (!this._counter && this._counter !== 0) {
-            this._counter = 0;
-        }
-        return this._counter;
-    }
-
-    static set _staticCounter(n) {
-        this._counter = n;
-    }
-
-    _initProgram() {
-        if (this._renderer.handler) {
+    protected _initProgram() {
+        if (this._renderer && this._renderer.handler) {
             if (!this._renderer.handler.programs.polyline_screen) {
                 this._renderer.handler.addProgram(shaders.polyline_screen());
             }
@@ -38,7 +36,7 @@ class PolylineHandler {
         }
     }
 
-    setRenderNode(renderNode) {
+    public setRenderNode(renderNode: RenderNode) {
         this._renderer = renderNode.renderer;
         this._initProgram();
         for (let i = 0; i < this._polylines.length; i++) {
@@ -46,18 +44,18 @@ class PolylineHandler {
         }
     }
 
-    add(polyline) {
+    public add(polyline: Polyline) {
         if (polyline._handlerIndex === -1) {
             polyline._handler = this;
             polyline._handlerIndex = this._polylines.length;
             this._polylines.push(polyline);
             this._entityCollection && this._entityCollection.renderNode &&
-                polyline.setRenderNode(this._entityCollection.renderNode);
+            polyline.setRenderNode(this._entityCollection.renderNode);
         }
     }
 
-    remove(polyline) {
-        var index = polyline._handlerIndex;
+    public remove(polyline: Polyline) {
+        let index = polyline._handlerIndex;
         if (index !== -1) {
             polyline._deleteBuffers();
             polyline._handlerIndex = -1;
@@ -67,21 +65,21 @@ class PolylineHandler {
         }
     }
 
-    reindexPolylineArray(startIndex) {
-        var ls = this._polylines;
+    public reindexPolylineArray(startIndex: number) {
+        let ls = this._polylines;
         for (let i = startIndex; i < ls.length; i++) {
             ls[i]._handlerIndex = i;
         }
     }
 
-    draw() {
+    public draw() {
         let i = this._polylines.length;
         while (i--) {
             this._polylines[i].draw();
         }
     }
 
-    drawPicking() {
+    public drawPicking() {
         if (this.pickingEnabled) {
             let i = this._polylines.length;
             while (i--) {
@@ -90,8 +88,8 @@ class PolylineHandler {
         }
     }
 
-    clear() {
-        var i = this._polylines.length;
+    public clear() {
+        let i = this._polylines.length;
         while (i--) {
             this._polylines[i]._deleteBuffers();
             this._polylines[i]._handler = null;
@@ -102,4 +100,4 @@ class PolylineHandler {
     }
 }
 
-export { PolylineHandler };
+export {PolylineHandler};

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

@@ -1,8 +1,18 @@
-"use strict";
+import * as utils from "../utils/shared";
+import {NumberArray3, Vec3} from "../math/Vec3";
+import {NumberArray4, Vec4} from "../math/Vec4";
+import {Entity} from "./Entity";
+import {RayHandler} from "./RayHandler";
 
-import {Vec3} from "../math/Vec3.js";
-import * as utils from "../utils/shared.js";
-import {Entity} from "./Entity.js";
+export interface IRayParams {
+    thickness?: number;
+    startPosition?: Vec3 | NumberArray3;
+    endPosition?: Vec3 | NumberArray3;
+    startColor?: string | NumberArray4;
+    endColor?: string | NumberArray4;
+    visibility?: boolean;
+
+}
 
 /**
  * Ray class.
@@ -15,21 +25,63 @@ import {Entity} from "./Entity.js";
  * @param {boolean} [options.visibility] - Visibility.
  */
 class Ray {
-    constructor(options) {
-        options = options || {};
-
-        /**
-         * Object unic identifier.
-         * @public
-         * @readonly
-         * @type {number}
-         */
-        this.id = Entity._staticCounter++;
-
-        // Thickenss
+
+    static __counter__: number = 0;
+    /**
+     * Object uniq identifier.
+     * @protected
+     * @type {number}
+     */
+    protected __id: number;
+
+    public _thickness: number;
+
+    protected _startPosition: Vec3;
+    public _startPositionHigh: Vec3;
+    public _startPositionLow: Vec3;
+
+    // RTE end position
+    protected _endPosition: Vec3;
+    public _endPositionHigh: Vec3;
+    public _endPositionLow: Vec3;
+
+    // start end point colors
+    public _startColor: Vec4;
+    public _endColor: Vec4;
+
+    /**
+     * Ray visibility.
+     * @protected
+     * @type {boolean}
+     */
+    protected _visibility: boolean;
+
+    /**
+     * Entity instance that holds this billboard.
+     * @public
+     * @type {Entity}
+     */
+    public _entity: Entity | null;
+
+    /**
+     * Handler that stores and renders this billboard object.
+     * @public
+     * @type {BillboardHandler}
+     */
+    public _handler: RayHandler | null;
+
+    /**
+     * Billboard handler array index.
+     * @public
+     * @type {number}
+     */
+    public _handlerIndex: number;
+    constructor(options: IRayParams = {}) {
+
+        this.__id = Ray.__counter__++;
+
         this._thickness = options.thickness || 2.0;
 
-        // RTE start position
         this._startPosition = utils.createVector3(options.startPosition);
         this._startPositionHigh = new Vec3();
         this._startPositionLow = new Vec3();
@@ -39,42 +91,20 @@ class Ray {
             this._startPositionLow
         );
 
-        // RTE end position
         this._endPosition = utils.createVector3(options.endPosition);
         this._endPositionHigh = new Vec3();
         this._endPositionLow = new Vec3();
         Vec3.doubleToTwoFloats(this._endPosition, this._endPositionHigh, this._endPositionLow);
 
-        // start end point colors
         this._startColor = utils.createColorRGBA(options.startColor);
         this._endColor = utils.createColorRGBA(options.endColor);
 
-        /**
-         * Ray visibility.
-         * @protected
-         * @type {boolean}
-         */
         this._visibility = options.visibility != undefined ? options.visibility : true;
 
-        /**
-         * Entity instance that holds this billboard.
-         * @protected
-         * @type {Entity}
-         */
         this._entity = null;
 
-        /**
-         * Handler that stores and renders this billboard object.
-         * @protected
-         * @type {BillboardHandler}
-         */
         this._handler = null;
 
-        /**
-         * Billboard handler array index.
-         * @protected
-         * @type {number}
-         */
         this._handlerIndex = -1;
     }
 
@@ -85,7 +115,7 @@ class Ray {
      * @param {number} y - Y coordinate.
      * @param {number} z - Z coordinate.
      */
-    setStartPosition(x, y, z) {
+    public setStartPosition(x: number, y: number, z: number) {
         this._startPosition.x = x;
         this._startPosition.y = y;
         this._startPosition.z = z;
@@ -102,7 +132,7 @@ class Ray {
         );
     }
 
-    getLength() {
+    public getLength(): number {
         return this._startPosition.distance(this._endPosition);
     }
 
@@ -111,7 +141,7 @@ class Ray {
      * @public
      * @param {Vec3} position - Cartesian coordinates.
      */
-    setStartPosition3v(position) {
+    public setStartPosition3v(position: Vec3) {
         this._startPosition.x = position.x;
         this._startPosition.y = position.y;
         this._startPosition.z = position.z;
@@ -135,7 +165,7 @@ class Ray {
      * @param {number} y - Y coordinate.
      * @param {number} z - Z coordinate.
      */
-    setEndPosition(x, y, z) {
+    public setEndPosition(x: number, y: number, z: number) {
         this._endPosition.x = x;
         this._endPosition.y = y;
         this._endPosition.z = z;
@@ -153,7 +183,7 @@ class Ray {
      * @public
      * @param {Vec3} position - Cartesian coordinates.
      */
-    setEndPosition3v(position) {
+    public setEndPosition3v(position: Vec3) {
         this._endPosition.x = position.x;
         this._endPosition.y = position.y;
         this._endPosition.z = position.z;
@@ -166,12 +196,12 @@ class Ray {
         );
     }
 
-    setThickness(thickness) {
+    public setThickness(thickness: number) {
         this._thickness = thickness;
         this._handler && this._handler.setThicknessArr(this._handlerIndex, thickness);
     }
 
-    setColors4v(startColor, endColor) {
+    public setColors4v(startColor?: Vec4, endColor?: Vec4) {
         if (startColor) {
             this._startColor.x = startColor.x;
             this._startColor.y = startColor.y;
@@ -179,7 +209,7 @@ class Ray {
             this._startColor.w = startColor.w;
         }
 
-        if (this._endColor) {
+        if (endColor) {
             this._endColor.x = endColor.x;
             this._endColor.y = endColor.y;
             this._endColor.z = endColor.z;
@@ -190,7 +220,7 @@ class Ray {
         this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
     }
 
-    setColorsHTML(startColor, endColor) {
+    public setColorsHTML(startColor?: string, endColor?: string) {
         if (startColor) {
             this._startColor = utils.htmlColorToRgba(startColor);
         }
@@ -199,8 +229,7 @@ class Ray {
             this._endColor = utils.htmlColorToRgba(endColor);
         }
 
-        this._handler &&
-        this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
+        this._handler && this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
     }
 
     /**
@@ -208,7 +237,7 @@ class Ray {
      * @public
      * @returns {Vec3}
      */
-    getStartPosition() {
+    public getStartPosition(): Vec3 {
         return this._startPosition;
     }
 
@@ -217,44 +246,44 @@ class Ray {
      * @public
      * @returns {Vec3}
      */
-    getEndPosition() {
+    public getEndPosition(): Vec3 {
         return this._endPosition;
     }
 
     /**
-     * Sets billboard visibility.
+     * Sets visibility.
      * @public
      * @param {boolean} visibility - Visibility flag.
      */
-    setVisibility(visibility) {
+    public setVisibility(visibility: boolean) {
         this._visibility = visibility;
         this._handler && this._handler.setVisibility(this._handlerIndex, visibility);
     }
 
     /**
-     * Returns billboard visibility.
+     * Returns visibility.
      * @public
      * @returns {boolean}
      */
-    getVisibility() {
+    public getVisibility(): boolean {
         return this._visibility;
     }
 
     /**
-     * Removes billboard from hander.
+     * Remove from handler.
      * @public
      */
-    remove() {
+    public remove() {
         this._entity = null;
         this._handler && this._handler.remove(this);
     }
 
     /**
-     * Sets billboard picking color.
+     * Set picking color.
      * @public
      * @param {Vec3} color - Picking color.
      */
-    setPickingColor3v(color) {
+    public setPickingColor3v(color: Vec3) {
         this._handler && this._handler.setPickingColorArr(this._handlerIndex, color);
     }
 }