@openglobus/og 0.18.0 → 0.18.2

package/{src/entity/LabelHandler.ts → lib/js/entity/LabelHandler.js}

@@ -1,30 +1,8 @@
 import * as shaders from "../shaders/label";
-import {ALIGN, Label} from "./Label";
-import {BaseBillboardHandler} from "./BaseBillboardHandler";
-import {concatTypedArrays, spliceTypedArray} from "../utils/shared";
-import {EntityCollection} from "./EntityCollection";
-import {LOCK_FREE} from "./LabelWorker";
-import {Planet} from "../scene/Planet";
-import {WebGLBufferExt} from "../webgl/Handler";
-import {Vec3} from "../math/Vec3";
-import {Vec4} from "../math/Vec4";
-
-type LabelWorkerCallbackData = {
-    vertexArr: Float32Array,
-    texCoordArr: Float32Array,
-    gliphParamArr: Float32Array,
-    positionHighArr: Float32Array,
-    positionLowArr: Float32Array,
-    sizeArr: Float32Array,
-    offsetArr: Float32Array,
-    rgbaArr: Float32Array,
-    rotationArr: Float32Array,
-    fontIndexArr: Float32Array,
-    outlineArr: Float32Array,
-    outlineColorArr: Float32Array,
-    pickingColorArr: Float32Array
-}
-
+import { ALIGN } from "./Label";
+import { BaseBillboardHandler } from "./BaseBillboardHandler";
+import { concatTypedArrays, spliceTypedArray } from "../utils/shared";
+import { LOCK_FREE } from "./LabelWorker";
 const PICKINGCOLOR_BUFFER = 0;
 const POSITION_BUFFER = 1;
 const SIZE_BUFFER = 2;
@@ -36,128 +14,94 @@ const VERTEX_BUFFER = 7;
 const FONTINDEX_BUFFER = 8;
 const OUTLINE_BUFFER = 9;
 const OUTLINECOLOR_BUFFER = 10;
-
 const EMPTY = -1.0;
 const RTL = 1.0;
-
 class LabelHandler extends BaseBillboardHandler {
-
-    protected override _billboards: Label[];
-
-    protected _gliphParamBuffer: WebGLBufferExt | null;
-    protected _fontIndexBuffer: WebGLBufferExt | null;
-    protected _outlineBuffer: WebGLBufferExt | null;
-    protected _outlineColorBuffer: WebGLBufferExt | null;
-
-    protected _gliphParamArr: Float32Array;
-    protected _fontIndexArr: Float32Array;
-    protected _outlineArr: Float32Array;
-    protected _outlineColorArr: Float32Array;
-
-    public _maxLetters: number;
-
-    constructor(entityCollection: EntityCollection, maxLetters: number = 21) {
+    constructor(entityCollection, maxLetters = 21) {
         super(entityCollection);
-
         this._billboards = [];
-
         this._gliphParamBuffer = null;
         this._fontIndexBuffer = null;
         this._outlineBuffer = null;
         this._outlineColorBuffer = null;
-
         this._gliphParamArr = new Float32Array([]);
         this._fontIndexArr = new Float32Array([]);
         this._outlineArr = new Float32Array([]);
         this._outlineColorArr = new Float32Array([]);
-
         this._buffersUpdateCallbacks[FONTINDEX_BUFFER] = this.createFontIndexBuffer;
         this._buffersUpdateCallbacks[OUTLINE_BUFFER] = this.createOutlineBuffer;
         this._buffersUpdateCallbacks[OUTLINECOLOR_BUFFER] = this.createOutlineColorBuffer;
-
         this._changedBuffers = new Array(this._buffersUpdateCallbacks.length);
-
         this._maxLetters = maxLetters;
     }
-
-    public override initProgram() {
+    initProgram() {
         if (this._renderer && this._renderer.handler && this._renderer.handler.gl) {
             if (!this._renderer.handler.programs.label) {
                 if (this._renderer.handler.gl.type === "webgl2") {
                     this._renderer.handler.addProgram(shaders.label_webgl2());
-                } else {
+                }
+                else {
                     this._renderer.handler.addProgram(shaders.label_screen());
                 }
             }
-
             if (!this._renderer.handler.programs.labelPicking) {
                 this._renderer.handler.addProgram(shaders.labelPicking());
             }
         }
     }
-
-    public get labels(): Label[] {
+    get labels() {
         return this._billboards;
     }
-
-    public override add(label: Label) {
+    add(label) {
         if (!label._handler) {
             label._handler = this;
             this.assignFontAtlas(label);
             this.refresh();
         }
     }
-
-    public updateFonts() {
+    updateFonts() {
         let l = [...this._billboards];
         this._billboards = [];
         for (let i = 0; i < l.length; i++) {
             this.assignFontAtlas(l[i]);
         }
     }
-
-    protected _addLabelToArrays(label: Label) {
-        this._renderer && this._renderer.labelWorker.make({handler: this, label: label});
+    _addLabelToArrays(label) {
+        this._renderer && this._renderer.labelWorker.make({ handler: this, label: label });
     }
-
-    public assignFontAtlas(label: Label) {
+    assignFontAtlas(label) {
         if (this._entityCollection && this._renderer) {
             label.assignFontAtlas(this._renderer.fontAtlas);
             this._addLabelToArrays(label);
-        } else {
+        }
+        else {
             this._billboards.push(label);
         }
     }
-
-    public workerCallback(data: LabelWorkerCallbackData, label: Label) {
+    workerCallback(data, label) {
         if (label._lockId !== LOCK_FREE && label._handler && this.isEqual(label._handler)) {
             label._isReady = true;
             label._lockId = LOCK_FREE;
             label._handlerIndex = this._billboards.length;
-
             this._billboards.push(label);
-
-            this._vertexArr = concatTypedArrays(this._vertexArr, data.vertexArr) as Float32Array;
-            this._texCoordArr = concatTypedArrays(this._texCoordArr, data.texCoordArr) as Float32Array;
-            this._gliphParamArr = concatTypedArrays(this._gliphParamArr, data.gliphParamArr) as Float32Array;
-            this._positionHighArr = concatTypedArrays(this._positionHighArr, data.positionHighArr) as Float32Array;
-            this._positionLowArr = concatTypedArrays(this._positionLowArr, data.positionLowArr) as Float32Array;
-            this._sizeArr = concatTypedArrays(this._sizeArr, data.sizeArr) as Float32Array;
-            this._offsetArr = concatTypedArrays(this._offsetArr, data.offsetArr) as Float32Array;
-            this._rgbaArr = concatTypedArrays(this._rgbaArr, data.rgbaArr) as Float32Array;
-            this._rotationArr = concatTypedArrays(this._rotationArr, data.rotationArr) as Float32Array;
-            this._fontIndexArr = concatTypedArrays(this._fontIndexArr, data.fontIndexArr) as Float32Array;
-            this._outlineArr = concatTypedArrays(this._outlineArr, data.outlineArr) as Float32Array;
-            this._outlineColorArr = concatTypedArrays(this._outlineColorArr, data.outlineColorArr) as Float32Array;
-            this._pickingColorArr = concatTypedArrays(this._pickingColorArr, data.pickingColorArr) as Float32Array;
-
+            this._vertexArr = concatTypedArrays(this._vertexArr, data.vertexArr);
+            this._texCoordArr = concatTypedArrays(this._texCoordArr, data.texCoordArr);
+            this._gliphParamArr = concatTypedArrays(this._gliphParamArr, data.gliphParamArr);
+            this._positionHighArr = concatTypedArrays(this._positionHighArr, data.positionHighArr);
+            this._positionLowArr = concatTypedArrays(this._positionLowArr, data.positionLowArr);
+            this._sizeArr = concatTypedArrays(this._sizeArr, data.sizeArr);
+            this._offsetArr = concatTypedArrays(this._offsetArr, data.offsetArr);
+            this._rgbaArr = concatTypedArrays(this._rgbaArr, data.rgbaArr);
+            this._rotationArr = concatTypedArrays(this._rotationArr, data.rotationArr);
+            this._fontIndexArr = concatTypedArrays(this._fontIndexArr, data.fontIndexArr);
+            this._outlineArr = concatTypedArrays(this._outlineArr, data.outlineArr);
+            this._outlineColorArr = concatTypedArrays(this._outlineColorArr, data.outlineColorArr);
+            this._pickingColorArr = concatTypedArrays(this._pickingColorArr, data.pickingColorArr);
             label.update();
-
             this.refresh();
         }
     }
-
-    public override clear() {
+    clear() {
         // @ts-ignore
         this._texCoordArr = null;
         // @ts-ignore
@@ -182,7 +126,6 @@ class LabelHandler extends BaseBillboardHandler {
         this._outlineArr = null;
         // @ts-ignore
         this._outlineColorArr = null;
-
         this._texCoordArr = new Float32Array([]);
         this._gliphParamArr = new Float32Array([]);
         this._vertexArr = new Float32Array([]);
@@ -195,31 +138,28 @@ class LabelHandler extends BaseBillboardHandler {
         this._fontIndexArr = new Float32Array([]);
         this._outlineArr = new Float32Array([]);
         this._outlineColorArr = new Float32Array([]);
-
         this._removeBillboards();
         this._deleteBuffers();
         this.refresh();
     }
-
-    protected override _deleteBuffers() {
+    _deleteBuffers() {
         if (this._renderer) {
-            let gl = this._renderer.handler.gl!;
-            gl.deleteBuffer(this._gliphParamBuffer!);
-            gl.deleteBuffer(this._sizeBuffer!);
-            gl.deleteBuffer(this._fontIndexBuffer!);
-            gl.deleteBuffer(this._texCoordBuffer!);
-            gl.deleteBuffer(this._outlineBuffer!);
-            gl.deleteBuffer(this._outlineColorBuffer!);
-            gl.deleteBuffer(this._positionHighBuffer!);
-            gl.deleteBuffer(this._positionLowBuffer!);
-            gl.deleteBuffer(this._sizeBuffer!);
-            gl.deleteBuffer(this._offsetBuffer!);
-            gl.deleteBuffer(this._rgbaBuffer!);
-            gl.deleteBuffer(this._rotationBuffer!);
-            gl.deleteBuffer(this._vertexBuffer!);
-            gl.deleteBuffer(this._texCoordBuffer!);
-            gl.deleteBuffer(this._pickingColorBuffer!);
-
+            let gl = this._renderer.handler.gl;
+            gl.deleteBuffer(this._gliphParamBuffer);
+            gl.deleteBuffer(this._sizeBuffer);
+            gl.deleteBuffer(this._fontIndexBuffer);
+            gl.deleteBuffer(this._texCoordBuffer);
+            gl.deleteBuffer(this._outlineBuffer);
+            gl.deleteBuffer(this._outlineColorBuffer);
+            gl.deleteBuffer(this._positionHighBuffer);
+            gl.deleteBuffer(this._positionLowBuffer);
+            gl.deleteBuffer(this._sizeBuffer);
+            gl.deleteBuffer(this._offsetBuffer);
+            gl.deleteBuffer(this._rgbaBuffer);
+            gl.deleteBuffer(this._rotationBuffer);
+            gl.deleteBuffer(this._vertexBuffer);
+            gl.deleteBuffer(this._texCoordBuffer);
+            gl.deleteBuffer(this._pickingColorBuffer);
             this._gliphParamBuffer = null;
             this._sizeBuffer = null;
             this._fontIndexBuffer = null;
@@ -237,246 +177,178 @@ class LabelHandler extends BaseBillboardHandler {
             this._pickingColorBuffer = null;
         }
     }
-
-    public override _displayPASS() {
-        let r = this._renderer!;
+    _displayPASS() {
+        let r = this._renderer;
         let h = r.handler;
         h.programs.label.activate();
         let sh = h.programs.label._program;
-        let sha = sh.attributes,
-            shu = sh.uniforms;
-
-        let gl = h.gl!,
-            ec = this._entityCollection;
-
+        let sha = sh.attributes, shu = sh.uniforms;
+        let gl = h.gl, ec = this._entityCollection;
         gl.disable(gl.CULL_FACE);
-
         gl.uniform1iv(shu.fontTextureArr, r.fontAtlas.samplerArr);
         gl.uniform4fv(shu.sdfParamsArr, r.fontAtlas.sdfParamsArr);
-        gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera!.getViewMatrix());
-        gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera!.getProjectionMatrix());
-        gl.uniform3fv(shu.eyePositionHigh, r.activeCamera!.eyeHigh);
-        gl.uniform3fv(shu.eyePositionLow, r.activeCamera!.eyeLow);
+        gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());
+        gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera.getProjectionMatrix());
+        gl.uniform3fv(shu.eyePositionHigh, r.activeCamera.eyeHigh);
+        gl.uniform3fv(shu.eyePositionLow, r.activeCamera.eyeLow);
         gl.uniform3fv(shu.scaleByDistance, ec.scaleByDistance);
         gl.uniform1f(shu.opacity, ec._fadingOpacity);
-        gl.uniform1f(shu.planetRadius, (ec.renderNode as Planet)._planetRadius2 || 0);
-        gl.uniform2fv(shu.viewport, [h.canvas!.clientWidth, h.canvas!.clientHeight]);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer!);
-        gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._gliphParamBuffer!);
-        gl.vertexAttribPointer(sha.a_gliphParam, this._gliphParamBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer!);
-        gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionHighBuffer!);
-        gl.vertexAttribPointer(sha.a_positionsHigh, this._positionHighBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionLowBuffer!);
-        gl.vertexAttribPointer(sha.a_positionsLow, this._positionLowBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._sizeBuffer!);
-        gl.vertexAttribPointer(sha.a_size, this._sizeBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._rotationBuffer!);
-        gl.vertexAttribPointer(sha.a_rotation, this._rotationBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._offsetBuffer!);
-        gl.vertexAttribPointer(sha.a_offset, this._offsetBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._fontIndexBuffer!);
-        gl.vertexAttribPointer(sha.a_fontIndex, this._fontIndexBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
+        gl.uniform1f(shu.planetRadius, ec.renderNode._planetRadius2 || 0);
+        gl.uniform2fv(shu.viewport, [h.canvas.clientWidth, h.canvas.clientHeight]);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer);
+        gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._gliphParamBuffer);
+        gl.vertexAttribPointer(sha.a_gliphParam, this._gliphParamBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer);
+        gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionHighBuffer);
+        gl.vertexAttribPointer(sha.a_positionsHigh, this._positionHighBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionLowBuffer);
+        gl.vertexAttribPointer(sha.a_positionsLow, this._positionLowBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._sizeBuffer);
+        gl.vertexAttribPointer(sha.a_size, this._sizeBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._rotationBuffer);
+        gl.vertexAttribPointer(sha.a_rotation, this._rotationBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._offsetBuffer);
+        gl.vertexAttribPointer(sha.a_offset, this._offsetBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._fontIndexBuffer);
+        gl.vertexAttribPointer(sha.a_fontIndex, this._fontIndexBuffer.itemSize, gl.FLOAT, false, 0, 0);
         //
         // outline PASS
         gl.uniform1i(shu.isOutlinePass, 1);
         gl.uniform1f(shu.depthOffset, ec.polygonOffsetUnits);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._outlineColorBuffer!);
-        gl.vertexAttribPointer(sha.a_rgba, this._outlineColorBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._outlineBuffer!);
-        gl.vertexAttribPointer(sha.a_outline, this._outlineBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer!.numItems);
-
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._outlineColorBuffer);
+        gl.vertexAttribPointer(sha.a_rgba, this._outlineColorBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._outlineBuffer);
+        gl.vertexAttribPointer(sha.a_outline, this._outlineBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer.numItems);
         //
         // no outline PASS
         gl.depthFunc(gl.EQUAL);
         gl.uniform1i(shu.isOutlinePass, 0);
         gl.uniform1f(shu.depthOffset, ec.polygonOffsetUnits);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._rgbaBuffer!);
-        gl.vertexAttribPointer(sha.a_rgba, this._rgbaBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer!.numItems);
-
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._rgbaBuffer);
+        gl.vertexAttribPointer(sha.a_rgba, this._rgbaBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer.numItems);
         gl.depthFunc(gl.LESS);
-
         gl.enable(gl.CULL_FACE);
     }
-
-    protected override _pickingPASS() {
-        let r = this._renderer!;
+    _pickingPASS() {
+        let r = this._renderer;
         let h = r.handler;
         h.programs.labelPicking.activate();
         let sh = h.programs.labelPicking._program;
-        let sha = sh.attributes,
-            shu = sh.uniforms;
-
-        let gl = h.gl!,
-            ec = this._entityCollection;
-
+        let sha = sh.attributes, shu = sh.uniforms;
+        let gl = h.gl, ec = this._entityCollection;
         let rn = ec.renderNode;
-
         gl.disable(gl.CULL_FACE);
-
-        gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera!.getViewMatrix());
-        gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera!.getProjectionMatrix());
-        gl.uniform3fv(shu.eyePositionHigh, r.activeCamera!.eyeHigh);
-        gl.uniform3fv(shu.eyePositionLow, r.activeCamera!.eyeLow);
+        gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());
+        gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera.getProjectionMatrix());
+        gl.uniform3fv(shu.eyePositionHigh, r.activeCamera.eyeHigh);
+        gl.uniform3fv(shu.eyePositionLow, r.activeCamera.eyeLow);
         gl.uniform3fv(shu.scaleByDistance, ec.scaleByDistance);
         gl.uniform1f(shu.opacity, ec._fadingOpacity);
-        gl.uniform1f(shu.planetRadius, (rn as Planet)._planetRadius2 || 0);
-        gl.uniform2fv(shu.viewport, [h.canvas!.clientWidth, h.canvas!.clientHeight]);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer!);
-        gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._gliphParamBuffer!);
-        gl.vertexAttribPointer(sha.a_gliphParam, this._gliphParamBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer!);
-        gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionHighBuffer!);
-        gl.vertexAttribPointer(sha.a_positionsHigh, this._positionHighBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionLowBuffer!);
-        gl.vertexAttribPointer(sha.a_positionsLow, this._positionLowBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._sizeBuffer!);
-        gl.vertexAttribPointer(sha.a_size, this._sizeBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._rotationBuffer!);
-        gl.vertexAttribPointer(sha.a_rotation, this._rotationBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._offsetBuffer!);
-        gl.vertexAttribPointer(sha.a_offset, this._offsetBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._pickingColorBuffer!);
-        gl.vertexAttribPointer(sha.a_rgba, this._pickingColorBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
+        gl.uniform1f(shu.planetRadius, rn._planetRadius2 || 0);
+        gl.uniform2fv(shu.viewport, [h.canvas.clientWidth, h.canvas.clientHeight]);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer);
+        gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._gliphParamBuffer);
+        gl.vertexAttribPointer(sha.a_gliphParam, this._gliphParamBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer);
+        gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionHighBuffer);
+        gl.vertexAttribPointer(sha.a_positionsHigh, this._positionHighBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._positionLowBuffer);
+        gl.vertexAttribPointer(sha.a_positionsLow, this._positionLowBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._sizeBuffer);
+        gl.vertexAttribPointer(sha.a_size, this._sizeBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._rotationBuffer);
+        gl.vertexAttribPointer(sha.a_rotation, this._rotationBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._offsetBuffer);
+        gl.vertexAttribPointer(sha.a_offset, this._offsetBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._pickingColorBuffer);
+        gl.vertexAttribPointer(sha.a_rgba, this._pickingColorBuffer.itemSize, gl.FLOAT, false, 0, 0);
         gl.uniform1f(shu.depthOffset, ec.polygonOffsetUnits);
-
-        gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer!.numItems);
-
+        gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer.numItems);
         gl.enable(gl.CULL_FACE);
     }
-
-    protected override _removeBillboard(label: Label) {
-
+    _removeBillboard(label) {
         let li = label._handlerIndex;
-
         this._billboards.splice(li, 1);
-
         let ml = 24 * this._maxLetters;
         let i = li * ml;
-        this._rgbaArr = spliceTypedArray<Float32Array>(this._rgbaArr, i, ml);
-        this._outlineColorArr = spliceTypedArray<Float32Array>(this._outlineColorArr, i, ml);
-        this._texCoordArr = spliceTypedArray<Float32Array>(this._texCoordArr, i, ml);
-        this._gliphParamArr = spliceTypedArray<Float32Array>(this._gliphParamArr, i, ml);
-
+        this._rgbaArr = spliceTypedArray(this._rgbaArr, i, ml);
+        this._outlineColorArr = spliceTypedArray(this._outlineColorArr, i, ml);
+        this._texCoordArr = spliceTypedArray(this._texCoordArr, i, ml);
+        this._gliphParamArr = spliceTypedArray(this._gliphParamArr, i, ml);
         ml = 18 * this._maxLetters;
         i = li * ml;
-        this._positionHighArr = spliceTypedArray<Float32Array>(this._positionHighArr, i, ml);
-        this._positionLowArr = spliceTypedArray<Float32Array>(this._positionLowArr, i, ml);
-        this._offsetArr = spliceTypedArray<Float32Array>(this._offsetArr, i, ml);
-        this._pickingColorArr = spliceTypedArray<Float32Array>(this._pickingColorArr, i, ml);
-
+        this._positionHighArr = spliceTypedArray(this._positionHighArr, i, ml);
+        this._positionLowArr = spliceTypedArray(this._positionLowArr, i, ml);
+        this._offsetArr = spliceTypedArray(this._offsetArr, i, ml);
+        this._pickingColorArr = spliceTypedArray(this._pickingColorArr, i, ml);
         ml = 12 * this._maxLetters;
         i = li * ml;
-        this._vertexArr = spliceTypedArray<Float32Array>(this._vertexArr, i, ml);
-
+        this._vertexArr = spliceTypedArray(this._vertexArr, i, ml);
         ml = 6 * this._maxLetters;
         i = li * ml;
-        this._sizeArr = spliceTypedArray<Float32Array>(this._sizeArr, i, ml);
-        this._rotationArr = spliceTypedArray<Float32Array>(this._rotationArr, i, ml);
-        this._fontIndexArr = spliceTypedArray<Float32Array>(this._fontIndexArr, i, ml);
-        this._outlineArr = spliceTypedArray<Float32Array>(this._outlineArr, i, ml);
-
+        this._sizeArr = spliceTypedArray(this._sizeArr, i, ml);
+        this._rotationArr = spliceTypedArray(this._rotationArr, i, ml);
+        this._fontIndexArr = spliceTypedArray(this._fontIndexArr, i, ml);
+        this._outlineArr = spliceTypedArray(this._outlineArr, i, ml);
         this.reindexBillboardsArray(li);
         this.refresh();
-
         label._handlerIndex = -1;
         label._handler = null;
         label._isReady = false;
     }
-
-    public setText(index: number, text: string, fontIndex: number, align: number, isRTL: boolean = false) {
-
+    setText(index, text, fontIndex, align, isRTL = false) {
         text = text.normalize('NFKC');
-
-        let fa = this._renderer!.fontAtlas.atlasesArr[fontIndex];
-
-        if (!fa) return;
-
+        let fa = this._renderer.fontAtlas.atlasesArr[fontIndex];
+        if (!fa)
+            return;
         let i = index * 24 * this._maxLetters;
-        let a = this._texCoordArr,
-            g = this._gliphParamArr;
-
+        let a = this._texCoordArr, g = this._gliphParamArr;
         let c = 0;
-
         let len = Math.min(this._maxLetters, text.length);
         let _rtl_ = 0.0;
         if (isRTL) {
             _rtl_ = RTL;
         }
-
         let offset = 0.0;
         let kern = fa.kernings;
-
         for (c = 0; c < len; c++) {
             let j = i + c * 24;
             let char = text[c];
-            let n = fa.get(char.charCodeAt(0)) || fa.get(" ".charCodeAt(0))!;
-            if (!n) continue;
+            let n = fa.get(char.charCodeAt(0)) || fa.get(" ".charCodeAt(0));
+            if (!n)
+                continue;
             let tc = n.texCoords;
-
             let m = n.metrics;
-
             a[j] = tc[0];
             a[j + 1] = tc[1];
             a[j + 2] = offset;
             a[j + 3] = _rtl_;
-
             a[j + 4] = tc[2];
             a[j + 5] = tc[3];
             a[j + 6] = offset;
             a[j + 7] = _rtl_;
-
             a[j + 8] = tc[4];
             a[j + 9] = tc[5];
             a[j + 10] = offset;
             a[j + 11] = _rtl_;
-
             a[j + 12] = tc[6];
             a[j + 13] = tc[7];
             a[j + 14] = offset;
             a[j + 15] = _rtl_;
-
             a[j + 16] = tc[8];
             a[j + 17] = tc[9];
             a[j + 18] = offset;
             a[j + 19] = _rtl_;
-
             a[j + 20] = tc[10];
             a[j + 21] = tc[11];
             a[j + 22] = offset;
             a[j + 23] = _rtl_;
-
             //
             // Gliph
             //
@@ -484,45 +356,40 @@ class LabelHandler extends BaseBillboardHandler {
             g[j + 1] = m.nHeight;
             g[j + 2] = m.nXOffset;
             g[j + 3] = m.nYOffset;
-
             g[j + 4] = m.nWidth;
             g[j + 5] = m.nHeight;
             g[j + 6] = m.nXOffset;
             g[j + 7] = m.nYOffset;
-
             g[j + 8] = m.nWidth;
             g[j + 9] = m.nHeight;
             g[j + 10] = m.nXOffset;
             g[j + 11] = m.nYOffset;
-
             g[j + 12] = m.nWidth;
             g[j + 13] = m.nHeight;
             g[j + 14] = m.nXOffset;
             g[j + 15] = m.nYOffset;
-
             g[j + 16] = m.nWidth;
             g[j + 17] = m.nHeight;
             g[j + 18] = m.nXOffset;
             g[j + 19] = m.nYOffset;
-
             g[j + 20] = m.nWidth;
             g[j + 21] = m.nHeight;
             g[j + 22] = m.nXOffset;
             g[j + 23] = m.nYOffset;
-
             let k = kern[char.charCodeAt(0)];
             if (k && text[c + 1]) {
                 let kk = k[text[c + 1].charCodeAt(0)];
                 if (kk) {
                     offset += m.nAdvance + kk;
-                } else {
+                }
+                else {
                     offset += m.nAdvance;
                 }
-            } else {
+            }
+            else {
                 offset += m.nAdvance;
             }
         }
-
         // 49/512 - font atlas left border letter offset
         if (align === ALIGN.CENTER) {
             offset *= -0.5;
@@ -536,7 +403,6 @@ class LabelHandler extends BaseBillboardHandler {
                 a[j + 22] += offset;
             }
         }
-
         for (; c < this._maxLetters; c++) {
             let j = i + c * 24;
             a[j + 3] = EMPTY;
@@ -546,117 +412,82 @@ class LabelHandler extends BaseBillboardHandler {
             a[j + 19] = EMPTY;
             a[j + 23] = EMPTY;
         }
-
         this._changedBuffers[TEXCOORD_BUFFER] = true;
     }
-
-    public override setPositionArr(index: number, positionHigh: Vec3, positionLow: Vec3) {
+    setPositionArr(index, positionHigh, positionLow) {
         let i = index * 18 * this._maxLetters;
-        let a = this._positionHighArr,
-            x = positionHigh.x,
-            y = positionHigh.y,
-            z = positionHigh.z,
-            b = this._positionLowArr,
-            xl = positionLow.x,
-            yl = positionLow.y,
-            zl = positionLow.z;
-
+        let a = this._positionHighArr, x = positionHigh.x, y = positionHigh.y, z = positionHigh.z, b = this._positionLowArr, xl = positionLow.x, yl = positionLow.y, zl = positionLow.z;
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 18;
             a[j] = x;
             a[j + 1] = y;
             a[j + 2] = z;
-
             a[j + 3] = x;
             a[j + 4] = y;
             a[j + 5] = z;
-
             a[j + 6] = x;
             a[j + 7] = y;
             a[j + 8] = z;
-
             a[j + 9] = x;
             a[j + 10] = y;
             a[j + 11] = z;
-
             a[j + 12] = x;
             a[j + 13] = y;
             a[j + 14] = z;
-
             a[j + 15] = x;
             a[j + 16] = y;
             a[j + 17] = z;
-
             // low
             b[j] = xl;
             b[j + 1] = yl;
             b[j + 2] = zl;
-
             b[j + 3] = xl;
             b[j + 4] = yl;
             b[j + 5] = zl;
-
             b[j + 6] = xl;
             b[j + 7] = yl;
             b[j + 8] = zl;
-
             b[j + 9] = xl;
             b[j + 10] = yl;
             b[j + 11] = zl;
-
             b[j + 12] = xl;
             b[j + 13] = yl;
             b[j + 14] = zl;
-
             b[j + 15] = xl;
             b[j + 16] = yl;
             b[j + 17] = zl;
         }
-
         this._changedBuffers[POSITION_BUFFER] = true;
     }
-
-    public override setPickingColorArr(index: number, color: Vec3) {
+    setPickingColorArr(index, color) {
         let i = index * 18 * this._maxLetters;
-        let a = this._pickingColorArr,
-            x = color.x / 255,
-            y = color.y / 255,
-            z = color.z / 255;
-
+        let a = this._pickingColorArr, x = color.x / 255, y = color.y / 255, z = color.z / 255;
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 18;
             a[j] = x;
             a[j + 1] = y;
             a[j + 2] = z;
-
             a[j + 3] = x;
             a[j + 4] = y;
             a[j + 5] = z;
-
             a[j + 6] = x;
             a[j + 7] = y;
             a[j + 8] = z;
-
             a[j + 9] = x;
             a[j + 10] = y;
             a[j + 11] = z;
-
             a[j + 12] = x;
             a[j + 13] = y;
             a[j + 14] = z;
-
             a[j + 15] = x;
             a[j + 16] = y;
             a[j + 17] = z;
         }
-
         this._changedBuffers[PICKINGCOLOR_BUFFER] = true;
     }
-
-    public override setSizeArr(index: number, size: number) {
+    setSizeArr(index, size) {
         let i = index * 6 * this._maxLetters;
         let a = this._sizeArr;
-
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 6;
             a[j] = size;
@@ -666,141 +497,101 @@ class LabelHandler extends BaseBillboardHandler {
             a[j + 4] = size;
             a[j + 5] = size;
         }
-
         this._changedBuffers[SIZE_BUFFER] = true;
     }
-
-    public override setOffsetArr(index: number, offset: Vec3) {
+    setOffsetArr(index, offset) {
         let i = index * 18 * this._maxLetters;
-        let a = this._offsetArr,
-            x = offset.x,
-            y = offset.y,
-            z = offset.z;
-
+        let a = this._offsetArr, x = offset.x, y = offset.y, z = offset.z;
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 18;
             a[j] = x;
             a[j + 1] = y;
             a[j + 2] = z;
-
             a[j + 3] = x;
             a[j + 4] = y;
             a[j + 5] = z;
-
             a[j + 6] = x;
             a[j + 7] = y;
             a[j + 8] = z;
-
             a[j + 9] = x;
             a[j + 10] = y;
             a[j + 11] = z;
-
             a[j + 12] = x;
             a[j + 13] = y;
             a[j + 14] = z;
-
             a[j + 15] = x;
             a[j + 16] = y;
             a[j + 17] = z;
         }
-
         this._changedBuffers[OFFSET_BUFFER] = true;
     }
-
-    public override setRgbaArr(index: number, rgba: Vec4) {
+    setRgbaArr(index, rgba) {
         let i = index * 24 * this._maxLetters;
-        let a = this._rgbaArr,
-            x = rgba.x,
-            y = rgba.y,
-            z = rgba.z,
-            w = rgba.w;
-
+        let a = this._rgbaArr, x = rgba.x, y = rgba.y, z = rgba.z, w = rgba.w;
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 24;
-
             a[j] = x;
             a[j + 1] = y;
             a[j + 2] = z;
             a[j + 3] = w;
-
             a[j + 4] = x;
             a[j + 5] = y;
             a[j + 6] = z;
             a[j + 7] = w;
-
             a[j + 8] = x;
             a[j + 9] = y;
             a[j + 10] = z;
             a[j + 11] = w;
-
             a[j + 12] = x;
             a[j + 13] = y;
             a[j + 14] = z;
             a[j + 15] = w;
-
             a[j + 16] = x;
             a[j + 17] = y;
             a[j + 18] = z;
             a[j + 19] = w;
-
             a[j + 20] = x;
             a[j + 21] = y;
             a[j + 22] = z;
             a[j + 23] = w;
         }
-
         this._changedBuffers[RGBA_BUFFER] = true;
     }
-
-    public setOutlineColorArr(index: number, rgba: Vec4) {
+    setOutlineColorArr(index, rgba) {
         let i = index * 24 * this._maxLetters;
-        let a = this._outlineColorArr,
-            x = rgba.x,
-            y = rgba.y,
-            z = rgba.z,
-            w = rgba.w;
-
+        let a = this._outlineColorArr, x = rgba.x, y = rgba.y, z = rgba.z, w = rgba.w;
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 24;
-
             a[j] = x;
             a[j + 1] = y;
             a[j + 2] = z;
             a[j + 3] = w;
-
             a[j + 4] = x;
             a[j + 5] = y;
             a[j + 6] = z;
             a[j + 7] = w;
-
             a[j + 8] = x;
             a[j + 9] = y;
             a[j + 10] = z;
             a[j + 11] = w;
-
             a[j + 12] = x;
             a[j + 13] = y;
             a[j + 14] = z;
             a[j + 15] = w;
-
             a[j + 16] = x;
             a[j + 17] = y;
             a[j + 18] = z;
             a[j + 19] = w;
-
             a[j + 20] = x;
             a[j + 21] = y;
             a[j + 22] = z;
             a[j + 23] = w;
         }
-
         this._changedBuffers[OUTLINECOLOR_BUFFER] = true;
     }
-
-    public setOutlineArr(index: number, outline: number) {
+    setOutlineArr(index, outline) {
         let i = index * 6 * this._maxLetters;
         let a = this._outlineArr;
-
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 6;
             a[j] = outline;
@@ -810,14 +601,11 @@ class LabelHandler extends BaseBillboardHandler {
             a[j + 4] = outline;
             a[j + 5] = outline;
         }
-
         this._changedBuffers[OUTLINE_BUFFER] = true;
     }
-
-    public override setRotationArr(index: number, rotation: number) {
+    setRotationArr(index, rotation) {
         let i = index * 6 * this._maxLetters;
         let a = this._rotationArr;
-
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 6;
             a[j] = rotation;
@@ -827,53 +615,41 @@ class LabelHandler extends BaseBillboardHandler {
             a[j + 4] = rotation;
             a[j + 5] = rotation;
         }
-
         this._changedBuffers[ROTATION_BUFFER] = true;
     }
-
-    public override setVisibility(index: number, visibility: boolean) {
+    setVisibility(index, visibility) {
         let vArr;
         if (visibility) {
             vArr = [0, 0, 0, -1, 1, -1, 1, -1, 1, 0, 0, 0];
-        } else {
+        }
+        else {
             vArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
         }
         this.setVertexArr(index, vArr);
     }
-
-    public override setVertexArr(index: number, vertexArr: number[] | Float32Array) {
+    setVertexArr(index, vertexArr) {
         let i = index * 12 * this._maxLetters;
         let a = this._vertexArr;
-
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 12;
-
             a[j] = vertexArr[0];
             a[j + 1] = vertexArr[1];
-
             a[j + 2] = vertexArr[2];
             a[j + 3] = vertexArr[3];
-
             a[j + 4] = vertexArr[4];
             a[j + 5] = vertexArr[5];
-
             a[j + 6] = vertexArr[6];
             a[j + 7] = vertexArr[7];
-
             a[j + 8] = vertexArr[8];
             a[j + 9] = vertexArr[9];
-
             a[j + 10] = vertexArr[10];
             a[j + 11] = vertexArr[11];
         }
-
         this._changedBuffers[VERTEX_BUFFER] = true;
     }
-
-    public setFontIndexArr(index: number, fontIndex: number) {
+    setFontIndexArr(index, fontIndex) {
         let i = index * 6 * this._maxLetters;
         let a = this._fontIndexArr;
-
         for (let q = 0; q < this._maxLetters; q++) {
             let j = i + q * 6;
             a[j] = fontIndex;
@@ -883,47 +659,38 @@ class LabelHandler extends BaseBillboardHandler {
             a[j + 4] = fontIndex;
             a[j + 5] = fontIndex;
         }
-
         this._changedBuffers[FONTINDEX_BUFFER] = true;
     }
-
-    public override createSizeBuffer() {
-        let h = this._renderer!.handler;
-        h.gl!.deleteBuffer(this._sizeBuffer as WebGLBuffer);
+    createSizeBuffer() {
+        let h = this._renderer.handler;
+        h.gl.deleteBuffer(this._sizeBuffer);
         this._sizeBuffer = h.createArrayBuffer(this._sizeArr, 1, this._sizeArr.length);
     }
-
-    public createFontIndexBuffer() {
-        let h = this._renderer!.handler;
-        h.gl!.deleteBuffer(this._fontIndexBuffer as WebGLBuffer);
+    createFontIndexBuffer() {
+        let h = this._renderer.handler;
+        h.gl.deleteBuffer(this._fontIndexBuffer);
         this._fontIndexBuffer = h.createArrayBuffer(this._fontIndexArr, 1, this._fontIndexArr.length);
     }
-
-    public override createTexCoordBuffer() {
-        let h = this._renderer!.handler;
-        h.gl!.deleteBuffer(this._texCoordBuffer as WebGLBuffer);
+    createTexCoordBuffer() {
+        let h = this._renderer.handler;
+        h.gl.deleteBuffer(this._texCoordBuffer);
         this._texCoordBuffer = h.createArrayBuffer(this._texCoordArr, 4, this._texCoordArr.length / 4);
-
-        h.gl!.deleteBuffer(this._gliphParamBuffer as WebGLBuffer);
+        h.gl.deleteBuffer(this._gliphParamBuffer);
         this._gliphParamBuffer = h.createArrayBuffer(this._gliphParamArr, 4, this._gliphParamArr.length / 4);
     }
-
-    public createOutlineBuffer() {
-        let h = this._renderer!.handler;
-        h.gl!.deleteBuffer(this._outlineBuffer as WebGLBuffer);
+    createOutlineBuffer() {
+        let h = this._renderer.handler;
+        h.gl.deleteBuffer(this._outlineBuffer);
         this._outlineBuffer = h.createArrayBuffer(this._outlineArr, 1, this._outlineArr.length);
     }
-
-    public createOutlineColorBuffer() {
-        let h = this._renderer!.handler;
-        h.gl!.deleteBuffer(this._outlineColorBuffer as WebGLBuffer);
+    createOutlineColorBuffer() {
+        let h = this._renderer.handler;
+        h.gl.deleteBuffer(this._outlineColorBuffer);
         this._outlineColorBuffer = h.createArrayBuffer(this._outlineColorArr, 4, this._outlineColorArr.length / 4);
     }
-
-    public setMaxLetters(c: number) {
+    setMaxLetters(c) {
         this._maxLetters = c;
         // TODO: ...
     }
 }
-
-export {LabelHandler};
+export { LabelHandler };