@pirireis/webglobeplugins 0.15.2-3.alpha → 0.15.3-alpha

package/util/account/single-attribute-buffer-management/buffer-orchestrator.js

@@ -19,149 +19,15 @@ export class BufferOrchestrator {
         this.tombstoneOffsets = [];
         this._length = 0;
     }
-    // ...existing code...
-    // TODO: CLEAN THIS
-    // insertBulk2(items: any[], bufferManagersMap: BufferManagersMap, bufferKeys: string[] | null = null) {
-    //     this.ensureSpace(items.length, bufferManagersMap);
-    //     const { offsetMap } = this;
-    //     // For block insert (truly new, consecutive offsets)
-    //     const blockItems: any[] = [];
-    //     let blockStart: number | null = null;
-    //     let lastBlockOffset: number | null = null;
-    //     // For single insert (existing or tombstone-assigned)
-    //     const singleItems: any[] = [];
-    //     const singleOffsets: number[] = [];
-    //     for (const item of items) {
-    //         let offset = offsetMap.get(item.key);
-    //         if (offset !== undefined) {
-    //             // Already present, update in place
-    //             singleItems.push(item);
-    //             singleOffsets.push(offset);
-    //         } else {
-    //             // Assign offset (tombstone or new)
-    //             if (this.tombstoneOffsets.length > 0) {
-    //                 offset = this.tombstoneOffsets.pop() as number;
-    //                 offsetMap.set(item.key, offset);
-    //                 singleItems.push(item);
-    //                 singleOffsets.push(offset);
-    //             } else {
-    //                 offset = this._length++;
-    //                 if (offset >= this._capacity) throw new Error("The Size Should Be Increased!!");
-    //                 offsetMap.set(item.key, offset);
-    //                 // Check for consecutive block
-    //                 if (blockStart === null) {
-    //                     blockStart = offset;
-    //                     lastBlockOffset = offset;
-    //                     blockItems.push(item);
-    //                 } else if (lastBlockOffset !== null && offset === lastBlockOffset + 1) {
-    //                     lastBlockOffset = offset;
-    //                     blockItems.push(item);
-    //                 } else {
-    //                     // Not consecutive, flush current block
-    //                     if (blockItems.length > 0) {
-    //                         this._insertBlock(blockItems, blockStart, bufferManagersMap, bufferKeys);
-    //                         blockItems.length = 0;
-    //                     }
-    //                     blockStart = offset;
-    //                     lastBlockOffset = offset;
-    //                     blockItems.push(item);
-    //                 }
-    //             }
-    //         }
-    //     }
-    //     // Flush any remaining block
-    //     if (blockItems.length > 0 && blockStart !== null) {
-    //         this._insertBlock(blockItems, blockStart, bufferManagersMap, bufferKeys);
-    //     }
-    //     // Insert singles
-    //     if (singleItems.length > 0) {
-    //         if (bufferKeys) {
-    //             for (const key of bufferKeys) {
-    //                 const bufferManagerComp = bufferManagersMap.get(key);
-    //                 if (!bufferManagerComp) throw new Error("insertBulk bufferKey does not exist");
-    //                 const { bufferManager, adaptor } = bufferManagerComp;
-    //                 bufferManager.insertBulk(singleItems.map(adaptor), singleOffsets);
-    //             }
-    //         } else {
-    //             for (const [key, { bufferManager, adaptor }] of bufferManagersMap) {
-    //                 bufferManager.insertBulk(singleItems.map(adaptor), singleOffsets);
-    //             }
-    //         }
-    //     }
-    // }
-    // // Helper for block insert
-    // private _insertBlock(blockItems: any[], blockStart: number, bufferManagersMap: BufferManagersMap, bufferKeys: string[] | null) {
-    //     if (bufferKeys) {
-    //         for (const key of bufferKeys) {
-    //             const bufferManagerComp = bufferManagersMap.get(key);
-    //             if (!bufferManagerComp) throw new Error("insertBulk bufferKey does not exist");
-    //             const { bufferManager, adaptor } = bufferManagerComp;
-    //             bufferManager.insertBlock(blockItems, blockStart, adaptor, Float32Array);
-    //         }
-    //     } else {
-    //         for (const [key, { bufferManager, adaptor }] of bufferManagersMap) {
-    //             bufferManager.insertBlock(blockItems, blockStart, adaptor, Float32Array);
-    //         }
-    //     }
-    // }
-    // ...existing code...
-    // want to add stack load to this method
-    // if offsetMap.has(item.key) === false get next offset, add the item to stack
-    // create a single big float32array and fill it with the items
-    // bufferManager.insertBulk([bigFloat32Array], [offsets[0]])
     insertBulk(items, bufferManagersMap, bufferKeys = null) {
         this.ensureSpace(items.length, bufferManagersMap);
         const { offsetMap } = this;
-        let offsetStart = null;
         const offsets = [];
-        const blockLoad = [];
         for (const item of items) {
             let o = offsetMap.get(item.key);
-            if (o === undefined && this.tombstoneOffsets.length > 0) {
-                // If there is a tombstone, use it
-                o = this.tombstoneOffsets.pop();
-                offsetMap.set(item.key, o);
-            }
-            if (o !== undefined) {
-                // Already exist or there is a random empty space in earlear part of memory.
-                // insert for single slots 
-                if (bufferKeys) {
-                    for (const key of bufferKeys) {
-                        const bufferManagerComp = bufferManagersMap.get(key);
-                        if (bufferManagerComp === undefined)
-                            throw new Error("insertBulk bufferKey does not exist");
-                        const { bufferManager, adaptor } = bufferManagerComp;
-                        bufferManager.insertBulk([adaptor(item)], [o]);
-                    }
-                }
-                else {
-                    for (const [key, { bufferManager, adaptor }] of bufferManagersMap) {
-                        bufferManager.insertBulk([adaptor(item)], [o]);
-                    }
-                }
-            }
-            else {
-                // offset comes from increment function
-                // this part stacks data to be load a a single big block.
-                const offset = this.nextOffset();
-                if (offset === undefined) {
-                    throw new Error("The Size Should Be Increased!!");
-                }
-                offsets.push(offset);
-                offsetMap.set(item.key, offset);
-                blockLoad.push(item);
-                if (offsetStart === null) {
-                    offsetStart = offset;
-                }
-            }
-        }
-        if (offsetStart === null)
-            return;
-        for (let i = 0; i < offsets.length - 1; i++) {
-            if (offsets[i] - offsets[i + 1] !== -1) {
-                // TODO: DELETE THIS
-                throw new Error("consecutive is not consecutive");
-            }
+            const offset = o !== undefined ? o : this.nextOffset();
+            offsetMap.set(item.key, offset);
+            offsets.push(offset);
         }
         if (bufferKeys) {
             for (const key of bufferKeys) {
@@ -169,12 +35,12 @@ export class BufferOrchestrator {
                 if (bufferManagerComp === undefined)
                     throw new Error("insertBulk bufferKey does not exist");
                 const { bufferManager, adaptor } = bufferManagerComp;
-                bufferManager.insertBlock(blockLoad, offsetStart, adaptor, Float32Array);
+                bufferManager.insertBulk(items.map(adaptor), offsets);
             }
         }
         else {
             for (const [key, { bufferManager, adaptor }] of bufferManagersMap) {
-                bufferManager.insertBlock(blockLoad, offsetStart, adaptor, Float32Array);
+                bufferManager.insertBulk(items.map(adaptor), offsets);
             }
         }
     }
@@ -188,7 +54,7 @@ export class BufferOrchestrator {
                 offsets.push(offset);
             }
             else {
-                throw new Error(`updateBulk item Key does not exist, cannot update: ${item.key}`);
+                throw new Error("updateBulk item Key does not exist");
             }
         }
         if (bufferKeys) {
@@ -223,18 +89,15 @@ export class BufferOrchestrator {
     getOffset(key) {
         return this.offsetMap.get(key);
     }
-    nextTombstone() {
+    nextOffset() {
         if (this.tombstoneOffsets.length > 0) {
             const offset = this.tombstoneOffsets.pop();
             return offset;
         }
-        return undefined;
-    }
-    nextOffset() {
         if (this._length < this._capacity) {
             return this._length++;
         }
-        return undefined;
+        return false;
     }
     ensureSpace(itemsLength, bufferManagersMap) {
         if (itemsLength <= this.emptySpace)

package/util/account/single-attribute-buffer-management/object-store.js

@@ -23,13 +23,6 @@ export class ObjectStore {
             }
         }
     }
-    insertBlock(objects, startOffset) {
-        for (let i = 0; i < objects.length; i++) {
-            const object = objects[i];
-            const offset = startOffset + i;
-            this._container[offset] = object;
-        }
-    }
     defrag(offsetValues, occupiedCapacity, newCapacity) {
         const hold = this._createEmptyList(newCapacity);
         for (let i = 0; i < offsetValues.length; i++) {

package/util/build-strategy/static-dynamic.js

@@ -9,31 +9,21 @@ export class StaticDynamicStrategy {
     _staticDynamicState = StaticDynamicState.DYNAMIC;
     _transitionLevel = 8; // Default transition level
     _lastStaticDynamicState = StaticDynamicState.STATIC;
-    _lastGeometry = null;
-    _toStatic;
-    constructor(globe, transitionLevel = 8, toStatic) {
+    constructor(globe, transitionLevel = 8) {
         this.globe = globe;
         this._transitionLevel = transitionLevel;
-        this._toStatic = toStatic;
         this.updateState();
     }
     updateState() {
         const currentLOD = this.globe.api_GetCurrentLODWithDecimal();
         const state = currentLOD < this._transitionLevel ? StaticDynamicState.STATIC : StaticDynamicState.DYNAMIC;
-        const currentGeometry = this.globe.api_GetCurrentGeometry();
         if (this._lastStaticDynamicState === StaticDynamicState.DYNAMIC && state === StaticDynamicState.STATIC) {
             this._staticDynamicState = StaticDynamicState.TO_STATIC;
-            this._toStatic();
-        }
-        else if ((currentGeometry !== this._lastGeometry) && state === StaticDynamicState.STATIC) {
-            this._staticDynamicState = StaticDynamicState.TO_STATIC;
-            this._toStatic();
         }
         else {
             this._staticDynamicState = state;
         }
         this._lastStaticDynamicState = this._staticDynamicState;
-        this._lastGeometry = currentGeometry;
     }
     getState() {
         return this._staticDynamicState;

package/util/check/typecheck.js

@@ -9,18 +9,6 @@ const doesOwnProperties = (properties, errorMessage) => {
 };
 export const isHexColor = (hexColor) => /^#[0-9A-F]{6}$/i.test(hexColor);
 export const isHexColorWithOpacity = (hexColor) => /^#[0-9A-F]{6}[0-9a-f]{0,2}$/i.test(hexColor);
-export const colorCheck = (color) => {
-    if (Array.isArray(color)) {
-        if (color.length !== 4)
-            throw new TypeError("Color must be an array 4 numbers RGBA");
-        color.forEach(c => {
-            if (typeof c !== "number")
-                throw new TypeError("Color array must contain only numbers");
-            if (c < 0 || c > 1)
-                throw new RangeError("Color values must be between 0 and 1");
-        });
-    }
-};
 export const opacityCheck = (opacity) => {
     if (typeof opacity !== "number")
         throw new TypeError("style.opacity must a number");

package/util/geometry/index.js

@@ -40,8 +40,7 @@ function normalize(array, newLength = 1) {
     }
     return result;
 }
-// TODO carry the usefull content to math module. 
 function sphereCoord(long, lat, globe, height = 0) {
-    return normalize(globe.api_GetCartesian3DPoint(long, lat, 0, false), 6378.137 + height);
+    return normalize(globe.api_GetCartesian3DPoint(long, lat, 0, 0), 6378.137 + height);
 }
 export { createBBoxMatrix, latLongToPixelXY, latLongBboxtoPixelXYBbox, sphereCoord, normalize };

package/programs/totems/globe-changes.js

@@ -1,59 +0,0 @@
-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;
-    }
-}

package/semiplugins/interface.js

@@ -1 +0,0 @@
-export {};