@openglobus/og 0.18.0 → 0.18.1

package/{src/camera/index.ts → lib/js/camera/index.d.ts}

@@ -1,4 +1,3 @@
 import { Camera } from './Camera';
 import { PlanetCamera } from './PlanetCamera';
-
 export { Camera, PlanetCamera };

package/lib/js/camera/index.js

@@ -0,0 +1,3 @@
+import { Camera } from './Camera';
+import { PlanetCamera } from './PlanetCamera';
+export { Camera, PlanetCamera };

package/lib/js/cons.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Console logging singleton object.
+ * @class
+ */
+export declare class Cons {
+    protected _container: HTMLElement;
+    protected _visibility: boolean;
+    constructor();
+    getVisibility(): boolean;
+    setVisibility(visibility: boolean): void;
+    /**
+     * Show console panel.
+     * @public
+     */
+    show(): void;
+    /**
+     * Hide console panel.
+     * @public
+     */
+    hide(): void;
+    /**
+     * Adds error text in the console.
+     * @public
+     * @param {string} str - Error text.
+     */
+    logErr(str: string): void;
+    /**
+     * Adds warning text in the console.
+     * @public
+     * @param {string} str - Warning text.
+     */
+    logWrn(str: string): void;
+    /**
+     * Adds log text in the console.
+     * @public
+     * @param {string} str - Log text.
+     */
+    log(str: string): void;
+}
+export declare const cons: Cons;

package/{src/cons.ts → lib/js/cons.js}

@@ -3,10 +3,6 @@
  * @class
  */
 export class Cons {
-
-    protected _container: HTMLElement;
-    protected _visibility: boolean;
-
     constructor() {
         this._container = document.createElement("div");
         this._container.classList.add("ogConsole");
@@ -14,30 +10,27 @@ export class Cons {
         if (document.body) {
             document.body.appendChild(this._container);
         }
-
         this._visibility = false;
     }
-
-    public getVisibility(): boolean {
+    getVisibility() {
         return this._visibility;
     }
-
-    public setVisibility(visibility: boolean) {
+    setVisibility(visibility) {
         if (this._visibility != visibility) {
             this._visibility = visibility;
             if (this._visibility) {
                 this.show();
-            } else {
+            }
+            else {
                 this.hide();
             }
         }
     }
-
     /**
      * Show console panel.
      * @public
      */
-    public show() {
+    show() {
         if (!this._container.parentNode) {
             if (document.body) {
                 document.body.appendChild(this._container);
@@ -46,22 +39,20 @@ export class Cons {
         this._container.style.display = "block";
         this._visibility = true;
     }
-
     /**
      * Hide console panel.
      * @public
      */
-    public hide() {
+    hide() {
         this._container.style.display = "none";
         this._visibility = false;
     }
-
     /**
      * Adds error text in the console.
      * @public
      * @param {string} str - Error text.
      */
-    public logErr(str: string) {
+    logErr(str) {
         let d = document.createElement("div");
         d.classList.add("ogConsole-text");
         d.classList.add("ogConsole-error");
@@ -70,13 +61,12 @@ export class Cons {
         this._container.appendChild(d);
         this.show();
     }
-
     /**
      * Adds warning text in the console.
      * @public
      * @param {string} str - Warning text.
      */
-    public logWrn(str: string) {
+    logWrn(str) {
         let d = document.createElement("div");
         d.classList.add("ogConsole-text");
         d.classList.add("ogConsole-warning");
@@ -85,13 +75,12 @@ export class Cons {
         this._container.appendChild(d);
         this.show();
     }
-
     /**
      * Adds log text in the console.
      * @public
      * @param {string} str - Log text.
      */
-    public log(str: string) {
+    log(str) {
         let d = document.createElement("div");
         d.classList.add("ogConsole-text");
         d.innerHTML = str;
@@ -100,5 +89,4 @@ export class Cons {
         this.show();
     }
 }
-
-export const cons = new Cons();
+export const cons = new Cons();

package/lib/js/control/Atmosphere.d.ts

@@ -0,0 +1,16 @@
+import { Framebuffer } from "../webgl/Framebuffer";
+import { Control, IControlParams } from "./Control";
+interface IAtmosphereParams extends IControlParams {
+}
+export declare class Atmosphere extends Control {
+    _transmittanceBuffer: Framebuffer | null;
+    _scatteringBuffer: Framebuffer | null;
+    opacity: number;
+    constructor(options?: IAtmosphereParams);
+    oninit(): void;
+    onactivate(): void;
+    ondeactivate(): void;
+    protected _drawAtmosphereTextures(): void;
+    protected _drawBackground(): void;
+}
+export {};

package/{src/control/Atmosphere.ts → lib/js/control/Atmosphere.js}

@@ -1,55 +1,37 @@
 import * as atmos from "../shaders/atmos";
-import {Framebuffer} from "../webgl/Framebuffer";
-import {Program} from '../webgl/Program';
-import {Control, IControlParams} from "./Control";
-
-interface IAtmosphereParams extends IControlParams {
-}
-
+import { Framebuffer } from "../webgl/Framebuffer";
+import { Program } from '../webgl/Program';
+import { Control } from "./Control";
 export class Atmosphere extends Control {
-    public _transmittanceBuffer: Framebuffer | null;
-    public _scatteringBuffer: Framebuffer | null;
-    public opacity: number;
-
-    constructor(options: IAtmosphereParams = {}) {
+    constructor(options = {}) {
         super({
             name: "Atmosphere",
             ...options
         });
-
         this._transmittanceBuffer = null;
         this._scatteringBuffer = null;
-
         this.opacity = 1.0;
     }
-
-    public override oninit() {
+    oninit() {
         if (this.renderer) {
             this.renderer.handler.addProgram(atmos.transmittance(), true);
             this.renderer.handler.addProgram(atmos.scattering(), true);
             this.renderer.handler.addProgram(atmosphereBackgroundShader(), true);
-
             this._drawAtmosphereTextures();
             this.activate();
         }
     }
-
-    public override onactivate() {
+    onactivate() {
         super.onactivate();
         this.planet && this.planet.events.on("draw", this._drawBackground, this);
     }
-
-    public override ondeactivate() {
+    ondeactivate() {
         super.ondeactivate();
         this.planet && this.planet.events.off("draw", this._drawBackground);
     }
-
-    protected _drawAtmosphereTextures() {
-
-        let width = 256,
-            height = 128;
-
-        this._transmittanceBuffer = new Framebuffer(this.renderer!.handler, {
+    _drawAtmosphereTextures() {
+        let width = 256, height = 128;
+        this._transmittanceBuffer = new Framebuffer(this.renderer.handler, {
             width: width,
             height: height,
             useDepth: false,
@@ -57,10 +39,8 @@ export class Atmosphere extends Control {
             type: "FLOAT",
             internalFormat: "RGBA16F"
         });
-
         this._transmittanceBuffer.init();
-
-        this._scatteringBuffer = new Framebuffer(this.renderer!.handler, {
+        this._scatteringBuffer = new Framebuffer(this.renderer.handler, {
             width: width,
             height: height,
             useDepth: false,
@@ -68,110 +48,79 @@ export class Atmosphere extends Control {
             type: "FLOAT",
             internalFormat: "RGBA16F"
         });
-
         this._scatteringBuffer.init();
-
-        let positionBuffer = this.renderer!.screenFramePositionBuffer;
-
-        let h = this.renderer!.handler;
-        let gl = h.gl!;
-
+        let positionBuffer = this.renderer.screenFramePositionBuffer;
+        let h = this.renderer.handler;
+        let gl = h.gl;
         //
         // Draw transmittance texture
         //
         this._transmittanceBuffer.activate();
-
         let p = h.programs.transmittance;
         let sha = p._program.attributes;
         let shu = p._program.uniforms;
         p.activate();
-
         gl.clearColor(0.0, 0.0, 0.0, 1.0);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
         gl.uniform2fv(shu.iResolution, [this._transmittanceBuffer.width, this._transmittanceBuffer.height]);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer!);
-        gl.vertexAttribPointer(sha.a_position, positionBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-        gl.drawArrays(gl.TRIANGLE_STRIP, 0, positionBuffer!.numItems);
-
+        gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
+        gl.vertexAttribPointer(sha.a_position, positionBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.drawArrays(gl.TRIANGLE_STRIP, 0, positionBuffer.numItems);
         this._transmittanceBuffer.deactivate();
-
         //
         // Draw scattering texture
         //
         this._scatteringBuffer.activate();
-
         p = h.programs.scattering;
         sha = p._program.attributes;
         shu = p._program.uniforms;
         p.activate();
-
         gl.clearColor(0.0, 0.0, 0.0, 1.0);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
         gl.uniform2fv(shu.iResolution, [this._scatteringBuffer.width, this._scatteringBuffer.height]);
-
         gl.activeTexture(gl.TEXTURE0);
         gl.bindTexture(gl.TEXTURE_2D, this._transmittanceBuffer.textures[0]);
         gl.uniform1i(shu.transmittanceTexture, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer!);
-        gl.vertexAttribPointer(sha.a_position, positionBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-        gl.drawArrays(gl.TRIANGLE_STRIP, 0, positionBuffer!.numItems);
-
+        gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
+        gl.vertexAttribPointer(sha.a_position, positionBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.drawArrays(gl.TRIANGLE_STRIP, 0, positionBuffer.numItems);
         this._scatteringBuffer.deactivate();
-
         //
         // remove shaders
         if (this._scatteringBuffer.isComplete()) {
             h.removeProgram("scattering");
         }
-
         if (this._transmittanceBuffer.isComplete()) {
             h.removeProgram("transmittance");
         }
     }
-
-    protected _drawBackground() {
-        let h = this.renderer!.handler;
-        let sh = h.programs.atmosphereBackground,
-            p = sh._program,
-            shu = p.uniforms,
-            gl = h.gl!;
-        let r = this.renderer!;
-        let cam = this.planet!.camera;
-
+    _drawBackground() {
+        let h = this.renderer.handler;
+        let sh = h.programs.atmosphereBackground, p = sh._program, shu = p.uniforms, gl = h.gl;
+        let r = this.renderer;
+        let cam = this.planet.camera;
         gl.disable(gl.DEPTH_TEST);
-
         sh.activate();
-        gl.bindBuffer(gl.ARRAY_BUFFER, r.screenFramePositionBuffer!);
+        gl.bindBuffer(gl.ARRAY_BUFFER, r.screenFramePositionBuffer);
         gl.vertexAttribPointer(p.attributes.corners, 2, gl.FLOAT, false, 0, 0);
-
         gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, this._transmittanceBuffer!.textures[0]);
+        gl.bindTexture(gl.TEXTURE_2D, this._transmittanceBuffer.textures[0]);
         gl.uniform1i(shu.transmittanceTexture, 0);
-
         gl.activeTexture(gl.TEXTURE1);
-        gl.bindTexture(gl.TEXTURE_2D, this._scatteringBuffer!.textures[0]);
+        gl.bindTexture(gl.TEXTURE_2D, this._scatteringBuffer.textures[0]);
         gl.uniform1i(shu.scatteringTexture, 1);
-
         gl.uniformMatrix4fv(shu.viewMatrix, false, cam.getViewMatrix());
-
-        let sunPos = this.planet!.sunPos;
+        let sunPos = this.planet.sunPos;
         gl.uniform3fv(shu.sunPos, [sunPos.x, sunPos.y, sunPos.z]);
         gl.uniform3fv(shu.camPos, [cam.eye.x, cam.eye.y, cam.eye.z]);
-        gl.uniform2fv(shu.iResolution, [r.sceneFramebuffer!.width, r.sceneFramebuffer!.height]);
+        gl.uniform2fv(shu.iResolution, [r.sceneFramebuffer.width, r.sceneFramebuffer.height]);
         gl.uniform1f(shu.fov, cam.getViewAngle());
         gl.uniform1f(shu.opacity, this.opacity);
-
         gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
-
         gl.enable(gl.DEPTH_TEST);
     }
 }
-
-function atmosphereBackgroundShader(): Program {
+function atmosphereBackgroundShader() {
     return new Program("atmosphereBackground", {
         uniforms: {
             iResolution: "vec2",
@@ -186,15 +135,13 @@ function atmosphereBackgroundShader(): Program {
         attributes: {
             corners: "vec3"
         },
-        vertexShader:
-            `            
+        vertexShader: `            
             attribute vec2 corners;
             
             void main(void) {
                 gl_Position = vec4(corners, 0.0, 1.0);
             }`,
-        fragmentShader:
-            `                                   
+        fragmentShader: `                                   
             precision highp float;
             
             ${atmos.COMMON}

package/lib/js/control/CompassButton.d.ts

@@ -0,0 +1,16 @@
+import { Control, IControlParams } from "./Control";
+interface ICompasButtonParams extends IControlParams {
+}
+/**
+ * Planet compass button
+ */
+export declare class CompassButton extends Control {
+    protected _heading: number;
+    protected _svg: HTMLElement | null;
+    constructor(options?: ICompasButtonParams);
+    oninit(): void;
+    protected _onClick(): void;
+    protected _draw(): void;
+    setHeading(heading: number): void;
+}
+export {};

package/{src/control/CompassButton.ts → lib/js/control/CompassButton.js}

@@ -1,6 +1,5 @@
-import {Button} from "../ui/Button";
-import {Control, IControlParams} from "./Control";
-
+import { Button } from "../ui/Button";
+import { Control } from "./Control";
 const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -76,68 +75,44 @@ const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     </g>
   </g>
 </svg>`;
-
-interface ICompasButtonParams extends IControlParams {
-
-}
-
 /**
  * Planet compass button
  */
 export class CompassButton extends Control {
-    protected _heading: number;
-    protected _svg: HTMLElement | null;
-
-    constructor(options: ICompasButtonParams = {}) {
+    constructor(options = {}) {
         super(options);
         this._heading = 0;
         this._svg = null;
     }
-
-    public override oninit() {
-
+    oninit() {
         let btn = new Button({
             classList: ["og-map-button", "og-compass-button"],
             icon: ICON_BUTTON_SVG
         });
-
-        btn.appendTo(this.renderer!.div!);
-
+        btn.appendTo(this.renderer.div);
         btn.events.on("click", this._onClick, this);
-
         this._svg = btn.select("svg");
-
-        this.renderer!.events!.on("draw", this._draw, this);
+        this.renderer.events.on("draw", this._draw, this);
     }
-
-    protected _onClick() {
-        const planet = this.planet!;
-        let c = planet.getCartesianFromPixelTerrain(this.renderer!.handler!.getCenter());
+    _onClick() {
+        const planet = this.planet;
+        let c = planet.getCartesianFromPixelTerrain(this.renderer.handler.getCenter());
         if (c) {
-            planet.flyCartesian(
-                c.normal().scaleTo(c.length() + c.distance(planet.camera.eye)),
-                null,
-                null,
-                0,
-                null,
-                null,
-                () => {
-                    planet.camera.look(c!);
-                }
-            );
-        } else {
+            planet.flyCartesian(c.normal().scaleTo(c.length() + c.distance(planet.camera.eye)), null, null, 0, null, null, () => {
+                planet.camera.look(c);
+            });
+        }
+        else {
             planet.flyCartesian(planet.camera.eye);
         }
     }
-
-    protected _draw() {
-        this.setHeading(this.planet!.camera.getHeading());
+    _draw() {
+        this.setHeading(this.planet.camera.getHeading());
     }
-
-    public setHeading(heading: number) {
+    setHeading(heading) {
         if (this._heading !== heading) {
             this._heading = heading;
-            this._svg!.style.transform = `rotateZ(${-heading}deg)`;
+            this._svg.style.transform = `rotateZ(${-heading}deg)`;
         }
     }
 }

package/lib/js/control/Control.d.ts

@@ -0,0 +1,100 @@
+import { Planet, Renderer } from "../index";
+export interface IControlParams {
+    name?: string;
+    autoActivate?: boolean;
+}
+/**
+ * Base control class. All other controls extend from this class.
+ * @class Control
+ * @param {Boolean} [options.autoActivate=true] - If true - calls initialize function after the renderer assigning.
+ */
+export declare class Control {
+    static __counter__: number;
+    protected __id: number;
+    protected _name: string;
+    /**
+     * Control activity.
+     * @protected
+     * @type {boolean}
+     */
+    protected _active: boolean;
+    /**
+     * Control initialized.
+     * @protected
+     * @type {boolean}
+     */
+    protected _initialized: boolean;
+    planet: Planet | null;
+    /**
+     * Assigned renderer.
+     * @public
+     * @type {Renderer}
+     */
+    renderer: Renderer | null;
+    /**
+     * Auto activation flag.
+     * @public
+     * @type {boolean}
+     */
+    autoActivate: boolean;
+    protected _deferredActive: boolean;
+    constructor(options?: IControlParams);
+    /**
+     * Returns control name.
+     * @public
+     * @return {string} -
+     */
+    get name(): string;
+    /**
+     * Control initialization function have to be overridden.
+     * @public
+     */
+    oninit(): void;
+    /**
+     * Control renderer assigning function have to be overridden.
+     * @public
+     */
+    onadd(): void;
+    /**
+     * Control remove function have to be overridden.
+     * @public
+     */
+    onremove(): void;
+    /**
+     * Control activation function have to be overridden.
+     * @public
+     */
+    onactivate(): void;
+    /**
+     * Control deactivation function have to be overriden.
+     * @public
+     */
+    ondeactivate(): void;
+    /**
+     * Assign renderer to the control.
+     * @public
+     * @type {Renderer}
+     */
+    addTo(renderer: Renderer): void;
+    /**
+     * Removes control.
+     * @public
+     */
+    remove(): void;
+    /**
+     * Activate control.
+     * @public
+     */
+    activate(): void;
+    /**
+     * Deactivate control.
+     * @public
+     */
+    deactivate(): void;
+    /**
+     * Is control active.
+     * @public
+     */
+    isActive(): boolean;
+    isEqual(control: Control): boolean;
+}