@kq_npm/client3d_webgl_vue 4.1.1-beta → 4.1.3-beta

package/modelexcavate/index.js

@@ -190,6 +190,7 @@ class ModelExcavateViewModel {
   //Box裁剪存储参数对象
   //绘制管理对象
   //绘制完成监听事件
+  //Kq3dWallPrimitive
   constructor(scenceView, options) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -201,28 +202,165 @@ class ModelExcavateViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_removeEventListener", null);
 
+    (0,defineProperty/* default */.Z)(this, "_wallPrimitive", void 0);
+
+    (0,defineProperty/* default */.Z)(this, "entity0", null);
+
+    (0,defineProperty/* default */.Z)(this, "wall", null);
+
+    (0,defineProperty/* default */.Z)(this, "ratio", 0.01);
+
+    (0,defineProperty/* default */.Z)(this, "ii", 1);
+
+    (0,defineProperty/* default */.Z)(this, "scratchCartesian2", new window.Cesium.Cartesian3());
+
+    (0,defineProperty/* default */.Z)(this, "scratchCartesian3", new window.Cesium.Cartesian3());
+
+    (0,defineProperty/* default */.Z)(this, "scratchCartesian4", new window.Cesium.Cartesian3());
+
+    (0,defineProperty/* default */.Z)(this, "scratchCartesian5", new window.Cesium.Cartesian3());
+
+    (0,defineProperty/* default */.Z)(this, "scratchCartesian6", new window.Cesium.Cartesian3());
+
+    (0,defineProperty/* default */.Z)(this, "scratchCartesian7", new window.Cesium.Cartesian3());
+
+    (0,defineProperty/* default */.Z)(this, "intervalId", null);
+
+    (0,defineProperty/* default */.Z)(this, "g_flattenedPolygonTexture", null);
+
     this._viewer = scenceView._viewer;
     this._options = options;
     this._drawManager = scenceView._drawManager;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-    // var kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
-    // var g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
 
+    let kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
+    this.g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
     var that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
         that._options.positions = shape._controlPoints;
-        this._Kq3dTerrainExcavation = this._Kq3dTerrainExcavation && this._Kq3dTerrainExcavation.destroy();
-        this._Kq3dTerrainExcavation = new window.Cesium.Kq3dTerrainExcavation({
-          viewer: this.viewer,
-          height: this._options.height,
-          positions: that._options.positions,
-          hasWall: false
-        });
+        that.createDynamicExcavationEffect();
 
         that._drawManager.clear();
       }
     });
+  } // 创建开挖模型
+
+
+  createDynamicExcavationEffect() {
+    this._Kq3dTerrainExcavation && this._Kq3dTerrainExcavation.destroy();
+    this._Kq3dTerrainExcavation = new window.Cesium.Kq3dTerrainExcavation({
+      viewer: this._viewer,
+      height: this._options.height,
+      positions: this._options.positions,
+      hasWall: false
+    });
+
+    if (this._wallPrimitive) {
+      this._viewer.scene.primitives.remove(this._wallPrimitive);
+
+      this._wallPrimitive = undefined;
+    }
+
+    this._wallPrimitive = new window.Cesium.Kq3dWallPrimitive({
+      viewer: this._viewer,
+      height: this._options.height,
+      positions: this._options.positions,
+      elevationOnTerrain: false
+    });
+
+    this._viewer.scene.primitives.add(this._wallPrimitive);
+
+    let that = this;
+
+    this._wallPrimitive._readyEvent.addEventListener(function (eventType) {
+      if (eventType != "Ready") {
+        return;
+      }
+
+      that.intervalId = setInterval(function () {
+        if (that.ii > 100) {
+          if (that.entity0) {
+            that._viewer.scene.primitives.remove(that.entity0);
+
+            that.entity0 = undefined;
+          }
+
+          if (that.wall) {
+            that._viewer.scene.primitives.remove(that.wall);
+
+            that.wall = undefined;
+          }
+
+          clearInterval(that.intervalId);
+          that.ii = 0;
+          return;
+        }
+
+        var carto2 = window.Cesium.Cartesian3.lerp(that._options.positions[0], that._options.positions[3], that.ratio * that.ii, that.scratchCartesian2);
+        var carto3 = window.Cesium.Cartesian3.lerp(that._options.positions[1], that._options.positions[2], that.ratio * that.ii, that.scratchCartesian3);
+
+        if (that.entity0) {
+          that._viewer.scene.primitives.remove(that.entity0);
+
+          that.entity0 = undefined;
+        }
+
+        that.entity0 = that.createPolyline([carto2, carto3]);
+        that.ii++;
+        that.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
+        var myPolygon = window.Cesium.PolygonGeometry.fromPositions({
+          positions: [that._options.positions[0], that._options.positions[1], carto3, carto2],
+          height: window.Cesium.Cartographic.fromCartesian(that._options.positions[0]).height
+        });
+        that.g_flattenedPolygonTexture.addFlattenedPolygon(myPolygon);
+      }, 100);
+    });
+  }
+
+  createPolyline(positions) {
+    var material = window.Cesium.Material.fromType("Kq3dLightningMaterial", {});
+
+    if (this.wall) {
+      this._viewer.scene.primitives.remove(this.wall);
+
+      this.wall = undefined;
+    }
+
+    var geometryInstances = [];
+    geometryInstances.push(new window.Cesium.GeometryInstance({
+      geometry: new window.Cesium.WallGeometry({
+        positions: positions,
+        maximumHeights: [10, 10],
+        minimumHeights: [-10, -10],
+        vertexFormat: window.Cesium.VertexFormat.POSITION_NORMAL_AND_ST
+      })
+    }));
+    this.wall = new window.Cesium.Primitive({
+      geometryInstances: geometryInstances,
+      appearance: new window.Cesium.MaterialAppearance({
+        material: material
+      })
+    });
+
+    this._viewer.scene.primitives.add(this.wall);
+
+    var geo = new window.Cesium.GroundPolylineGeometry({
+      positions: positions,
+      width: 40.0,
+      vertexFormat: window.Cesium.PolylineMaterialAppearance.VERTEX_FORMAT
+    });
+    var primitive = new window.Cesium.GroundPolylinePrimitive({
+      asynchronous: false,
+      classificationType: window.Cesium.ClassificationType.BOTH,
+      geometryInstances: new window.Cesium.GeometryInstance({
+        geometry: geo
+      }),
+      appearance: new window.Cesium.PolylineMaterialAppearance({
+        material: material
+      })
+    });
+    return this._viewer.scene.primitives.add(primitive);
   }
 
   start() {
@@ -232,6 +370,9 @@ class ModelExcavateViewModel {
 
     for (let i = 0; i < models.length; i++) {
       if (models[i]._url) {
+        models[i].enableFlattenning = true;
+        models[i].flattenDiscard = true;
+        this.g_flattenedPolygonTexture.attachTileset(models[i]);
         flag = true;
       }
     }
@@ -244,16 +385,41 @@ class ModelExcavateViewModel {
       });
     } else {
       (0,message/* default */.Z)({
-        message: "请添加模型后拾取!",
+        message: "请添加模型后绘制!",
         type: "warning"
       });
     }
-  } //清除
+  } // qi切换高度重新计算
+
+
+  setHeight(val) {
+    this._options.height = Number(val);
+  } // 清除
 
 
   clear() {
     this._drawManager.stopDraw(); // 销毁地形开挖
 
+
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+      this.ii = 0;
+
+      if (this.entity0) {
+        this._viewer.scene.primitives.remove(this.entity0);
+
+        this.entity0 = undefined;
+      }
+
+      if (this.wall) {
+        this._viewer.scene.primitives.remove(this.wall);
+
+        this.wall = undefined;
+      }
+    }
+
+    this.Kq3dTerrainExcavation && this.Kq3dTerrainExcavation.destroy();
+    this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
   } //销毁
 
 
@@ -378,7 +544,7 @@ const __default__ = {
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           viewModel = new ModelExcavateViewModel(scenceView, {
-            excavationDepth: formItem.excavationDepth
+            height: formItem.excavationDepth
           });
         }
       });
@@ -459,7 +625,7 @@ const __default__ = {
           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_slider, {
             modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).excavationDepth,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).excavationDepth = $event),
-            step: 100,
+            step: 1,
             min: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).minExcavationDepth,
             max: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).maxExcavationDepth,
             onChange: _cache[1] || (_cache[1] = $event => changeHeight()),
@@ -499,9 +665,9 @@ const __default__ = {
       }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
         class: "kq3d-model-excavate-tip"
       }, {
-        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips), 1
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips + '(' + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).reverseDrawPolygon + ')'), 1
         /* TEXT */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)(" <p v-if=\"formItem.terrainStyle === 2\">{{ \"(\" + language.reverseDrawPolygon + \")\" }}</p> ")]),
+        )]),
         _: 1
         /* STABLE */
 

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.1.1-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"5.3.0","echarts-stat":"1.2.0","js-cookie":"3.0.1","omit.js":"2.0.2","save":"2.5.0","tinycolor2":"1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"0.18.5","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.1.3-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"5.3.0","echarts-stat":"1.2.0","js-cookie":"3.0.1","omit.js":"2.0.2","save":"2.5.0","tinycolor2":"1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"0.18.5","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}