@openglobus/og 0.18.0 → 0.18.2

package/lib/js/entity/Billboard.d.ts

@@ -0,0 +1,113 @@
+import { BaseBillboard, IBaseBillboardParams } from "./BaseBillboard";
+import { BillboardHandler } from "./BillboardHandler";
+import { HTMLImageElementExt } from "../utils/ImagesCacheManager";
+export interface IBillboardParams extends IBaseBillboardParams {
+    src?: string;
+    image?: HTMLImageElement;
+    size?: [number, number];
+    width?: number;
+    height?: number;
+}
+/**
+ * Represents basic quad billboard image.
+ * @class
+ * @extends {BaseBillboard}
+ * @param {Object} [options] - Options:
+ * @param {Vec3|Array.<number>} [options.position] - Billboard spatial position.
+ * @param {number} [options.rotation] - Screen angle rotation.
+ * @param {Vec4|string|Array.<number>} [options.color] - Billboard color.
+ * @param {Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
+ * @param {Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
+ * @param {boolean} [options.visibility] - Visibility.
+ * @param {string} [options.src] - Billboard image url source.
+ * @param {Image} [options.image] - Billboard image object.
+ * @param {number} [options.width] - Screen width.
+ * @param {number} [options.height] - Screen height.
+ * @param {number} [options.scale] - Billboard scale.
+ */
+declare class Billboard extends BaseBillboard {
+    _handler: BillboardHandler | null;
+    /**
+     * Image src.
+     * @protected
+     * @type {string}
+     */
+    protected _src: string | null;
+    /**
+     * Image object.
+     * @protected
+     * @type {Object}
+     */
+    protected _image: HTMLImageElement & {
+        __nodeIndex?: number;
+    } | null;
+    protected _scale: number;
+    /**
+     * Billboard screen width.
+     * @public
+     * @type {number}
+     */
+    _width: number;
+    /**
+     * Billboard screen height.
+     * @public
+     * @type {number}
+     */
+    _height: number;
+    constructor(options?: IBillboardParams);
+    /**
+     * Sets billboard image url source.
+     * @public
+     * @param {string} src - Image url.
+     */
+    setSrc(src: string | null): void;
+    getSrc(): string | null;
+    /**
+     * Sets image object.
+     * @public
+     * @param {Object} image - JavaScript image object.
+     */
+    setImage(image: HTMLImageElement): void;
+    getImage(): HTMLImageElementExt | null;
+    /**
+     * Sets billboard screen size in pixels.
+     * @public
+     * @param {number} width - Billboard width.
+     * @param {number} height - Billboard height.
+     */
+    setSize(width: number, height: number): void;
+    /**
+     * Returns billboard screen size.
+     * @public
+     * @returns {Object}
+     */
+    getSize(): {
+        width: number;
+        height: number;
+    };
+    /**
+     * Sets billboard screen width.
+     * @public
+     * @param {number} width - Width.
+     */
+    setWidth(width: number): void;
+    /**
+     * Gets billboard screen width.
+     * @public
+     * @returns {number}
+     */
+    getWidth(): number;
+    /**
+     * Sets billboard screen heigh.
+     * @public
+     * @param {number} height - Height.
+     */
+    setHeight(height: number): void;
+    /**
+     * Gets billboard screen height.
+     * @public
+     * @returns {number}
+     */
+    getHeight(): number;
+}
+export { Billboard };

package/{src/entity/Billboard.ts → lib/js/entity/Billboard.js}

@@ -1,15 +1,4 @@
-import {BaseBillboard, IBaseBillboardParams} from "./BaseBillboard";
-import {BillboardHandler} from "./BillboardHandler";
-import {HTMLImageElementExt} from "../utils/ImagesCacheManager";
-
-export interface IBillboardParams extends IBaseBillboardParams {
-    src?: string;
-    image?: HTMLImageElement;
-    size?: [number, number];
-    width?: number;
-    height?: number;
-}
-
+import { BaseBillboard } from "./BaseBillboard";
 /**
  * Represents basic quad billboard image.
  * @class
@@ -28,62 +17,21 @@ export interface IBillboardParams extends IBaseBillboardParams {
  * @param {number} [options.scale] - Billboard scale.
  */
 class Billboard extends BaseBillboard {
-
-    public override _handler: BillboardHandler | null;
-
-    /**
-     * Image src.
-     * @protected
-     * @type {string}
-     */
-    protected _src: string | null;
-
-    /**
-     * Image object.
-     * @protected
-     * @type {Object}
-     */
-    protected _image: HTMLImageElement & { __nodeIndex?: number } | null;
-
-    protected _scale: number;
-
-    /**
-     * Billboard screen width.
-     * @public
-     * @type {number}
-     */
-    public _width: number;
-
-    /**
-     * Billboard screen height.
-     * @public
-     * @type {number}
-     */
-    public _height: number;
-
-    constructor(options: IBillboardParams = {}) {
-
+    constructor(options = {}) {
         super(options);
-
         this._handler = null;
-
         this._src = options.src || null;
-
         this._image = options.image || null;
-
         this._scale = 1.0;
-
         this._width = options.width || (options.size ? options.size[0] : 30);
-
         this._height = options.height || (options.size ? options.size[1] : 30);
     }
-
     /**
      * Sets billboard image url source.
      * @public
      * @param {string} src - Image url.
      */
-    public setSrc(src: string | null) {
+    setSrc(src) {
         this._src = src;
         let bh = this._handler;
         if (bh && src && src.length) {
@@ -91,101 +39,89 @@ class Billboard extends BaseBillboard {
             if (rn && rn.renderer) {
                 let ta = rn.renderer.billboardsTextureAtlas;
                 let that = this;
-                ta.loadImage(src, function (img: HTMLImageElementExt) {
+                ta.loadImage(src, function (img) {
                     if (img.__nodeIndex != undefined && ta.get(img.__nodeIndex)) {
                         that._image = img;
-                        bh!.setTexCoordArr(
-                            that._handlerIndex,
-                            ta.get(that._image!.__nodeIndex!)!.texCoords
-                        );
-                    } else {
+                        bh.setTexCoordArr(that._handlerIndex, ta.get(that._image.__nodeIndex).texCoords);
+                    }
+                    else {
                         ta.addImage(img);
                         ta.createTexture();
                         that._image = img;
-                        rn!.updateBillboardsTexCoords();
+                        rn.updateBillboardsTexCoords();
                     }
                 });
             }
         }
     }
-
-    public getSrc(): string | null {
+    getSrc() {
         return this._src;
     }
-
     /**
      * Sets image object.
      * @public
      * @param {Object} image - JavaScript image object.
      */
-    public setImage(image: HTMLImageElement) {
+    setImage(image) {
         this.setSrc(image.src);
     }
-
-    public getImage(): HTMLImageElementExt | null {
+    getImage() {
         return this._image;
     }
-
     /**
      * Sets billboard screen size in pixels.
      * @public
      * @param {number} width - Billboard width.
      * @param {number} height - Billboard height.
      */
-    public setSize(width: number, height: number) {
+    setSize(width, height) {
         this._width = width;
         this._height = height;
         this._handler &&
-        this._handler.setSizeArr(this._handlerIndex, width * this._scale, height * this._scale);
+            this._handler.setSizeArr(this._handlerIndex, width * this._scale, height * this._scale);
     }
-
     /**
      * Returns billboard screen size.
      * @public
      * @returns {Object}
      */
-    public getSize(): { width: number, height: number } {
+    getSize() {
         return {
             width: this._width,
             height: this._height
         };
     }
-
     /**
      * Sets billboard screen width.
      * @public
      * @param {number} width - Width.
      */
-    public setWidth(width: number) {
+    setWidth(width) {
         this.setSize(width, this._height);
     }
-
     /**
      * Gets billboard screen width.
      * @public
      * @returns {number}
      */
-    public getWidth(): number {
+    getWidth() {
         return this._width;
     }
-
     /**
      * Sets billboard screen heigh.
      * @public
      * @param {number} height - Height.
      */
-    public setHeight(height: number) {
+    setHeight(height) {
         this.setSize(this._width, height);
     }
-
     /**
      * Gets billboard screen height.
      * @public
      * @returns {number}
      */
-    public getHeight(): number {
+    getHeight() {
         return this._height;
     }
 }
-
-export {Billboard};
+export { Billboard };

package/lib/js/entity/BillboardHandler.d.ts

@@ -0,0 +1,15 @@
+import { BaseBillboardHandler } from "./BaseBillboardHandler";
+import { Billboard } from "./Billboard";
+import { EntityCollection } from "./EntityCollection";
+/**
+ * @class BillboardHandler
+ */
+declare class BillboardHandler extends BaseBillboardHandler {
+    protected _billboards: Billboard[];
+    constructor(props: EntityCollection);
+    add(billboard: Billboard): void;
+    protected _addBillboardToArrays(billboard: Billboard): void;
+    get billboards(): Billboard[];
+    refreshTexCoordsArr(): void;
+}
+export { BillboardHandler };

package/{src/entity/BillboardHandler.ts → lib/js/entity/BillboardHandler.js}

@@ -1,56 +1,33 @@
-import {BaseBillboardHandler} from "./BaseBillboardHandler";
-import {Billboard} from "./Billboard";
-import {concatTypedArrays} from "../utils/shared";
-import {EntityCollection} from "./EntityCollection";
-
+import { BaseBillboardHandler } from "./BaseBillboardHandler";
+import { concatTypedArrays } from "../utils/shared";
 /**
  * @class BillboardHandler
  */
 class BillboardHandler extends BaseBillboardHandler {
-
-    protected override _billboards: Billboard[];
-
-    constructor(props: EntityCollection) {
+    constructor(props) {
         super(props);
-
         this._billboards = [];
     }
-
-    public override add(billboard: Billboard) {
+    add(billboard) {
         if (billboard._handlerIndex == -1) {
             super.add(billboard);
-
             this._addBillboardToArrays(billboard);
             this.refresh();
-            let src = billboard.getSrc() || (billboard.getImage() && billboard.getImage()!.src);
+            let src = billboard.getSrc() || (billboard.getImage() && billboard.getImage().src);
             if (src) {
                 billboard.setSrc(src);
             }
         }
     }
-
-    protected _addBillboardToArrays(billboard: Billboard) {
+    _addBillboardToArrays(billboard) {
         if (billboard.getVisibility()) {
-            this._vertexArr = concatTypedArrays(
-                this._vertexArr,
-                [-0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5]
-            ) as Float32Array;
-        } else {
-            this._vertexArr = concatTypedArrays(
-                this._vertexArr,
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-            ) as Float32Array;
+            this._vertexArr = concatTypedArrays(this._vertexArr, [-0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5]);
         }
-
-        this._texCoordArr = concatTypedArrays(
-            this._texCoordArr,
-            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        ) as Float32Array;
-
-        let x = billboard._positionHigh.x,
-            y = billboard._positionHigh.y,
-            z = billboard._positionHigh.z,
-            w;
+        else {
+            this._vertexArr = concatTypedArrays(this._vertexArr, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+        }
+        this._texCoordArr = concatTypedArrays(this._texCoordArr, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+        let x = billboard._positionHigh.x, y = billboard._positionHigh.y, z = billboard._positionHigh.z, w;
         this._positionHighArr = concatTypedArrays(this._positionHighArr, [
             x, y, z,
             x, y, z,
@@ -58,8 +35,7 @@ class BillboardHandler extends BaseBillboardHandler {
             x, y, z,
             x, y, z,
             x, y, z
-        ]) as Float32Array;
-
+        ]);
         x = billboard._positionLow.x;
         y = billboard._positionLow.y;
         z = billboard._positionLow.z;
@@ -70,12 +46,10 @@ class BillboardHandler extends BaseBillboardHandler {
             x, y, z,
             x, y, z,
             x, y, z
-        ]) as Float32Array;
-
+        ]);
         x = billboard._width;
         y = billboard._height;
-        this._sizeArr = concatTypedArrays(this._sizeArr, [x, y, x, y, x, y, x, y, x, y, x, y]) as Float32Array;
-
+        this._sizeArr = concatTypedArrays(this._sizeArr, [x, y, x, y, x, y, x, y, x, y, x, y]);
         x = billboard._offset.x;
         y = billboard._offset.y;
         z = billboard._offset.z;
@@ -86,8 +60,7 @@ class BillboardHandler extends BaseBillboardHandler {
             x, y, z,
             x, y, z,
             x, y, z
-        ]) as Float32Array;
-
+        ]);
         x = billboard._color.x;
         y = billboard._color.y;
         z = billboard._color.z;
@@ -99,22 +72,18 @@ class BillboardHandler extends BaseBillboardHandler {
             x, y, z, w,
             x, y, z, w,
             x, y, z, w
-        ]) as Float32Array;
-
+        ]);
         x = billboard._rotation;
-        this._rotationArr = concatTypedArrays(this._rotationArr, [x, x, x, x, x, x]) as Float32Array;
-
-        x = billboard._entity!._pickingColor.x / 255;
-        y = billboard._entity!._pickingColor.y / 255;
-        z = billboard._entity!._pickingColor.z / 255;
-        this._pickingColorArr = concatTypedArrays(this._pickingColorArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]) as Float32Array;
+        this._rotationArr = concatTypedArrays(this._rotationArr, [x, x, x, x, x, x]);
+        x = billboard._entity._pickingColor.x / 255;
+        y = billboard._entity._pickingColor.y / 255;
+        z = billboard._entity._pickingColor.z / 255;
+        this._pickingColorArr = concatTypedArrays(this._pickingColorArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]);
     }
-
-    public get billboards(): Billboard[] {
-        return this._billboards
+    get billboards() {
+        return this._billboards;
     }
-
-    public override refreshTexCoordsArr() {
+    refreshTexCoordsArr() {
         let bc = this._entityCollection;
         if (bc && this._renderer) {
             let ta = this._renderer.billboardsTextureAtlas;
@@ -122,7 +91,7 @@ class BillboardHandler extends BaseBillboardHandler {
                 let bi = this._billboards[i];
                 let img = bi.getImage();
                 if (img) {
-                    let imageNode = ta.get(img.__nodeIndex!);
+                    let imageNode = ta.get(img.__nodeIndex);
                     if (imageNode) {
                         this.setTexCoordArr(bi._handlerIndex, imageNode.texCoords);
                     }
@@ -131,5 +100,4 @@ class BillboardHandler extends BaseBillboardHandler {
         }
     }
 }
-
-export {BillboardHandler};
+export { BillboardHandler };