@anov/3d 0.0.79 → 0.0.81

package/dist/factory/unit/CameraPoi.d.ts

@@ -16,6 +16,7 @@ declare class CameraPoi {
     generateObject(): Promise<void>;
     cameraEvent(sprite: Group, region: any): void;
     probeEvent(sprite: SpritePoi, region: any): void;
+    setMeshVisible(visible: any): void;
     closeHotmap(): void;
     togglePoi(visible?: boolean): void;
     remove(): void;
@@ -30,7 +31,7 @@ declare class Dialog {
     eventListener: Set<Function>;
     eventList: Map<string, Function>;
     constructor(cameraManage: any);
-    getMesh(position: any, cameraPosition: any): Promise<unknown>;
+    getMesh(position: any, careraParams: any): Promise<unknown>;
     getTarget(cameraPosition: any, rotation?: number[]): any;
     getBoxSize(sprite: Sprite): {
         width: number;

package/dist/factory/unit/CameraPoi.js

@@ -17,8 +17,248 @@ import { loadingManager, usePath } from "../3d";
 
 // @ts-ignore
 
-// @ts-ignore
-import { regionMap } from "../regionData";
+var data = {
+  camera: [{
+    id: '1',
+    name: '摄像头1',
+    position: [-315, 30, -150],
+    fovDefault: 60,
+    fovRange: [30, 120],
+    dialogCamera: {
+      position: [-315, 30, -150],
+      rotation: [30, 180, 0]
+    }
+  }, {
+    id: '2',
+    name: '摄像头2',
+    position: [30, 30, -150],
+    fovDefault: 60,
+    fovRange: [30, 120],
+    dialogCamera: {
+      position: [30, 30, -150],
+      rotation: [30, 180, 0]
+    }
+  }, {
+    id: '3',
+    name: '摄像头3',
+    position: [360, 30, -150],
+    fovDefault: 60,
+    fovRange: [30, 120],
+    dialogCamera: {
+      position: [360, 30, -150],
+      rotation: [30, 180, 0]
+    }
+  }, {
+    id: '4',
+    name: '摄像头4',
+    position: [-320, 30, 32],
+    dialogCamera: {
+      position: [-320, 30, 32],
+      rotation: [30, 180, 0]
+    }
+  }, {
+    id: '5',
+    name: '摄像头5',
+    position: [-307, 30, 170],
+    fovDefault: 60,
+    fovRange: [30, 120],
+    dialogCamera: {
+      position: [-307, 30, 170],
+      rotation: [30, 180, 0]
+    }
+  }, {
+    id: '6',
+    name: '摄像头6',
+    position: [77, 30, 96],
+    fovDefault: 60,
+    fovRange: [30, 120],
+    dialogCamera: {
+      position: [77, 30, 96],
+      rotation: [30, 180, 0]
+    }
+  }, {
+    id: '7',
+    name: '摄像头7',
+    position: [404, 30, 85],
+    fovDefault: 60,
+    fovRange: [30, 120],
+    dialogCamera: {
+      position: [404, 30, 85],
+      rotation: [30, 180, 0]
+    }
+  }],
+  probePoint: [{
+    id: '1',
+    name: '异常监测点1',
+    warn: true,
+    position: [56, 21, 86],
+    heat_map: {
+      diameter: 10,
+      intensity: 1,
+      data: [{
+        value: 1257.21,
+        position: [-31.4, 0, 112.58]
+      }, {
+        value: 5188.86,
+        position: [59.81, 0, 108.16]
+      }, {
+        value: 8233.59,
+        position: [127.01, 0, 93.51]
+      }, {
+        value: 6160.32,
+        position: [-23.39, 0, 109.85]
+      }, {
+        value: 2089.44,
+        position: [86.24, 0, 98.25]
+      }, {
+        value: 7964.25,
+        position: [142.08, 0, 91.55]
+      }, {
+        value: 2891.54,
+        position: [-18.76, 0, 105.96]
+      }, {
+        value: 4016.91,
+        position: [129.83, 0, 58.93]
+      }, {
+        value: 1658.48,
+        position: [114.01, 0, 73.39]
+      }, {
+        value: 6015.75,
+        position: [95.08, 0, 81.71]
+      }, {
+        value: 2645.72,
+        position: [71.33, 0, 111.15]
+      }, {
+        value: 5328.71,
+        position: [53.08, 0, 100.99]
+      }, {
+        value: 7860.39,
+        position: [45.44, 0, 62.02]
+      }, {
+        value: 629.26,
+        position: [66.18, 0, 68.98]
+      }, {
+        value: 7998.3,
+        position: [66.91, 0, 61.18]
+      }, {
+        value: 1793.47,
+        position: [96.94, 0, 82.64]
+      }, {
+        value: 8761.08,
+        position: [79.27, 0, 98.97]
+      }, {
+        value: 171.17,
+        position: [-8.36, 0, 106.03]
+      }, {
+        value: 7927.78,
+        position: [19.1, 0, 68.98]
+      }, {
+        value: 1245.33,
+        position: [-12.97, 0, 100.53]
+      }, {
+        value: 5776.97,
+        position: [58.42, 0, 63.39]
+      }, {
+        value: 7995.19,
+        position: [27.95, 0, 71.28]
+      }, {
+        value: 5594.95,
+        position: [-40.68, 0, 113.13]
+      }, {
+        value: 1100.63,
+        position: [-25.66, 0, 112.21]
+      }, {
+        value: 4414.18,
+        position: [21.2, 0, 85.83]
+      }, {
+        value: 6992.41,
+        position: [46.74, 0, 99.35]
+      }, {
+        value: 9635.05,
+        position: [75.22, 0, 85.63]
+      }, {
+        value: 2605.65,
+        position: [-8.83, 0, 98.76]
+      }, {
+        value: 4383.19,
+        position: [71.33, 0, 99.15]
+      }, {
+        value: 8279.62,
+        position: [11.94, 0, 106.16]
+      }, {
+        value: 1684.68,
+        position: [92.12, 0, 88.78]
+      }, {
+        value: 9923.54,
+        position: [80.71, 0, 62.07]
+      }, {
+        value: 7653.27,
+        position: [148.54, 0, 60.52]
+      }, {
+        value: 5039.09,
+        position: [62.98, 0, 59.55]
+      }, {
+        value: 551.79,
+        position: [135.28, 0, 103.93]
+      }, {
+        value: 4524.42,
+        position: [-4.12, 0, 67.67]
+      }, {
+        value: 2241.86,
+        position: [101.14, 0, 101.28]
+      }, {
+        value: 3456.36,
+        position: [116.45, 0, 93.74]
+      }, {
+        value: 4585.21,
+        position: [43.88, 0, 86.63]
+      }, {
+        value: 4457.15,
+        position: [124.61, 0, 70.21]
+      }, {
+        value: 2494.11,
+        position: [29.21, 0, 104.71]
+      }, {
+        value: 1231.78,
+        position: [97.08, 0, 69.05]
+      }, {
+        value: 6806.42,
+        position: [4.42, 0, 102.62]
+      }, {
+        value: 603.51,
+        position: [108.36, 0, 94.25]
+      }, {
+        value: 3680.9,
+        position: [-35.15, 0, 99.69]
+      }, {
+        value: 6376.6,
+        position: [61.69, 0, 102.39]
+      }, {
+        value: 4364.56,
+        position: [43.58, 0, 112.51]
+      }, {
+        value: 7729.71,
+        position: [-5.25, 0, 113.76]
+      }, {
+        value: 9914.23,
+        position: [-13.56, 0, 84.21]
+      }, {
+        value: 5854.25,
+        position: [50, 0, 83.54]
+      }]
+    }
+  }, {
+    id: '2',
+    name: '甲烷监测点2',
+    warn: false,
+    position: [384, 21, 75]
+  }, {
+    id: '3',
+    name: '甲烷监测点3',
+    warn: false,
+    position: [9, 21, -134]
+  }]
+};
 var load = new ModelLoader();
 var CameraPoi = /*#__PURE__*/function () {
   function CameraPoi(gobal) {
@@ -39,85 +279,69 @@ var CameraPoi = /*#__PURE__*/function () {
   _createClass(CameraPoi, [{
     key: "generateObject",
     value: function () {
-      var _generateObject = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this = this;
-        var model, rotatingRight, unFrame;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _generateObject = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _this = this,
+          _data$probePoint;
+        var model, point, rotatingRight, unFrame;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context2.next = 2;
+              _context.next = 2;
               return load.loadGLTF("".concat(usePath, "shexiang.glb"), false, true, './draco/', function (gltf) {
                 return gltf;
               });
             case 2:
-              model = _context2.sent;
-              Object.keys(regionMap).forEach( /*#__PURE__*/function () {
-                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key) {
-                  var _region$probePoint;
-                  var region, group, sprite, position, scan, point;
-                  return _regeneratorRuntime().wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        // 摄像机
-                        region = regionMap[key];
-                        group = new Group();
-                        group.name = region.camera.id;
-                        sprite = new SpritePoi("".concat(usePath, "camera.png"), {
-                          scale: [14, 14, 1]
-                        });
-                        sprite.rotation.y = Math.PI;
-                        position = new Vector3().fromArray(region.camera.position);
-                        sprite.position.copy(position);
-                        group.add(sprite);
-                        scan = model.scene.clone();
-                        scan.scale.addScalar(8);
-                        scan.rotation.x = -Math.PI / 2 + 0.5;
-                        scan.position.copy(position.clone().add(new Vector3(0, -2, 0)));
-                        group.add(scan);
-                        _this.cameraMesh.set(region.title, group);
-                        _this.gobal.interactionManager.add(group);
-                        _this.cameraEvent(group, region);
-                        _this.gobal.scene.add(group);
+              model = _context.sent;
+              data.camera.forEach(function (region) {
+                var group = new Group();
+                group.name = region.id;
+                var sprite = new SpritePoi("".concat(usePath, "camera.png"), {
+                  scale: [14, 14, 1]
+                });
+                sprite.rotation.y = Math.PI;
+                var position = new Vector3().fromArray(region.position);
+                sprite.position.copy(position);
+                group.add(sprite);
+                var scan = model.scene.clone();
+                scan.scale.addScalar(8);
+                scan.rotation.x = -Math.PI / 2 + 0.5;
+                scan.position.copy(position.clone().add(new Vector3(0, -2, 0)));
+                group.add(scan);
+                _this.cameraMesh.set(region.name, group);
+                _this.gobal.interactionManager.add(group);
+                _this.cameraEvent(group, region);
+                _this.gobal.scene.add(group);
+              });
 
-                        // 甲烷检测点
-                        point = new MethanePoint();
-                        (_region$probePoint = region.probePoint) === null || _region$probePoint === void 0 ? void 0 : _region$probePoint.forEach(function (item) {
-                          var mesh;
-                          if (item.warn) {
-                            mesh = new SpritePoi("".concat(usePath, "p4/warn.png"), {
-                              scale: [16, 16, 1]
-                            });
-                            _this.gobal.interactionManager.add(mesh);
-                            _this.probeEvent(mesh, region);
-                            // 使用GSAP创建跳动动画
-                            gsap.to(mesh.position, {
-                              y: '+=3',
-                              // 上跳10个单位
-                              duration: 0.2,
-                              // 动画持续时间
-                              ease: 'power1.inOut',
-                              // 缓动函数
-                              yoyo: true,
-                              // 循环
-                              repeat: -1 // 无限重复
-                            });
-                          } else {
-                            mesh = point.create();
-                          }
-                          mesh.position.copy(new Vector3().fromArray(item.position));
-                          _this.warnMesh.set(region.title, mesh);
-                          _this.gobal.scene.add(mesh);
-                        });
-                      case 19:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function (_x) {
-                  return _ref.apply(this, arguments);
-                };
-              }());
+              // 甲烷检测点
+              point = new MethanePoint();
+              (_data$probePoint = data.probePoint) === null || _data$probePoint === void 0 ? void 0 : _data$probePoint.forEach(function (item) {
+                var mesh;
+                if (item.warn) {
+                  mesh = new SpritePoi("".concat(usePath, "p4/warn.png"), {
+                    scale: [16, 16, 1]
+                  });
+                  _this.gobal.interactionManager.add(mesh);
+                  _this.probeEvent(mesh, item);
+                  // 使用GSAP创建跳动动画
+                  gsap.to(mesh.position, {
+                    y: '+=3',
+                    // 上跳10个单位
+                    duration: 0.2,
+                    // 动画持续时间
+                    ease: 'power1.inOut',
+                    // 缓动函数
+                    yoyo: true,
+                    // 循环
+                    repeat: -1 // 无限重复
+                  });
+                } else {
+                  mesh = point.create();
+                }
+                mesh.position.copy(new Vector3().fromArray(item.position));
+                _this.warnMesh.set(item.name, mesh);
+                _this.gobal.scene.add(mesh);
+              });
               // 设置左右旋转的标志位和旋转速度
               rotatingRight = true; // 是否正在向右转动
               unFrame = use.useframe(function () {
@@ -140,11 +364,11 @@ var CameraPoi = /*#__PURE__*/function () {
                 });
               });
               this.eventListener.add(unFrame);
-            case 7:
+            case 9:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
       function generateObject() {
         return _generateObject.apply(this, arguments);
@@ -156,24 +380,24 @@ var CameraPoi = /*#__PURE__*/function () {
     value: function cameraEvent(sprite, region) {
       var _this2 = this;
       var fn = /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           var isClose, _use$useScene, camera, position, targetPosition, camaraPosition;
-          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 if (!_this2.currentDialogMesh) {
-                  _context3.next = 7;
+                  _context2.next = 7;
                   break;
                 }
-                isClose = _this2.currentDialogMesh.name === region.camera.name;
+                isClose = _this2.currentDialogMesh.name === region.name;
                 _this2.dialogManage.close();
                 if (!isClose) {
-                  _context3.next = 5;
+                  _context2.next = 5;
                   break;
                 }
-                return _context3.abrupt("return");
+                return _context2.abrupt("return");
               case 5:
-                _context3.next = 8;
+                _context2.next = 8;
                 break;
               case 7:
                 if (_this2.headMap && _this2.headMap.isShow) {
@@ -187,40 +411,45 @@ var CameraPoi = /*#__PURE__*/function () {
                 }
               case 8:
                 sendToMessage(MessageType.Event, 'onCameraStatus', EMessageStatus.Success, undefined, {
-                  id: region.camera.id
+                  id: region.id
                 });
-                position = new Vector3().fromArray(region.camera.position);
+                position = new Vector3().fromArray(region.position);
                 targetPosition = position.clone().toArray();
                 camaraPosition = position.clone().add(new Vector3(0, 40, 80)).toArray();
                 _this2.gobal.cameraUtil.set({
                   position: camaraPosition,
                   target: targetPosition
                 });
-                _context3.next = 15;
-                return _this2.dialogManage.getMesh(position, position.clone().add(new Vector3(0, -20, 5)));
-              case 15:
-                _this2.currentDialogMesh = _context3.sent;
+                _this2.setMeshVisible(false);
+                _context2.next = 16;
+                return _this2.dialogManage.getMesh(position, region);
+              case 16:
+                _this2.currentDialogMesh = _context2.sent;
                 _this2.dialogManage.addEventListener('close', function () {
                   // 初始相机到原始位置
                   _this2.gobal.cameraUtil.set({
                     position: _this2.startPosition.toArray(),
                     target: _this2.cameraLookAt.toArray()
                   });
+                  _this2.setMeshVisible(true);
                   _this2.currentDialogMesh = null;
+                  _this2.cameraMesh.forEach(function (mesh) {
+                    mesh.visible = true;
+                  });
                   sendToMessage(MessageType.Event, 'onCancelCameraStatus', EMessageStatus.Success, undefined, {
-                    id: region.camera.id
+                    id: region.id
                   });
                 });
-                _this2.currentDialogMesh.name = region.camera.name;
+                _this2.currentDialogMesh.name = region.name;
                 _this2.gobal.scene.add(_this2.currentDialogMesh);
-              case 19:
+              case 20:
               case "end":
-                return _context3.stop();
+                return _context2.stop();
             }
-          }, _callee3);
+          }, _callee2);
         }));
         return function fn() {
-          return _ref2.apply(this, arguments);
+          return _ref.apply(this, arguments);
         };
       }();
       sprite.addEventListener('click', fn);
@@ -235,23 +464,23 @@ var CameraPoi = /*#__PURE__*/function () {
       var _use$useScene2 = use.useScene(),
         camera = _use$useScene2.camera;
       this.headMap = new HeadMap();
-      var unClick = sprite.addEventListener('click', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var unClick = sprite.addEventListener('click', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var position, camaraPosition;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (sprite.visible) {
-                _context4.next = 2;
+                _context3.next = 2;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context3.abrupt("return");
             case 2:
               sprite.visible = false;
               sendToMessage(MessageType.Event, 'onGasMonitorStatus', EMessageStatus.Success, undefined, {
-                id: region.probePoint[0].id
+                id: region.id
               });
               _this3.togglePoi(false);
-              position = new Vector3().fromArray(region.probePoint[0].position);
+              position = new Vector3().fromArray(region.position);
               camaraPosition = position.clone().add(new Vector3(0, 30, 0));
               _this3.startPosition = camera.position.clone();
               // 获取相机朝向
@@ -282,12 +511,22 @@ var CameraPoi = /*#__PURE__*/function () {
               });
             case 11:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4);
+        }, _callee3);
       })));
       this.eventListener.add(unClick);
     }
+  }, {
+    key: "setMeshVisible",
+    value: function setMeshVisible(visible) {
+      this.cameraMesh.forEach(function (mesh) {
+        return mesh.visible = visible;
+      });
+      this.warnMesh.forEach(function (mesh) {
+        return mesh.visible = visible;
+      });
+    }
   }, {
     key: "closeHotmap",
     value: function closeHotmap() {
@@ -316,6 +555,7 @@ var CameraPoi = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove() {
+      this.dialogManage.close();
       // 删除摄像机POI点
       this.cameraMesh.forEach(function (sprite) {
         sprite.removeFromParent();
@@ -338,7 +578,6 @@ var CameraPoi = /*#__PURE__*/function () {
         orbitControls.enabled = true;
       }
       this.eventListener.clear();
-      this.dialogManage.close();
     }
   }]);
   return CameraPoi;
@@ -414,16 +653,16 @@ var Dialog = /*#__PURE__*/function () {
   _createClass(Dialog, [{
     key: "getMesh",
     value: function () {
-      var _getMesh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(position, cameraPosition) {
+      var _getMesh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(position, careraParams) {
         var _this4 = this;
         var _this$manage$gobal$sc, texture, close, cuteSprite, unFrame;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this.close();
-              this.camera = new PerspectiveCamera(90, window.innerWidth / window.innerHeight, 0.1, 10000);
-              this.camera.position.copy(cameraPosition);
-              this.camera.rotation.set(-Math.PI / 6, Math.PI, 0);
+              this.camera = new PerspectiveCamera(careraParams.fovDefault || 60, window.innerWidth / window.innerHeight, 0.1, 10000);
+              this.camera.position.copy(new Vector3().fromArray(careraParams.position));
+              this.camera.rotation.set(Math.PI / 6, Math.PI, 0);
               _this$manage$gobal$sc = this.manage.gobal.scene.setCustomPerspective(this.camera), texture = _this$manage$gobal$sc.texture, close = _this$manage$gobal$sc.close;
               cuteSprite = new Sprite(new SpriteMaterial({
                 map: texture,
@@ -437,7 +676,7 @@ var Dialog = /*#__PURE__*/function () {
                 _this4.updateScale(cuteSprite);
               });
               this.eventListener.add(unFrame);
-              return _context5.abrupt("return", new Promise(function (reslove) {
+              return _context4.abrupt("return", new Promise(function (reslove) {
                 setTimeout(function () {
                   var borderMesh = _this4.getBorderMesh(_this4.camera, cuteSprite);
                   var group = new Group();
@@ -451,11 +690,11 @@ var Dialog = /*#__PURE__*/function () {
               }));
             case 12:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
-      function getMesh(_x2, _x3) {
+      function getMesh(_x, _x2) {
         return _getMesh.apply(this, arguments);
       }
       return getMesh;
@@ -497,9 +736,9 @@ var Dialog = /*#__PURE__*/function () {
       // 将边界框的最小和最大顶点转换为屏幕坐标
       var min = bbox.min.project(camera);
       var max = bbox.max.project(camera);
-      var _ref4 = [window.innerWidth, window.innerHeight],
-        w = _ref4[0],
-        h = _ref4[1];
+      var _ref3 = [window.innerWidth, window.innerHeight],
+        w = _ref3[0],
+        h = _ref3[1];
       var dom = document.querySelector('#app');
       if (dom) {
         w = dom.clientWidth;
@@ -652,7 +891,7 @@ var Dialog = /*#__PURE__*/function () {
       sliderBar.type = 'range';
       sliderBar.min = '30';
       sliderBar.max = '120';
-      sliderBar.value = '90';
+      sliderBar.value = '60';
       sliderBar.className = 'dialog-slider';
       sliderBar.addEventListener('input', function () {
         camera.fov = sliderBar.value;