@aibee/crc-bmap 0.0.57 → 0.0.59

package/lib/bmap.esm.js

@@ -453,6 +453,7 @@ var defaultOptions = {
   layerType: "",
   zIndex: 0,
   stroke: true,
+  deltaHeight: 0,
   userData: {}
 };
 var Graphic = class extends Object3D {
@@ -565,7 +566,7 @@ var Graphic = class extends Object3D {
     const geometry = new ExtrudeGeometry(shape, {
       steps: 1,
       bevelEnabled: false,
-      depth: this.options.height,
+      depth: this.options.height + this.options.deltaHeight,
       curveSegments: 4
     });
     return geometry;
@@ -595,7 +596,7 @@ var Graphic = class extends Object3D {
   }
   getBorderPoints() {
     const points = [];
-    const height = this.options.height;
+    const height = this.options.height + this.options.deltaHeight;
     const { cds, curveIndex } = this.options.geometry;
     for (let j = 0; j < cds.length; j++) {
       const curCds = cds[j];
@@ -1018,6 +1019,7 @@ var GraphicLayer = class extends Layer {
     return box.getCenter(new Vector35());
   }
   createGraphic(options) {
+    options.deltaHeight = 1e-5 * this.graphicMap.size;
     const graphic = new Graphic(this.context, options);
     this.add(graphic);
     this.graphicMap.set(options.id, graphic);
@@ -1312,10 +1314,14 @@ var Floor = class extends Object3D7 {
     this.groundUpper.add(this.poiLayer);
     this.add(this.groundUpper);
   }
+  createGround(options) {
+    options.deltaHeight = 1e-5 * this.grounds.size;
+    const ground = new Graphic(this.context, options);
+    this.addGrounds([ground]);
+  }
   addGrounds(grounds) {
     grounds.forEach((ground) => {
       if (!this.grounds.has(ground)) {
-        ground.options.height += ground.options.zIndex / 1e4;
         ground.mesh.castShadow = true;
         this.grounds.add(ground);
         this.groundUpper.add(ground);
@@ -1343,7 +1349,6 @@ var Floor = class extends Object3D7 {
     this.add(this.shadow);
   }
   addGraphic(graphicOptions) {
-    graphicOptions.height += this.graphicLayer.graphicMap.size * 1e-5;
     return this.graphicLayer.createGraphic(graphicOptions);
   }
   addPoi(poiOptions) {
@@ -2473,6 +2478,8 @@ var Context = class extends EventDispatcher6 {
           this.control.target.copy(position.clone().add(lookAtVector));
         }).onComplete(() => {
           this.tweenGroup.remove(tween);
+          this.camera.position.copy(start.clone().sub(lookAtVector));
+          this.control.target.copy(position.clone());
           this.control.update();
           this.control.enabled = true;
           resolve(true);
@@ -2562,6 +2569,9 @@ var defaultConfig = {
     stroke: false,
     strokeColor: "#000",
     strokeOpacity: 1
+  },
+  graphic: {
+    fillOpacity: 1
   }
 };
 function getConfig(config) {
@@ -2712,7 +2722,7 @@ var BMap = class extends EventDispatcher7 {
           item.info.transformToBuildingGround = true;
         });
       }
-      const { ground, markGraphic } = this.config;
+      const { ground, markGraphic, graphic } = this.config;
       for (const item of data) {
         if (item.info.group === "ground") {
           item.info.fillColor = ground.color;
@@ -2721,15 +2731,15 @@ var BMap = class extends EventDispatcher7 {
           item.info.stroke = ground.stroke;
           item.info.strokeColor = ground.strokeColor;
           item.info.strokeOpacity = ground.strokeOpacity;
+        } else if (item.info.userData.mark) {
+          item.info.height = markGraphic.height;
+          item.info.fillColor = markGraphic.color;
+          item.info.fillOpacity = markGraphic.opacity;
+          item.info.stroke = markGraphic.stroke;
+          item.info.strokeColor = markGraphic.strokeColor;
+          item.info.strokeOpacity = markGraphic.strokeOpacity;
         } else {
-          if (item.info.userData.mark) {
-            item.info.height = markGraphic.height;
-            item.info.fillColor = markGraphic.color;
-            item.info.fillOpacity = markGraphic.opacity;
-            item.info.stroke = markGraphic.stroke;
-            item.info.strokeColor = markGraphic.strokeColor;
-            item.info.strokeOpacity = markGraphic.strokeOpacity;
-          }
+          item.info.fillOpacity = graphic.fillOpacity;
         }
       }
       if (!this.config.useFloorCache) {
@@ -2748,7 +2758,7 @@ var BMap = class extends EventDispatcher7 {
     const graphics = [];
     for (const item of data) {
       if (item.info.group === "ground") {
-        curFloor.addGrounds([new Graphic(this.context, item.info)]);
+        curFloor.createGround(item.info);
       } else {
         const graphic = curFloor.addGraphic(item.info);
         graphic.userData.data = item;