@aibee/crc-bmap 0.0.131 → 0.0.132

package/lib/bmap.esm.js

@@ -2078,7 +2078,7 @@ import {
   Box2 as Box23,
   Vector3 as Vector319,
   Vector2 as Vector29,
-  Raycaster as Raycaster5,
+  Raycaster as Raycaster4,
   Box3 as Box39,
   Color as Color6,
   AmbientLight as AmbientLight2
@@ -4285,7 +4285,7 @@ var GroundTexture = class extends Object3D10 {
       for (let i = 0; i < position.count; i++) {
         position.setZ(i, z);
       }
-      const uvs = [1, 1, 0, 1, 0, 0, 1, 0];
+      const uvs = [0, 1, 1, 1, 1, 0, 0, 0];
       shapeGeometry.setAttribute("uv", new Float32BufferAttribute(uvs, 2));
       return shapeGeometry;
     });
@@ -4384,6 +4384,10 @@ var Lane = class extends Object3D12 {
         option.geometry.coords.slice(1)
       );
       const geometry = new ShapeGeometry2(shape, 4);
+      const pos = geometry.getAttribute("position");
+      for (let i = 0; i < pos.count; i++) {
+        pos.setZ(i, option.airHeight + (option.deltaHeight || 0));
+      }
       return geometry;
     });
     this.geometry = mergeGeometries3(geometries);
@@ -4446,7 +4450,7 @@ var Lane = class extends Object3D12 {
       });
       return options2.map((option) => {
         const geometry = new LineGeometry();
-        const vec = option.geometry.otherCoords[1].map((item) => [...item, 0]).flat(2);
+        const vec = option.geometry.otherCoords[1].map((item) => [...item, option.airHeight + (option.deltaHeight || 0)]).flat(2);
         geometry.setPositions(vec);
         const line = new Line2(geometry, material);
         line.computeLineDistances();
@@ -4750,9 +4754,11 @@ var Poi2 = class extends Object3D14 {
         new SpriteMaterial({
           map: texture,
           transparent: true,
-          alphaTest: 0.2
+          alphaTest: 0.2,
+          depthTest: false
         })
       );
+      spriteIcon.visible = false;
       spriteIcon.renderOrder = 1e5;
       texture.needsUpdate = true;
       this.add(spriteIcon);
@@ -4767,9 +4773,11 @@ var Poi2 = class extends Object3D14 {
         new SpriteMaterial({
           map: texture,
           transparent: true,
-          alphaTest: 0.2
+          alphaTest: 0.2,
+          depthTest: false
         })
       );
+      spriteText.visible = false;
       spriteText.renderOrder = 100001;
       texture.needsUpdate = true;
       this.spriteText = spriteText;
@@ -5737,7 +5745,7 @@ var Context = class extends EventDispatcher6 {
     const point3 = new Vector29();
     point3.x = x / this.clientSize.width * 2 - 1;
     point3.y = y / this.clientSize.height * -2 + 1;
-    const raycaster = new Raycaster5();
+    const raycaster = new Raycaster4();
     raycaster.setFromCamera(point3, this.camera);
     raycaster.ray.origin.sub(raycaster.ray.direction.clone().multiplyScalar(100));
     const res = this.currentFloor?.graphicLayer.getGraphicByRaycaster(raycaster);
@@ -5979,7 +5987,7 @@ var Context = class extends EventDispatcher6 {
    * @param position 修改后的相机的位置
    * @param duration 动画持续时间
    */
-  setCameraPosition(position, duration) {
+  async setCameraPosition(position, duration) {
     const start = this.camera.position.clone();
     const lookAtVector = this.getCameraLookAt();
     if (!duration) {
@@ -5988,6 +5996,7 @@ var Context = class extends EventDispatcher6 {
       this.control.target.copy(position.clone());
       this.control.update();
       this.control.enabled = true;
+      return;
     }
     return timeoutPromise(
       new Promise((resolve) => {
@@ -6010,12 +6019,12 @@ var Context = class extends EventDispatcher6 {
     );
   }
   render() {
-    this.renderer.render(this.scene, this.camera);
     this.dispatchEvent({ type: "update" });
-    this.renderRf = this.timer.requestAnimationFrame(() => {
-      this.render();
-    });
     this.tweenGroup.update();
+    this.renderer.render(this.scene, this.camera);
+    this.renderRf = this.timer.setTimeout(() => {
+      this.render();
+    }, 100);
   }
   pauseRender() {
     this.timer.cancelAnimationFrame(this.renderRf);
@@ -8024,24 +8033,30 @@ var Navigation = class extends Plugin {
       return;
     }
     const { control } = this.bmap.context;
+    const time = duration / Math.PI * 4 * diffAngle * 10;
+    const offsetDistance = 150 / this.bmap.context.camera.zoom;
+    const polar = this.bmap.context.control.getPolarAngle();
+    const maxPolarAngle = this.bmap.context.control.maxPolarAngle;
+    const minPolarAngle = this.bmap.context.control.minPolarAngle;
+    this.bmap.context.control.minPolarAngle = this.bmap.context.control.maxPolarAngle = polar;
     return new Promise((resolve) => {
       const start = { azimuthal: control.getAzimuthalAngle() };
       const end = { azimuthal: angle };
-      const tween = new Tween2(start, this.pathTween).to(end, duration).onUpdate(() => {
-        control.target.copy(this.startPoi.position);
-        control.maxAzimuthAngle = start.azimuthal;
-        control.minAzimuthAngle = start.azimuthal;
-        control.update();
-        const target = this.startPoi.position.clone();
+      const tween = new Tween2(start, this.pathTween).to(end, time).onUpdate(async () => {
+        this.bmap.context.control.target.copy(this.startPoi.position);
+        this.bmap.context.setAzimuthalAngle(start.azimuthal, 0);
+        const target = control.target.clone();
         const offset = new Vector323();
         offset.setFromMatrixColumn(this.bmap.context.camera.matrix, 1);
         offset.normalize();
-        offset.multiplyScalar(150 / this.bmap.context.camera.zoom);
+        offset.multiplyScalar(offsetDistance);
         target.add(offset);
         this.bmap.context.setCameraPosition(target, 0);
       }).onComplete(() => {
         control.enabled = true;
         this.pathTween.remove(tween);
+        this.bmap.context.control.minPolarAngle = minPolarAngle;
+        this.bmap.context.control.maxPolarAngle = maxPolarAngle;
         resolve(true);
       }).onStart(() => {
         control.enabled = false;
@@ -8626,8 +8641,10 @@ var AibeeLoader = class {
         case "texture2d":
         case "texture3d":
           transformGraphicData(layer.elements, center2);
-          const texture = new GroundTexture(this.bmap.context, layer.elements);
-          floor.textureLayer.add(texture);
+          if (layer.elements.length) {
+            const texture = new GroundTexture(this.bmap.context, layer.elements);
+            floor.textureLayer.add(texture);
+          }
           break;
         case "glb":
           transformGraphicData(layer.elements, center2);
@@ -8744,8 +8761,10 @@ var AibeeLoader = class {
               visible: true
             };
           });
-          const parkingTexture = new GroundTexture(this.bmap.context, textures);
-          floor.textureLayer.add(parkingTexture);
+          if (textures.length) {
+            const parkingTexture = new GroundTexture(this.bmap.context, textures);
+            floor.textureLayer.add(parkingTexture);
+          }
           floor.userData.parkingSpaces = parkingSpacesGraphics;
           floor.userData.parkingSpacesGraphicMap = parkingSpacesGraphicMap;
           break;