@openglobus/og 0.10.4 → 0.11.1

package/src/og/utils/NormalMapCreator.js

@@ -11,68 +11,70 @@ import { Program } from "../webgl/Program.js";
 import { types } from "../webgl/types.js";
 import { QueueArray } from "../QueueArray.js";
 
-const NormalMapCreator = function (planet, options) {
-    options = options || {};
-
-    this._minTabelSize = options.minTableSize || 1;
-    this._maxTableSize = options.maxTableSize || 8;
-
-    this._planet = planet;
-    this._handler = planet.renderer.handler;
-    this._verticesBufferArray = [];
-    this._indexBufferArray = [];
-    this._positionBuffer = null;
-    this._framebuffer = null;
-    this._normalMapVerticesTexture = null;
-
-    this._width = options.width || 128;
-    this._height = options.height || 128;
-
-    this._queue = new QueueArray(1024);
-
-    this._lock = new Lock();
-
-    this._init();
-};
-
-NormalMapCreator.prototype._init = function () {
-    var isWebkit = false; //('WebkitAppearance' in document.documentElement.style) && !/^((?!chrome).)*safari/i.test(navigator.userAgent);
-
-    /*==================================================================================
-     * http://www.sunsetlakesoftware.com/2013/10/21/optimizing-gaussian-blurs-mobile-gpu
-     *=================================================================================*/
-    var normalMapBlur = new Program("normalMapBlur", {
-        attributes: {
-            a_position: { type: types.VEC2, enableArray: true }
-        },
-        uniforms: {
-            s_texture: { type: types.SAMPLER2D }
-        },
-        vertexShader:
-            `attribute vec2 a_position;
+export class NormalMapCreator {
+
+    constructor(planet, options) {
+        options = options || {};
+
+        this._minTabelSize = options.minTableSize || 1;
+        this._maxTableSize = options.maxTableSize || 8;
+
+        this._planet = planet;
+        this._handler = planet.renderer.handler;
+        this._verticesBufferArray = [];
+        this._indexBufferArray = [];
+        this._positionBuffer = null;
+        this._framebuffer = null;
+        this._normalMapVerticesTexture = null;
+
+        this._width = options.width || 128;
+        this._height = options.height || 128;
+
+        this._queue = new QueueArray(1024);
+
+        this._lock = new Lock();
+
+        this._init();
+    };
+
+    _init() {
+        var isWebkit = false; //('WebkitAppearance' in document.documentElement.style) && !/^((?!chrome).)*safari/i.test(navigator.userAgent);
+
+        /*==================================================================================
+         * http://www.sunsetlakesoftware.com/2013/10/21/optimizing-gaussian-blurs-mobile-gpu
+         *=================================================================================*/
+        var normalMapBlur = new Program("normalMapBlur", {
+            attributes: {
+                a_position: { type: types.VEC2, enableArray: true }
+            },
+            uniforms: {
+                s_texture: { type: types.SAMPLER2D }
+            },
+            vertexShader:
+                `attribute vec2 a_position;
                        attribute vec2 a_texCoord;
 
                       varying vec2 blurCoordinates[5];
 
                       void main() {
                           vec2 vt = a_position * 0.5 + 0.5;` +
-            (isWebkit ? "vt.y = 1.0 - vt.y; " : " ") +
-            `gl_Position = vec4(a_position, 0.0, 1.0);
+                (isWebkit ? "vt.y = 1.0 - vt.y; " : " ") +
+                `gl_Position = vec4(a_position, 0.0, 1.0);
                           blurCoordinates[0] = vt;
                           blurCoordinates[1] = vt + ` +
-            (1.0 / this._width) * 1.407333 +
-            ";" +
-            "blurCoordinates[2] = vt - " +
-            (1.0 / this._height) * 1.407333 +
-            ";" +
-            "blurCoordinates[3] = vt + " +
-            (1.0 / this._width) * 3.294215 +
-            ";" +
-            "blurCoordinates[4] = vt - " +
-            (1.0 / this._height) * 3.294215 +
-            ";" +
-            "}",
-        fragmentShader: `precision lowp float;
+                (1.0 / this._width) * 1.407333 +
+                ";" +
+                "blurCoordinates[2] = vt - " +
+                (1.0 / this._height) * 1.407333 +
+                ";" +
+                "blurCoordinates[3] = vt + " +
+                (1.0 / this._width) * 3.294215 +
+                ";" +
+                "blurCoordinates[4] = vt - " +
+                (1.0 / this._height) * 3.294215 +
+                ";" +
+                "}",
+            fragmentShader: `precision lowp float;
                         uniform sampler2D s_texture;
                         
                         varying vec2 blurCoordinates[5];
@@ -91,14 +93,14 @@ NormalMapCreator.prototype._init = function () {
                             //}
                             gl_FragColor = sum;
                         }`
-    });
-
-    var normalMap = new Program("normalMap", {
-        attributes: {
-            a_position: { type: types.VEC2, enableArray: true },
-            a_normal: { type: types.VEC3, enableArray: true }
-        },
-        vertexShader: `attribute vec2 a_position;
+        });
+
+        var normalMap = new Program("normalMap", {
+            attributes: {
+                a_position: { type: types.VEC2, enableArray: true },
+                a_normal: { type: types.VEC3, enableArray: true }
+            },
+            vertexShader: `attribute vec2 a_position;
                       attribute vec3 a_normal;
                       
                       varying vec3 v_color;
@@ -107,238 +109,212 @@ NormalMapCreator.prototype._init = function () {
                           gl_Position = vec4(a_position, 0, 1);
                           v_color = normalize(a_normal) * 0.5 + 0.5;
                       }`,
-        fragmentShader: `precision highp float;
+            fragmentShader: `precision highp float;
                         
                         varying vec3 v_color;
                         
                         void main () {
                             gl_FragColor = vec4(v_color, 1.0);
                         }`
-    });
-
-    this._handler.addProgram(normalMapBlur);
-    this._handler.addProgram(normalMap);
-
-    //create hidden handler buffer
-    this._framebuffer = new Framebuffer(this._handler, {
-        width: this._width,
-        height: this._height,
-        useDepth: false
-    });
-
-    this._framebuffer.init();
-
-    this._normalMapVerticesTexture = this._handler.createEmptyTexture_l(this._width, this._height);
+        });
+
+        this._handler.addProgram(normalMapBlur);
+        this._handler.addProgram(normalMap);
+
+        //create hidden handler buffer
+        this._framebuffer = new Framebuffer(this._handler, {
+            width: this._width,
+            height: this._height,
+            useDepth: false
+        });
+
+        this._framebuffer.init();
+
+        this._normalMapVerticesTexture = this._handler.createEmptyTexture_l(this._width, this._height);
+
+        //create vertices hasharray for different grid size segments from 2^4(16) to 2^7(128)
+        for (var p = this._minTabelSize; p <= this._maxTableSize; p++) {
+            var gs = Math.pow(2, p);
+            var gs2 = gs / 2;
+            var vertices = new Float32Array((gs + 1) * (gs + 1) * 2);
+
+            for (var i = 0; i <= gs; i++) {
+                for (var j = 0; j <= gs; j++) {
+                    let ind = (i * (gs + 1) + j) * 2;
+                    vertices[ind] = -1 + j / gs2;
+                    vertices[ind + 1] = -1 + i / gs2;
+                }
+            }
 
-    //create vertices hasharray for different grid size segments from 2^4(16) to 2^7(128)
-    for (var p = this._minTabelSize; p <= this._maxTableSize; p++) {
-        var gs = Math.pow(2, p);
-        var gs2 = gs / 2;
-        var vertices = new Float32Array((gs + 1) * (gs + 1) * 2);
+            this._verticesBufferArray[gs] = this._handler.createArrayBuffer(
+                vertices,
+                2,
+                vertices.length / 2
+            );
+            this._indexBufferArray[gs] =
+                this._planet._indexesCache[Math.log2(gs)][Math.log2(gs)][Math.log2(gs)][Math.log2(gs)][
+                    Math.log2(gs)
+                ].buffer;
+        }
 
-        for (var i = 0; i <= gs; i++) {
-            for (var j = 0; j <= gs; j++) {
-                let ind = (i * (gs + 1) + j) * 2;
-                vertices[ind] = -1 + j / gs2;
-                vertices[ind + 1] = -1 + i / gs2;
+        //create 2d screen square buffer
+        var positions = new Float32Array([-1.0, -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0]);
+
+        this._positionBuffer = this._handler.createArrayBuffer(positions, 2, positions.length / 2);
+    };
+
+    _drawNormalMapBlur(segment) {
+        var normals = segment.normalMapNormals;
+        if (
+            segment.node &&
+            segment.node.getState() !== quadTree.NOTRENDERING &&
+            normals &&
+            normals.length
+        ) {
+            var size = normals.length / 3;
+            var gridSize = Math.sqrt(size) - 1;
+
+            let indBuf = this._verticesBufferArray[gridSize];
+
+            if (indBuf) {
+                if (segment.planet.terrain.equalizeNormals) {
+                    segment._normalMapEdgeEqualize(quadTree.N);
+                    segment._normalMapEdgeEqualize(quadTree.S);
+                    segment._normalMapEdgeEqualize(quadTree.W);
+                    segment._normalMapEdgeEqualize(quadTree.E);
+                }
+
+                var outTexture = segment.normalMapTexturePtr;
+
+                var h = this._handler;
+                var gl = h.gl;
+
+                var _normalsBuffer = h.createArrayBuffer(normals, 3, size, gl.DYNAMIC_DRAW);
+
+                var f = this._framebuffer;
+                var p = h.programs.normalMap;
+                var sha = p._program.attributes;
+
+                f.bindOutputTexture(this._normalMapVerticesTexture);
+
+                p.activate();
+
+                gl.bindBuffer(gl.ARRAY_BUFFER, indBuf);
+                gl.vertexAttribPointer(sha.a_position, indBuf.itemSize, gl.FLOAT, false, 0, 0);
+
+                gl.bindBuffer(gl.ARRAY_BUFFER, _normalsBuffer);
+                gl.vertexAttribPointer(sha.a_normal, _normalsBuffer.itemSize, gl.FLOAT, false, 0, 0);
+
+                gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBufferArray[gridSize]);
+                gl.drawElements(
+                    gl.TRIANGLE_STRIP,
+                    this._indexBufferArray[gridSize].numItems,
+                    gl.UNSIGNED_INT,
+                    0
+                );
+
+                gl.deleteBuffer(_normalsBuffer);
+
+                //
+                // blur pass
+                //
+                f.bindOutputTexture(outTexture);
+
+                p = h.programs.normalMapBlur;
+
+                p.activate();
+                gl.bindBuffer(gl.ARRAY_BUFFER, this._positionBuffer);
+                gl.vertexAttribPointer(
+                    p._program.attributes.a_position,
+                    this._positionBuffer.itemSize,
+                    gl.FLOAT,
+                    false,
+                    0,
+                    0
+                );
+                gl.activeTexture(gl.TEXTURE0);
+                gl.bindTexture(gl.TEXTURE_2D, this._normalMapVerticesTexture);
+                gl.uniform1i(p._program.uniforms.s_texture, 0);
+                gl.drawArrays(gl.TRIANGLE_STRIP, 0, this._positionBuffer.numItems);
+                return true;
+            } else {
+                return true;
             }
         }
+        return false;
+    };
 
-        this._verticesBufferArray[gs] = this._handler.createArrayBuffer(
-            vertices,
-            2,
-            vertices.length / 2
-        );
-        this._indexBufferArray[gs] =
-            this._planet._indexesCache[Math.log2(gs)][Math.log2(gs)][Math.log2(gs)][Math.log2(gs)][
-                Math.log2(gs)
-            ].buffer;
-    }
-
-    //create 2d screen square buffer
-    var positions = new Float32Array([-1.0, -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0]);
-
-    this._positionBuffer = this._handler.createArrayBuffer(positions, 2, positions.length / 2);
-};
-
-NormalMapCreator.prototype._drawNormalMapBlur = function (segment) {
-    var normals = segment.normalMapNormals;
-    if (
-        segment.node &&
-        segment.node.getState() !== quadTree.NOTRENDERING &&
-        normals &&
-        normals.length
-    ) {
-        var size = normals.length / 3;
-        var gridSize = Math.sqrt(size) - 1;
-
-        let indBuf = this._verticesBufferArray[gridSize];
-
-        if (indBuf) {
-            if (segment.planet.terrain.equalizeNormals) {
-                segment._normalMapEdgeEqualize(quadTree.N);
-                segment._normalMapEdgeEqualize(quadTree.S);
-                segment._normalMapEdgeEqualize(quadTree.W);
-                segment._normalMapEdgeEqualize(quadTree.E);
-            }
+    _drawNormalMapNoBlur(segment) {
+        var normals = segment.normalMapNormals;
+        if (
+            segment.node &&
+            segment.node.getState() !== quadTree.NOTRENDERING &&
+            normals &&
+            normals.length
+        ) {
+            var size = normals.length / 3;
+            var gridSize = Math.sqrt(size) - 1;
 
-            var outTexture = segment.normalMapTexturePtr;
+            let indBuf = this._verticesBufferArray[gridSize];
 
-            var h = this._handler;
-            var gl = h.gl;
+            if (indBuf) {
+                if (segment.planet.terrain.equalizeNormals) {
+                    segment._normalMapEdgeEqualize(quadTree.N);
+                    segment._normalMapEdgeEqualize(quadTree.S);
+                    segment._normalMapEdgeEqualize(quadTree.W);
+                    segment._normalMapEdgeEqualize(quadTree.E);
+                }
 
-            var _normalsBuffer = h.createArrayBuffer(normals, 3, size, gl.DYNAMIC_DRAW);
+                var outTexture = segment.normalMapTexturePtr;
 
-            var f = this._framebuffer;
-            var p = h.programs.normalMap;
-            var sha = p._program.attributes;
+                var h = this._handler;
+                var gl = h.gl;
 
-            f.bindOutputTexture(this._normalMapVerticesTexture);
+                var _normalsBuffer = h.createArrayBuffer(normals, 3, size, gl.DYNAMIC_DRAW);
 
-            p.activate();
+                var f = this._framebuffer;
+                var p = h.programs.normalMap;
+                var sha = p._program.attributes;
 
-            gl.bindBuffer(gl.ARRAY_BUFFER, indBuf);
-            gl.vertexAttribPointer(sha.a_position, indBuf.itemSize, gl.FLOAT, false, 0, 0);
+                f.bindOutputTexture(outTexture);
 
-            gl.bindBuffer(gl.ARRAY_BUFFER, _normalsBuffer);
-            gl.vertexAttribPointer(sha.a_normal, _normalsBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                p.activate();
 
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBufferArray[gridSize]);
-            gl.drawElements(
-                gl.TRIANGLE_STRIP,
-                this._indexBufferArray[gridSize].numItems,
-                gl.UNSIGNED_INT,
-                0
-            );
+                gl.bindBuffer(gl.ARRAY_BUFFER, indBuf);
+                gl.vertexAttribPointer(sha.a_position, indBuf.itemSize, gl.FLOAT, false, 0, 0);
 
-            gl.deleteBuffer(_normalsBuffer);
+                gl.bindBuffer(gl.ARRAY_BUFFER, _normalsBuffer);
+                gl.vertexAttribPointer(sha.a_normal, _normalsBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
-            //
-            // blur pass
-            //
-            f.bindOutputTexture(outTexture);
+                gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBufferArray[gridSize]);
+                gl.drawElements(
+                    gl.TRIANGLE_STRIP,
+                    this._indexBufferArray[gridSize].numItems,
+                    gl.UNSIGNED_INT,
+                    0
+                );
 
-            p = h.programs.normalMapBlur;
+                gl.deleteBuffer(_normalsBuffer);
 
-            p.activate();
-            gl.bindBuffer(gl.ARRAY_BUFFER, this._positionBuffer);
-            gl.vertexAttribPointer(
-                p._program.attributes.a_position,
-                this._positionBuffer.itemSize,
-                gl.FLOAT,
-                false,
-                0,
-                0
-            );
-            gl.activeTexture(gl.TEXTURE0);
-            gl.bindTexture(gl.TEXTURE_2D, this._normalMapVerticesTexture);
-            gl.uniform1i(p._program.uniforms.s_texture, 0);
-            gl.drawArrays(gl.TRIANGLE_STRIP, 0, this._positionBuffer.numItems);
-            return true;
-        } else {
-            return true;
-        }
-    }
-    return false;
-};
-
-NormalMapCreator.prototype._drawNormalMapNoBlur = function (segment) {
-    var normals = segment.normalMapNormals;
-    if (
-        segment.node &&
-        segment.node.getState() !== quadTree.NOTRENDERING &&
-        normals &&
-        normals.length
-    ) {
-        var size = normals.length / 3;
-        var gridSize = Math.sqrt(size) - 1;
-
-        let indBuf = this._verticesBufferArray[gridSize];
-
-        if (indBuf) {
-            if (segment.planet.terrain.equalizeNormals) {
-                segment._normalMapEdgeEqualize(quadTree.N);
-                segment._normalMapEdgeEqualize(quadTree.S);
-                segment._normalMapEdgeEqualize(quadTree.W);
-                segment._normalMapEdgeEqualize(quadTree.E);
+                return true;
+            } else {
+                return true;
             }
+        }
+        return false;
+    };
 
-            var outTexture = segment.normalMapTexturePtr;
-
-            var h = this._handler;
-            var gl = h.gl;
-
-            var _normalsBuffer = h.createArrayBuffer(normals, 3, size, gl.DYNAMIC_DRAW);
-
-            var f = this._framebuffer;
-            var p = h.programs.normalMap;
-            var sha = p._program.attributes;
-
-            f.bindOutputTexture(outTexture);
-
-            p.activate();
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, indBuf);
-            gl.vertexAttribPointer(sha.a_position, indBuf.itemSize, gl.FLOAT, false, 0, 0);
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, _normalsBuffer);
-            gl.vertexAttribPointer(sha.a_normal, _normalsBuffer.itemSize, gl.FLOAT, false, 0, 0);
-
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBufferArray[gridSize]);
-            gl.drawElements(
-                gl.TRIANGLE_STRIP,
-                this._indexBufferArray[gridSize].numItems,
-                gl.UNSIGNED_INT,
-                0
-            );
-
-            gl.deleteBuffer(_normalsBuffer);
+    _drawNormalMap(segment) {
+        let t = segment.planet.terrain;
 
-            return true;
+        if (t.isBlur(segment)) {
+            return this._drawNormalMapBlur(segment);
         } else {
-            return true;
+            return this._drawNormalMapNoBlur(segment);
         }
-    }
-    return false;
-};
-
-NormalMapCreator.prototype._drawNormalMap = function (segment) {
-    let t = segment.planet.terrain;
-
-    if (t.isBlur(segment)) {
-        return this._drawNormalMapBlur(segment);
-    } else {
-        return this._drawNormalMapNoBlur(segment);
-    }
-};
-
-NormalMapCreator.prototype.drawSingle = function (segment) {
-    var h = this._handler,
-        gl = h.gl;
-
-    this._framebuffer.activate();
-
-    gl.disable(gl.CULL_FACE);
-    gl.disable(gl.DEPTH_TEST);
-
-    if (segment.terrainReady && this._drawNormalMap(segment)) {
-        segment.normalMapReady = true;
-        segment.normalMapTexture = segment.normalMapTexturePtr;
-        segment.normalMapTextureBias[0] = 0;
-        segment.normalMapTextureBias[1] = 0;
-        segment.normalMapTextureBias[2] = 1;
-    }
-    segment._inTheQueue = false;
-
-    gl.disable(gl.BLEND);
-    gl.enable(gl.DEPTH_TEST);
-    gl.enable(gl.CULL_FACE);
-
-    this._framebuffer.deactivate();
-};
-
-NormalMapCreator.prototype.frame = function () {
-    if (this._queue.length) {
+    };
+
+    drawSingle(segment) {
         var h = this._handler,
             gl = h.gl;
 
@@ -347,65 +323,91 @@ NormalMapCreator.prototype.frame = function () {
         gl.disable(gl.CULL_FACE);
         gl.disable(gl.DEPTH_TEST);
 
-        var deltaTime = 0,
-            startTime = window.performance.now();
-
-        while (this._lock.isFree() && this._queue.length && deltaTime < 0.25) {
-            var segment = this._queue.shift();
-            if (segment.terrainReady && this._drawNormalMap(segment)) {
-                segment.normalMapReady = true;
-                segment.normalMapTexture = segment.normalMapTexturePtr;
-                segment.normalMapTextureBias[0] = 0;
-                segment.normalMapTextureBias[1] = 0;
-                segment.normalMapTextureBias[2] = 1;
-            }
-            segment._inTheQueue = false;
-            deltaTime = window.performance.now() - startTime;
+        if (segment.terrainReady && this._drawNormalMap(segment)) {
+            segment.normalMapReady = true;
+            segment.normalMapTexture = segment.normalMapTexturePtr;
+            segment.normalMapTextureBias[0] = 0;
+            segment.normalMapTextureBias[1] = 0;
+            segment.normalMapTextureBias[2] = 1;
         }
+        segment._inTheQueue = false;
 
         gl.disable(gl.BLEND);
         gl.enable(gl.DEPTH_TEST);
         gl.enable(gl.CULL_FACE);
 
         this._framebuffer.deactivate();
-    }
-};
-
-NormalMapCreator.prototype.queue = function (segment) {
-    segment._inTheQueue = true;
-    this._queue.push(segment);
-};
-
-NormalMapCreator.prototype.unshift = function (segment) {
-    segment._inTheQueue = true;
-    this._queue.unshift(segment);
-};
-
-NormalMapCreator.prototype.remove = function (segment) {
-    //...
-};
-
-NormalMapCreator.prototype.clear = function () {
-    while (this._queue.length) {
-        var s = this._queue.pop();
-        s._inTheQueue = false;
-    }
-};
-
-/**
- * Set activity off
- * @public
- */
-NormalMapCreator.prototype.lock = function (key) {
-    this._lock.lock(key);
-};
+    };
+
+    frame() {
+        if (this._queue.length) {
+            var h = this._handler,
+                gl = h.gl;
+
+            this._framebuffer.activate();
+
+            gl.disable(gl.CULL_FACE);
+            gl.disable(gl.DEPTH_TEST);
+
+            var deltaTime = 0,
+                startTime = window.performance.now();
+
+            while (this._lock.isFree() && this._queue.length && deltaTime < 0.25) {
+                var segment = this._queue.shift();
+                if (segment.terrainReady && this._drawNormalMap(segment)) {
+                    segment.normalMapReady = true;
+                    segment.normalMapTexture = segment.normalMapTexturePtr;
+                    segment.normalMapTextureBias[0] = 0;
+                    segment.normalMapTextureBias[1] = 0;
+                    segment.normalMapTextureBias[2] = 1;
+                }
+                segment._inTheQueue = false;
+                deltaTime = window.performance.now() - startTime;
+            }
 
-/**
- * Set activity on
- * @public
- */
-NormalMapCreator.prototype.free = function (key) {
-    this._lock.free(key);
-};
+            gl.disable(gl.BLEND);
+            gl.enable(gl.DEPTH_TEST);
+            gl.enable(gl.CULL_FACE);
 
-export { NormalMapCreator };
+            this._framebuffer.deactivate();
+        }
+    };
+
+    queue(segment) {
+        segment._inTheQueue = true;
+        this._queue.push(segment);
+    };
+
+    unshift(segment) {
+        segment._inTheQueue = true;
+        this._queue.unshift(segment);
+    };
+
+    remove(segment) {
+        //...
+    };
+
+    clear() {
+        while (this._queue.length) {
+            var s = this._queue.pop();
+            s._inTheQueue = false;
+        }
+    };
+
+    /**
+     * Set activity off
+     * @public
+     */
+    lock(key) {
+        this._lock.lock(key);
+    };
+
+    /**
+     * Set activity on
+     * @public
+     */
+    free(key) {
+        this._lock.free(key);
+    };
+
+}