vis-core 0.13.4 → 0.13.5

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.4", o1 = !1;
+const pX = "0.13.5", o1 = !1;
 class Na {
   constructor(t, e = {}) {
     D(this, "container");
@@ -41520,90 +41520,17 @@ class bX extends ye {
       }), this.extrudelineArr = y);
     });
   }
-  setColor(e, i) {
-    this.areaArr.forEach((s) => {
-      if (s.userData.adcode === e) {
-        if (i === "origin") {
-          s.useMaterial("origin");
-          return;
-        }
-        const [l, a] = s.setMaterialList(
-          i,
-          "clone",
-          !1
-        ), o = this.options.curvatureResolution && this.options.areaGroup ? a : l;
-        o.color.set("#ffffff"), o.onBeforeCompile = (c) => {
-          c.uniforms.c = {
-            value: new rt(i)
-          }, 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 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);
-          }
-  
-          ${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);
-   
-       
-          `
-          );
-        }, o.needsUpdate = !0, s.useMaterial(i);
-      }
-    });
+  setAreaColor(e, i) {
+    if (i === "origin") {
+      e.useMaterial("origin");
+      return;
+    }
+    const [s, l] = e.setMaterialList(
+      i,
+      "clone",
+      !1
+    ), a = this.options.curvatureResolution && this.options.areaGroup ? l : s;
+    return a.color.set(i), e.useMaterial(i), a;
   }
   addArea(e, i) {
     return Zt(this, null, function* () {
@@ -42151,8 +42078,7 @@ const DI = {
   }
   handleSetting(e, i) {
     return Zt(this, null, function* () {
-      var s, l;
-      return yield qi(Hs.prototype, this, "handleSetting").call(this, e, i), e === "label" ? i === !1 ? (this.eraseLabels(), this.options.showLabel = !1) : (this.settings.labelLite = !1, yield this.settings.labelLite, this.options.showLabel = !0, yield this.drawLabels()) : e === "labelLite" ? i === !1 ? (this.eraseLabels(), this.options.showLabel = !1) : (this.settings.label = !1, yield this.settings.label, this.options.showLabel = "lite", yield this.drawLabels()) : e === "shadowMap" ? i === !1 ? this.shadowMapDisabled() : yield this.shadowMapEnabled() : e === "areaColor" && this.setAreaColor((l = (s = this.mapArea) == null ? void 0 : s.at(0)) == null ? void 0 : l.userData.adcode, i), i;
+      return yield qi(Hs.prototype, this, "handleSetting").call(this, e, i), e === "label" ? i === !1 ? (this.eraseLabels(), this.options.showLabel = !1) : (this.settings.labelLite = !1, yield this.settings.labelLite, this.options.showLabel = !0, yield this.drawLabels()) : e === "labelLite" ? i === !1 ? (this.eraseLabels(), this.options.showLabel = !1) : (this.settings.label = !1, yield this.settings.label, this.options.showLabel = "lite", yield this.drawLabels()) : e === "shadowMap" && (i === !1 ? this.shadowMapDisabled() : yield this.shadowMapEnabled()), i;
     });
   }
   init() {
@@ -42312,9 +42238,85 @@ const DI = {
       this.mList.setMaterialObj("plane", s), this.mList.showMaterialList.set("area", ["plane#topMat", "plane#sideMat"]), this.mList.showMaterialList.set("line", "plane#lineMat"), this.mList.showMaterialList.set("extrudeline", "plane#extrudeLineMat"), this.mList.showMaterialListTitle.set("area", "板块"), this.mList.showMaterialListTitle.set("line", "板块线"), this.mList.showMaterialListTitle.set("extrudeline", "板块边线");
     });
   }
-  setAreaColor(e, i) {
-    var s;
-    (s = this.map) == null || s.setColor(e, i);
+  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);
+    
+              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);
   }
   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.4";
+declare const _default: "0.13.5";
 export default _default;

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

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

package/dist/vis/map/objects/PlaneMap.d.ts

@@ -40,7 +40,7 @@ export default class PlaneMap extends BaseObject {
     extrudelineArr?: Line[];
     constructor(options: Options);
     create(): Promise<void>;
-    setColor(adcode: number, color: string): void;
+    setAreaColor(area: ExtrudePolygon, color: string): THREE.MeshStandardMaterial | undefined;
     addArea(geojson: GeoJSON, options: {
         material: THREE.Material | THREE.Material[];
         bbox?: number[];

package/package.json

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