@aibee/crc-bmap 0.0.67 → 0.0.68

package/lib/bmap.esm.js

@@ -2312,8 +2312,8 @@ var CameraBound = class {
     __publicField(this, "onCameraChange", () => {
       const bound = this.getCurFloorScreenPosition();
       if (bound) {
-        const { leftBottom, rightTop } = bound;
-        const isInBound = this.checkDistanceToScreenEdge(leftBottom, rightTop);
+        const { left, right, top, bottom } = bound;
+        const isInBound = this.checkDistanceToScreenEdge({ left, right, top, bottom });
         if (isInBound) {
           this.changePrevCamera();
         } else {
@@ -2360,24 +2360,25 @@ var CameraBound = class {
     const box = new Box37().setFromObject(this.context.currentFloor.groundUpper);
     const { camera, container: { clientWidth: w, clientHeight: h } } = this.context;
     const { min, max } = box;
-    const leftBottom = vector3ToDevice(min, camera, w, h);
-    const rightTop = vector3ToDevice(max, camera, w, h);
-    return { leftBottom, rightTop };
+    const lb = vector3ToDevice(min, camera, w, h);
+    const rt = vector3ToDevice(max, camera, w, h);
+    const lt = vector3ToDevice(new Vector311(min.x, max.y, max.z), camera, w, h);
+    const rb = vector3ToDevice(new Vector311(max.x, min.y, min.z), camera, w, h);
+    const left = Math.min(lb.x, rt.x, lt.x, rb.x);
+    const right = Math.max(lb.x, rt.x, lt.x, rb.x);
+    const top = Math.min(lb.y, rt.y, lt.y, rb.y);
+    const bottom = Math.max(lb.y, rt.y, lt.y, rb.y);
+    return { left, right, top, bottom };
   }
   /**
    * 检测地图是不是在显示范围
-   * @param leftBottom 
-   * @param rightTop 
-   * @returns { boolean } 
+   * @param param0 
+   * @returns 
    */
-  checkDistanceToScreenEdge(leftBottom, rightTop) {
+  checkDistanceToScreenEdge({ left, right, top, bottom }) {
     const { width, height } = this.context.clientSize;
     const [pt, pr, pb, pl] = this.context.config.cameraBound.padding;
-    const left = leftBottom.x;
-    const right = width - rightTop.x;
-    const top = rightTop.y;
-    const bottom = height - leftBottom.y;
-    return left < pl && right < pr && top < pt && bottom < pb;
+    return left <= pl && width - right <= pr && top <= pt && height - bottom <= pb;
   }
   dispose() {
     this.unRegistryEvent();