@pirireis/webglobeplugins 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT"

package/programs/rings/distancering/circleflatprogram.js

@@ -105,19 +105,16 @@ class Logic {
 
         if (compass !== this._compassmode) {
             gl.uniform1i(this._compassLocation, compass);
-            console.log("compass", compass);
             this._compassmode = compass;
         }
 
         if (opacity !== this._opacity) {
             gl.uniform1f(this._opacityLocation, opacity);
-            console.log("opacity", opacity);
             this._opacity = opacity;
         }
 
         if (circleEdgeCount !== this._circleEdgeCount) {
             gl.uniform1f(this._circleEdgeCountLocation, circleEdgeCount);
-            console.log("circleEdgeCount", circleEdgeCount);
             this._circleEdgeCount = circleEdgeCount;
         }
         gl.drawArraysInstanced(gl.LINE_LOOP, 0, circleEdgeCount, attrBufferManager.length);

package/programs/rings/distancering/index.js

@@ -1,5 +1,5 @@
 import { programCache as circleProgramCache } from './circleflatprogram';
-import PaddyFlatProgram from './paddyflatprogram';
+import { PaddingProgramCache } from './paddyflatprogram';
 import CirclePaddySharedBuffer from './circlepaddysharedbuffer';
 import { PaddingFreeAngleCache } from './circlepaddingfreeangleprogram';
-export { circleProgramCache, PaddyFlatProgram, CirclePaddySharedBuffer, PaddingFreeAngleCache };
+export { circleProgramCache, PaddingProgramCache, CirclePaddySharedBuffer, PaddingFreeAngleCache };

package/programs/rings/distancering/paddyflatprogram.js

@@ -98,8 +98,9 @@ class Logic {
             const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
             this.gl.useProgram(this.program);
             this.gl.uniform1i(this._compassLocation, 1);
-            this.gl.useProgram(currentProgram);
+            this.gl.uniform1f(this._opacityLocation, 1.0);
             this.gl.uniform1f(this._padCountLocation, 360)
+            this.gl.useProgram(currentProgram);
         }
 
     }
@@ -113,13 +114,16 @@ class Logic {
         // draw instanced
         if (padCount !== this._padCount) {
             this._padCount = padCount;
+            console.log("padCount", padCount);
             gl.uniform1f(_padCountLocation, padCount);
         }
         if (compass !== this._compassMode) {
+            console.log("compass", compass);
             gl.uniform1i(_compassLocation, compass);
             this._compassMode = compass;
         }
         if (opacity !== this._opacity) {
+            console.log("opacity", opacity);
             this._opacity = opacity;
             gl.uniform1f(this._opacityLocation, opacity);
         }
@@ -136,17 +140,7 @@ class Logic {
 
 
 
-export default class {
-    constructor(globe, gl) {
-        this.gl = gl;
-        this.logic = noRegisterGlobeProgramCache.getProgram(globe, Logic);
-    }
-
-    draw(attrBufferManager, padCount, compass) {
-        this.logic.draw(attrBufferManager, padCount, compass);
-    }
-
-    free() {
-        noRegisterGlobeProgramCache.releaseProgram(this.gl, Logic);
-    }
-}
+export const PaddingProgramCache = Object.freeze({
+    getProgram: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
+    releaseProgram: (globe) => { noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
+})

package/rangerings/rangeringangletext.js

@@ -32,7 +32,7 @@ const object = {
 
 
 export default class RangeRingAngleText {
-    constructor(globe, id, { style = null, flatCompassMode = COMPASS_MODES.REAL, hideAll = false } = {}) {
+    constructor(globe, id, { style = null, flatCompassMode = COMPASS_MODES.REAL, hideAll = false, opacity = 1 } = {}) {
         this.globe = globe;
         this.ObjectArray = globe.ObjectArray;
         this.id = id;
@@ -40,7 +40,7 @@ export default class RangeRingAngleText {
         this._lastImplicitCompassMode = this.__implicitCompassMode();
 
         this._hideAll = hideAll;
-
+        this._opacity = opacity;
         const style_ = style !== null ? style : this.getDefaultStyle();
         this.object = Object.assign({}, object, { style: style_, id: this.id });
 
@@ -80,11 +80,19 @@ export default class RangeRingAngleText {
 
     setStyle(style) {
         if (style === null) return;
+        style.opacity = this._opacity;
         this.object.style = style;
         this.ObjectArray.StyleChanged(this.object);
     }
 
 
+    setOpacity(opacity) {
+        this._opacity = opacity;
+        const { style } = this.object;
+        style.opacity = opacity;
+        this.ObjectArray.StyleChanged(this.object);
+    }
+
     setCompass(mode) {
         if (mode === this._flatCompassMode) return;
         this._flatCompassMode = mode;

package/rangerings/rangerings.js

@@ -3,7 +3,7 @@ import { COMPASS_MODES } from "./enum";
 import { PaddingFreeAngleCache } from "../programs/rings/distancering";
 
 import RangeRingAngleText from "./rangeringangletext";
-const { circleProgramCache, PaddyFlatProgram, CirclePaddySharedBuffer } = rings;
+const { circleProgramCache, PaddingProgramCache, CirclePaddySharedBuffer } = rings;
 
 /**
  * @typedef RangeRingData
@@ -42,25 +42,32 @@ export default class {
         this.gl = gl;
         this.globe = globe;
         this.circleFlatProgram = circleProgramCache.getProgram(globe);
-        this.paddyFlatProgram = new PaddyFlatProgram(globe, gl);
+        this.paddyFlatProgram = PaddingProgramCache.getProgram(globe);
         this.paddingFreeAngleProgram = PaddingFreeAngleCache.getProgram(globe);
         if (this._showNumbers) {
-            this.textPlugin = new RangeRingAngleText(globe, this.id + "text", { flatCompassMode: this.compass, style: this._numbersStyle });
+            this.textPlugin = new RangeRingAngleText(globe, this.id + "text", { flatCompassMode: this.compass, style: this._numbersStyle, opacity: this._opacity });
             delete this._numbersStyle;
         }
     }
 
     // TODO: Add text free
     free() {
-        this.circleFlatProgram.free();
-        this.paddyFlatProgram.free();
+        this.circleFlatProgram?.free();
+        this.paddyFlatProgram?.free();
         this.bufferManager?.free();
+        this.paddingBufferManager?.free();
         this.textPlugin?.free();
+        this.circleFlatProgram = null;
+        this.paddyFlatProgram = null;
+        this.bufferManager = null;
+        this.paddingBufferManager = null;
+        this.textPlugin = null;
     }
 
 
     setOpacity(opacity) {
         this._opacity = opacity;
+        this.textPlugin?.setOpacity(opacity); // TODO impolement this
         this.globe.DrawRender();
     }
 
@@ -75,6 +82,7 @@ export default class {
             gl.disable(gl.DEPTH_TEST);
             // gl.enable(gl.BLEND);
             // gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+            console.log("the opacity", _opacity);
             circleFlatProgram.draw(bufferManager, compass, circleEdgeCount, _opacity);
             if (this._onedegreepaddingOn) paddyFlatProgram.draw(bufferManager, 360, compass, _opacity);
             paddingFreeAngleProgram.draw(paddingBufferManager, compass, _opacity);