@kq_npm/client3d_webgl_vue 4.0.9-beta → 4.1.1-beta

package/videofusion/index.js

@@ -50,11 +50,20 @@ class VideoFusiontViewModel {
 
 
   fusion() {
+    let type = 3;
+
+    if (this._options.videoPath.indexOf('.m3u8') > 0) {
+      type = 5;
+    }
+
     this.clear();
     let cartographic = Cesium.Cartographic.fromCartesian(this._viewer.camera.positionWC);
+    this._options.heading = Cesium.Math.toDegrees(this._viewer.camera.heading);
+    this._options.pitch = Cesium.Math.toDegrees(this._viewer.camera.pitch);
+    this._options.roll = Cesium.Math.toDegrees(this._viewer.camera.roll);
     var param = {
       url: this._options.videoPath,
-      type: 3,
+      type: type,
       position: {
         x: Cesium.Math.toDegrees(cartographic.longitude),
         y: Cesium.Math.toDegrees(cartographic.latitude),
@@ -84,6 +93,15 @@ class VideoFusiontViewModel {
     if (this._videoFusion) {
       return this._videoFusion.param.position;
     }
+  } // 获取HeadingPitchRoll
+
+
+  getHeadingPitchRoll() {
+    return {
+      heading: Math.round(this._options.heading),
+      pitch: Math.round(this._options.pitch),
+      roll: Math.round(this._options.roll)
+    };
   } //飞入
 
 
@@ -450,9 +468,6 @@ const __default__ = {
     expose
   }) {
     const props = __props;
-    const {
-      proxy
-    } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.getCurrentInstance)();
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let collapseValue = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 获取组件传参
 
@@ -471,15 +486,17 @@ const __default__ = {
       videoPath: props.settingParams && props.settingParams.videoPath || "",
       fov: props.settingParams && props.settingParams.fov || 40,
       far: props.settingParams && props.settingParams.far || 50,
-      heading: props.settingParams && props.settingParams.heading || 40,
-      pitch: props.settingParams && props.settingParams.pitch || -40,
-      roll: props.settingParams && props.settingParams.roll || 15,
+      heading: 0,
+      pitch: 0,
+      roll: 0,
       alpha: props.settingParams && props.settingParams.alpha || 1.0,
       eclosion: props.settingParams && props.settingParams.eclosion || 0.5,
       showHideLine: props.settingParams && props.settingParams.showHideLine !== undefined || false
     }); // 显示坐标
 
-    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false); // 显示朝向角俯仰角翻转角
+
+    let showHpr = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
     let viewModel = null; // 组件容器Ref
 
     let boxRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null); // 生成组件默认header
@@ -512,9 +529,6 @@ const __default__ = {
             videoPath: formItem.videoPath,
             fov: formItem.fov,
             far: formItem.far,
-            heading: formItem.heading,
-            pitch: formItem.pitch,
-            roll: formItem.roll,
             alpha: formItem.alpha,
             eclosion: formItem.eclosion,
             showHideLine: formItem.showHideLine
@@ -601,6 +615,7 @@ const __default__ = {
         if (viewModel) {
           viewModel.fusion();
           setCoordinate();
+          serHpr();
         }
       }
     }
@@ -620,6 +635,18 @@ const __default__ = {
         formItem.maxHeight = coordinate.z + heightOffset;
         showCoordinate.value = true;
       }
+    } // 设置朝向角俯仰角翻转角
+
+
+    function serHpr() {
+      let hpr = viewModel.getHeadingPitchRoll();
+
+      if (hpr) {
+        formItem.heading = hpr.heading;
+        formItem.pitch = hpr.pitch;
+        formItem.roll = hpr.roll;
+        showHpr.value = true;
+      }
     } // 飞入
 
 
@@ -630,6 +657,7 @@ const __default__ = {
 
     function clearResult() {
       showCoordinate.value = false;
+      showHpr.value = false;
       viewModel && viewModel.clear();
     } // 销毁
 
@@ -1036,7 +1064,7 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).heading
               }, {
@@ -1092,7 +1120,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).pitch
               }, {
@@ -1148,7 +1178,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).roll
               }, {
@@ -1204,7 +1236,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).transparents
               }, {

package/videoproject/index.js

@@ -68,11 +68,14 @@ class VideoProjectViewModel {
   project() {
     this.clear();
     let position = Cesium.Cartesian3.clone(this._viewer.camera.positionWC);
+    this._options.heading = this._viewer.camera.heading;
+    this._options.pitch = this._viewer.camera.pitch;
+    this._options.roll = this._viewer.camera.roll;
     let options = {
       position: position,
-      heading: Cesium.Math.toRadians(this._options.heading),
-      pitch: Cesium.Math.toRadians(this._options.pitch),
-      roll: Cesium.Math.toRadians(this._options.roll),
+      heading: this._options.heading,
+      pitch: this._options.pitch,
+      roll: this._options.roll,
       fov: Cesium.Math.toRadians(this._options.fov),
       aspectRatio: this._options.aspectRatio,
       far: this._options.far,
@@ -101,6 +104,15 @@ class VideoProjectViewModel {
         height: cartographic.height
       };
     }
+  } // 获取HeadingPitchRoll
+
+
+  getHeadingPitchRoll() {
+    return {
+      heading: Math.round(Cesium.Math.toDegrees(this._options.heading)),
+      pitch: Math.round(Cesium.Math.toDegrees(this._options.pitch)),
+      roll: Math.round(Cesium.Math.toDegrees(this._options.roll))
+    };
   } //飞入
 
 
@@ -109,9 +121,9 @@ class VideoProjectViewModel {
       this._viewer.camera.flyTo({
         destination: this._projectVideo.position,
         orientation: {
-          heading: Cesium.Math.toRadians(this._options.heading),
-          pitch: Cesium.Math.toRadians(this._options.pitch),
-          roll: Cesium.Math.toRadians(this._options.roll)
+          heading: this._options.heading,
+          pitch: this._options.pitch,
+          roll: this._options.roll
         }
       });
     }
@@ -435,9 +447,6 @@ const __default__ = {
     expose
   }) {
     const props = __props;
-    const {
-      proxy
-    } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.getCurrentInstance)();
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let collapseValue = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 获取组件传参
 
@@ -453,18 +462,20 @@ const __default__ = {
       height: 0,
       minHeight: -heightOffset,
       maxHeight: heightOffset,
+      heading: 0,
+      pitch: 0,
+      roll: 0,
       videoPath: props.settingParams && props.settingParams.videoPath || "",
       projectType: props.settingParams && props.settingParams.projectType || 1,
       fov: props.settingParams && props.settingParams.fov || 20,
       aspectRatio: props.settingParams && props.settingParams.aspectRatio || 1.6,
       far: props.settingParams && props.settingParams.far || 50,
-      heading: props.settingParams && props.settingParams.heading || 330,
-      pitch: props.settingParams && props.settingParams.pitch || -12,
-      roll: props.settingParams && props.settingParams.roll || 0,
       showHideLine: props.settingParams && props.settingParams.showHideLine !== undefined || true
     }); // 显示坐标
 
-    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false); // 显示朝向角俯仰角翻转角
+
+    let showHpr = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
     let viewModel = null; // 组件容器Ref
 
     let boxRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null); // 生成组件默认header
@@ -499,9 +510,6 @@ const __default__ = {
             fov: formItem.fov,
             aspectRatio: formItem.aspectRatio,
             far: formItem.far,
-            heading: formItem.heading,
-            pitch: formItem.pitch,
-            roll: formItem.roll,
             showHideLine: formItem.showHideLine
           };
           viewModel = new VideoProjectViewModel/* default */.Z(scenceView, options);
@@ -586,9 +594,11 @@ const __default__ = {
         if (viewModel) {
           viewModel.project();
           setCoordinate();
+          serHpr();
         }
       }
-    }
+    } // 设置坐标
+
 
     function setCoordinate() {
       let coordinate = viewModel.getProjectCoordinate();
@@ -605,6 +615,18 @@ const __default__ = {
         formItem.maxHeight = coordinate.height + heightOffset;
         showCoordinate.value = true;
       }
+    } // 设置朝向角俯仰角翻转角
+
+
+    function serHpr() {
+      let hpr = viewModel.getHeadingPitchRoll();
+
+      if (hpr) {
+        formItem.heading = hpr.heading;
+        formItem.pitch = hpr.pitch;
+        formItem.roll = hpr.roll;
+        showHpr.value = true;
+      }
     } // 飞入
 
 
@@ -615,6 +637,7 @@ const __default__ = {
 
     function clearResult() {
       showCoordinate.value = false;
+      showHpr.value = false;
       viewModel && viewModel.clear();
     } // 销毁
 
@@ -1136,7 +1159,7 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).heading
               }, {
@@ -1192,7 +1215,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).pitch
               }, {
@@ -1248,7 +1273,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).roll
               }, {
@@ -1304,7 +1331,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
               style: {
                 "margin-bottom": "8px"
               }