@aibee/crc-bmap 0.0.67 → 0.0.69

package/lib/bmap.esm.js

@@ -410,6 +410,16 @@ function addAlphaToHexColor(hexColor, alpha) {
   let newHexColor = `#${(1 << 24 | newR << 16 | newG << 8 | newB).toString(16).slice(1)}`;
   return newHexColor;
 }
+function darkenColor(hexColor) {
+  let r = parseInt(hexColor.substring(1, 3), 16);
+  let g = parseInt(hexColor.substring(3, 5), 16);
+  let b = parseInt(hexColor.substring(5, 7), 16);
+  r = Math.floor(r * 0.95);
+  g = Math.floor(g * 0.95);
+  b = Math.floor(b * 0.95);
+  let darkHexColor = "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
+  return darkHexColor;
+}
 
 // src/utils/model.ts
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader";
@@ -430,7 +440,9 @@ function loadModel(url) {
     loader = createLoader();
   }
   const p = new Promise((resolve, reject) => {
-    loader.load(url, resolve, void 0, reject);
+    loader.load(url, (gltf) => {
+      resolve(gltf);
+    }, void 0, reject);
   });
   modelMap.set(url, p);
   return p.then((gltf) => {
@@ -622,12 +634,20 @@ var Graphic = class extends Object3D {
     return geometry;
   }
   initMaterial() {
-    const material = this.context.materialFactory.createMeshStandardMaterial({
+    const material = this.context.materialFactory.createMeshBasicMaterial({
       color: this.options.fillColor,
       opacity: this.options.fillOpacity
     });
-    this.material = material;
-    return material;
+    if (this.options.height <= 1e-3) {
+      this.material = material;
+      return material;
+    }
+    const material1 = this.context.materialFactory.createMeshBasicMaterial({
+      color: darkenColor(this.options.fillColor),
+      opacity: this.options.fillOpacity
+    });
+    this.material = [material, material1];
+    return [material, material1];
   }
   initLineMaterial() {
     const lineMaterial = this.context.materialFactory.createLineMaterial({
@@ -647,7 +667,7 @@ var Graphic = class extends Object3D {
   getBorderPoints() {
     const points = [];
     const height = this.options.height + this.options.deltaHeight;
-    const { cds, curveIndex } = this.options.geometry;
+    const { cds } = this.options.geometry;
     for (let j = 0; j < cds.length; j++) {
       const curCds = cds[j];
       for (let i = 0; i < curCds.length; i++) {
@@ -885,6 +905,7 @@ var Poi = class extends EventDispatcher2 {
     __publicField(this, "visible", true);
     __publicField(this, "size", { width: 0, height: 0 });
     __publicField(this, "position", new Vector35());
+    __publicField(this, "userData", {});
     __publicField(this, "_changePosition", () => {
     });
     this.options = proxyOptions(__spreadValues(__spreadValues({}, defaultOptions3), options), this);
@@ -1290,7 +1311,7 @@ var PoiLayer = class extends Layer {
 
 // src/elements/heatmap.ts
 import {
-  MeshBasicMaterial,
+  MeshBasicMaterial as MeshBasicMaterial2,
   Object3D as Object3D6,
   PlaneGeometry as PlaneGeometry2,
   Texture,
@@ -1335,7 +1356,7 @@ var HeatmapElement = class extends Object3D6 {
     const geometry = new PlaneGeometry2(width, height);
     const texture = new Texture(this.div.firstChild);
     texture.needsUpdate = true;
-    const material = new MeshBasicMaterial({
+    const material = new MeshBasicMaterial2({
       transparent: true,
       side: DoubleSide2,
       map: texture
@@ -2252,12 +2273,13 @@ var HoverHelper = class extends EventDispatcher5 {
 };
 
 // src/factory/material.ts
-import { LineBasicMaterial as LineBasicMaterial2, MeshStandardMaterial as MeshStandardMaterial3 } from "three";
+import { LineBasicMaterial as LineBasicMaterial2, MeshStandardMaterial as MeshStandardMaterial2, MeshBasicMaterial as MeshBasicMaterial3 } from "three";
 var MaterialFactory = class {
   constructor(context) {
     this.context = context;
     __publicField(this, "lineMaterialMap", /* @__PURE__ */ new Map());
     __publicField(this, "meshStandardMaterialMap", /* @__PURE__ */ new Map());
+    __publicField(this, "meshBasicMaterialMap", /* @__PURE__ */ new Map());
   }
   generateLineMaterialKey({ color, opacity }) {
     return `${color}-${opacity}`;
@@ -2280,7 +2302,7 @@ var MaterialFactory = class {
     if (this.meshStandardMaterialMap.has(key)) {
       return this.meshStandardMaterialMap.get(key);
     }
-    const material = new MeshStandardMaterial3({
+    const material = new MeshStandardMaterial2({
       color,
       roughness: 1,
       transparent: true,
@@ -2290,11 +2312,33 @@ var MaterialFactory = class {
     this.meshStandardMaterialMap.set(key, material);
     return material;
   }
+  createMeshBasicMaterial({ color, opacity }) {
+    const key = `${color}-${opacity}`;
+    if (this.meshBasicMaterialMap.has(key)) {
+      return this.meshBasicMaterialMap.get(key);
+    }
+    const material = new MeshBasicMaterial3({
+      color,
+      transparent: true,
+      opacity,
+      depthWrite: true
+    });
+    this.meshBasicMaterialMap.set(key, material);
+    return material;
+  }
   dispose() {
     this.lineMaterialMap.forEach((val, _) => {
       val.dispose();
     });
     this.lineMaterialMap.clear();
+    this.meshStandardMaterialMap.forEach((val, _) => {
+      val.dispose();
+    });
+    this.meshStandardMaterialMap.clear();
+    this.meshBasicMaterialMap.forEach((val, _) => {
+      val.dispose();
+    });
+    this.meshBasicMaterialMap.clear();
   }
 };
 
@@ -2310,16 +2354,6 @@ var CameraBound = class {
     });
     __publicField(this, "enable", true);
     __publicField(this, "onCameraChange", () => {
-      const bound = this.getCurFloorScreenPosition();
-      if (bound) {
-        const { leftBottom, rightTop } = bound;
-        const isInBound = this.checkDistanceToScreenEdge(leftBottom, rightTop);
-        if (isInBound) {
-          this.changePrevCamera();
-        } else {
-          this.backToPrevCamera();
-        }
-      }
     });
     this.registryEvent();
     this.changePrevCamera();
@@ -2360,24 +2394,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();
@@ -2725,8 +2760,9 @@ var Context = class extends EventDispatcher6 {
         const start = this.camera.position.clone();
         const lookAtVector = this.getCameraLookAt();
         const tween = new Tween(start, this.tweenGroup).to(position, duration).onUpdate(() => {
-          this.camera.position.copy(start);
-          this.control.target.copy(position.clone().add(lookAtVector));
+          this.camera.position.copy(start.clone().sub(lookAtVector));
+          this.control.target.copy(start.clone());
+          this.control.update();
         }).onComplete(() => {
           this.tweenGroup.remove(tween);
           this.camera.position.copy(start.clone().sub(lookAtVector));
@@ -3386,6 +3422,7 @@ export {
   createRect,
   createSvg,
   createSvgElement,
+  darkenColor,
   defaultConfig,
   dispose,
   disposeLoader,