@pirireis/webglobeplugins 0.16.0 → 0.16.2

package/partialrings/buffer-manager.js

@@ -1,89 +1,75 @@
-import BufferOffsetManager from "../util/account/bufferoffsetmanager";
-
-
-
-const ITEM_SIZE = 10;
-export default class BufferManager extends BufferOffsetManager {
-    constructor(globe, gl, buffer, { initialCapacity = 10, bufferType = "DYNAMIC_DRAW" } = {}) {
-        super(ITEM_SIZE, { capacity: initialCapacity });
-        this.globe = globe;
-        this.gl = gl;
-        this.buffer = buffer;
-        this.bufferType = bufferType;
-
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, initialCapacity * ITEM_SIZE * 4, gl[bufferType]);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-    }
-
-    /**
-     * 
-     * @param { Array<{key, long, lat, startAngle, tailAngle, radius, rgba[4], rgbaMode }>} rings 
-     * @returns 
-     */
-    insertBulk(items) {
-        if (items.length === 0) return;
-        this.autoExtendBuffer(items.length);
-        const { gl, buffer } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, long, lat, startAngle, tailAngle, rgba, radius, rgbaMode } of items) {
-            const offset = this.getOffset(key) | this.nextOffset();
-            this.setOffset(key, offset);
-            const block = new Float32Array([
-                long, lat, startAngle, tailAngle, ...rgba, radius, rgbaMode]);
-            gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
-            // 2         1       1           1         4       1 = 10
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.globe.DrawRender();
-    }
-
-
-    /**
-     * @param {Array<{key, long, lat, startAngle, tailAngle}>} items
-     * 
-     * */
-    updateCenterAndAngleBulk(items) {
-        const { gl, buffer } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, long, lat, startAngle, tailAngle } of items) {
-            const offset = this.getOffset(key);
-            if (offset === null) {
-                console.warn(`key ${key} not found`);
-                continue;
-            }
-            const block = new Float32Array([long, lat, startAngle, tailAngle]);
-            gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.globe.DrawRender();
-    }
-    /**
-     * 
-     * @param {Array<{key:string, payload:Float32Array}} items 
-     * @param {PART_OFFSET_LOOPUP} part | long, lat, START_ANGLE, ROTATION_ANGLE, RADIUS, rgba, rgba_MODE
-     * @returns 
-     */
-    updatePartial(items, part) {
-        const { gl, buffer } = this;
-        this._updatePartial(items, part, gl, buffer);
-        this.globe.DrawRender();
-
-    }
-
-
-
-    deleteBulk(keys) {
-        this._deleteBulk(keys);
-        this.globe.DrawRender();
-    }
-
-
-
-
-    free() {
-        this.gl.deleteBuffer(this.buffer);
-        this.buffer = null;
-    }
-}
+import BufferOffsetManager from "../util/account/bufferoffsetmanager";
+const ITEM_SIZE = 10;
+export default class BufferManager extends BufferOffsetManager {
+    constructor(globe, gl, buffer, { initialCapacity = 10, bufferType = "DYNAMIC_DRAW" } = {}) {
+        super(ITEM_SIZE, { capacity: initialCapacity });
+        this.globe = globe;
+        this.gl = gl;
+        this.buffer = buffer;
+        this.bufferType = bufferType;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, initialCapacity * ITEM_SIZE * 4, gl[bufferType]);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+    }
+    /**
+     *
+     * @param { Array<{key, long, lat, startAngle, tailAngle, radius, rgba[4], rgbaMode }>} rings
+     * @returns
+     */
+    insertBulk(items) {
+        if (items.length === 0)
+            return;
+        this.autoExtendBuffer(items.length);
+        const { gl, buffer } = this;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        for (let { key, long, lat, startAngle, tailAngle, rgba, radius, rgbaMode } of items) {
+            const offset = this.getOffset(key) | this.nextOffset();
+            this.setOffset(key, offset);
+            const block = new Float32Array([
+                long, lat, startAngle, tailAngle, ...rgba, radius, rgbaMode
+            ]);
+            gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
+            // 2         1       1           1         4       1 = 10
+        }
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        this.globe.DrawRender();
+    }
+    /**
+     * @param {Array<{key, long, lat, startAngle, tailAngle}>} items
+     *
+     * */
+    updateCenterAndAngleBulk(items) {
+        const { gl, buffer } = this;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        for (let { key, long, lat, startAngle, tailAngle } of items) {
+            const offset = this.getOffset(key);
+            if (offset === null) {
+                console.warn(`key ${key} not found`);
+                continue;
+            }
+            const block = new Float32Array([long, lat, startAngle, tailAngle]);
+            gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
+        }
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        this.globe.DrawRender();
+    }
+    /**
+     *
+     * @param {Array<{key:string, payload:Float32Array}} items
+     * @param {PART_OFFSET_LOOPUP} part | long, lat, START_ANGLE, ROTATION_ANGLE, RADIUS, rgba, rgba_MODE
+     * @returns
+     */
+    updatePartial(items, part) {
+        const { gl, buffer } = this;
+        this._updatePartial(items, part, gl, buffer);
+        this.globe.DrawRender();
+    }
+    deleteBulk(keys) {
+        this._deleteBulk(keys);
+        this.globe.DrawRender();
+    }
+    free() {
+        this.gl.deleteBuffer(this.buffer);
+        this.buffer = null;
+    }
+}

package/partialrings/index.js

@@ -1,3 +1,2 @@
-import PartialRing, { RINGPARTIAL_ALPHA_MODE, RINGPARTIAL_DRAW_MODE, PART_OFFSET_LOOPUP } from './plugin';
-
-export { PartialRing, RINGPARTIAL_ALPHA_MODE, RINGPARTIAL_DRAW_MODE, PART_OFFSET_LOOPUP };
+import PartialRing, { RINGPARTIAL_ALPHA_MODE, RINGPARTIAL_DRAW_MODE, PART_OFFSET_LOOPUP } from './plugin';
+export { PartialRing, RINGPARTIAL_ALPHA_MODE, RINGPARTIAL_DRAW_MODE, PART_OFFSET_LOOPUP };

package/partialrings/plugin.js

@@ -1,160 +1,128 @@
-
-
-import BufferOffsetManager from '../util/account/bufferoffsetmanager';
-import { programCache, ITEM_SIZE } from './program';
-
-import { opacityCheck } from '../util/check/typecheck';
-
-const emptyBlock = new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-
-export const RINGPARTIAL_DRAW_MODE = Object.freeze({
-    LINE_STRIP: "LINE_STRIP",
-    TRIANGLE_FAN: "TRIANGLE_FAN",
-});
-
-export const RINGPARTIAL_ALPHA_MODE = Object.freeze({
-    CONSTANT: 0,
-    FADING: 1,
-    HIDE: 2,
-});
-
-
-export const PART_OFFSET_LOOPUP = Object.freeze({
-    LONG: 0,
-    LAT: 1,
-    START_ANGLE: 2,
-    TAIL_ANGLE: 3,
-    RGBA: 4,
-    RADIUS: 8,
-    RGBA_MODE: 9,
-});
-
-
-export default class {
-    constructor(id, { edgeCount = 10, drawMode = RINGPARTIAL_DRAW_MODE.LINE_STRIP, startLod = 3, endLod = 13, alphaMultiplier = 1 } = {}) {
-        this.id = id;
-        this.edgeCount = edgeCount;
-        this.drawMode = drawMode;
-        this.startLod = startLod;
-        this.endLod = endLod;
-        this.alphaMultiplier = alphaMultiplier;
-
-    }
-
-    init(globe, gl) {
-        this.gl = gl;
-        this.globe = globe;
-        this.program = programCache.get(globe);
-        const { vao, buffer } = this.program.getVaoBuffer();
-        this.vao = vao;
-        this.buffer = buffer;
-    }
-
-
-    draw3D() {
-        const LOD = this.globe.api_GetCurrentLOD();
-
-        if (LOD < this.startLod || LOD > this.endLod) return;
-        this.program.draw(
-            this.bufferManager.length,
-            this.vao,
-            this.edgeCount,
-            this.alphaMultiplier,
-            this.drawMode,
-        )
-    }
-
-    /**
-     * 
-     * @param {RINGPARTIAL_DRAW_MODE} drawMode 
-     */
-    setDrawMode(drawMode) {
-        this.drawMode = drawMode;
-    }
-
-    setOpacity(opacity) {
-        opacityCheck(opacity);
-        this.alphaMultiplier = opacity;
-    }
-
-    setStartEndLOD({ startLod = null, endLod = null } = {}) {
-        if (startLod !== null) this.startLod = startLod;
-        if (endLod !== null) this.endLod = endLod;
-    }
-
-    createBufferMAnager(initialCapacity = 10, bufferType = 'DYNAMIC_DRAW') {
-        if (!this.bufferManager) { this.bufferManager = new BufferManager(this.globe, this.gl, this.buffer, { initialCapacity, bufferType, }); }
-        return this.bufferManager;
-    }
-
-    free() {
-        programCache.free(this.globe);
-        this.bufferManager.free();
-    }
-}
-
-
-class BufferManager extends BufferOffsetManager {
-
-    constructor(globe, gl, buffer, { initialCapacity = 10, bufferType, } = {}) {
-        super(10, { capacity: initialCapacity, bufferType, });
-        this.globe = globe;
-        this.gl = gl;
-        this.buffer = buffer;
-        this.bufferType = bufferType;
-
-
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, initialCapacity * ITEM_SIZE * 4, gl[bufferType]);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-    }
-
-    /**
-     * 
-     * @param { Array<{key, long, lat, startAngle, tailAngle, radius, rgba[4], rgbaMode }>} rings 
-     * @returns 
-     */
-    insertBulk(items) {
-        if (items.length === 0) return;
-        this.autoExtendBuffer(items.length);
-        const { gl, buffer } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, long, lat, startAngle, tailAngle, rgba, radius, rgbaMode } of items) {
-            const offset = this.getOffset(key) | this.nextOffset();
-            this.setOffset(key, offset);
-            const block = new Float32Array([
-                long, lat, startAngle, tailAngle, ...rgba, radius, rgbaMode]);
-            gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
-            // 2         1       1           1         4       1 = 10
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.globe.DrawRender();
-    }
-
-
-    /**
-     * 
-     * @param {Array<{key:string, payload:Float32Array}} items 
-     * @param {PART_OFFSET_LOOPUP} part | long, lat, START_ANGLE, ROTATION_ANGLE, RADIUS, rgba, rgba_MODE
-     * @returns 
-     */
-    updatePartial(items, part) {
-        const { gl, buffer } = this;
-        this._updatePartial(items, part, gl, buffer);
-        this.globe.DrawRender();
-
-    }
-
-
-    delete(keys) {
-        const { gl, buffer } = this;
-        this._removefromBuffer(gl, buffer, keys, emptyBlock);
-        this.globe.DrawRender();
-    }
-
-
-    free() {
-        this.gl.deleteBuffer(this.buffer);
-        this.buffer = null;
-    }
-}
+import BufferOffsetManager from '../util/account/bufferoffsetmanager';
+import { programCache, ITEM_SIZE } from './program';
+import { opacityCheck } from '../util/check/typecheck';
+const emptyBlock = new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+export const RINGPARTIAL_DRAW_MODE = Object.freeze({
+    LINE_STRIP: "LINE_STRIP",
+    TRIANGLE_FAN: "TRIANGLE_FAN",
+});
+export const RINGPARTIAL_ALPHA_MODE = Object.freeze({
+    CONSTANT: 0,
+    FADING: 1,
+    HIDE: 2,
+});
+export const PART_OFFSET_LOOPUP = Object.freeze({
+    LONG: 0,
+    LAT: 1,
+    START_ANGLE: 2,
+    TAIL_ANGLE: 3,
+    RGBA: 4,
+    RADIUS: 8,
+    RGBA_MODE: 9,
+});
+export default class {
+    constructor(id, { edgeCount = 10, drawMode = RINGPARTIAL_DRAW_MODE.LINE_STRIP, startLod = 3, endLod = 13, alphaMultiplier = 1 } = {}) {
+        this.id = id;
+        this.edgeCount = edgeCount;
+        this.drawMode = drawMode;
+        this.startLod = startLod;
+        this.endLod = endLod;
+        this.alphaMultiplier = alphaMultiplier;
+    }
+    init(globe, gl) {
+        this.gl = gl;
+        this.globe = globe;
+        this.program = programCache.get(globe);
+        const { vao, buffer } = this.program.getVaoBuffer();
+        this.vao = vao;
+        this.buffer = buffer;
+    }
+    draw3D() {
+        const LOD = this.globe.api_GetCurrentLOD();
+        if (LOD < this.startLod || LOD > this.endLod)
+            return;
+        this.program.draw(this.bufferManager.length, this.vao, this.edgeCount, this.alphaMultiplier, this.drawMode);
+    }
+    /**
+     *
+     * @param {RINGPARTIAL_DRAW_MODE} drawMode
+     */
+    setDrawMode(drawMode) {
+        this.drawMode = drawMode;
+    }
+    setOpacity(opacity) {
+        opacityCheck(opacity);
+        this.alphaMultiplier = opacity;
+    }
+    setStartEndLOD({ startLod = null, endLod = null } = {}) {
+        if (startLod !== null)
+            this.startLod = startLod;
+        if (endLod !== null)
+            this.endLod = endLod;
+    }
+    createBufferMAnager(initialCapacity = 10, bufferType = 'DYNAMIC_DRAW') {
+        if (!this.bufferManager) {
+            this.bufferManager = new BufferManager(this.globe, this.gl, this.buffer, { initialCapacity, bufferType, });
+        }
+        return this.bufferManager;
+    }
+    free() {
+        programCache.free(this.globe);
+        this.bufferManager.free();
+    }
+}
+class BufferManager extends BufferOffsetManager {
+    constructor(globe, gl, buffer, { initialCapacity = 10, bufferType, } = {}) {
+        super(10, { capacity: initialCapacity, bufferType, });
+        this.globe = globe;
+        this.gl = gl;
+        this.buffer = buffer;
+        this.bufferType = bufferType;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, initialCapacity * ITEM_SIZE * 4, gl[bufferType]);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+    }
+    /**
+     *
+     * @param { Array<{key, long, lat, startAngle, tailAngle, radius, rgba[4], rgbaMode }>} rings
+     * @returns
+     */
+    insertBulk(items) {
+        if (items.length === 0)
+            return;
+        this.autoExtendBuffer(items.length);
+        const { gl, buffer } = this;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        for (let { key, long, lat, startAngle, tailAngle, rgba, radius, rgbaMode } of items) {
+            const offset = this.getOffset(key) | this.nextOffset();
+            this.setOffset(key, offset);
+            const block = new Float32Array([
+                long, lat, startAngle, tailAngle, ...rgba, radius, rgbaMode
+            ]);
+            gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
+            // 2         1       1           1         4       1 = 10
+        }
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        this.globe.DrawRender();
+    }
+    /**
+     *
+     * @param {Array<{key:string, payload:Float32Array}} items
+     * @param {PART_OFFSET_LOOPUP} part | long, lat, START_ANGLE, ROTATION_ANGLE, RADIUS, rgba, rgba_MODE
+     * @returns
+     */
+    updatePartial(items, part) {
+        const { gl, buffer } = this;
+        this._updatePartial(items, part, gl, buffer);
+        this.globe.DrawRender();
+    }
+    delete(keys) {
+        const { gl, buffer } = this;
+        this._removefromBuffer(gl, buffer, keys, emptyBlock);
+        this.globe.DrawRender();
+    }
+    free() {
+        this.gl.deleteBuffer(this.buffer);
+        this.buffer = null;
+    }
+}