vis-core 0.13.5 → 0.13.6

package/dist/index.module.js

@@ -41145,7 +41145,7 @@ function Bl(n) {
   const t = new qt();
   return t.color.setScalar(n), t;
 }
-const pX = "0.13.5", o1 = !1;
+const pX = "0.13.6", o1 = !1;
 class Na {
   constructor(t, e = {}) {
     D(this, "container");
@@ -42239,84 +42239,85 @@ const DI = {
     });
   }
   setAreaMixColor(e, i) {
-    const s = this.setAreaColorByProperty("adcode", e, i);
-    s && (s.color.set("#ffffff"), s.onBeforeCompile = (l) => {
-      l.uniforms.c = {
-        value: new rt(i)
-      }, l.fragmentShader = `
-        uniform vec3 c;
-        vec3 rgb2hsv(float r, float g, float b) {
-          vec3 c = vec3(r, g, b);
-          vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
-          vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
-          vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
-
-          float d = q.x - min(q.w, q.y);
-          float e = 1.0e-10;
-          return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
-        }
-
-        vec3 hsv2rgb( float h, float s, float v ) {
-          vec3 c = vec3(h, s, v);
-          vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-          vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-          return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-        }
-
-        vec3 adjustBrightnessContrast(vec3 color, float brightness, float contrast) {
-            color = color * brightness;
-            color = (color - 0.5) * contrast + 0.5;
-            return clamp(color, 0.0, 1.0);
-        }
-
-        float contrast(float value, float contrast) {
-            return (value - 0.5) * contrast + 0.5;
-        }
-
-        float contrast2(float value, float contrast, float center) {
-            return (value - center) * contrast + center;
-        }
-
-        vec3 adjustBrightness(vec3 color, float brightness) {
-            float factor = 0.4 * brightness * brightness + 0.6 * brightness;
-            return clamp(color * factor, 0.0, 1.0);
-        }
-
-        ${l.fragmentShader}
-        `.replace(
-        "#include <dithering_fragment>",
-        `#include <dithering_fragment>
-              vec4 _i_50_rgb = gl_FragColor;
-              float alpha = 1.0;
-              vec3 _i_51_hsv = rgb2hsv(_i_50_rgb.r, _i_50_rgb.g, _i_50_rgb.b);
-              vec3 _i_52_rgb = hsv2rgb(_i_51_hsv.r, _i_51_hsv.g, _i_51_hsv.b);
+    this.setAreaColorByProperty("adcode", e, i, !0);
+  }
+  setAreaColorByProperty(e, i, s, l = !1) {
+    if (!this.map)
+      return;
+    const a = this.map.areaArr.find((o) => o.userData[e] === i);
+    if (a) {
+      const o = this.map.setAreaColor(a, s);
+      l && o && (o.color.set("#ffffff"), o.onBeforeCompile = (c) => {
+        c.uniforms.c = {
+          value: new rt(s)
+        }, c.fragmentShader = `
+            uniform vec3 c;
+            vec3 rgb2hsv(float r, float g, float b) {
+              vec3 c = vec3(r, g, b);
+              vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
+              vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
+              vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
     
-              float alphas = _i_52_rgb.b * 0.6;
-              alphas *= 0.8;
-              alphas *= mix(1.5, 1.9, alphas);
-              alphas += (1.0 - alphas) * 0.25;
+              float d = q.x - min(q.w, q.y);
+              float e = 1.0e-10;
+              return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
+            }
     
-              float endC = 1.0;
-              alphas = mix(0.3, endC, alphas / endC);
-              alphas = mix(alphas, alphas, step(endC, alphas));
-              alphas = contrast(alphas, 1.4);
-              alphas = contrast2(alphas, 1.5, 0.9);
+            vec3 hsv2rgb( float h, float s, float v ) {
+              vec3 c = vec3(h, s, v);
+              vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+              vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+              return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+            }
+    
+            vec3 adjustBrightnessContrast(vec3 color, float brightness, float contrast) {
+                color = color * brightness;
+                color = (color - 0.5) * contrast + 0.5;
+                return clamp(color, 0.0, 1.0);
+            }
+    
+            float contrast(float value, float contrast) {
+                return (value - 0.5) * contrast + 0.5;
+            }
+    
+            float contrast2(float value, float contrast, float center) {
+                return (value - center) * contrast + center;
+            }
+    
+            vec3 adjustBrightness(vec3 color, float brightness) {
+                float factor = 0.4 * brightness * brightness + 0.6 * brightness;
+                return clamp(color * factor, 0.0, 1.0);
+            }
     
-              vec3 chsv = rgb2hsv(c.r, c.g, c.b);
-              vec3 ccccc = hsv2rgb(chsv.r, chsv.g - 0.2, alphas - 0.27);
-              gl_FragColor = vec4(ccccc, alpha * 0.65);
- 
+            ${c.fragmentShader}
+            `.replace(
+          "#include <dithering_fragment>",
+          `#include <dithering_fragment>
+                  vec4 _i_50_rgb = gl_FragColor;
+                  float alpha = 1.0;
+                  vec3 _i_51_hsv = rgb2hsv(_i_50_rgb.r, _i_50_rgb.g, _i_50_rgb.b);
+                  vec3 _i_52_rgb = hsv2rgb(_i_51_hsv.r, _i_51_hsv.g, _i_51_hsv.b);
+        
+                  float alphas = _i_52_rgb.b * 0.6;
+                  alphas *= 0.8;
+                  alphas *= mix(1.5, 1.9, alphas);
+                  alphas += (1.0 - alphas) * 0.25;
+        
+                  float endC = 1.0;
+                  alphas = mix(0.3, endC, alphas / endC);
+                  alphas = mix(alphas, alphas, step(endC, alphas));
+                  alphas = contrast(alphas, 1.4);
+                  alphas = contrast2(alphas, 1.5, 0.9);
+        
+                  vec3 chsv = rgb2hsv(c.r, c.g, c.b);
+                  vec3 ccccc = hsv2rgb(chsv.r, chsv.g - 0.2, alphas - 0.27);
+                  gl_FragColor = vec4(ccccc, alpha * 0.65);
      
-        `
-      );
-    }, s.needsUpdate = !0);
-  }
-  setAreaColorByProperty(e, i, s) {
-    if (!this.map)
-      return;
-    const l = this.map.areaArr.find((a) => a.userData[e] === i);
-    if (l)
-      return this.map.setAreaColor(l, s);
+         
+            `
+        );
+      }, o.needsUpdate = !0);
+    }
   }
   addAreaPlaneByProperty(l, a) {
     return Zt(this, arguments, function* (e, i, s = {}) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.13.5";
+declare const _default: "0.13.6";
 export default _default;

package/dist/vis/map/index.d.ts

@@ -105,7 +105,7 @@ export default class extends Base {
     loaderAdd(adcode: number): void;
     initMaterial(adcode: number): Promise<void>;
     setAreaMixColor(adcode: number, color: string): void;
-    setAreaColorByProperty(key: string, value: any, color: string): THREE.MeshStandardMaterial | undefined;
+    setAreaColorByProperty(key: string, value: any, color: string, mix?: boolean): void;
     addAreaPlaneByProperty(key: string, value: any, options?: {
         material?: THREE.Material;
         lineMaterial?: MeshLineMaterial;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",