@openglobus/og 0.17.1 → 0.18.0

package/src/{og/webgl/ProgramController.js → webgl/ProgramController.ts}

@@ -1,40 +1,40 @@
-"use strict";
-
-import { Handler } from "./Handler.js";
-import { Program } from "./Program.js";
+import {Handler, WebGLBufferExt} from "./Handler";
+import {Program} from "./Program";
 
 /**
- * This is shader program controller that used by hadler object to access the shader
+ * This is shader program controller that used by handler object to access the shader
  * program capabilities, like switching program during the rendering.
  * Get access to the program from ...handler.programs.<program name> etc.
  * @class
+ * @param {Handler} handler - Handler.
+ * @param {Program} program - Shader program.
  */
 export class ProgramController {
+
     /**
-     *
-     * @param {Handler} handler - Handler.
-     * @param {Program} program - Shader program.
+     * Handler.
+     * @protected
+     * @type {Handler}
      */
-    constructor(handler, program) {
-        /**
-         * Shader program.
-         * @private
-         * @type {Program}
-         */
-        this._program = program;
+    protected _handler: Handler;
 
-        /**
-         * Handler.
-         * @private
-         * @type {Handler}
-         */
-        this._handler = handler;
+    /**
+     * Shader program.
+     * @public
+     * @type {Program}
+     */
+    public _program: Program;
 
-        /**
-         * Program current frame activation flag.
-         * @private
-         * @type {boolean}
-         */
+    /**
+     * Program current frame activation flag.
+     * @public
+     * @type {boolean}
+     */
+    public _activated: boolean;
+
+    constructor(handler: Handler, program: Program) {
+        this._program = program;
+        this._handler = handler;
         this._activated = false;
     }
 
@@ -42,8 +42,10 @@ export class ProgramController {
      * Lazy create program call.
      * @public
      */
-    initialize() {
-        this._program.createProgram(this._handler.gl);
+    public initialize() {
+        if (this._handler.gl) {
+            this._program.createProgram(this._handler.gl);
+        }
     }
 
     /**
@@ -51,7 +53,7 @@ export class ProgramController {
      * @public
      * @return {Program} -
      */
-    getProgram() {
+    public getProgram(): Program {
         return this._program;
     }
 
@@ -60,11 +62,11 @@ export class ProgramController {
      * @public
      * @returns {ProgramController} -
      */
-    activate() {
+    public activate(): this {
         if (!this._activated) {
-            this._handler.activeProgram.deactivate();
+            this._handler.activeProgram!.deactivate();
             this._handler.activeProgram = this;
-            var p = this._program;
+            let p = this._program;
             this._activated = true;
             p.enableAttribArrays();
             p.use();
@@ -76,23 +78,22 @@ export class ProgramController {
      * Remove program from handler
      * @public
      */
-    remove() {
-        var p = this._handler.programs;
+    public remove() {
+        let p = this._handler.programs;
         if (p[this._program.name]) {
             if (this._activated) {
                 this.deactivate();
             }
             this._program.delete();
-            p[this._program.name] = null;
             delete p[this._program.name];
         }
     }
 
     /**
-     * Deactivate shader program. This is not necessary while activae function used.
+     * Deactivate shader program. This is not necessary while activate function used.
      * @public
      */
-    deactivate() {
+    public deactivate() {
         this._program.disableAttribArrays();
         this._activated = false;
     }
@@ -102,17 +103,17 @@ export class ProgramController {
      * @public
      * @return {boolean} -
      */
-    isActive() {
+    public isActive(): boolean {
         return this._activated;
     }
 
     /**
      * Sets program uniforms and attributes values and return controller instance.
      * @public
-     * @param {Object} params - Object with variable name and value like { value: 12, someArray:[1,2,3], uSampler: texture,... }
+     * @param {Record<string, any>} params - Object with variable name and value like { value: 12, someArray:[1,2,3], uSampler: texture,... }
      * @return {ProgramController} -
      */
-    set(params) {
+    public set(params: Record<string, any>) {
         this.activate();
         this._program.set(params);
         return this;
@@ -122,10 +123,10 @@ export class ProgramController {
      * Draw index buffer with this program.
      * @public
      * @param {number} mode - Gl draw mode
-     * @param {WEBGLBuffer} buffer - Buffer to draw.
+     * @param {WebGLBuffer} buffer - Buffer to draw.
      * @return {ProgramController} Returns current shader controller instance.
      */
-    drawIndexBuffer(mode, buffer) {
+    public drawIndexBuffer(mode: number, buffer: WebGLBufferExt): ProgramController {
         this._program.drawIndexBuffer(mode, buffer);
         return this;
     }
@@ -136,7 +137,7 @@ export class ProgramController {
      * @param {number} numItems - draw items count.
      * @return {ProgramController} Returns current shader controller instance.
      */
-    drawArrays(mode, numItems) {
+    public drawArrays(mode: number, numItems: number): ProgramController {
         this._program.drawArrays(mode, numItems);
         return this;
     }

package/src/webgl/index.ts

@@ -0,0 +1,13 @@
+import { Framebuffer } from "./Framebuffer";
+import { Handler } from "./Handler";
+import { Multisample } from "./Multisample";
+import { Program } from "./Program";
+import { types } from "./types";
+
+export {
+    Framebuffer,
+    Handler,
+    Multisample,
+    types,
+    Program
+};

package/src/{og/webgl/types.js → webgl/types.ts}

@@ -1,31 +1,29 @@
-/**
- * @module og/webgl/types
- */
-
-'use strict';
-
-let _declarations = [
-    "FLOAT", "DOUBLE", "BOOL", "INT", "UINT",
-    "VEC2", "VEC3", "VEC4", "DVEC2",
-    "DVEC3", "DVEC4",
-    "BVEC2", "BVEC3", "BVEC4",
-    "IVEC2", "IVEC3", "IVEC4",
-    "UVEC2", "UVEC3", "UVEC4",
-    "MAT2", "DMAT2", "MAT3", "DMAT3", "MAT4", "DMAT4",
-    "MAT2X3", "MAT2X4", "MAT3X2", "MAT3X4", "MAT4X2",
-    "MAT4X3", "DMAT2X3", "DMAT2X4", "DMAT3X2", "DMAT3X4",
-    "DMAT4X2", "DMAT4X3",
-    "SAMPLER1D", "SAMPLER2D", "SAMPLER3D", "SAMPLERCUBE", "SAMPLER2DSHADOW",
-    "SAMPLER2DARRAY",
-    "INTXX", "FLOATXX"];
-
-export const types = {};
-
-for (let i = 0; i < _declarations.length; i++) {
-    types[_declarations[i]] = i;
-}
-
-export const typeStr = {};
-for (let i = 0; i < _declarations.length; i++) {
-    typeStr[_declarations[i].toLowerCase()] = types[_declarations[i]];
-}
+/**
+ * @module og/webgl/types
+ */
+
+let _declarations: string[] = [
+    "FLOAT", "DOUBLE", "BOOL", "INT", "UINT",
+    "VEC2", "VEC3", "VEC4", "DVEC2",
+    "DVEC3", "DVEC4",
+    "BVEC2", "BVEC3", "BVEC4",
+    "IVEC2", "IVEC3", "IVEC4",
+    "UVEC2", "UVEC3", "UVEC4",
+    "MAT2", "DMAT2", "MAT3", "DMAT3", "MAT4", "DMAT4",
+    "MAT2X3", "MAT2X4", "MAT3X2", "MAT3X4", "MAT4X2",
+    "MAT4X3", "DMAT2X3", "DMAT2X4", "DMAT3X2", "DMAT3X4",
+    "DMAT4X2", "DMAT4X3",
+    "SAMPLER1D", "SAMPLER2D", "SAMPLER3D", "SAMPLERCUBE", "SAMPLER2DSHADOW",
+    "SAMPLER2DARRAY",
+    "INTXX", "FLOATXX"];
+
+export const types: { [id: string]: number } = {};
+
+for (let i = 0; i < _declarations.length; i++) {
+    types[_declarations[i]] = i;
+}
+
+export const typeStr: { [id: string]: number } = {};
+for (let i = 0; i < _declarations.length; i++) {
+    typeStr[_declarations[i].toLowerCase()] = types[_declarations[i]];
+}

package/src/webgl/variableHandlers.ts

@@ -0,0 +1,114 @@
+/**
+ * @module og/webgl/variableHandlers
+ */
+
+import {types} from "./types";
+import {Program} from "./Program";
+import {WebGLBufferExt} from "./Handler";
+
+export type VariableHandler = {
+    u: { [id: number]: Function },
+    a: { [id: number]: Function }
+};
+
+export type ProgramVariable = {
+    type: string | number,
+    func: Function,
+    _pName: WebGLUniformLocation | number,
+    value: number | Float32Array | Int32Array | WebGLBufferExt,
+    itemType: string | number,
+    normalized: boolean,
+    divisor: number
+};
+
+/*=========================
+   Uniforms callbacks
+ =========================*/
+export const variableHandlers: VariableHandler = {
+    u: [],
+    a: []
+};
+
+variableHandlers.u[types.MAT4] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniformMatrix4fv(variable._pName, false, variable.value as Float32Array);
+};
+
+variableHandlers.u[types.MAT3] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniformMatrix3fv(variable._pName, false, variable.value as Float32Array);
+};
+
+variableHandlers.u[types.FLOAT] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform1f(variable._pName, variable.value as number);
+};
+
+variableHandlers.u[types.INT] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform1i(variable._pName, variable.value as number);
+};
+
+variableHandlers.u[types.VEC2] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform2fv(variable._pName, variable.value as Float32Array);
+};
+
+variableHandlers.u[types.VEC3] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform3fv(variable._pName, variable.value as Float32Array);
+};
+
+variableHandlers.u[types.VEC4] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform4fv(variable._pName, variable.value as Float32Array);
+};
+
+variableHandlers.u[types.SAMPLER2D] = function (program: Program, variable: ProgramVariable) {
+    let pgl = program.gl!;
+    pgl.activeTexture(pgl.TEXTURE0 + program._textureID);
+    pgl.bindTexture(pgl.TEXTURE_2D, variable.value);
+    pgl.uniform1i(variable._pName, program._textureID);
+    program._textureID++;
+};
+
+variableHandlers.u[types.SAMPLERCUBE] = function (program: Program, variable: ProgramVariable) {
+    let pgl = program.gl!;
+    pgl.activeTexture(pgl.TEXTURE0 + program._textureID);
+    pgl.bindTexture(pgl.TEXTURE_CUBE_MAP, variable.value);
+    pgl.uniform1i(variable._pName, program._textureID);
+    program._textureID++;
+};
+
+variableHandlers.u[types.SAMPLER2DARRAY] = function (program: Program, variable: ProgramVariable) {
+    let value = variable.value as Int32Array;
+    let pgl = program.gl!,
+        size = value.length;
+    let samplerArr = new Int32Array(size);
+    for (let i = 0; i < size; i++) {
+        pgl.activeTexture(pgl.TEXTURE0 + program._textureID + i);
+        pgl.bindTexture(pgl.TEXTURE_2D, value[i]);
+        samplerArr[i] = i;
+    }
+    pgl.uniform1iv(variable._pName, samplerArr);
+};
+
+variableHandlers.u[types.INTXX] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform1iv(variable._pName, variable.value as Int32Array);
+};
+
+variableHandlers.u[types.FLOATXX] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.uniform1fv(variable._pName, variable.value as Float32Array);
+};
+
+/*========================
+   Attributes callbacks
+ ========================*/
+variableHandlers.a[types.FLOAT] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.vertexAttrib1f(variable._pName as number, variable.value as number);
+};
+
+variableHandlers.a[types.VEC2] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.vertexAttrib2fv(variable._pName as number, variable.value as Float32Array);
+};
+
+variableHandlers.a[types.VEC3] = function (program: Program, variable: ProgramVariable) {
+    program.gl!.vertexAttrib3fv(variable._pName as number, variable.value as Float32Array);
+};
+
+//VariableHandlers.a[types.VEC4] = function (program, variable) {
+//    program.gl.vertexAttrib4fv(variable._pName, variable.value);
+//};

package/src/og/Deferred.js

@@ -1,11 +0,0 @@
-'use strict';
-
-export function Deferred() {
-    this.resolve = null;
-    this.reject = null;
-    this.promise = new Promise(function (resolve, reject) {
-        this.resolve = resolve;
-        this.reject = reject;
-    }.bind(this));
-    Object.freeze(this);
-}

package/src/og/Events.js

@@ -1,185 +0,0 @@
-"use strict";
-
-import { binaryInsert, stamp } from "./utils/shared.js";
-
-/**
- * Base events class to handle custom events.
- * @class
- */
-class Events {
-    /**
-     *
-     * @param {Array.<string>} [eventNames] - Event names that could be dispatched.
-     * @param {*} [sender]
-     */
-    constructor(eventNames, sender) {
-        /**
-         * Registered event names.
-         * @protected
-         * @type {Array.<string>}
-         */
-        this._eventNames = [];
-
-        eventNames && this.registerNames(eventNames);
-
-        this._sender = sender || this;
-
-        /**
-         * Stop propagation flag
-         * @protected
-         * @type {boolean}
-         */
-        this._stopPropagation = false;
-
-        this._stampCache = {};
-
-        this.__id = Events._staticCounter++;
-    }
-
-    static get _staticCounter() {
-        if (!this.__counter__ && this.__counter__ !== 0) {
-            this.__counter__ = 0;
-        }
-        return this.__counter__;
-    }
-
-    static set _staticCounter(n) {
-        this.__counter__ = n;
-    }
-
-    bindSender(sender) {
-        this._sender = sender || this;
-    }
-
-    /**
-     * Function that creates event object properties that would be dispatched.
-     * @public
-     * @param {Array.<string>} eventNames - Specified event names list.
-     */
-    registerNames(eventNames) {
-        for (let i = 0; i < eventNames.length; i++) {
-            this[eventNames[i]] = { active: true, handlers: [] };
-            this._eventNames.push(eventNames[i]);
-        }
-    }
-
-    _getStamp(name, id, ogid) {
-        return `${name}_${id}_${ogid}`;
-    }
-
-    /**
-     * Returns true if event callback has stamped.
-     * @protected
-     * @param {Object} name - Event identifier.
-     * @param {Object} obj - Event callback.
-     * @return {boolean} -
-     */
-    _stamp(name, obj) {
-        var ogid = stamp(obj);
-
-        var st = this._getStamp(name, this.__id, ogid);
-
-        if (!this._stampCache[st]) {
-            this._stampCache[st] = ogid;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Attach listener.
-     * @public
-     * @param {string} name - Event name to listen.
-     * @param {eventCallback} callback - Event callback function.
-     * @param {any} [sender] - Event callback function owner.
-     * @param {number} [priority] - Priority of event callback.
-     */
-    on(name, callback, sender, priority = 0) {
-        if (this._stamp(name, callback)) {
-            if (this[name]) {
-                let c = callback.bind(sender || this._sender);
-                c._openglobus_id = callback._openglobus_id;
-                c._openglobus_priority = priority;
-                binaryInsert(this[name].handlers, c, (a, b) => {
-                    return b._openglobus_priority - a._openglobus_priority;
-                });
-            }
-        }
-    }
-
-    /**
-     * Stop listening event name with specified callback function.
-     * @public
-     * @param {string} name - Event name.
-     * @param {eventCallback} callback - Attached  event callback.
-     */
-    off(name, callback) {
-        if (callback) {
-            var st = this._getStamp(name, this.__id, callback._openglobus_id);
-            if (callback._openglobus_id && this._stampCache[st]) {
-                var h = this[name].handlers;
-                var i = h.length;
-                var indexToRemove = -1;
-                while (i--) {
-                    var hi = h[i];
-                    if (hi._openglobus_id === callback._openglobus_id) {
-                        indexToRemove = i;
-                        break;
-                    }
-                }
-
-                if (indexToRemove !== -1) {
-                    h.splice(indexToRemove, 1);
-                    this._stampCache[st] = undefined;
-                    delete this._stampCache[st];
-                }
-            }
-        }
-    }
-
-    /**
-     * Dispatch event.
-     * @public
-     * @param {Object} event - Event instance property that created by event name.
-     * @param {Object} [obj] - Event object.
-     */
-    dispatch(event, ...args) {
-        let result = true;
-        if (event && event.active && !this._stopPropagation) {
-            let h = event.handlers.slice(0),
-                i = h.length;
-            while (i--) {
-                if (h[i](...args) === false) {
-                    result = false;
-                }
-            }
-        }
-        this._stopPropagation = false;
-        return result;
-    }
-
-    /**
-     * Brakes events propagation.
-     * @public
-     */
-    stopPropagation() {
-        this._stopPropagation = true;
-    }
-
-    /**
-     * Removes all events.
-     * @public
-     */
-    clear() {
-        for (let i = 0; i < this._eventNames.length; i++) {
-            var e = this[this._eventNames[i]];
-            e.handlers.length = 0;
-            e.handlers = [];
-        }
-        this._eventNames.length = 0;
-        this._eventNames = [];
-    }
-}
-
-export { Events };