@openglobus/og 0.18.0 → 0.18.2

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

@@ -0,0 +1,15 @@
+import { BaseWorker } from "../utils/BaseWorker";
+import { Label } from "../entity/Label";
+import { LabelHandler } from "../entity/LabelHandler";
+export declare const LOCK_UPDATE = -2;
+export declare const LOCK_FREE = -1;
+interface LabelInfo {
+    label: Label;
+    handler: LabelHandler;
+}
+declare class LabelWorker extends BaseWorker<LabelInfo> {
+    constructor(numWorkers?: number);
+    protected _onMessage(e: MessageEvent): void;
+    make(data: LabelInfo): void;
+}
+export { LabelWorker };

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

@@ -1,65 +1,45 @@
-import {BaseWorker} from "../utils/BaseWorker";
-import {Label} from "../entity/Label";
-import {LabelHandler} from "../entity/LabelHandler";
-
+import { BaseWorker } from "../utils/BaseWorker";
 export const LOCK_UPDATE = -2;
 export const LOCK_FREE = -1;
-
-interface LabelInfo {
-    label: Label;
-    handler: LabelHandler;
-}
-
-class LabelWorker extends BaseWorker<LabelInfo> {
-
-    constructor(numWorkers: number = 4) {
+class LabelWorker extends BaseWorker {
+    constructor(numWorkers = 4) {
         super(numWorkers, LABEL_PROGRAM);
     }
-
-    protected override _onMessage(e: MessageEvent) {
-        let s = this._source.get(e.data.id)!;
-
+    _onMessage(e) {
+        let s = this._source.get(e.data.id);
         if (s.label._lockId === LOCK_UPDATE) {
             requestAnimationFrame(() => {
-                this.make({handler: s.handler, label: s.label});
+                this.make({ handler: s.handler, label: s.label });
             });
-        } else {
+        }
+        else {
             s.handler.workerCallback(e.data, s.label);
         }
-
         this._source.delete(e.data.id);
     }
-
-
-    public override make(data: LabelInfo) {
-        let label = data.label,
-            handler = data.handler;
-
+    make(data) {
+        let label = data.label, handler = data.handler;
         if (handler._entityCollection) {
-
             if (this._workerQueue.length) {
-                let w = this._workerQueue.pop()!;
-
-                this._source.set(this._sourceId, data);
-
+                let w = this._workerQueue.pop();
                 let labelData = label.serializeWorkerData(this._sourceId);
-
-                label._lockId = this._sourceId;
-
-                this._sourceId++;
-
-                w.postMessage({
-                    labelData: labelData
-                }, [
-                    labelData.buffer,
-                ]);
-            } else {
+                if (labelData) {
+                    this._source.set(this._sourceId, data);
+                    label._lockId = this._sourceId;
+                    this._sourceId++;
+                    w.postMessage({
+                        labelData: labelData
+                    }, [
+                        labelData.buffer,
+                    ]);
+                }
+            }
+            else {
                 this._pendingQueue.push(data);
             }
         }
     }
 }
-
 const LABEL_PROGRAM = `'use strict';
 
     function concatTypedArrays(dest, index, source) {
@@ -180,5 +160,4 @@ const LABEL_PROGRAM = `'use strict';
                     _pickingColorArr.buffer
             ]);
     }`;
-
-export {LabelWorker};
+export { LabelWorker };

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

@@ -0,0 +1,179 @@
+import { Entity } from "./Entity";
+import { PointCloudHandler } from "./PointCloudHandler";
+import { RenderNode } from "../scene/RenderNode";
+import { Vec3 } from "../math/Vec3";
+import { Vec4 } from "../math/Vec4";
+import { WebGLBufferExt } from "../webgl/Handler";
+import { EntityCollection } from "./EntityCollection";
+export interface IPointCloudParams {
+    visibility?: boolean;
+    pointSize?: number;
+    pickingScale?: number;
+    points?: Poi[];
+}
+type Poi = [number, number, number, number, number, number, number, any | undefined];
+interface IPoint {
+    _entity: Entity | null;
+    _pickingColor: Vec3;
+    _entityCollection: EntityCollection | null;
+    index: number;
+    position: Vec3;
+    color: Vec4;
+    pointCloud: PointCloud;
+    properties: any;
+}
+/**
+ * PointCloud object.
+ * @class
+ * @param {*} [options] - Point cloud options:
+ * @param {Array.<Array.<number>>} [options.points] - Points cartesian coordinates array,
+ * where first three is cartesian coordinates, next fourth is an RGBA color, and last is a point properties.
+ * @param {number} [options.pointSize] - Point screen size in pixels.
+ * @param {number} [options.pickingScale] - Point border picking size in screen pixels.
+ * @param {boolean} [options.visibility] - Point cloud visibility.
+ * @example <caption>Creates point cloud with two ten pixel size points</caption>
+ * new og.Entity({
+ *     pointCloud: {
+ *         pointSize: 10,
+ *         points: [
+ *             [0, 0, 0, 255, 255, 255, 255, { 'name': 'White point' }],
+ *             [100, 100, 0, 255, 0, 0, 255, { 'name': 'Red point' }]
+ *         ]
+ *     }
+ * });
+ */
+declare class PointCloud {
+    static __counter__: number;
+    protected __id: number;
+    /**
+     * Cloud visibility.
+     * @public
+     * @type {boolean}
+     */
+    visibility: boolean;
+    /**
+     * Point screen size in pixels.
+     * @public
+     * @type {number}
+     */
+    pointSize: number;
+    /**
+     * Point picking border size in pixels.
+     * @public
+     * @type {number}
+     */
+    pickingScale: number;
+    /**
+     * Parent collection render node.
+     * @protected
+     * @type {RenderNode | null}
+     */
+    protected _renderNode: RenderNode | null;
+    /**
+     * Entity instance that holds this point cloud.
+     * @public
+     * @type {Entity | null}
+     */
+    _entity: Entity | null;
+    /**
+     * Points properties.
+     * @protected
+     * @type {IPoint[]}
+     */
+    protected _points: IPoint[];
+    /**
+     * Coordinates array.
+     * @protected
+     * @type {number[]}
+     */
+    protected _coordinatesData: number[];
+    /**
+     * Color array.
+     * @protected
+     * @type {number[]}
+     */
+    protected _colorData: number[];
+    /**
+     * Picking color array.
+     * @protected
+     * @type {number[]}
+     */
+    protected _pickingColorData: number[];
+    protected _coordinatesBuffer: WebGLBufferExt | null;
+    protected _colorBuffer: WebGLBufferExt | null;
+    protected _pickingColorBuffer: WebGLBufferExt | null;
+    /**
+     * Handler that stores and renders this object.
+     * @public
+     * @type {PointCloudHandler}
+     */
+    _handler: PointCloudHandler | null;
+    _handlerIndex: number;
+    protected _buffersUpdateCallbacks: Function[];
+    protected _changedBuffers: boolean[];
+    constructor(options?: IPointCloudParams);
+    /**
+     * Clears point cloud data
+     * @public
+     */
+    clear(): void;
+    /**
+     * Sets cloud visibility.
+     * @public
+     * @param {boolean} visibility - Visibility flag.
+     */
+    setVisibility(visibility: boolean): void;
+    /**
+     * @return {boolean} Point cloud visibility.
+     */
+    getVisibility(): boolean;
+    /**
+     * Assign rendering scene node.
+     * @public
+     * @param {RenderNode}  renderNode - Assigned render node.
+     */
+    setRenderNode(renderNode: RenderNode): void;
+    /**
+     * Removes from entity.
+     * @public
+     */
+    remove(): void;
+    /**
+     * Adds points to render.
+     * @public
+     * @param { Poi[]} points - Point cloud array.
+     * @example
+     * var points = [[0, 0, 0, 255, 255, 255, 255, { 'name': 'White point' }], [100, 100, 0, 255, 0, 0, 255, { 'name': 'Red point' }]];
+     */
+    setPoints(points: Poi[]): void;
+    setPointPosition(index: number, x: number, y: number, z: number): void;
+    setPointColor(index: number, r: number, g: number, b: number, a: number): void;
+    addPoints(points: Poi[]): void;
+    addPoint(index: number, point: Poi): void;
+    /**
+     * Returns specific point by index.
+     * @public
+     * @param {number} index - Point index.
+     * @return {Poi} Specific point
+     */
+    getPoint(index: number): IPoint;
+    removePoint(index: number): void;
+    insertPoint(index: number, point: Poi): void;
+    draw(): void;
+    drawPicking(): void;
+    /**
+     * Update gl buffers.
+     * @protected
+     */
+    protected _update(): void;
+    /**
+     * Delete buffers
+     * @public
+     */
+    _deleteBuffers(): void;
+    protected _createCoordinatesBuffer(): void;
+    protected _createColorBuffer(): void;
+    protected _createPickingColorBuffer(): void;
+    protected _setPickingColors(): void;
+}
+export { PointCloud };