@openglobus/og 0.17.2 → 0.18.0

package/src/{og/scene/Axes.js → scene/Axes.ts}

@@ -1,21 +1,25 @@
-'use strict';
-
-import { Program } from '../webgl/Program.js';
-import { RenderNode } from './RenderNode.js';
+import {Program} from '../webgl/Program';
+import {RenderNode} from './RenderNode';
+import {WebGLBufferExt} from "../webgl/Handler";
 
 class Axes extends RenderNode {
-    constructor(size) {
+
+    public size: number;
+    public axesBuffer: WebGLBufferExt | null;
+    public axesColorBuffer: WebGLBufferExt | null;
+
+    constructor(size: number = 100) {
         super("Axes");
 
-        this.size = size || 100;
+        this.size = size;
         this.axesBuffer = null;
         this.axesColorBuffer = null;
     }
 
-    init() {
-        this.createAxisBuffer(this.size);
-        this.drawMode = this.renderer.handler.gl.LINES;
-        this.renderer.handler.addProgram(new Program("axesShader", {
+    public override init() {
+        this.createAxesBuffer(this.size);
+        this.drawMode = this.renderer!.handler.gl!.LINES;
+        this.renderer!.handler.addProgram(new Program("axesShader", {
             uniforms: {
                 projectionViewMatrix: 'mat4'
             },
@@ -41,34 +45,34 @@ class Axes extends RenderNode {
         }));
     }
 
-    frame() {
+    public override frame() {
 
-        this.renderer.handler.programs.axesShader.activate().set({
-            projectionViewMatrix: this.renderer.activeCamera.getProjectionViewMatrix(),
-            aVertexPosition: this.axisBuffer,
-            aVertexColor: this.axisColorBuffer
+        this.renderer!.handler.programs.axesShader.activate().set({
+            projectionViewMatrix: this.renderer!.activeCamera!.getProjectionViewMatrix(),
+            aVertexPosition: this.axesBuffer,
+            aVertexColor: this.axesColorBuffer
         });
 
-        this.renderer.handler.programs.axesShader.drawArrays(this.drawMode, this.axisBuffer.numItems);
+        this.renderer!.handler.programs.axesShader.drawArrays(this.drawMode, this.axesBuffer!.numItems);
     }
 
-    createAxisBuffer(gridSize) {
+    public createAxesBuffer(gridSize: number) {
 
-        var vertices = [
+        const vertices = [
             0.0, 0.0, 0.0, gridSize - 1, 0.0, 0.0, // x - R
             0.0, 0.0, 0.0, 0.0, gridSize - 1, 0.0, // y - B  
             0.0, 0.0, 0.0, 0.0, 0.0, gridSize - 1  // z - G
         ];
 
-        var colors = [
+        const colors = [
             1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0,   // x - R
             0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,   // y - B
             0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0    // z - G
         ];
 
-        this.axisBuffer = this.renderer.handler.createArrayBuffer(new Float32Array(vertices), 3, 6);
-        this.axisColorBuffer = this.renderer.handler.createArrayBuffer(new Float32Array(colors), 4, 6);
+        this.axesBuffer = this.renderer!.handler.createArrayBuffer(new Float32Array(vertices), 3, 6);
+        this.axesColorBuffer = this.renderer!.handler.createArrayBuffer(new Float32Array(colors), 4, 6);
     }
 }
 
-export { Axes };
+export {Axes};

package/src/{og/scene/BaseNode.js → scene/BaseNode.ts}

@@ -1,55 +1,62 @@
-"use strict";
-
 /**
  * Scene node base class.
  * @class
  * @param {string} name - Node name.
  */
 class BaseNode {
-    constructor(name) {
-        /**
-         * Node name.
-         * @public
-         * @type {string}
-         */
-        this.name = name;
-
-        /**
-         * Top scene tree node pointer.
-         * @public
-         * @type {BaseNode}
-         */
+
+    static __counter__: number = 0;
+
+    protected __id: number;
+
+    /**
+     * Node name.
+     * @public
+     * @type {string}
+     */
+    protected _name: string;
+
+    /**
+     * Top scene tree node pointer.
+     * @public
+     * @type {BaseNode}
+     */
+    public topNode: BaseNode;
+
+    protected _dictionary: Record<string, BaseNode>;
+
+    /**
+     * Children nodes.
+     * @public
+     * @type {Array.<BaseNode>}
+     */
+    public childNodes: BaseNode[];
+
+    /**
+     * Parent node pointer.
+     * @public
+     * @type {BaseNode}
+     */
+    public parentNode: BaseNode | null;
+
+    constructor(name?: string) {
+
+        this.__id = BaseNode.__counter__++;
+
+        this._name = name || `nonameNode:${this.__id}`;
+
         this.topNode = this;
 
-        this._dictionary = [];
-        this._dictionary[name] = this;
+        this._dictionary = {};
+        this._dictionary[this._name] = this;
 
-        /**
-         * Children nodes.
-         * @public
-         * @type {Array.<RenderNode>}
-         */
         this.childNodes = [];
 
-        /**
-         * Parent node pointer.
-         * @public
-         * @type {RenderNode}
-         */
         this.parentNode = null;
-
-        this.__staticId = BaseNode._staticCounter++;
     }
 
-    static get _staticCounter() {
-        if (!this.__counter__ && this.__counter__ !== 0) {
-            this.__counter__ = 0;
-        }
-        return this.__counter__;
-    }
-
-    static set _staticCounter(n) {
-        this.__counter__ = n;
+    public get name(): string {
+        return this._name;
     }
 
     /**
@@ -57,7 +64,7 @@ class BaseNode {
      * @public
      * @type {BaseNode}
      */
-    addNode(node) {
+    public addNode(node: BaseNode) {
         if (this.parentNode == null) {
             node.topNode = this;
         } else {
@@ -73,7 +80,7 @@ class BaseNode {
      * Destroy node.
      * @public
      */
-    destroy() {
+    public destroy() {
         for (let i = 0; i < this.childNodes.length; i++) {
             this.childNodes[i].destroy();
         }
@@ -86,7 +93,7 @@ class BaseNode {
      * @param {string} name - Node name.
      * @return {RenderNode} Node object in the current node.
      */
-    getNodeByName(name) {
+    public getNodeByName(name: string): BaseNode {
         return this._dictionary[name];
     }
 
@@ -94,16 +101,15 @@ class BaseNode {
      * Clear current node.
      * @protected
      */
-    _clear() {
-        this.name = "";
+    protected _clear() {
         this.parentNode = null;
-        this.topNode = null;
+        this.topNode = this;
         this.childNodes.length = 0;
     }
 
-    isEqual(node) {
-        return node.__staticId === this.__staticId;
+    public isEqual(node: BaseNode): boolean {
+        return node.__id === this.__id;
     }
 }
 
-export { BaseNode };
+export {BaseNode};