gladly-plot 0.0.6 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gladly-plot",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "GPU-powered multi-axis plotting library with regl + d3",
   "type": "module",
   "exports": {

package/src/core/LayerType.js

@@ -242,15 +242,17 @@ export class LayerType {
     }
 
     for (const [suffix, qk] of Object.entries(layer.colorAxes)) {
-      uniforms[`colorscale${suffix}`]       = regl.prop(`colorscale_${qk}`)
-      uniforms[`color_range${suffix}`]      = regl.prop(`color_range_${qk}`)
-      uniforms[`color_scale_type${suffix}`] = regl.prop(`color_scale_type_${qk}`)
-      uniforms[`alpha_blend${suffix}`]      = regl.prop(`alpha_blend_${qk}`)
+      const pk = qk.replace(/\./g, '_')
+      uniforms[`colorscale${suffix}`]       = regl.prop(`colorscale_${pk}`)
+      uniforms[`color_range${suffix}`]      = regl.prop(`color_range_${pk}`)
+      uniforms[`color_scale_type${suffix}`] = regl.prop(`color_scale_type_${pk}`)
+      uniforms[`alpha_blend${suffix}`]      = regl.prop(`alpha_blend_${pk}`)
     }
 
     for (const [suffix, qk] of Object.entries(layer.filterAxes)) {
-      uniforms[`filter_range${suffix}`]      = regl.prop(`filter_range_${qk}`)
-      uniforms[`filter_scale_type${suffix}`] = regl.prop(`filter_scale_type_${qk}`)
+      const pk = qk.replace(/\./g, '_')
+      uniforms[`filter_range${suffix}`]      = regl.prop(`filter_range_${pk}`)
+      uniforms[`filter_scale_type${suffix}`] = regl.prop(`filter_scale_type_${pk}`)
     }
 
     // Strip spatial uniforms from vert (re-declared in buildSpatialGlsl)

package/src/core/Plot.js

@@ -1052,16 +1052,18 @@ void main() {
       }
 
       for (const qk of Object.values(layer.colorAxes)) {
-        props[`colorscale_${qk}`] = this.colorAxisRegistry.getColorscaleIndex(qk)
+        const pk = qk.replace(/\./g, '_')
+        props[`colorscale_${pk}`] = this.colorAxisRegistry.getColorscaleIndex(qk)
         const range = this.colorAxisRegistry.getRange(qk)
-        props[`color_range_${qk}`] = range ?? [0, 1]
-        props[`color_scale_type_${qk}`] = this._getScaleTypeFloat(qk)
-        props[`alpha_blend_${qk}`] = this.colorAxisRegistry.getAlphaBlend(qk)
+        props[`color_range_${pk}`] = range ?? [0, 1]
+        props[`color_scale_type_${pk}`] = this._getScaleTypeFloat(qk)
+        props[`alpha_blend_${pk}`] = this.colorAxisRegistry.getAlphaBlend(qk)
       }
 
       for (const qk of Object.values(layer.filterAxes)) {
-        props[`filter_range_${qk}`] = this.filterAxisRegistry.getRangeUniform(qk)
-        props[`filter_scale_type_${qk}`] = this._getScaleTypeFloat(qk)
+        const pk = qk.replace(/\./g, '_')
+        props[`filter_range_${pk}`] = this.filterAxisRegistry.getRangeUniform(qk)
+        props[`filter_scale_type_${pk}`] = this._getScaleTypeFloat(qk)
       }
 
       layer.draw(props)
@@ -1178,15 +1180,17 @@ void main() {
         }
         if (layer.instanceCount !== null) props.instances = layer.instanceCount
         for (const qk of Object.values(layer.colorAxes)) {
-          props[`colorscale_${qk}`] = this.colorAxisRegistry.getColorscaleIndex(qk)
+          const pk = qk.replace(/\./g, '_')
+          props[`colorscale_${pk}`] = this.colorAxisRegistry.getColorscaleIndex(qk)
           const range = this.colorAxisRegistry.getRange(qk)
-          props[`color_range_${qk}`] = range ?? [0, 1]
-          props[`color_scale_type_${qk}`] = this._getScaleTypeFloat(qk)
-          props[`alpha_blend_${qk}`] = this.colorAxisRegistry.getAlphaBlend(qk)
+          props[`color_range_${pk}`] = range ?? [0, 1]
+          props[`color_scale_type_${pk}`] = this._getScaleTypeFloat(qk)
+          props[`alpha_blend_${pk}`] = this.colorAxisRegistry.getAlphaBlend(qk)
         }
         for (const qk of Object.values(layer.filterAxes)) {
-          props[`filter_range_${qk}`] = this.filterAxisRegistry.getRangeUniform(qk)
-          props[`filter_scale_type_${qk}`] = this._getScaleTypeFloat(qk)
+          const pk = qk.replace(/\./g, '_')
+          props[`filter_range_${pk}`] = this.filterAxisRegistry.getRangeUniform(qk)
+          props[`filter_scale_type_${pk}`] = this._getScaleTypeFloat(qk)
         }
         layer.draw(props)
       }