@openglobus/og 0.18.0 → 0.18.1

package/lib/js/scene/RenderNode.d.ts

@@ -0,0 +1,150 @@
+import { BaseNode } from "./BaseNode";
+import { Renderer } from "../renderer/Renderer";
+import { LightSource } from "../light/LightSource";
+import { EntityCollection } from "../entity/EntityCollection";
+/**
+ * Render node is a logical part of a render mechanism. Represents scene rendering.
+ * For example one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
+ * Each render node has own model view space defined with matrices(scale, rotation, translation, transformation).
+ * There are collections of light sources, entities and so on in the node.
+ * Access to the node is renderer.renderNodes["Earth"]
+ * @class
+ * @extends {BaseNode}
+ * @param {string} name - Node name.
+ */
+declare class RenderNode extends BaseNode {
+    /**
+     * Renderer that calls frame() callback.
+     * @public
+     * @type {Renderer}
+     */
+    renderer: Renderer | null;
+    drawMode: number;
+    /** Show rendering.
+     * @public
+     */
+    show: boolean;
+    protected _isActive: boolean;
+    childNodes: RenderNode[];
+    /**
+     * Lighting calculations.
+     * @public
+     * @type {boolean}
+     */
+    lightEnabled: boolean;
+    /**
+     * Point light array.
+     * @public
+     * @type {Array.<LightSource>}
+     */
+    _lights: LightSource[];
+    _lightsNames: string[];
+    _lightsPositions: number[];
+    _lightsParamsv: number[];
+    _lightsParamsf: number[];
+    /**
+     * Entity collection array.
+     * @public
+     * @type {Array.<EntityCollection>}
+     */
+    entityCollections: EntityCollection[];
+    protected _pickingId: number;
+    constructor(name?: string);
+    /**
+     * Adds node to the current hierarchy.
+     * @public
+     * @type {RenderNode}
+     */
+    addNode(node: RenderNode): void;
+    /**
+     * Assign render node with renderer.
+     * @public
+     * @param {Renderer} renderer - Render node's renderer.
+     */
+    assign(renderer: Renderer): void;
+    initialize(): void;
+    init(): void;
+    onremove(): void;
+    remove(): void;
+    /**
+     * Adds entity collection.
+     * @public
+     * @param {EntityCollection} entityCollection - Entity collection.
+     * @param {boolean} [isHidden] - If it's true that this collection has specific rendering.
+     * @returns {RenderNode} -
+     */
+    addEntityCollection(entityCollection: EntityCollection, isHidden?: boolean): RenderNode;
+    /**
+     * Removes entity collection.
+     * @public
+     * @param {EntityCollection} entityCollection - Entity collection for remove.
+     */
+    removeEntityCollection(entityCollection: EntityCollection): void;
+    /**
+     * Adds point light source.
+     * @public
+     * @param {LightSource} light - Light source.
+     * @returns {RenderNode}
+     */
+    addLight(light: LightSource): RenderNode;
+    /**
+     * Gets light object by its name.
+     * @public
+     * @param {string} name - Point light name.
+     * @returns {LightSource}
+     */
+    getLightByName(name: string): LightSource | undefined;
+    /**
+     * Removes light source.
+     * @public
+     * @param {LightSource} light - Light source object.
+     */
+    removeLight(light: LightSource): void;
+    /**
+     * Calls render frame node's callback. Used in renderer.
+     * @public
+     */
+    preDrawNode(): void;
+    /**
+     * Calls render frame node's callback. Used in renderer.
+     * @public
+     */
+    drawNode(): void;
+    /**
+     * Gets render node activity.
+     * @public
+     * @returns {Boolean} -
+     */
+    isActive(): boolean;
+    /**
+     * Rendering activation.
+     * @public
+     * @param {boolean} isActive - Activation flag.
+     */
+    setActive(isActive: boolean): void;
+    /**
+     * Sets draw mode
+     * @public
+     * @param {Number} mode - Draw mode, such as gl.TRIANGLES, gl.TRIANGLE_STRIP, gl.LINES etc.
+     */
+    setDrawMode(mode: number): void;
+    /**
+     * IMPORTANT: This function have to be called manually in each render node frame callback, before drawing scene geometry.
+     * @public
+     */
+    transformLights(): void;
+    updateBillboardsTexCoords(): void;
+    frame(): void;
+    preFrame(): void;
+    protected _preDrawNodes(): void;
+    protected _drawNodes(): void;
+    drawEntityCollections(ec: EntityCollection[]): void;
+    /**
+     * Draw entity collections picking frame.
+     * @public
+     * @param {Array<EntityCollection>} ec - Entity collection array.
+     */
+    drawPickingEntityCollections(ec: EntityCollection[]): void;
+    protected _entityCollectionPickingCallback(): void;
+}
+export { RenderNode };

package/{src/scene/RenderNode.ts → lib/js/scene/RenderNode.js}

@@ -1,8 +1,4 @@
-import {BaseNode} from "./BaseNode";
-import {Renderer} from "../renderer/Renderer";
-import {LightSource} from "../light/LightSource";
-import {EntityCollection} from "../entity/EntityCollection";
-
+import { BaseNode } from "./BaseNode";
 /**
  * Render node is a logical part of a render mechanism. Represents scene rendering.
  * For example one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
@@ -13,102 +9,43 @@ import {EntityCollection} from "../entity/EntityCollection";
  * @extends {BaseNode}
  * @param {string} name - Node name.
  */
-
 class RenderNode extends BaseNode {
-
-    /**
-     * Renderer that calls frame() callback.
-     * @public
-     * @type {Renderer}
-     */
-    public renderer: Renderer | null;
-
-    public drawMode: number;
-
-    /** Show rendering.
-     * @public
-     */
-    public show: boolean;
-
-    protected _isActive: boolean;
-
-    public override childNodes: RenderNode[];
-
-    /**
-     * Lighting calculations.
-     * @public
-     * @type {boolean}
-     */
-    public lightEnabled: boolean;
-
-    /**
-     * Point light array.
-     * @public
-     * @type {Array.<LightSource>}
-     */
-    public _lights: LightSource[];
-    public _lightsNames: string[];
-    public _lightsPositions: number[];
-    public _lightsParamsv: number[];
-    public _lightsParamsf: number[];
-
-    /**
-     * Entity collection array.
-     * @public
-     * @type {Array.<EntityCollection>}
-     */
-    public entityCollections: EntityCollection[];
-
-    protected _pickingId: number;
-
-    constructor(name?: string) {
+    constructor(name) {
         super(name);
-
         this.childNodes = [];
-
         this.renderer = null;
-
         this.drawMode = 0;
-
         this.show = true;
-
         this._isActive = true;
-
         this.lightEnabled = false;
-
         this._lights = [];
         this._lightsNames = [];
         this._lightsPositions = [];
         this._lightsParamsv = [];
         this._lightsParamsf = [];
-
         this.entityCollections = [];
-
         this._pickingId = -1;
     }
-
     /**
      * Adds node to the current hierarchy.
      * @public
      * @type {RenderNode}
      */
-    public override addNode(node: RenderNode) {
+    addNode(node) {
         super.addNode(node);
         this.renderer && node.assign(this.renderer);
     }
-
     /**
      * Assign render node with renderer.
      * @public
      * @param {Renderer} renderer - Render node's renderer.
      */
-    public assign(renderer: Renderer) {
+    assign(renderer) {
         this.renderer = renderer;
         this._pickingId = renderer.addPickingCallback(this, this._entityCollectionPickingCallback);
         this.initialize();
     }
-
-    public initialize() {
+    initialize() {
         if (this.renderer && this.renderer.isInitialized()) {
             for (let i = 0; i < this.entityCollections.length; i++) {
                 this.entityCollections[i].bindRenderNode(this);
@@ -116,19 +53,14 @@ class RenderNode extends BaseNode {
             this.init();
         }
     }
-
-    public init() {
+    init() {
         //virtual
     }
-
-    public onremove() {
+    onremove() {
         //virtual
     }
-
-    public remove() {
-        let r = this.renderer,
-            n = this.name;
-
+    remove() {
+        let r = this.renderer, n = this.name;
         if (r) {
             // TODO: replace to renderer
             if (r.renderNodes[n] && r.renderNodes[n].isEqual(this)) {
@@ -136,7 +68,6 @@ class RenderNode extends BaseNode {
                 r.renderNodes[n] = null;
                 delete r.renderNodes[n];
             }
-
             for (let i = 0; i < r._renderNodesArr.length; i++) {
                 if (r._renderNodesArr[i].isEqual(this)) {
                     r._renderNodesArr.splice(i, 1);
@@ -148,7 +79,6 @@ class RenderNode extends BaseNode {
             this.onremove && this.onremove();
         }
     }
-
     /**
      * Adds entity collection.
      * @public
@@ -156,121 +86,106 @@ class RenderNode extends BaseNode {
      * @param {boolean} [isHidden] - If it's true that this collection has specific rendering.
      * @returns {RenderNode} -
      */
-    public addEntityCollection(entityCollection: EntityCollection, isHidden?: boolean): RenderNode {
+    addEntityCollection(entityCollection, isHidden) {
         entityCollection.addTo(this, isHidden);
         return this;
     }
-
     /**
      * Removes entity collection.
      * @public
      * @param {EntityCollection} entityCollection - Entity collection for remove.
      */
-    public removeEntityCollection(entityCollection: EntityCollection) {
+    removeEntityCollection(entityCollection) {
         entityCollection.remove();
     }
-
     /**
      * Adds point light source.
      * @public
      * @param {LightSource} light - Light source.
      * @returns {RenderNode}
      */
-    public addLight(light: LightSource): RenderNode {
+    addLight(light) {
         light.addTo(this);
         return this;
     }
-
     /**
      * Gets light object by its name.
      * @public
      * @param {string} name - Point light name.
      * @returns {LightSource}
      */
-    public getLightByName(name: string): LightSource | undefined {
+    getLightByName(name) {
         let li = this._lightsNames.indexOf(name);
         return this._lights[li];
     }
-
     /**
      * Removes light source.
      * @public
      * @param {LightSource} light - Light source object.
      */
-    public removeLight(light: LightSource) {
+    removeLight(light) {
         light.remove();
     }
-
     /**
      * Calls render frame node's callback. Used in renderer.
      * @public
      */
-    public preDrawNode() {
+    preDrawNode() {
         this._isActive && this._preDrawNodes();
     }
-
-
     /**
      * Calls render frame node's callback. Used in renderer.
      * @public
      */
-    public drawNode() {
+    drawNode() {
         this._isActive && this._drawNodes();
     }
-
     /**
      * Gets render node activity.
      * @public
      * @returns {Boolean} -
      */
-    public isActive(): boolean {
+    isActive() {
         return this._isActive;
     }
-
     /**
      * Rendering activation.
      * @public
      * @param {boolean} isActive - Activation flag.
      */
-    public setActive(isActive: boolean) {
+    setActive(isActive) {
         this._isActive = isActive;
-
         if (this.renderer) {
             if (this._isActive && this._pickingId === -1) {
                 // This picking callback MUST be the first picking callback
                 // in the rendering queue in the renderer. It affects on blending.
-                this._pickingId = this.renderer.addPickingCallback(
-                    this,
-                    this._entityCollectionPickingCallback
-                );
-            } else if (!this._isActive && this._pickingId !== -1) {
+                this._pickingId = this.renderer.addPickingCallback(this, this._entityCollectionPickingCallback);
+            }
+            else if (!this._isActive && this._pickingId !== -1) {
                 this.renderer.removePickingCallback(this._pickingId);
                 this._pickingId = -1;
             }
         }
-
         for (let i = 0; i < this.childNodes.length; i++) {
             this.childNodes[i].setActive(isActive);
         }
     }
-
     /**
      * Sets draw mode
      * @public
      * @param {Number} mode - Draw mode, such as gl.TRIANGLES, gl.TRIANGLE_STRIP, gl.LINES etc.
      */
-    public setDrawMode(mode: number) {
+    setDrawMode(mode) {
         this.drawMode = mode;
         for (let i = 0; i < this.childNodes.length; i++) {
             this.childNodes[i].setDrawMode(mode);
         }
     }
-
     /**
      * IMPORTANT: This function have to be called manually in each render node frame callback, before drawing scene geometry.
      * @public
      */
-    public transformLights() {
+    transformLights() {
         for (let i = 0; i < this._lights.length; i++) {
             let ii = i * 3;
             let tp;
@@ -279,7 +194,6 @@ class RenderNode extends BaseNode {
             this._lightsPositions[ii + 1] = tp.y;
             this._lightsPositions[ii + 2] = tp.z;
         }
-
         // for (let i = 0; i < this._lights.length; i++) {
         //     var ii = i * 4;
         //     var tp;
@@ -295,101 +209,84 @@ class RenderNode extends BaseNode {
         //     this._lightsTransformedPositions[ii + 2] = tp.z;
         // }
     }
-
-    public updateBillboardsTexCoords() {
+    updateBillboardsTexCoords() {
         for (let i = 0; i < this.entityCollections.length; i++) {
             this.entityCollections[i].billboardHandler.refreshTexCoordsArr();
         }
     }
-
     // public updateGeoObjectsTexCoords() {
     //     for (let i = 0; i < this.entityCollections.length; i++) {
     //         this.entityCollections[i].geoObjectHandler.refreshTexCoordsArr();
     //     }
     // }
-
-    public frame() {
+    frame() {
         // virtual
     }
-
-    public preFrame() {
+    preFrame() {
         // virtual
     }
-
-    protected _preDrawNodes() {
+    _preDrawNodes() {
         for (let i = 0; i < this.childNodes.length; i++) {
             if (this.childNodes[i]._isActive) {
                 this.childNodes[i]._preDrawNodes();
             }
         }
-
         if (this.show) {
             //this.lightEnabled && this.transformLights();
             this.preFrame();
             this.drawEntityCollections(this.entityCollections);
         }
     }
-
-    protected _drawNodes() {
+    _drawNodes() {
         for (let i = 0; i < this.childNodes.length; i++) {
             if (this.childNodes[i]._isActive) {
                 this.childNodes[i]._drawNodes();
             }
         }
-
         if (this.show) {
             this.frame();
         }
     }
-
-    public drawEntityCollections(ec: EntityCollection[]) {
-        this.renderer!.enqueueEntityCollectionsToDraw(ec);
+    drawEntityCollections(ec) {
+        this.renderer.enqueueEntityCollectionsToDraw(ec);
     }
-
     /**
      * Draw entity collections picking frame.
      * @public
      * @param {Array<EntityCollection>} ec - Entity collection array.
      */
-    public drawPickingEntityCollections(ec: EntityCollection[]) {
+    drawPickingEntityCollections(ec) {
         if (ec.length) {
-
             // billboard pass
             let i = ec.length;
             while (i--) {
                 ec[i]._fadingOpacity && ec[i].billboardHandler.drawPicking();
             }
-
             // geoObject pass
             i = ec.length;
             while (i--) {
                 ec[i]._fadingOpacity && ec[i].geoObjectHandler.drawPicking();
             }
-
             // label pass
             i = ec.length;
             while (i--) {
                 ec[i]._fadingOpacity && ec[i].labelHandler.drawPicking();
             }
-
             // ray pass
             i = ec.length;
             while (i--) {
                 ec[i]._fadingOpacity && ec[i].rayHandler.drawPicking();
             }
-
             // polyline pass
             i = ec.length;
             while (i--) {
                 ec[i]._visibility && ec[i].polylineHandler.drawPicking();
             }
-
             //Strip pass
             i = ec.length;
             while (i--) {
                 ec[i]._visibility && ec[i].stripHandler.drawPicking();
             }
-
             // //pointClouds pass
             // i = ec.length;
             // while (i--) {
@@ -397,10 +294,8 @@ class RenderNode extends BaseNode {
             // }
         }
     }
-
-    protected _entityCollectionPickingCallback() {
+    _entityCollectionPickingCallback() {
         this.drawPickingEntityCollections(this.entityCollections);
     }
 }
-
-export {RenderNode};
+export { RenderNode };

package/lib/js/scene/SkyBox.d.ts

@@ -0,0 +1,13 @@
+import { RenderNode } from './RenderNode';
+import { WebGLBufferExt, WebGLTextureExt, Texture3DParams } from "../webgl/Handler";
+declare class SkyBox extends RenderNode {
+    params: Texture3DParams;
+    vertexPositionBuffer: WebGLBufferExt | null;
+    texture: WebGLTextureExt | null;
+    constructor(params: Texture3DParams);
+    static createDefault(RESOURCES_URL: string): SkyBox;
+    init(): void;
+    frame(): void;
+    protected _createBuffers(): void;
+}
+export { SkyBox };