@pirireis/webglobeplugins 1.0.2 → 1.0.4

package/{programs/totems/canvas-webglobe-info.ts → webglobeplugins/programs/totems/canvas-webglobe-info.js}

@@ -1,6 +1,4 @@
-import { globeProgramCache } from "../programcache";
-import { Globe } from "../../types"
-
+import { globeProgramCache } from "../programcache";
 export const WebGlobeInfoUniformBlockString = `
 layout(std140) uniform WebGlobeInfo {
     vec2 canvas_resolution;
@@ -10,147 +8,134 @@ layout(std140) uniform WebGlobeInfo {
     float world_tilt;
     float earth_distance;
 }; 
-`;
-
-
-export default class CanvasWebGlobeInfo {
-    id: string;
-    description: string;
-    gl: WebGL2RenderingContext | null;
-    globe: Globe | null;
-    ubo: WebGLBuffer | null;
-    traslateFloat32: Float32Array;
-    mapWHFloat32: Float32Array;
-
-    constructor() {
-        this.id = "CanvasWebGlobeInfo";
-        this.description =
-            `Sets a uniform block and provides buffer for it. The following is the glsl uniform block:` +
-            WebGlobeInfoUniformBlockString;
-        this.gl = null;
-        this.globe = null;
-        this.ubo = null;
-        this.traslateFloat32 = new Float32Array(3);
-        this.mapWHFloat32 = new Float32Array(2);
-    }
-
-    init(globe: Globe, gl: WebGL2RenderingContext) {
-        this.gl = gl;
-        this.globe = globe;
-        this.ubo = this._createUBO();
-        this.traslateFloat32 = new Float32Array(3);
-        this.mapWHFloat32 = new Float32Array(2);
-        this.setGeometry();
-        this.resize();
-    }
-
-    _createUBO(): WebGLBuffer | null {
-        if (!this.gl) return null;
-        const gl = this.gl;
-        const ubo = gl.createBuffer();
-        if (!ubo) return null;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        gl.bufferData(gl.UNIFORM_BUFFER, 164, gl.STREAM_DRAW);
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, 0, ubo);
-        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-        return ubo;
-    }
-
-    resize() {
-        if (!this.gl || !this.globe || !this.ubo) return;
-        const { gl, globe, ubo } = this;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        gl.bufferSubData(
-            gl.UNIFORM_BUFFER,
-            152,
-            new Float32Array([globe.api_ScrW(), globe.api_ScrH()])
-        );
-        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-    }
-
-    setGeometry() {
-        if (!this.gl || !this.globe || !this.ubo) return;
-        const { gl, globe, ubo } = this;
-        const is3D = globe.api_GetCurrentGeometry() === 0 ? 1 : 0;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        gl.bufferSubData(gl.UNIFORM_BUFFER, 140, new Float32Array([is3D]));
-    }
-
-    draw3D(projection: Float32Array, modelView: Float32Array, translate: { x: number; y: number; z: number }) {
-        if (!this.gl || !this.globe || !this.ubo) return;
-        const { gl, traslateFloat32, ubo, mapWHFloat32, globe } = this;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        {
-            // view, projection, translate
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
-            traslateFloat32.set([translate.x, translate.y, translate.z], 0);
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 128, traslateFloat32);
-        }
-        {
-            // zoom level
-            gl.bufferSubData(
-                gl.UNIFORM_BUFFER,
-                160,
-                new Float32Array([globe.api_GetCurrentLODWithDecimal()])
-            );
-        }
-        {
-            // mapWH
-            if (globe.api_GetCurrentGeometry() === 1) {
-                const { width, height } = globe.api_GetCurrentWorldWH();
-                mapWHFloat32.set([width, height]);
-                gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
-            }
-        }
-        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-    }
-
-    getUBO(): WebGLBuffer | null {
-        return this.ubo;
-    }
-
-    bind(bindingPoint: number) {
-        if (!this.gl || !this.ubo) return;
-        const { gl, ubo } = this;
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, ubo);
-    }
-
-    unbind(bindingPoint: number) {
-        if (!this.gl) return;
-        const { gl } = this;
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, null);
-    }
-
-    free() {
-        if (!this.gl || !this.ubo) return;
-        const { gl, ubo } = this;
-        gl.deleteBuffer(ubo);
-    }
-
-    readBuffer() {
-        if (!this.gl || !this.ubo) return null;
-        const result = new Float32Array(41);
-        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, this.ubo);
-        this.gl.getBufferSubData(this.gl.UNIFORM_BUFFER, 0, result);
-        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, null);
-        return {
-            view: result.slice(0, 16),
-            projection: result.slice(16, 32),
-            translate: result.slice(32, 35),
-            is3D: result[35],
-            mapWH: result.slice(36, 38),
-            screenWH: result.slice(38, 40),
-            z_level: result[40],
-        };
-    }
-}
-
-export const CanvasWebGlobeInfoCache = Object.freeze({
-    get: (globe: Globe) => {
-        return globeProgramCache.getProgram(globe, CanvasWebGlobeInfo);
-    },
-    release: (globe: Globe) => {
-        return globeProgramCache.releaseProgram(globe, CanvasWebGlobeInfo);
-    },
-});
+`;
+export default class CanvasWebGlobeInfo {
+    id;
+    description;
+    gl;
+    globe;
+    ubo;
+    traslateFloat32;
+    mapWHFloat32;
+    constructor() {
+        this.id = "CanvasWebGlobeInfo";
+        this.description =
+            `Sets a uniform block and provides buffer for it. The following is the glsl uniform block:` +
+                WebGlobeInfoUniformBlockString;
+        this.gl = null;
+        this.globe = null;
+        this.ubo = null;
+        this.traslateFloat32 = new Float32Array(3);
+        this.mapWHFloat32 = new Float32Array(2);
+    }
+    init(globe, gl) {
+        this.gl = gl;
+        this.globe = globe;
+        this.ubo = this._createUBO();
+        this.traslateFloat32 = new Float32Array(3);
+        this.mapWHFloat32 = new Float32Array(2);
+        this.setGeometry();
+        this.resize();
+    }
+    _createUBO() {
+        if (!this.gl)
+            return null;
+        const gl = this.gl;
+        const ubo = gl.createBuffer();
+        if (!ubo)
+            return null;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        gl.bufferData(gl.UNIFORM_BUFFER, 164, gl.STREAM_DRAW);
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, 0, ubo);
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+        return ubo;
+    }
+    resize() {
+        if (!this.gl || !this.globe || !this.ubo)
+            return;
+        const { gl, globe, ubo } = this;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 152, new Float32Array([globe.api_ScrW(), globe.api_ScrH()]));
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+    }
+    setGeometry() {
+        if (!this.gl || !this.globe || !this.ubo)
+            return;
+        const { gl, globe, ubo } = this;
+        const is3D = globe.api_GetCurrentGeometry() === 0 ? 1 : 0;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 140, new Float32Array([is3D]));
+    }
+    draw3D(projection, modelView, translate) {
+        if (!this.gl || !this.globe || !this.ubo)
+            return;
+        const { gl, traslateFloat32, ubo, mapWHFloat32, globe } = this;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        {
+            // view, projection, translate
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
+            traslateFloat32.set([translate.x, translate.y, translate.z], 0);
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 128, traslateFloat32);
+        }
+        {
+            // zoom level
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 160, new Float32Array([globe.api_GetCurrentLODWithDecimal()]));
+        }
+        {
+            // mapWH
+            if (globe.api_GetCurrentGeometry() === 1) {
+                const { width, height } = globe.api_GetCurrentWorldWH();
+                mapWHFloat32.set([width, height]);
+                gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
+            }
+        }
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+    }
+    getUBO() {
+        return this.ubo;
+    }
+    bind(bindingPoint) {
+        if (!this.gl || !this.ubo)
+            return;
+        const { gl, ubo } = this;
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, ubo);
+    }
+    unbind(bindingPoint) {
+        if (!this.gl)
+            return;
+        const { gl } = this;
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, null);
+    }
+    free() {
+        if (!this.gl || !this.ubo)
+            return;
+        const { gl, ubo } = this;
+        gl.deleteBuffer(ubo);
+    }
+    readBuffer() {
+        if (!this.gl || !this.ubo)
+            return null;
+        const result = new Float32Array(41);
+        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, this.ubo);
+        this.gl.getBufferSubData(this.gl.UNIFORM_BUFFER, 0, result);
+        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, null);
+        return {
+            view: result.slice(0, 16),
+            projection: result.slice(16, 32),
+            translate: result.slice(32, 35),
+            is3D: result[35],
+            mapWH: result.slice(36, 38),
+            screenWH: result.slice(38, 40),
+            z_level: result[40],
+        };
+    }
+}
+export const CanvasWebGlobeInfoCache = Object.freeze({
+    get: (globe) => {
+        return globeProgramCache.getProgram(globe, CanvasWebGlobeInfo);
+    },
+    release: (globe) => {
+        return globeProgramCache.releaseProgram(globe, CanvasWebGlobeInfo);
+    },
+});

package/{programs/totems/globe-changes.ts → webglobeplugins/programs/totems/globe-changes.js}

@@ -1,79 +1,59 @@
-import { Globe, GlobeLookInfo, GlobeChanges } from "../../types";
-
-
-
-export class GlobeChangeObserver {
-    private globe: Globe;
-    private lastLOD: number = -1;
-    private lastGeometry: 0 | 1;
-    private lastWorldWH: { width: number; height: number } = { width: 0, height: 0 };
-    private lastLook: GlobeLookInfo = {
-        CenterLong: 0,
-        CenterLat: 0,
-        Distance: 0,
-        Tilt: 0,
-        NorthAng: 0
-    };
-    private lastElevationCoefficient: number = NaN;
-    changes: GlobeChanges = {
-        geometry: false,
-        look: false,
-        lod: false,
-        lod2DWheel: false,
-        elevationScale: false,
-        screenMoved: false
-    }
-
-    constructor(globe: Globe) {
-        this.globe = globe;
-        this.lastGeometry = globe.api_GetCurrentGeometry();
-        this.lastLook = globe.api_GetCurrentLookInfo();
-        this.lastLOD = globe.api_GetCurrentLODWithDecimal();
-        this.lastWorldWH = globe.api_GetCurrentWorldWH();
-        this.lastElevationCoefficient = globe.api_GetZScale()
-    }
-
-
-    checkChanges(): void {
-        const globe = this.globe;
-        const currentGeometry = globe.api_GetCurrentGeometry();
-        const currentLook = globe.api_GetCurrentLookInfo();
-        const currentLOD = globe.api_GetCurrentLODWithDecimal();
-        const currentWorldWH = globe.api_GetCurrentWorldWH();
-
-        this.changes.geometry = (this.lastGeometry !== currentGeometry);
-        this.changes.look = (
-            this.lastLook.CenterLong !== currentLook.CenterLong ||
-            this.lastLook.CenterLat !== currentLook.CenterLat ||
-            this.lastLook.Distance !== currentLook.Distance ||
-            this.lastLook.Tilt !== currentLook.Tilt ||
-            this.lastLook.NorthAng !== currentLook.NorthAng ||
-            this.lastWorldWH.width !== currentWorldWH.width ||
-            this.lastWorldWH.height !== currentWorldWH.height
-        );
-
-        this.changes.lod = (this.lastLOD !== currentLOD);
-        this.changes.lod2DWheel = (!globe.api_IsScreenMoving() && this.changes.lod);
-
-        // Update last known states
-        this.lastGeometry = currentGeometry;
-        this.lastLook = currentLook;
-        this.lastLOD = currentLOD;
-        this.lastWorldWH = currentWorldWH;
-
-        this.changes.screenMoved = (this.changes.geometry ||
-            this.changes.look ||
-            this.changes.lod ||
-            this.changes.lod2DWheel);
-
-    }
-
-
-    getChanges(): GlobeChanges {
-        return this.changes;
-    }
-
-}
-
-
-
+export class GlobeChangeObserver {
+    globe;
+    lastLOD = -1;
+    lastGeometry;
+    lastWorldWH = { width: 0, height: 0 };
+    lastLook = {
+        CenterLong: 0,
+        CenterLat: 0,
+        Distance: 0,
+        Tilt: 0,
+        NorthAng: 0
+    };
+    lastElevationCoefficient = NaN;
+    changes = {
+        geometry: false,
+        look: false,
+        lod: false,
+        lod2DWheel: false,
+        elevationScale: false,
+        screenMoved: false
+    };
+    constructor(globe) {
+        this.globe = globe;
+        this.lastGeometry = globe.api_GetCurrentGeometry();
+        this.lastLook = globe.api_GetCurrentLookInfo();
+        this.lastLOD = globe.api_GetCurrentLODWithDecimal();
+        this.lastWorldWH = globe.api_GetCurrentWorldWH();
+        this.lastElevationCoefficient = globe.api_GetZScale();
+    }
+    checkChanges() {
+        const globe = this.globe;
+        const currentGeometry = globe.api_GetCurrentGeometry();
+        const currentLook = globe.api_GetCurrentLookInfo();
+        const currentLOD = globe.api_GetCurrentLODWithDecimal();
+        const currentWorldWH = globe.api_GetCurrentWorldWH();
+        this.changes.geometry = (this.lastGeometry !== currentGeometry);
+        this.changes.look = (this.lastLook.CenterLong !== currentLook.CenterLong ||
+            this.lastLook.CenterLat !== currentLook.CenterLat ||
+            this.lastLook.Distance !== currentLook.Distance ||
+            this.lastLook.Tilt !== currentLook.Tilt ||
+            this.lastLook.NorthAng !== currentLook.NorthAng ||
+            this.lastWorldWH.width !== currentWorldWH.width ||
+            this.lastWorldWH.height !== currentWorldWH.height);
+        this.changes.lod = (this.lastLOD !== currentLOD);
+        this.changes.lod2DWheel = (!globe.api_IsScreenMoving() && this.changes.lod);
+        // Update last known states
+        this.lastGeometry = currentGeometry;
+        this.lastLook = currentLook;
+        this.lastLOD = currentLOD;
+        this.lastWorldWH = currentWorldWH;
+        this.changes.screenMoved = (this.changes.geometry ||
+            this.changes.look ||
+            this.changes.lod ||
+            this.changes.lod2DWheel);
+    }
+    getChanges() {
+        return this.changes;
+    }
+}