@kq_npm/client3d_webgl_vue 4.5.38 → 4.5.40

package/weathereffect/index.js

@@ -150,10 +150,10 @@ var client_icons_vue_ = __webpack_require__(348);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(6277);
 ;// CONCATENATED MODULE: ./src/webgl/weathereffect/WeatherEffectViewModel.js
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
- */
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
+ */
 
 let _gravityScratch = null;
 let _gravityStart = 0.0;
@@ -163,7 +163,6 @@ class WeatherEffectViewModel {
   _scene = null; //三维球场景视图对象
   _particleSystem = null; //粒子系统三维对象
   _drawManager = null; //绘制管理对象
-  _removeEventListener = null; //绘制完成监听事件
   _options = null; //天气特效存储参数对象
   _rainImage = const_image_.RAIN_URL; //雨图片url地址
   _snowImage = const_image_.SNOW_URL; //雪图片url地址
@@ -175,10 +174,31 @@ class WeatherEffectViewModel {
     this._scene = scenceView._viewer.scene;
     this._drawManager = scenceView._drawManager;
     _gravityScratch = new Cesium.Cartesian3();
+  }
+
+  applyGravity(particle, dt) {
+    _gravityScratch = Cesium.Cartesian3.normalize(particle.position, _gravityScratch);
+    Cesium.Cartesian3.multiplyByScalar(
+      _gravityScratch,
+      Cesium.Math.randomBetween(_gravityStart, _gravityEnd),
+      _gravityScratch
+    );
+    particle.velocity = Cesium.Cartesian3.add(particle.velocity, _gravityScratch, particle.velocity);
+  }
+
+  //添加天气特效
+  addWeatherEffect(options) {
     var that = this;
-    that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
+    let mode = options.mode;
+    if (mode !== "rain" && mode !== "snow") {
+      console.log("This mode is not supported.");
+      return;
+    }
+    if (options.gravity) this.setGravity(options.gravity);
+    this._options = options;
+    this._drawManager.startDraw("marker", { image: null }, (feature, { shape }) => {
+      if (!shape.groupName || shape.groupName !== "WeatherEffectDraw") return;
       if (shape && shape.type === "marker") {
-        that._drawManager.clear();
         let position = shape.position;
         if (position) {
           let matrix = new Cesium.Matrix4.fromTranslation(position);
@@ -212,35 +232,14 @@ class WeatherEffectViewModel {
           }
         }
       }
-    });
-  }
-
-  applyGravity(particle, dt) {
-    _gravityScratch = Cesium.Cartesian3.normalize(particle.position, _gravityScratch);
-    Cesium.Cartesian3.multiplyByScalar(
-      _gravityScratch,
-      Cesium.Math.randomBetween(_gravityStart, _gravityEnd),
-      _gravityScratch
-    );
-    particle.velocity = Cesium.Cartesian3.add(particle.velocity, _gravityScratch, particle.velocity);
-  }
-
-  //添加天气特效
-  addWeatherEffect(options) {
-    let mode = options.mode;
-      if (mode !== "rain" && mode !== "snow") {
-        console.log("This mode is not supported.");
-        return;
-      }
-      if (options.gravity) this.setGravity(options.gravity);
-      this._options = options;
-      this._drawManager.startDraw("marker", { image: null });
+      that._drawManager && that._drawManager.clearDrawGroup("WeatherEffectDraw");
+    }, "WeatherEffectDraw");
   }
 
   //清除天气特效
   clear() {
     this._drawManager.stopDraw();
-    this._drawManager.clear();
+    this._drawManager && this._drawManager.clearDrawGroup("WeatherEffectDraw");
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   }
@@ -248,9 +247,6 @@ class WeatherEffectViewModel {
   //销毁
   destroy() {
     this.clear();
-    //移除监听事件
-    this._removeEventListener && this._removeEventListener();
-    this._removeEventListener = null;
   }
 
   //设置范围半径