@openglobus/og 0.18.0 → 0.18.2

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

@@ -0,0 +1,138 @@
+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 {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.
+ */
+declare class GeoObject {
+    protected _tag: string;
+    instanced: boolean;
+    /**
+     * Entity instance that holds this geo object.
+     * @public
+     * @type {Entity}
+     */
+    _entity: Entity | null;
+    /**
+     * Geo object center cartesian position.
+     * @protected
+     * @type {Vec3}
+     */
+    protected _position: Vec3;
+    _positionHigh: Vec3;
+    _positionLow: Vec3;
+    protected _pitch: number;
+    protected _yaw: number;
+    protected _roll: number;
+    protected _scale: number;
+    /**
+     * RGBA color.
+     * @public
+     * @type {Vec4}
+     */
+    _color: Vec4;
+    _direction: Vec3;
+    _handler: GeoObjectHandler | null;
+    _handlerIndex: number;
+    _tagData: InstanceData | null;
+    _tagDataIndex: number;
+    protected _object3d: Object3d;
+    protected _visibility: boolean;
+    protected _qNorthFrame: Quat;
+    constructor(options: IGeoObjectParams);
+    get tag(): string;
+    getPosition(): Vec3;
+    getPitch(): number;
+    getYaw(): number;
+    getRoll(): number;
+    getDirection(): Vec3;
+    get object3d(): Object3d;
+    get vertices(): number[];
+    get normals(): number[];
+    get texCoords(): number[];
+    get indices(): number[];
+    /**
+     * Sets geo object opacity.
+     * @public
+     * @param {number} a - Billboard opacity.
+     */
+    setOpacity(a: number): void;
+    /**
+     * Sets color.
+     * @public
+     * @param {number} r - Red.
+     * @param {number} g - Green.
+     * @param {number} b - Blue.
+     * @param {number} [a] - Alpha.
+     */
+    setColor(r: number, g: number, b: number, a?: number): void;
+    /**
+     * Sets color.
+     * @public
+     * @param {Vec3 | Vec4} color - RGBA vector.
+     */
+    setColor4v(color: Vec3 | Vec4): void;
+    /**
+     * Sets geo object visibility.
+     * @public
+     * @param {boolean} visibility - Visibility flag.
+     */
+    setVisibility(visibility: boolean): void;
+    /**
+     * Returns geo object visibility.
+     * @public
+     * @returns {boolean}
+     */
+    getVisibility(): boolean;
+    /**
+     * Sets geo object position.
+     * @public
+     * @param {number} x - X coordinate.
+     * @param {number} y - Y coordinate.
+     * @param {number} z - Z coordinate.
+     */
+    setPosition(x: number, y: number, z: number): void;
+    /**
+     * Sets geo object position.
+     * @public
+     * @param {Vec3} position - Cartesian coordinates.
+     */
+    setPosition3v(position: Vec3): void;
+    setYaw(yaw: number): void;
+    setPitch(pitch: number): void;
+    setRoll(roll: number): void;
+    setScale(scale: number): void;
+    getScale(): number;
+    /**
+     * Removes geo object from handler.
+     * @public
+     */
+    remove(): void;
+    /**
+     * Sets billboard picking color.
+     * @public
+     * @param {Vec3} color - Picking color.
+     */
+    setPickingColor3v(color: Vec3): void;
+    updateDirection(): void;
+}
+export { GeoObject };

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

@@ -1,23 +1,5 @@
 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;
-}
-
+import { Quat, Vec3 } from "../math/index";
 /**
  * @class
  * @param {Object} options -  Geo object parameters:
@@ -27,144 +9,71 @@ export interface IGeoObjectParams {
  * It would be nice if it could provide not instanced rendering loop too.
  */
 class GeoObject {
-    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;
-
-    protected _visibility: boolean;
-
-    protected _qNorthFrame: Quat;
-
-    constructor(options: IGeoObjectParams) {
-
+    constructor(options) {
+        this._handlerIndex = -1;
         this._tag = options.tag || "none";
-
         this.instanced = true;
-
         this._entity = null;
-
         this._position = utils.createVector3(options.position);
-
         this._positionHigh = new Vec3();
         this._positionLow = new Vec3();
         Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
-
         this._pitch = options.pitch || 0.0;
         this._yaw = options.yaw || 0.0;
         this._roll = options.roll || 0.0;
-
         this._scale = options.scale || 1.0;
-
         this._color = utils.createColorRGBA(options.color);
-
         this._direction = new Vec3(0, 1, 0);
-
         this._handler = null;
         this._handlerIndex = -1;
-
         this._tagData = null;
         this._tagDataIndex = -1;
-
         this._object3d = options.object3d;
-
         this._visibility = true;
-
         this._qNorthFrame = new Quat();
     }
-
-    public get tag() {
+    get tag() {
         return this._tag;
     }
-
-    public getPosition(): Vec3 {
+    getPosition() {
         return this._position;
     }
-
-    public getPitch(): number {
+    getPitch() {
         return this._pitch;
     }
-
-    public getYaw(): number {
+    getYaw() {
         return this._yaw;
     }
-
-    public getRoll(): number {
+    getRoll() {
         return this._roll;
     }
-
-    public getDirection(): Vec3 {
+    getDirection() {
         return this._direction;
     }
-
-    public get object3d(): Object3d {
+    get object3d() {
         return this._object3d;
     }
-
-    public get vertices(): number[] {
+    get vertices() {
         return this._object3d.vertices;
     }
-
-    public get normals(): number[] {
+    get normals() {
         return this._object3d.normals;
     }
-
-    public get texCoords(): number[] {
+    get texCoords() {
         return this._object3d.texCoords;
     }
-
-    public get indices(): number[] {
+    get indices() {
         return this._object3d.indices;
     }
-
     /**
      * Sets geo object opacity.
      * @public
      * @param {number} a - Billboard opacity.
      */
-    public setOpacity(a: number) {
+    setOpacity(a) {
         this._color.w = a;
         this.setColor(this._color.x, this._color.y, this._color.z, a);
     }
-
     /**
      * Sets color.
      * @public
@@ -173,46 +82,42 @@ class GeoObject {
      * @param {number} b - Blue.
      * @param {number} [a] - Alpha.
      */
-    public setColor(r: number, g: number, b: number, a?: number) {
+    setColor(r, g, b, a) {
         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 {Vec3 | Vec4} color - RGBA vector.
      */
-    public setColor4v(color: Vec3 | Vec4) {
+    setColor4v(color) {
         this._color.x = color.x;
         this._color.y = color.y;
         this._color.z = color.z;
-        (color as Vec4).w != undefined && (this._color.w = (color as Vec4).w);
-        this._handler && this._handler.setRgbaArr(this._tagData!, this._tagDataIndex, this._color);
+        color.w != undefined && (this._color.w = color.w);
+        this._handler && this._handler.setRgbaArr(this._tagData, this._tagDataIndex, this._color);
     }
-
     /**
      * Sets geo object visibility.
      * @public
      * @param {boolean} visibility - Visibility flag.
      */
-    public setVisibility(visibility: boolean) {
+    setVisibility(visibility) {
         this._visibility = visibility;
-        this._handler && this._handler.setVisibility(this._tagData!, this._tagDataIndex, visibility);
+        this._handler && this._handler.setVisibility(this._tagData, this._tagDataIndex, visibility);
     }
-
     /**
      * Returns geo object visibility.
      * @public
      * @returns {boolean}
      */
-    public getVisibility(): boolean {
+    getVisibility() {
         return this._visibility;
     }
-
     /**
      * Sets geo object position.
      * @public
@@ -220,80 +125,70 @@ class GeoObject {
      * @param {number} y - Y coordinate.
      * @param {number} z - Z coordinate.
      */
-    public setPosition(x: number, y: number, z: number) {
+    setPosition(x, y, z) {
         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 {Vec3} position - Cartesian coordinates.
      */
-    public setPosition3v(position: Vec3) {
+    setPosition3v(position) {
         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();
     }
-
-    public setYaw(yaw: number) {
+    setYaw(yaw) {
         this._yaw = yaw;
         this.updateDirection();
     }
-
-    public setPitch(pitch: number) {
+    setPitch(pitch) {
         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);
     }
-
-    public setRoll(roll: number) {
+    setRoll(roll) {
         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);
     }
-
-    public setScale(scale: number) {
+    setScale(scale) {
         this._scale = scale;
-        this._handler && this._handler.setScaleArr(this._tagData!, this._tagDataIndex, scale);
+        this._handler && this._handler.setScaleArr(this._tagData, this._tagDataIndex, scale);
     }
-
-    public getScale(): number {
+    getScale() {
         return this._scale;
     }
-
     /**
      * Removes geo object from handler.
      * @public
      */
-    public remove() {
+    remove() {
         this._entity = null;
         this._handler && this._handler.remove(this);
     }
-
     /**
      * Sets billboard picking color.
      * @public
      * @param {Vec3} color - Picking color.
      */
-    public setPickingColor3v(color: Vec3) {
-        this._handler && this._handler.setPickingColorArr(this._tagData!, this._tagDataIndex, color);
+    setPickingColor3v(color) {
+        this._handler && this._handler.setPickingColorArr(this._tagData, this._tagDataIndex, color);
     }
-
-    public updateDirection() {
+    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 };

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

@@ -0,0 +1,99 @@
+import { TypedArray } from "../utils/shared";
+import { EntityCollection } from "./EntityCollection";
+import { GeoObject } from "./GeoObject";
+import { Planet } from "../scene/Planet";
+import { Vec3 } from "../math/Vec3";
+import { Vec4 } from "../math/Vec4";
+import { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
+declare class InstanceData {
+    isFree: boolean;
+    _geoObjectHandler: GeoObjectHandler;
+    geoObjects: GeoObject[];
+    numInstances: number;
+    _texture: WebGLTextureExt | null;
+    _textureSrc: string | null;
+    _pitchRollArr: number[] | TypedArray;
+    _sizeArr: number[] | TypedArray;
+    _vertexArr: number[] | TypedArray;
+    _positionHighArr: number[] | TypedArray;
+    _positionLowArr: number[] | TypedArray;
+    _directionArr: number[] | TypedArray;
+    _rgbaArr: number[] | TypedArray;
+    _normalsArr: number[] | TypedArray;
+    _indicesArr: number[] | TypedArray;
+    _pickingColorArr: number[] | TypedArray;
+    _visibleArr: number[] | TypedArray;
+    _texCoordArr: number[] | TypedArray;
+    _pitchRollBuffer: WebGLBufferExt | null;
+    _sizeBuffer: WebGLBufferExt | null;
+    _vertexBuffer: WebGLBufferExt | null;
+    _positionHighBuffer: WebGLBufferExt | null;
+    _positionLowBuffer: WebGLBufferExt | null;
+    _directionBuffer: WebGLBufferExt | null;
+    _rgbaBuffer: WebGLBufferExt | null;
+    _normalsBuffer: WebGLBufferExt | null;
+    _indicesBuffer: WebGLBufferExt | null;
+    _pickingColorBuffer: WebGLBufferExt | null;
+    _visibleBuffer: WebGLBufferExt | null;
+    _texCoordBuffer: WebGLBufferExt | null;
+    _buffersUpdateCallbacks: Function[];
+    _changedBuffers: boolean[];
+    constructor(geoObjectHandler: GeoObjectHandler);
+    createTexture(image: HTMLCanvasElement | ImageBitmap | ImageData | HTMLImageElement): void;
+    clear(): void;
+    _deleteBuffers(): void;
+    createVertexBuffer(): void;
+    createPitchRollBuffer(): void;
+    createVisibleBuffer(): void;
+    createSizeBuffer(): void;
+    createTexCoordBuffer(): void;
+    createPositionBuffer(): void;
+    createRgbaBuffer(): void;
+    createDirectionBuffer(): void;
+    createNormalsBuffer(): void;
+    createIndicesBuffer(): void;
+    createPickingColorBuffer(): void;
+    refresh(): void;
+    update(): void;
+}
+declare class GeoObjectHandler {
+    static __counter__: number;
+    protected __id: number;
+    /**
+     * Picking rendering option.
+     * @public
+     * @type {boolean}
+     */
+    pickingEnabled: boolean;
+    protected _entityCollection: EntityCollection;
+    _planet: Planet | null;
+    protected _geoObjects: GeoObject[];
+    protected _instanceDataMap: Map<string, InstanceData>;
+    protected _instanceDataMapValues: InstanceData[];
+    protected _dataTagUpdateQueue: InstanceData[];
+    constructor(entityCollection: EntityCollection);
+    initProgram(): void;
+    setRenderNode(renderNode: Planet): void;
+    protected _addGeoObjectToArray(geoObject: GeoObject): void;
+    _displayPASS(): void;
+    drawPicking(): void;
+    protected _pickingPASS(): void;
+    _loadDataTagTexture(tagData: InstanceData): Promise<void>;
+    setDirectionArr(tagData: InstanceData, tagDataIndex: number, direction: Vec3): void;
+    setVisibility(tagData: InstanceData, tagDataIndex: number, visibility: boolean): void;
+    setPositionArr(tagData: InstanceData, tagDataIndex: number, positionHigh: Vec3, positionLow: Vec3): void;
+    setRgbaArr(tagData: InstanceData, tagDataIndex: number, rgba: Vec4): void;
+    setPickingColorArr(tagData: InstanceData, tagDataIndex: number, color: Vec3): void;
+    setPitchRollArr(tagData: InstanceData, tagDataIndex: number, pitch: number, roll: number): void;
+    setScaleArr(tagData: InstanceData, tagDataIndex: number, scale: number): void;
+    protected _updateTag(dataTag: InstanceData): void;
+    update(): void;
+    _removeAll(): void;
+    clear(): void;
+    draw(): void;
+    add(geoObject: GeoObject): void;
+    remove(geoObject: GeoObject): void;
+    _clearDataTagQueue(): void;
+    _removeGeoObject(geoObject: GeoObject): void;
+}
+export { GeoObjectHandler, InstanceData };