vis-core 0.27.5 → 0.27.7

package/dist/index.module.js

@@ -88,7 +88,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), Ne = JSON.parse(Re), ke = Date.now();
     return !Ne.s || Ne.s > ke ? (this.token = void 0, "") : Ne.e && Ne.e < ke ? (this.token = void 0, "") : (Ne.isValid = ye, Ne);
   }
-}, version = "0.27.5";
+}, version = "0.27.7";
 /**
  * @license
  * Copyright 2010-2025 Three.js Authors
@@ -60320,12 +60320,29 @@ class Base extends Camera {
       const r = this.pencil;
       this.lead = r.lead.init(this.leadObjs), this.delLoadArr && (r.loader.delLoadArr = this.delLoadArr), r.loader.on("progress", (...Re) => {
         this.showState !== !0 && this.emit("loaderProgress", ...Re);
-      }), this.leftTruck && (r.controls.mouseButtons.left = Ki.TRUCK, r.controls.mouseButtons.right = Ki.ROTATE), this.lead.group.hide(), this.lead.prefabGroup.hide(), this.initSceneUserData(), this.initSettings();
+      }), this.leftTruck && (r.controls.mouseButtons.left = Ki.TRUCK, r.controls.mouseButtons.right = Ki.ROTATE), this.lead.group.hide(), this.lead.prefabGroup.hide(), this.initSceneUserData(), this.initCameraUserData(), this.initSettings();
     });
   }
   setSceneActive() {
     this.pencil.showPage(this.sceneActive), this.pencil.installPlugins.set("materialList", this.mList);
   }
+  initCameraUserData() {
+    const r = this.pencil;
+    r.camera.userData = new Proxy(
+      {
+        up: r.camera.up.toArray().join(",")
+      },
+      {
+        set: (d, v, C) => {
+          if (v === "up") {
+            const _ = C.split(",").map((w) => +w);
+            r.camera.up.set(_[0], _[1], _[2]), r.controls.updateCameraUp();
+          }
+          return Reflect.set(d, v, C);
+        }
+      }
+    );
+  }
   initSceneUserData() {
     var w, fe, ye, Le, Re, Ne;
     const r = this.pencil, d = r.scene.background, v = d instanceof Color$1 ? "Color" : d instanceof Texture ? "Texture" : "None", C = v === "Texture" ? d : null, _ = v === "Color" ? "#" + d.getHexString() : "#000000";
@@ -139754,82 +139771,87 @@ class City$1 extends Base {
   }
   initMaterial() {
     return B0(this, null, function* () {
-      const r = ["20", "60", "max"].reduce(
-        (_, w) => {
-          const fe = this.loader.getAsset(`/image/city/${w}-1.jpg`), ye = this.loader.getAsset(`/image/city/${w}.webp`);
-          return _[w] = [
-            new MeshBasicMaterial({
-              name: "建筑顶面-板块内" + w + "高",
-              color: "#00a3bc"
-            }),
-            new MeshStandardMaterial({
-              name: "建筑侧面-板块内" + w + "高",
-              map: fe,
-              normalMap: ye,
-              envMap: this.getRoomEnvMap()
-              // envMapIntensity: 2,
-            })
-          ], [fe, ye].forEach((Le) => {
-            Le.wrapS = RepeatWrapping, Le.wrapT = RepeatWrapping, Le.repeat.set(1, 1);
-          }), _;
-        },
-        {}
-      );
-      this.mList.addMultiple("building", {
-        "20Top": r[20][0],
-        "20Side": r[20][1],
-        "60Top": r[60][0],
-        "60Side": r[60][1],
-        maxTop: r.max[0],
-        maxSide: r.max[1]
-      });
-      const d = ["20", "60", "max"].reduce(
-        (_, w) => {
-          const fe = this.loader.getAsset(`/image/city/${w}-1.jpg`), ye = this.loader.getAsset(`/image/city/${w}.webp`);
-          return _[w] = [
-            new MeshBasicMaterial({
-              name: "建筑顶面-板块外" + w + "高",
-              color: "#133144"
-            }),
-            new MeshStandardMaterial({
-              name: "建筑侧面-块外" + w + "高",
-              map: fe,
-              normalMap: ye,
-              envMap: this.getRoomEnvMap()
-              // envMapIntensity: 2,
-            })
-          ], [fe, ye].forEach((Le) => {
-            Le.wrapS = RepeatWrapping, Le.wrapT = RepeatWrapping, Le.repeat.set(1, 1);
-          }), _;
-        },
-        {}
-      );
-      this.mList.addMultiple("building-grey", {
-        "20Top": d[20][0],
-        "20Side": d[20][1],
-        "60Top": d[60][0],
-        "60Side": d[60][1],
-        maxTop: d.max[0],
-        maxSide: d.max[1]
-      });
-      const v = new De({
-        //@ts-ignore
-        name: "道路-板块内",
-        color: "#ffc457",
-        sizeAttenuation: 0,
-        lineWidth: 40
-      }), C = new De({
-        //@ts-ignore
-        name: "道路-板块外",
-        color: "#4a3f15",
-        sizeAttenuation: 0,
-        lineWidth: 40
-      });
-      this.mList.addMultiple("road", {
-        primary: v
-      }), this.mList.addMultiple("road-grey", {
-        primary: C
-      }), this.mList.addMultiple("geography", {
+      if (this.options.showBuilding) {
+        const r = ["20", "60", "max"].reduce(
+          (v, C) => {
+            const _ = this.loader.getAsset(`/image/city/${C}-1.jpg`), w = this.loader.getAsset(`/image/city/${C}.webp`);
+            return v[C] = [
+              new MeshBasicMaterial({
+                name: "建筑顶面-板块内" + C + "高",
+                color: "#00a3bc"
+              }),
+              new MeshStandardMaterial({
+                name: "建筑侧面-板块内" + C + "高",
+                map: _,
+                normalMap: w,
+                envMap: this.getRoomEnvMap()
+                // envMapIntensity: 2,
+              })
+            ], [_, w].forEach((fe) => {
+              fe.wrapS = RepeatWrapping, fe.wrapT = RepeatWrapping, fe.repeat.set(1, 1);
+            }), v;
+          },
+          {}
+        );
+        this.mList.addMultiple("building", {
+          "20Top": r[20][0],
+          "20Side": r[20][1],
+          "60Top": r[60][0],
+          "60Side": r[60][1],
+          maxTop: r.max[0],
+          maxSide: r.max[1]
+        });
+        const d = ["20", "60", "max"].reduce(
+          (v, C) => {
+            const _ = this.loader.getAsset(`/image/city/${C}-1.jpg`), w = this.loader.getAsset(`/image/city/${C}.webp`);
+            return v[C] = [
+              new MeshBasicMaterial({
+                name: "建筑顶面-板块外" + C + "高",
+                color: "#133144"
+              }),
+              new MeshStandardMaterial({
+                name: "建筑侧面-块外" + C + "高",
+                map: _,
+                normalMap: w,
+                envMap: this.getRoomEnvMap()
+                // envMapIntensity: 2,
+              })
+            ], [_, w].forEach((fe) => {
+              fe.wrapS = RepeatWrapping, fe.wrapT = RepeatWrapping, fe.repeat.set(1, 1);
+            }), v;
+          },
+          {}
+        );
+        this.mList.addMultiple("building-grey", {
+          "20Top": d[20][0],
+          "20Side": d[20][1],
+          "60Top": d[60][0],
+          "60Side": d[60][1],
+          maxTop: d.max[0],
+          maxSide: d.max[1]
+        });
+      }
+      if (this.options.showRoad) {
+        const r = new De({
+          //@ts-ignore
+          name: "道路-板块内",
+          color: "#ffc457",
+          sizeAttenuation: 0,
+          lineWidth: 40
+        }), d = new De({
+          //@ts-ignore
+          name: "道路-板块外",
+          color: "#4a3f15",
+          sizeAttenuation: 0,
+          lineWidth: 40
+        });
+        this.mList.addMultiple("road", {
+          primary: r
+        }), this.mList.addMultiple("road-grey", {
+          primary: d
+        });
+      }
+      (this.options.showRiver || this.options.showGrassland) && (this.mList.addMultiple("geography", {
         river: new MeshBasicMaterial({
           name: "河流-板块内",
           color: "#115d8a"
@@ -139847,7 +139869,7 @@ class City$1 extends Base {
           name: "绿地-板块外",
           color: "#133341"
         })
-      }), this.mList.add(
+      })), this.mList.add(
         "city-plane",
         new MeshBasicMaterial({
           name: "底面",
@@ -139858,16 +139880,16 @@ class City$1 extends Base {
   }
   disableSSAO() {
     const r = this.pencil.composerController.ssaoPass;
-    r && (r.enabled = !1);
+    r && r.enabled && (r.enabled = !1, console.log("disableSSAO"));
   }
   enabledSSAO() {
     const r = this.pencil.composerController.ssaoPass;
-    r && (r.enabled = !0);
+    r && !r.enabled && (r.enabled = !0, console.log("enabledSSAO"));
   }
   init() {
     return B0(this, null, function* () {
       const { jsonName: r, adcode: d } = this.options;
-      yield this.initPencil(), this.tier0 || this.enabledSSAO(), this.loaderAdd(), this.loaderAddJson(r), console.time(`vis-core:time.${this.visName}${d}-loader`), yield this.loader.loadAll(), console.timeEnd(`vis-core:time.${this.visName}${d}-loader`), this.settings.mouseLeft = Ki.SCREEN_PAN, yield this.settings.mouseLeft, this.pencil.camera.up = new Vector3(0, 0, 1), this.pencil.controls.updateCameraUp(), this.adcode = this.options.adcode, this.options.center && (this.pcenter = this.options.center), this.projection = m({
+      yield this.initPencil(), this.loaderAdd(), this.loaderAddJson(r), console.time(`vis-core:time.${this.visName}${d}-loader`), yield this.loader.loadAll(), console.timeEnd(`vis-core:time.${this.visName}${d}-loader`), this.settings.mouseLeft = Ki.SCREEN_PAN, yield this.settings.mouseLeft, this.pencil.camera.userData.up = "0,0,1", this.adcode = this.options.adcode, this.options.center && (this.pcenter = this.options.center), this.projection = m({
         center: this.pcenter,
         scale: this.pscale
       }), this.group = yield this.lead.draw("Group", {
@@ -139901,11 +139923,7 @@ class City$1 extends Base {
   }
   initVis() {
     return B0(this, null, function* () {
-      const { fitTo: r, jsonName: d, planeOut: v } = this.options, C = this.adcode, _ = this.loader, w = _.getAsset(
-        `/cityGzip/Building${d}.json.gzip`
-      ), fe = _.getAsset(`/cityGzip/Road${d}.json.gzip`), ye = _.getAsset(`/cityGzip/River${d}.json.gzip`), Le = _.getAsset(
-        `/cityGzip/Grassland${d}.json.gzip`
-      ), Re = {};
+      const { fitTo: r, jsonName: d, planeOut: v } = this.options, C = this.adcode, _ = this.loader, w = this.options.showBuilding && _.getAsset(`/cityGzip/Building${d}.json.gzip`), fe = this.options.showRoad && _.getAsset(`/cityGzip/Road${d}.json.gzip`), ye = this.options.showRiver && _.getAsset(`/cityGzip/River${d}.json.gzip`), Le = this.options.showGrassland && _.getAsset(`/cityGzip/Grassland${d}.json.gzip`), Re = {};
       [
         ...(ye == null ? void 0 : ye.features) || [],
         ...(Le == null ? void 0 : Le.features) || []
@@ -139928,28 +139946,28 @@ class City$1 extends Base {
         selectHide: !0
       })), yield Promise.all(
         [
-          w && this.options.showBuilding && this.drawBuilding({
+          w && this.drawBuilding({
             json: w,
             meters: ke,
             clip: this.options.clip,
             grey: this.options.grey,
             sideGradient: this.options.buildingSideGradient
           }),
-          fe && this.options.showRoad && this.drawRoad({
+          fe && this.drawRoad({
             json: fe,
             meters: ke,
             z: Ne.length,
             clip: this.options.clip,
             grey: this.options.grey
           }),
-          ye && this.options.showRiver && this.drawArea({
+          ye && this.drawArea({
             json: ye,
             type: "river",
             oArr: Ne,
             clip: this.options.clip,
             grey: this.options.grey
           }),
-          Le && this.options.showGrassland && this.drawArea({
+          Le && this.drawArea({
             json: Le,
             type: "grassland",
             oArr: Ne,
@@ -139964,7 +139982,9 @@ class City$1 extends Base {
             this.innerAreaGroup
           )
         ].filter(Boolean)
-      ), r && this.fitToTarget(C), this.pencil.getPlugin("worker").saveCache();
+      ), r && this.fitToTarget(C), this.pencil.getPlugin("worker").saveCache(), !this.tier0 && this.options.showBuilding && this.pencil.controls.addEventListener("update", () => {
+        this.pencil.controls.distance < 0.1 ? this.enabledSSAO() : this.disableSSAO();
+      });
     });
   }
   fitToTarget(r, d) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.27.5";
+declare const _default: "0.27.7";
 export default _default;

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

@@ -97,6 +97,7 @@ export default class Base extends Camera {
     initPencil(): Promise<void>;
     private sceneActive;
     setSceneActive(): void;
+    initCameraUserData(): void;
     initSceneUserData(): void;
     initBaseObjectUserData(baseObject: BaseObject): void;
     addCSS3DRenderer(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.27.5",
+  "version": "0.27.7",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",