@openglobus/og 0.18.0 → 0.18.1

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

@@ -1,6 +1,3 @@
-import {Handler, WebGLBufferExt} from "./Handler";
-import {Program} from "./Program";
-
 /**
  * This is shader program controller that used by handler object to access the shader
  * program capabilities, like switching program during the rendering.
@@ -10,61 +7,36 @@ import {Program} from "./Program";
  * @param {Program} program - Shader program.
  */
 export class ProgramController {
-
-    /**
-     * Handler.
-     * @protected
-     * @type {Handler}
-     */
-    protected _handler: Handler;
-
-    /**
-     * Shader program.
-     * @public
-     * @type {Program}
-     */
-    public _program: Program;
-
-    /**
-     * Program current frame activation flag.
-     * @public
-     * @type {boolean}
-     */
-    public _activated: boolean;
-
-    constructor(handler: Handler, program: Program) {
+    constructor(handler, program) {
         this._program = program;
         this._handler = handler;
         this._activated = false;
     }
-
     /**
      * Lazy create program call.
      * @public
      */
-    public initialize() {
+    initialize() {
         if (this._handler.gl) {
             this._program.createProgram(this._handler.gl);
         }
     }
-
     /**
      * Returns controller's shader program.
      * @public
      * @return {Program} -
      */
-    public getProgram(): Program {
+    getProgram() {
         return this._program;
     }
-
     /**
      * Activates current shader program.
      * @public
      * @returns {ProgramController} -
      */
-    public activate(): this {
+    activate() {
         if (!this._activated) {
-            this._handler.activeProgram!.deactivate();
+            this._handler.activeProgram.deactivate();
             this._handler.activeProgram = this;
             let p = this._program;
             this._activated = true;
@@ -73,12 +45,11 @@ export class ProgramController {
         }
         return this;
     }
-
     /**
      * Remove program from handler
      * @public
      */
-    public remove() {
+    remove() {
         let p = this._handler.programs;
         if (p[this._program.name]) {
             if (this._activated) {
@@ -88,37 +59,33 @@ export class ProgramController {
             delete p[this._program.name];
         }
     }
-
     /**
      * Deactivate shader program. This is not necessary while activate function used.
      * @public
      */
-    public deactivate() {
+    deactivate() {
         this._program.disableAttribArrays();
         this._activated = false;
     }
-
     /**
      * Returns program activity.
      * @public
      * @return {boolean} -
      */
-    public isActive(): boolean {
+    isActive() {
         return this._activated;
     }
-
     /**
      * Sets program uniforms and attributes values and return controller instance.
      * @public
      * @param {Record<string, any>} params - Object with variable name and value like { value: 12, someArray:[1,2,3], uSampler: texture,... }
      * @return {ProgramController} -
      */
-    public set(params: Record<string, any>) {
+    set(params) {
         this.activate();
         this._program.set(params);
         return this;
     }
-
     /**
      * Draw index buffer with this program.
      * @public
@@ -126,18 +93,17 @@ export class ProgramController {
      * @param {WebGLBuffer} buffer - Buffer to draw.
      * @return {ProgramController} Returns current shader controller instance.
      */
-    public drawIndexBuffer(mode: number, buffer: WebGLBufferExt): ProgramController {
+    drawIndexBuffer(mode, buffer) {
         this._program.drawIndexBuffer(mode, buffer);
         return this;
     }
-
     /**
      * Calls Gl drawArray function.
      * @param {number} mode - Gl draw mode.
      * @param {number} numItems - draw items count.
      * @return {ProgramController} Returns current shader controller instance.
      */
-    public drawArrays(mode: number, numItems: number): ProgramController {
+    drawArrays(mode, numItems) {
         this._program.drawArrays(mode, numItems);
         return this;
     }

package/{src/webgl/index.ts → lib/js/webgl/index.d.ts}

@@ -3,11 +3,4 @@ import { Handler } from "./Handler";
 import { Multisample } from "./Multisample";
 import { Program } from "./Program";
 import { types } from "./types";
-
-export {
-    Framebuffer,
-    Handler,
-    Multisample,
-    types,
-    Program
-};
+export { Framebuffer, Handler, Multisample, types, Program };

package/lib/js/webgl/index.js

@@ -0,0 +1,6 @@
+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/lib/js/webgl/types.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @module og/webgl/types
+ */
+export declare const types: {
+    [id: string]: number;
+};
+export declare const typeStr: {
+    [id: string]: number;
+};

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

@@ -1,8 +1,7 @@
 /**
  * @module og/webgl/types
  */
-
-let _declarations: string[] = [
+let _declarations = [
     "FLOAT", "DOUBLE", "BOOL", "INT", "UINT",
     "VEC2", "VEC3", "VEC4", "DVEC2",
     "DVEC3", "DVEC4",
@@ -15,15 +14,13 @@ let _declarations: string[] = [
     "DMAT4X2", "DMAT4X3",
     "SAMPLER1D", "SAMPLER2D", "SAMPLER3D", "SAMPLERCUBE", "SAMPLER2DSHADOW",
     "SAMPLER2DARRAY",
-    "INTXX", "FLOATXX"];
-
-export const types: { [id: string]: number } = {};
-
+    "INTXX", "FLOATXX"
+];
+export const types = {};
 for (let i = 0; i < _declarations.length; i++) {
     types[_declarations[i]] = i;
 }
-
-export const typeStr: { [id: string]: number } = {};
+export const typeStr = {};
 for (let i = 0; i < _declarations.length; i++) {
     typeStr[_declarations[i].toLowerCase()] = types[_declarations[i]];
 }

package/lib/js/webgl/variableHandlers.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @module og/webgl/variableHandlers
+ */
+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;
+};
+export declare const variableHandlers: VariableHandler;

package/lib/js/webgl/variableHandlers.js

@@ -0,0 +1,78 @@
+/**
+ * @module og/webgl/variableHandlers
+ */
+import { types } from "./types";
+/*=========================
+   Uniforms callbacks
+ =========================*/
+export const variableHandlers = {
+    u: [],
+    a: []
+};
+variableHandlers.u[types.MAT4] = function (program, variable) {
+    program.gl.uniformMatrix4fv(variable._pName, false, variable.value);
+};
+variableHandlers.u[types.MAT3] = function (program, variable) {
+    program.gl.uniformMatrix3fv(variable._pName, false, variable.value);
+};
+variableHandlers.u[types.FLOAT] = function (program, variable) {
+    program.gl.uniform1f(variable._pName, variable.value);
+};
+variableHandlers.u[types.INT] = function (program, variable) {
+    program.gl.uniform1i(variable._pName, variable.value);
+};
+variableHandlers.u[types.VEC2] = function (program, variable) {
+    program.gl.uniform2fv(variable._pName, variable.value);
+};
+variableHandlers.u[types.VEC3] = function (program, variable) {
+    program.gl.uniform3fv(variable._pName, variable.value);
+};
+variableHandlers.u[types.VEC4] = function (program, variable) {
+    program.gl.uniform4fv(variable._pName, variable.value);
+};
+variableHandlers.u[types.SAMPLER2D] = function (program, variable) {
+    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, variable) {
+    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, variable) {
+    let value = variable.value;
+    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, variable) {
+    program.gl.uniform1iv(variable._pName, variable.value);
+};
+variableHandlers.u[types.FLOATXX] = function (program, variable) {
+    program.gl.uniform1fv(variable._pName, variable.value);
+};
+/*========================
+   Attributes callbacks
+ ========================*/
+variableHandlers.a[types.FLOAT] = function (program, variable) {
+    program.gl.vertexAttrib1f(variable._pName, variable.value);
+};
+variableHandlers.a[types.VEC2] = function (program, variable) {
+    program.gl.vertexAttrib2fv(variable._pName, variable.value);
+};
+variableHandlers.a[types.VEC3] = function (program, variable) {
+    program.gl.vertexAttrib3fv(variable._pName, variable.value);
+};
+//VariableHandlers.a[types.VEC4] = function (program, variable) {
+//    program.gl.vertexAttrib4fv(variable._pName, variable.value);
+//};

package/package.json

@@ -1,20 +1,23 @@
 {
   "name": "@openglobus/og",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers, and 3D objects. It uses the WebGL technology, open source, and completely free.",
   "directories": {
     "example": "./sandbox"
   },
-  "main": "./src/index.ts",
+  "main": "./lib/js/index.js",
   "style": "./css/og.css",
   "scripts": {
     "docs": "jsdoc -r ./src/ -c ./jsdoc.conf.json -d ./docs",
     "serve": "ws -p 8080",
     "build": "rollup -c --bundleConfigAsCjs",
+    "clean": "rm -rf ./lib ./docs",
+    "prepublishOnly": "npm run build; npm run gen_js",
     "dev": "rollup -c -w --bundleConfigAsCjs --environment NODE_ENV:development",
     "test": "jest --env=jsdom --runInBand --ci --coverage=false",
     "test_watch": "jest --env=jsdom --watch",
     "lint": "eslint -c ./.eslintrc.js src/",
+    "gen_js": "tsc --build tsconfig.json --declaration",
     "font": "node ./fonts/index.js"
   },
   "repository": {
@@ -28,39 +31,29 @@
     "email": "mgevlich@gmail.com"
   },
   "homepage": "https://www.openglobus.org",
-  "exports": {
-    ".": "./src/index.js",
-    "./layer": "./src/layer/index.js",
-    "./bv": "./src/index.js",
-    "./terrain": "./src/terrain/index.js",
-    "./entity": "./src/entity/index.js",
-    "./control": "./src/control/index.js",
-    "./webgl": "./src/webgl/index.js",
-    "./scene": "./src/scene/index.js",
-    "./css/og.css": "./css/og.css"
-  },
   "devDependencies": {
-    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-env": "^7.22.20",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-terser": "^0.4.1",
-    "@types/jest": "^29.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
-    "clean-jsdoc-theme": "^4.2.7",
-    "eslint": "^8.39.0",
-    "jest": "^29.5.0",
-    "jest-canvas-mock": "^2.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "@rollup/plugin-terser": "^0.4.3",
+    "@rollup/plugin-typescript": "^11.1.3",
+    "@types/jest": "^29.5.5",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
+    "clean-jsdoc-theme": "^4.2.10",
+    "eslint": "^8.49.0",
+    "jest": "^29.7.0",
+    "jest-canvas-mock": "^2.5.2",
+    "jest-environment-jsdom": "^29.7.0",
     "jsdoc": "^4.0.2",
-    "lint-staged": "^13.2.2",
+    "lint-staged": "^14.0.1",
     "local-web-server": "^5.3.0",
-    "postcss": "^8.4.23",
-    "prettier": "^2.8.8",
-    "rollup": "^3.21.3",
+    "postcss": "^8.4.29",
+    "prettier": "^3.0.3",
+    "rollup": "^3.29.2",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-postcss": "^4.0.2",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "lint-staged": {
     "*.{js,ts}": [
@@ -68,8 +61,7 @@
     ]
   },
   "files": [
-    "src/**/*",
-    "dist/**/*",
+    "lib/**/*",
     "css/**/*"
   ],
   "keywords": [
@@ -78,8 +70,5 @@
     "webgl",
     "globe",
     "og"
-  ],
-  "dependencies": {
-    "@rollup/plugin-typescript": "^11.1.2"
-  }
+  ]
 }