@openglobus/og 0.17.1 → 0.18.0

package/src/camera/index.ts

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

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

@@ -1,10 +1,12 @@
-'use strict';
-
 /**
  * Console logging singleton object.
  * @class
  */
 export class Cons {
+
+    protected _container: HTMLElement;
+    protected _visibility: boolean;
+
     constructor() {
         this._container = document.createElement("div");
         this._container.classList.add("ogConsole");
@@ -16,11 +18,11 @@ export class Cons {
         this._visibility = false;
     }
 
-    getVisibility() {
+    public getVisibility(): boolean {
         return this._visibility;
     }
 
-    setVisibility(visibility) {
+    public setVisibility(visibility: boolean) {
         if (this._visibility != visibility) {
             this._visibility = visibility;
             if (this._visibility) {
@@ -35,7 +37,7 @@ export class Cons {
      * Show console panel.
      * @public
      */
-    show() {
+    public show() {
         if (!this._container.parentNode) {
             if (document.body) {
                 document.body.appendChild(this._container);
@@ -49,7 +51,7 @@ export class Cons {
      * Hide console panel.
      * @public
      */
-    hide() {
+    public hide() {
         this._container.style.display = "none";
         this._visibility = false;
     }
@@ -59,8 +61,8 @@ export class Cons {
      * @public
      * @param {string} str - Error text.
      */
-    logErr(str) {
-        var d = document.createElement("div");
+    public logErr(str: string) {
+        let d = document.createElement("div");
         d.classList.add("ogConsole-text");
         d.classList.add("ogConsole-error");
         d.innerHTML = "error: " + str;
@@ -74,8 +76,8 @@ export class Cons {
      * @public
      * @param {string} str - Warning text.
      */
-    logWrn(str) {
-        var d = document.createElement("div");
+    public logWrn(str: string) {
+        let d = document.createElement("div");
         d.classList.add("ogConsole-text");
         d.classList.add("ogConsole-warning");
         d.innerHTML = "warning: " + str;
@@ -88,16 +90,10 @@ export class Cons {
      * Adds log text in the console.
      * @public
      * @param {string} str - Log text.
-     * @param {Object} [style] - HTML style.
      */
-    log(str, style) {
-        var d = document.createElement("div");
+    public log(str: string) {
+        let d = document.createElement("div");
         d.classList.add("ogConsole-text");
-        if (style) {
-            for (let s in style) {
-                d.style[s] = style[s];
-            }
-        }
         d.innerHTML = str;
         console.trace(str);
         this._container.appendChild(d);

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

@@ -1,18 +1,17 @@
-"use strict";
-
-import * as atmos from "../shaders/atmos.js";
-import { Framebuffer } from "../webgl/index.js";
-import { Program } from '../webgl/Program.js';
-import { Control } from "./Control.js";
-
-/**
- * Frame per second(FPS) display control.
- * @class
- * @extends {Control}
- * @param {Object} [options] - Control options.
- */
-class Atmosphere extends Control {
-    constructor(options) {
+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 {
+}
+
+export class Atmosphere extends Control {
+    public _transmittanceBuffer: Framebuffer | null;
+    public _scatteringBuffer: Framebuffer | null;
+    public opacity: number;
+
+    constructor(options: IAtmosphereParams = {}) {
         super({
             name: "Atmosphere",
             ...options
@@ -24,32 +23,33 @@ class Atmosphere extends Control {
         this.opacity = 1.0;
     }
 
-    oninit() {
-        this.renderer.handler.addProgram(atmos.transmittance(), true);
-        this.renderer.handler.addProgram(atmos.scattering(), true);
-        this.renderer.handler.addProgram(atmosphereBackgroundShader(), true);
+    public override 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();
+            this._drawAtmosphereTextures();
+            this.activate();
+        }
     }
 
-    onactivate() {
+    public override onactivate() {
         super.onactivate();
-        this.planet.events.on("draw", this._drawBackground, this);
+        this.planet && this.planet.events.on("draw", this._drawBackground, this);
     }
 
-    ondeactivate() {
+    public override ondeactivate() {
         super.ondeactivate();
-        this.planet.events.off("draw", this._drawBackground);
+        this.planet && this.planet.events.off("draw", this._drawBackground);
     }
 
-    _drawAtmosphereTextures() {
+    protected _drawAtmosphereTextures() {
 
         let width = 256,
             height = 128;
 
-        this._transmittanceBuffer = new Framebuffer(this.renderer.handler, {
+        this._transmittanceBuffer = new Framebuffer(this.renderer!.handler, {
             width: width,
             height: height,
             useDepth: false,
@@ -60,7 +60,7 @@ class Atmosphere extends Control {
 
         this._transmittanceBuffer.init();
 
-        this._scatteringBuffer = new Framebuffer(this.renderer.handler, {
+        this._scatteringBuffer = new Framebuffer(this.renderer!.handler, {
             width: width,
             height: height,
             useDepth: false,
@@ -71,10 +71,10 @@ class Atmosphere extends Control {
 
         this._scatteringBuffer.init();
 
-        let positionBuffer = this.renderer.screenFramePositionBuffer;
+        let positionBuffer = this.renderer!.screenFramePositionBuffer;
 
-        let h = this.renderer.handler;
-        let gl = h.gl;
+        let h = this.renderer!.handler;
+        let gl = h.gl!;
 
         //
         // Draw transmittance texture
@@ -91,9 +91,9 @@ class Atmosphere extends Control {
 
         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();
 
@@ -116,9 +116,9 @@ class Atmosphere extends Control {
         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();
 
@@ -133,33 +133,35 @@ class Atmosphere extends Control {
         }
     }
 
-    _drawBackground() {
-        let h = this.renderer.handler;
+    protected _drawBackground() {
+        let h = this.renderer!.handler;
         let sh = h.programs.atmosphereBackground,
             p = sh._program,
-            shu = p.uniforms, gl = h.gl;
-        let cam = this.renderer.activeCamera;
+            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, this.renderer.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, [this.renderer.sceneFramebuffer.width, this.renderer.sceneFramebuffer.height]);
+        gl.uniform2fv(shu.iResolution, [r.sceneFramebuffer!.width, r.sceneFramebuffer!.height]);
         gl.uniform1f(shu.fov, cam.getViewAngle());
         gl.uniform1f(shu.opacity, this.opacity);
 
@@ -169,7 +171,7 @@ class Atmosphere extends Control {
     }
 }
 
-function atmosphereBackgroundShader() {
+function atmosphereBackgroundShader(): Program {
     return new Program("atmosphereBackground", {
         uniforms: {
             iResolution: "vec2",
@@ -383,5 +385,3 @@ function atmosphereBackgroundShader() {
             }`
     });
 }
-
-export { Atmosphere };

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

@@ -1,7 +1,5 @@
-"use strict";
-
-import { Button } from "../ui/Button.js";
-import { Control } from "./Control.js";
+import {Button} from "../ui/Button";
+import {Control, IControlParams} from "./Control";
 
 const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
@@ -79,68 +77,67 @@ const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
   </g>
 </svg>`;
 
+interface ICompasButtonParams extends IControlParams {
+
+}
+
 /**
  * Planet compass button
- * @class
- * @extends {Control}
- * @params {Object} [options] - Control options.
  */
-class CompassButton extends Control {
-    constructor(options = {}) {
+export class CompassButton extends Control {
+    protected _heading: number;
+    protected _svg: HTMLElement | null;
+
+    constructor(options: ICompasButtonParams = {}) {
         super(options);
-        this._heading = null;
+        this._heading = 0;
         this._svg = null;
     }
 
-    oninit() {
+    public override 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.on("click", this._onClick, this);
+        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);
     }
 
-    _onClick() {
-        let c = this.planet.getCartesianFromPixelTerrain(this.renderer.handler.getCenter());
+    protected _onClick() {
+        const planet = this.planet!;
+        let c = planet.getCartesianFromPixelTerrain(this.renderer!.handler!.getCenter());
         if (c) {
-            this.planet.flyCartesian(
-                c.normal().scaleTo(c.length() + c.distance(this.planet.camera.eye)),
+            planet.flyCartesian(
+                c.normal().scaleTo(c.length() + c.distance(planet.camera.eye)),
                 null,
                 null,
                 0,
                 null,
                 null,
                 () => {
-                    this.planet.camera.look(c);
+                    planet.camera.look(c!);
                 }
             );
         } else {
-            this.planet.flyCartesian(this.planet.camera.eye);
+            planet.flyCartesian(planet.camera.eye);
         }
     }
 
-    _draw(e) {
-        this.setHeading(e.activeCamera.getHeading());
+    protected _draw() {
+        this.setHeading(this.planet!.camera.getHeading());
     }
 
-    setHeading(heading) {
+    public setHeading(heading: number) {
         if (this._heading !== heading) {
             this._heading = heading;
-            this._svg.style.transform = `rotateZ(${-heading}deg)`;
+            this._svg!.style.transform = `rotateZ(${-heading}deg)`;
         }
     }
 }
-
-export function compassButton(options) {
-    return new CompassButton(options);
-}
-
-export { CompassButton };

package/src/{og/control/Control.js → control/Control.ts}

@@ -1,110 +1,113 @@
-"use strict";
+import {Planet, Renderer} from "../index";
+
+export interface IControlParams {
+    name?: string;
+    autoActivate?: boolean
+}
 
 /**
- * Base control class for implementing renderer controls.
- * All other controls extend from this class.
- * @class
- * @param {Object} [options] - Control activation options:
+ * Base control class. All other controls extend from this class.
+ * @class Control
  * @param {Boolean} [options.autoActivated=true] - If true - calls initialize function after the renderer assigning.
  */
-class Control {
+export class Control {
+    static __counter__: number = 0;
+    protected __id: number;
+    protected _name: string;
+
+    /**
+     * Control activity.
+     * @protected
+     * @type {boolean}
+     */
+    protected _active: boolean;
+
+    /**
+     * Control initialized.
+     * @protected
+     * @type {boolean}
+     */
+    protected _initialized: boolean;
+
+    public planet: Planet | null;
+
+    /**
+     * Assigned renderer.
+     * @public
+     * @type {Renderer}
+     */
+    public renderer: Renderer | null;
+
     /**
-     * @param {Object} [options] - Control activation options:
+     * Auto activation flag.
+     * @public
+     * @type {boolean}
      */
-    constructor(options) {
-        options = options || {};
+    public autoActivate: boolean;
+
+    protected _deferredActive: boolean;
 
-        this._id = Control.__staticCounter++;
+    constructor(options: IControlParams = {}) {
 
-        this._name = options.name || "_control_" + this._id;
+        this.__id = Control.__counter__++;
+
+        this._name = options.name || `_control_${this.__id.toString()}`;
+
+        this.planet = null;
 
-        /**
-         * Control initialized.
-         * @protected
-         * @type {Boolean}
-         */
         this._initialized = false;
 
-        /**
-         * Assigned renderer.
-         * @public
-         * @type {Renderer}
-         */
         this.renderer = null;
 
-        /**
-         * Auto activation flag.
-         * @public
-         * @type {Boolean}
-         */
         this.autoActivate = options.autoActivate || false;
 
-        /**
-         * Control activity.
-         * @protected
-         * @type {Boolean}
-         */
         this._active = false;
-    }
 
-    static get __staticCounter() {
-        if (!this.__counter && this.__counter !== 0) {
-            this.__counter = 0;
-        }
-        return this.__counter;
-    }
-
-    static set __staticCounter(n) {
-        this.__counter = n;
+        this._deferredActive = true;
     }
 
     /**
      * Returns control name.
      * @public
-     * @virtual
+     * @return {string} -
      */
-    get name() {
+    public get name(): string {
         return this._name;
     }
 
     /**
-     * Control initialization function have to be overriden.
+     * Control initialization function have to be overridden.
      * @public
-     * @virtual
      */
-    oninit() {
+    public oninit() {
     }
 
     /**
-     * Control renderer assigning function have to be overriden.
+     * Control renderer assigning function have to be overridden.
      * @public
-     * @virtual
      */
-    onadd() {
+    public onadd() {
     }
 
     /**
-     * Control remove function have to be overriden.
+     * Control remove function have to be overridden.
      * @public
-     * @virtual
      */
-    onremove() {
+    public onremove() {
     }
 
     /**
-     * Control activation function have to be overriden.
+     * Control activation function have to be overridden.
      * @public
-     * @virtual
      */
-    onactivate() {
+    public onactivate() {
     }
 
     /**
      * Control deactivation function have to be overriden.
      * @public
-     * @virtual
      */
-    ondeactivate() {
+    public ondeactivate() {
     }
 
     /**
@@ -112,7 +115,7 @@ class Control {
      * @public
      * @type {Renderer}
      */
-    addTo(renderer) {
+    public addTo(renderer: Renderer) {
         if (renderer) {
             this.renderer = renderer;
             renderer.controls[this.name] = this;
@@ -128,10 +131,10 @@ class Control {
     }
 
     /**
-     * Assign renderer to the control.
+     * Removes control.
      * @public
      */
-    remove() {
+    public remove() {
 
         this.deactivate();
 
@@ -146,7 +149,6 @@ class Control {
 
         if (c) {
             if (this.isEqual(c)) {
-                r.controls[n] = null;
                 delete r.controls[n];
             }
         }
@@ -160,14 +162,18 @@ class Control {
      * Activate control.
      * @public
      */
-    activate() {
+    public activate() {
         if (!this._active) {
             if (!this._initialized) {
                 this._initialized = true;
                 this.oninit && this.oninit();
             }
-            this._active = true;
-            this.onactivate && this.onactivate();
+            if (this._deferredActive) {
+                this._active = true;
+                this.onactivate && this.onactivate();
+            } else {
+                this._deferredActive = true;
+            }
         }
     }
 
@@ -175,10 +181,12 @@ class Control {
      * Deactivate control.
      * @public
      */
-    deactivate() {
+    public deactivate() {
         if (this._active) {
             this._active = false;
             this.ondeactivate && this.ondeactivate();
+        } else if (!this._initialized) {
+            this._deferredActive = false;
         }
     }
 
@@ -186,13 +194,11 @@ class Control {
      * Is control active.
      * @public
      */
-    isActive() {
+    public isActive(): boolean {
         return this._active;
     }
 
-    isEqual(control) {
-        return control._id === this._id;
+    public isEqual(control: Control): boolean {
+        return control.__id === this.__id;
     }
 }
-
-export { Control };