@pirireis/webglobeplugins 1.0.2 → 1.0.4

package/{util → webglobeplugins/util}/index.js

@@ -1,9 +1,10 @@
-// import * as webglobjectbuilders from './webglobjectbuilders';
-// import * as shaderfunctions from './shaderfunctions';
-// import * as geometry from './geometry';
-// import * as webglobe from './webglobe';
-// export { webglobjectbuilders, shaderfunctions, geometry, webglobe };
-// export * from './webglobe';
-// export * from './webglobjectbuilders';
-// export * from './shaderfunctions';
-// export * from './geometry';
+"use strict";
+// import * as webglobjectbuilders from './webglobjectbuilders';
+// import * as shaderfunctions from './shaderfunctions';
+// import * as geometry from './geometry';
+// import * as webglobe from './webglobe';
+// export { webglobjectbuilders, shaderfunctions, geometry, webglobe };
+// export * from './webglobe';
+// export * from './webglobjectbuilders';
+// export * from './shaderfunctions';
+// export * from './geometry';

package/webglobeplugins/util/interpolation/index.js

@@ -0,0 +1 @@
+"use strict";

package/webglobeplugins/util/interpolation/timetrack/index.js

@@ -0,0 +1,2 @@
+const createWorker = () => new Worker(new URL('./web-worker.js', import.meta.url), { type: 'module' });
+export { createWorker };

package/{util → webglobeplugins/util}/interpolation/timetrack/timetrack-interpolator.js

@@ -1,94 +1,79 @@
-import { findFirstIndexInRange } from '../../algorithms/search-binary';
-import {
-    sphericalLinearInterpolation_Cartesian3d,
-    sphericalLinearInterpolation_Mercator,
-} from '../../../Math/methods';
-
-
-
-/**
- * @typedef {Array<number>} vec3 [x, y, z]
- * @typedef {Array<number>} vec2 [x, y]
- * @typedef {Array<number>} vec4 [x, y, z, w]
- * @typedef {number} fraction a number between 0 and 1
- * @typedef {Array<number>} wgs84 [long, lat]
- */
-
-const _0vec3 = [0, 0, 0];
-
-const GEOMETRY = Object.freeze({
-    CARTESIAN3D: 0,
-    MERCATOR: 1,
-});
-
-class TimeTrackInterpolator {
-    /**
-     * @typedef Timetrack
-     * @property {Array<vec4>}} coordinates [x,y,z, length]
-     * @property {Array<Number>} times  
-     * @param {Array<Timetrack>} timeTracks 
-     */
-    constructor({ timeTracks, bbox = null, geometry = GEOMETRY.CARTESIAN3D } = {}) {
-        this.timeTracks = null;
-        this.timeTracksStartTimes = null;
-        this.geometry = geometry;
-        if (timeTracks) this.setTimetracks(timeTracks);
-        if (bbox) this.setBbox(bbox);
-    }
-
-
-    setGeometry(geometry) {
-        if (geometry !== GEOMETRY.CARTESIAN3D && geometry !== GEOMETRY.MERCATOR) {
-            throw new Error('Invalid geometry');
-        }
-        this.geometry = geometry;
-    }
-
-    setTimetracks(timeTracks) {
-        this.timeTracks = timeTracks;
-    }
-
-
-    interpolate(time) {
-        const { timeTracks, geometry } = this;
-        if (!timeTracks) { return null; }
-        const resultArray = [];
-        const info = {
-            outOfRange: 0,
-            processed: 0,
-        }
-
-        for (let i = 0; i < timeTracks.length; i++) {
-            const { times, coordinates } = timeTracks[i];
-
-            if (times[times.length - 1] < time) continue;
-            info.processed++;
-            const timeIndex = findFirstIndexInRange(times, time);
-            if (timeIndex === null) { info.outOfRange++; continue; }
-            const timeFraction = (time - times[timeIndex]) / (times[timeIndex + 1] - times[timeIndex]);
-            if (geometry === GEOMETRY.CARTESIAN3D) {
-                sphericalLinearInterpolation_Cartesian3d(_0vec3, coordinates[timeIndex], coordinates[timeIndex + 1], timeFraction);
-            } else {
-                sphericalLinearInterpolation_Mercator(_0vec3, coordinates[timeIndex], coordinates[timeIndex + 1], timeFraction);
-            }
-            resultArray.push(..._0vec3);
-        }
-        return new Float32Array(resultArray);
-    }
-
-
-    // implicit methods
-
-    _orderTimeTracks() {
-        this.timeTracks.sort((a, b) => a.times[0] - b.times[0]);
-    }
-
-    _setStartTimes() {
-        this.timeTracksStartTimes = this.timeTracks.map(tt => tt.times[0]);
-    }
-
-
-}
-
-
-export { TimeTrackInterpolator, GEOMETRY };
+import { findFirstIndexInRange } from '../../algorithms/search-binary';
+import { sphericalLinearInterpolation_Cartesian3d, sphericalLinearInterpolation_Mercator, } from '../../../Math/methods';
+/**
+ * @typedef {Array<number>} vec3 [x, y, z]
+ * @typedef {Array<number>} vec2 [x, y]
+ * @typedef {Array<number>} vec4 [x, y, z, w]
+ * @typedef {number} fraction a number between 0 and 1
+ * @typedef {Array<number>} wgs84 [long, lat]
+ */
+const _0vec3 = [0, 0, 0];
+const GEOMETRY = Object.freeze({
+    CARTESIAN3D: 0,
+    MERCATOR: 1,
+});
+class TimeTrackInterpolator {
+    /**
+     * @typedef Timetrack
+     * @property {Array<vec4>}} coordinates [x,y,z, length]
+     * @property {Array<Number>} times
+     * @param {Array<Timetrack>} timeTracks
+     */
+    constructor({ timeTracks, bbox = null, geometry = GEOMETRY.CARTESIAN3D } = {}) {
+        this.timeTracks = null;
+        this.timeTracksStartTimes = null;
+        this.geometry = geometry;
+        if (timeTracks)
+            this.setTimetracks(timeTracks);
+        if (bbox)
+            this.setBbox(bbox);
+    }
+    setGeometry(geometry) {
+        if (geometry !== GEOMETRY.CARTESIAN3D && geometry !== GEOMETRY.MERCATOR) {
+            throw new Error('Invalid geometry');
+        }
+        this.geometry = geometry;
+    }
+    setTimetracks(timeTracks) {
+        this.timeTracks = timeTracks;
+    }
+    interpolate(time) {
+        const { timeTracks, geometry } = this;
+        if (!timeTracks) {
+            return null;
+        }
+        const resultArray = [];
+        const info = {
+            outOfRange: 0,
+            processed: 0,
+        };
+        for (let i = 0; i < timeTracks.length; i++) {
+            const { times, coordinates } = timeTracks[i];
+            if (times[times.length - 1] < time)
+                continue;
+            info.processed++;
+            const timeIndex = findFirstIndexInRange(times, time);
+            if (timeIndex === null) {
+                info.outOfRange++;
+                continue;
+            }
+            const timeFraction = (time - times[timeIndex]) / (times[timeIndex + 1] - times[timeIndex]);
+            if (geometry === GEOMETRY.CARTESIAN3D) {
+                sphericalLinearInterpolation_Cartesian3d(_0vec3, coordinates[timeIndex], coordinates[timeIndex + 1], timeFraction);
+            }
+            else {
+                sphericalLinearInterpolation_Mercator(_0vec3, coordinates[timeIndex], coordinates[timeIndex + 1], timeFraction);
+            }
+            resultArray.push(..._0vec3);
+        }
+        return new Float32Array(resultArray);
+    }
+    // implicit methods
+    _orderTimeTracks() {
+        this.timeTracks.sort((a, b) => a.times[0] - b.times[0]);
+    }
+    _setStartTimes() {
+        this.timeTracksStartTimes = this.timeTracks.map(tt => tt.times[0]);
+    }
+}
+export { TimeTrackInterpolator, GEOMETRY };

package/{util → webglobeplugins/util}/interpolation/timetrack/web-worker.js

@@ -1,51 +1,46 @@
-import { TimeTrackInterpolator, GEOMETRY } from './timetrack-interpolator';
-
-
-const interpolator = new TimeTrackInterpolator({ geometry: GEOMETRY.CARTESIAN3D });
-
-/* eslint-disable-next-line no-restricted-globals */
-self.onmessage = function (e) {
-
-    const { geometry = null, timeTracks = null, time = null } = e.data;
-
-    if (geometry !== null) {
-        try {
-            interpolator.setGeometry(geometry);
-        } catch (error) {
-            /* eslint-disable-next-line no-restricted-globals */
-            self.postMessage({ error: error.message });
-            return;
-        }
-    }
-
-    if (timeTracks !== null) {
-        try {
-            interpolator.setTimetracks(timeTracks);
-        } catch (error) {
-            /* eslint-disable-next-line no-restricted-globals */
-            self.postMessage({ error: error.message });
-            return;
-        }
-    }
-
-    if (time !== null) {
-        try {
-            const result = interpolator.interpolate(time);
-            if (result === null) {
-                /* eslint-disable-next-line no-restricted-globals */
-                self.postMessage({ error: 'No TimeTracks Data' });
-                return;
-            }
-            /* eslint-disable-next-line no-restricted-globals */
-            self.postMessage(result, [result.buffer]);
-            return;
-        } catch (error) {
-            /* eslint-disable-next-line no-restricted-globals */
-            self.postMessage({ error: error.message });
-            return;
-        }
-    }
-    /* eslint-disable-next-line no-restricted-globals */
-    self.postMessage(true);
-}
-
+import { TimeTrackInterpolator, GEOMETRY } from './timetrack-interpolator';
+const interpolator = new TimeTrackInterpolator({ geometry: GEOMETRY.CARTESIAN3D });
+/* eslint-disable-next-line no-restricted-globals */
+self.onmessage = function (e) {
+    const { geometry = null, timeTracks = null, time = null } = e.data;
+    if (geometry !== null) {
+        try {
+            interpolator.setGeometry(geometry);
+        }
+        catch (error) {
+            /* eslint-disable-next-line no-restricted-globals */
+            self.postMessage({ error: error.message });
+            return;
+        }
+    }
+    if (timeTracks !== null) {
+        try {
+            interpolator.setTimetracks(timeTracks);
+        }
+        catch (error) {
+            /* eslint-disable-next-line no-restricted-globals */
+            self.postMessage({ error: error.message });
+            return;
+        }
+    }
+    if (time !== null) {
+        try {
+            const result = interpolator.interpolate(time);
+            if (result === null) {
+                /* eslint-disable-next-line no-restricted-globals */
+                self.postMessage({ error: 'No TimeTracks Data' });
+                return;
+            }
+            /* eslint-disable-next-line no-restricted-globals */
+            self.postMessage(result, [result.buffer]);
+            return;
+        }
+        catch (error) {
+            /* eslint-disable-next-line no-restricted-globals */
+            self.postMessage({ error: error.message });
+            return;
+        }
+    }
+    /* eslint-disable-next-line no-restricted-globals */
+    self.postMessage(true);
+};

package/{util/picking/fence.ts → webglobeplugins/util/picking/fence.js}

@@ -1,47 +1,43 @@
-const fence = (gl: WebGL2RenderingContext): Promise<void> => new Promise((resolve, reject) => {
-    // This will create a fence. If this follows a `readPixels()` call, then it
-    // will signal to WebGL that the read instruction should be asynchronous. 
-    // This means JS can continue to work on other tasks while the read instruction
-    // completes.
-    const sync = gl.fenceSync(gl.SYNC_GPU_COMMANDS_COMPLETE, 0);
-    if (!sync) {
-        reject(new Error('Failed to create fence sync object.'));
-        return;
-    }
-    gl.flush();
-
-    // There are TWO possible ways to check on the status of a WebGLSync object.
-
-    // 1. This will check it using clientWaitSync()
-    // const checkStatus_v1 = () => {
-    //     const status = gl.clientWaitSync(sync, 0, 0);
-
-    //     // There are four possible values for status:
-    //     // a. ALREADY_SIGNALED and CONDITION_SATISFIED (done)
-    //     // b. TIMEOUT_EXPIRED (check again later)
-    //     // c. WAIT_FAILED (there was an error)
-    //     if (status === gl.TIMEOUT_EXPIRED) {
-    //         setTimeout(checkStatus_v1, 1);
-    //     } else if (status === gl.ALREADY_SIGNALED || status === gl.CONDITION_SATISFIED) {
-    //         gl.deleteSync(sync);
-    //         resolve();
-    //     } else {
-    //         gl.deleteSync(sync);
-    //         reject(new Error('Fence did not resolve normally for some reason'));
-    //     }
-    // };
-
-    // 2. This will check with getSyncParameter(s, gl.SYNC_STATUS)
-    const checkStatus_v2 = () => {
-        const status = gl.getSyncParameter(sync, gl.SYNC_STATUS);
-        if (status === gl.SIGNALED) {
-            gl.deleteSync(sync);
-            resolve();
-        } else {
-            setTimeout(checkStatus_v2, 1);
-        }
-    };
-    setTimeout(checkStatus_v2, 1);
-});
-
-export { fence };
+const fence = (gl) => new Promise((resolve, reject) => {
+    // This will create a fence. If this follows a `readPixels()` call, then it
+    // will signal to WebGL that the read instruction should be asynchronous. 
+    // This means JS can continue to work on other tasks while the read instruction
+    // completes.
+    const sync = gl.fenceSync(gl.SYNC_GPU_COMMANDS_COMPLETE, 0);
+    if (!sync) {
+        reject(new Error('Failed to create fence sync object.'));
+        return;
+    }
+    gl.flush();
+    // There are TWO possible ways to check on the status of a WebGLSync object.
+    // 1. This will check it using clientWaitSync()
+    // const checkStatus_v1 = () => {
+    //     const status = gl.clientWaitSync(sync, 0, 0);
+    //     // There are four possible values for status:
+    //     // a. ALREADY_SIGNALED and CONDITION_SATISFIED (done)
+    //     // b. TIMEOUT_EXPIRED (check again later)
+    //     // c. WAIT_FAILED (there was an error)
+    //     if (status === gl.TIMEOUT_EXPIRED) {
+    //         setTimeout(checkStatus_v1, 1);
+    //     } else if (status === gl.ALREADY_SIGNALED || status === gl.CONDITION_SATISFIED) {
+    //         gl.deleteSync(sync);
+    //         resolve();
+    //     } else {
+    //         gl.deleteSync(sync);
+    //         reject(new Error('Fence did not resolve normally for some reason'));
+    //     }
+    // };
+    // 2. This will check with getSyncParameter(s, gl.SYNC_STATUS)
+    const checkStatus_v2 = () => {
+        const status = gl.getSyncParameter(sync, gl.SYNC_STATUS);
+        if (status === gl.SIGNALED) {
+            gl.deleteSync(sync);
+            resolve();
+        }
+        else {
+            setTimeout(checkStatus_v2, 1);
+        }
+    };
+    setTimeout(checkStatus_v2, 1);
+});
+export { fence };