@aibee/crc-bmap 0.0.46 → 0.0.47

package/lib/bmap.esm.js

@@ -112,7 +112,6 @@ import {
   Scene,
   WebGLRenderer,
   OrthographicCamera,
-  HemisphereLight,
   Shape,
   PCFSoftShadowMap,
   Group,
@@ -146,12 +145,7 @@ function initCamera(width, height) {
 }
 function initLight() {
   const lights = new Group();
-  const hemisphereLight = new HemisphereLight(16777215, 16777215, 2);
-  hemisphereLight.intensity = 1;
-  hemisphereLight.position.set(0, 0, 10);
-  hemisphereLight.up.set(0, 0, 1);
-  lights.add(hemisphereLight);
-  const ambientLight = new AmbientLight(16777215, 1);
+  const ambientLight = new AmbientLight(16777215, 2.6);
   lights.add(ambientLight);
   return lights;
 }
@@ -176,7 +170,7 @@ function initDirectionalLight(color = 16777215, intensity = 1) {
   directionalLight.castShadow = true;
   directionalLight.shadow.radius = 8;
   directionalLight.shadow.bias = -1e-3;
-  directionalLight.shadow.mapSize.set(128, 128);
+  directionalLight.shadow.mapSize.set(256, 256);
   directionalLight.shadow.camera.left = -200;
   directionalLight.shadow.camera.right = 200;
   directionalLight.shadow.camera.top = 200;
@@ -401,7 +395,6 @@ import {
   Mesh,
   Color as Color2,
   Box3,
-  EdgesGeometry,
   Vector3
 } from "three";
 import { merge } from "lodash";
@@ -428,7 +421,7 @@ var defaultOptions = {
   strokeOpacity: 1,
   // 描边透明度
   strokeWidth: 1,
-  // 描边宽度
+  // 描边宽度 
   doors: [],
   // 门配置
   locked: false,
@@ -560,11 +553,42 @@ var Graphic = class extends Object3D {
   initMesh() {
     return new Mesh(this.geometry, this.material);
   }
+  getBorderPoints() {
+    const points = [];
+    const height = this.options.height;
+    const { cds, curveIndex } = this.options.geometry;
+    for (let j = 0; j < cds.length; j++) {
+      const curCds = cds[j];
+      for (let i = 0; i < curCds.length; i++) {
+        const cur = curCds[i];
+        const next = i + 1 === curCds.length ? curCds[0] : curCds[i + 1];
+        points.push(cur[0], cur[1], 0);
+        points.push(next[0], next[1], 0);
+        points.push(cur[0], cur[1], height);
+        points.push(next[0], next[1], height);
+        if (j > 0) {
+          points.push(cur[0], cur[1], 0);
+          points.push(cur[0], cur[1], height);
+        } else {
+          if (curveIndex.length) {
+            if (curveIndex.includes(i)) {
+              points.push(cur[0], cur[1], 0);
+              points.push(cur[0], cur[1], height);
+            }
+          } else {
+            points.push(cur[0], cur[1], 0);
+            points.push(cur[0], cur[1], height);
+          }
+        }
+      }
+    }
+    return points;
+  }
   createBorder() {
     const material = this.initLineMaterial();
-    const geometry = new EdgesGeometry(this.geometry);
+    const points = this.getBorderPoints();
     const lineGeometry = new LineSegmentsGeometry();
-    lineGeometry.fromEdgesGeometry(geometry);
+    lineGeometry.setPositions(points);
     const line = new LineSegments2(lineGeometry, material);
     line.position.z = this.options.airHeight;
     return line;
@@ -603,13 +627,13 @@ var Shadow = class extends Object3D2 {
     super();
     __publicField(this, "directionalLight");
     __publicField(this, "plane");
-    __publicField(this, "basicOpacity", 0.15);
+    __publicField(this, "basicOpacity", 0.07);
     this.directionalLight = this.initLight();
     this.initPlane();
   }
   // 创建光源
   initLight() {
-    const directionalLight = initDirectionalLight(16777215, 1);
+    const directionalLight = initDirectionalLight(16777215, 0.5);
     directionalLight.position.set(0, 0, 100);
     this.add(directionalLight);
     return directionalLight;
@@ -745,7 +769,7 @@ var Overlay = class extends EventDispatcher {
 
 // src/elements/poi.ts
 var defaultOptions2 = {
-  text: "",
+  texts: [{ text: "" }],
   level: 1,
   collision_enable: true,
   opacity: 1,
@@ -784,7 +808,7 @@ var Poi = class extends Object3D4 {
         this.resetSize();
       }
     });
-    this.addEventListener("change-text", ({ value }) => {
+    this.addEventListener("change-texts", ({ value }) => {
       this.overlay.div.removeChild(this.textDiv);
       this.overlay.div.appendChild(this.initText());
       this.resetSize();
@@ -827,7 +851,8 @@ var Poi = class extends Object3D4 {
     if (this.options.icon) {
       div.appendChild(this.initIcon());
     }
-    div.style.fontSize = `12px`;
+    div.style.fontSize = `14px`;
+    div.style.textShadow = `#fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0`;
     div.style.display = `flex`;
     div.style.flexDirection = `column`;
     div.style.justifyContent = `center`;
@@ -844,18 +869,27 @@ var Poi = class extends Object3D4 {
   initText() {
     const textDiv = document.createElement("div");
     textDiv.appendChild(this.createTextFragment());
-    textDiv.style.background = "rgba(255, 255, 255, .7)";
-    textDiv.style.padding = "2px";
-    textDiv.style.borderRadius = "4px";
+    if (this.options.texts.length > 1) {
+      textDiv.style.background = "rgba(255, 255, 255, .7)";
+      textDiv.style.padding = "2px 4px";
+      textDiv.style.borderRadius = "4px";
+      textDiv.style.fontSize = "12px";
+      textDiv.style.lineHeight = "16px";
+    }
     this.textDiv = textDiv;
     return textDiv;
   }
   createTextFragment() {
     const f = document.createDocumentFragment();
-    this.options.text.split("\r\n").forEach((item) => {
+    this.options.texts.forEach((item) => {
       const div = document.createElement("div");
       div.style.whiteSpace = "nowrap";
-      div.textContent = item;
+      if (item.styles) {
+        for (let [key, value] of Object.entries(item.styles)) {
+          div.style[key] = value;
+        }
+      }
+      div.textContent = item.text;
       f.appendChild(div);
     });
     return f;
@@ -1234,7 +1268,7 @@ var Floor = class extends Object3D7 {
   addGrounds(grounds) {
     grounds.forEach((ground) => {
       if (!this.grounds.has(ground)) {
-        ground.options.height += ground.options.zIndex / 1e5;
+        ground.options.height += ground.options.zIndex / 1e4;
         this.grounds.add(ground);
         this.groundUpper.add(ground);
       }
@@ -1261,7 +1295,7 @@ var Floor = class extends Object3D7 {
     this.add(this.shadow);
   }
   addGraphic(graphicOptions) {
-    graphicOptions.height += (graphicOptions.height || 0) / 1e5;
+    graphicOptions.height += this.graphicLayer.graphicMap.size * 1e-5;
     return this.graphicLayer.createGraphic(graphicOptions);
   }
   addPoi(poiOptions) {
@@ -2245,9 +2279,11 @@ var Context = class extends EventDispatcher5 {
       target: this.control.target.clone()
     };
     if (!duration) {
-      this.camera.position.copy(start.target.clone().sub(lookAtVector));
-      this.control.target.copy(start.target);
-      this.camera.zoom = start.zoom;
+      this.camera.position.copy(center2.clone().sub(lookAtVector));
+      this.control.target.copy(center2);
+      this.camera.zoom = zoom;
+      this.control.update();
+      return;
     }
     return timeoutPromise(
       new Promise((resolve) => {
@@ -2540,7 +2576,7 @@ var BMap = class extends EventDispatcher6 {
     }
     const grounds = data.filter((item) => item.info.group === "ground");
     grounds.forEach((item) => {
-      item.info.fillColor = "#F5F7F9";
+      item.info.fillColor = "#F2F6FC";
       item.info.fillOpacity = 1;
       item.info.strokeOpacity = 0;
       item.info.height = 5;
@@ -2548,9 +2584,6 @@ var BMap = class extends EventDispatcher6 {
     const groundGraphics = grounds.map((ground) => new Graphic(this.context, ground.info));
     curFloor.addGrounds(groundGraphics);
     const graphicData = data.filter((item) => item.info.group !== "ground");
-    graphicData.forEach((item, index) => {
-      item.info.height = 5;
-    });
     const legacyToGraphicMap = /* @__PURE__ */ new Map();
     const graphics = graphicData.map((item) => {
       const graphic = curFloor.addGraphic(item.info);
@@ -2574,6 +2607,7 @@ var BMap = class extends EventDispatcher6 {
         this.context.switchFloor(createdFloor.curFloor);
         this.context.control.minZoom = 0;
         this.context.control.maxZoom = Infinity;
+        this.context.camera.zoom = 1;
         this.context.setAzimuthalAngle(0, 0);
         this.context.fitCameraToGround(void 0, 0);
         this.basicZoom = this.context.camera.zoom;
@@ -2833,6 +2867,8 @@ var BMap = class extends EventDispatcher6 {
   }
   dispose() {
     this.context.dispose();
+    this.floorDataMap.clear();
+    this.buildingGroundMap.clear();
     clearTextTexture();
     clearCanvas();
     this.unRegistryEvent();