deeptwins-engine-3d 0.1.49 → 0.1.50

package/dist/esm/videoFusion/VideoProject.d.ts

@@ -1,12 +1,12 @@
 import BaseVideo from './BaseVideo';
 export default class VideoProject extends BaseVideo {
-    type: 'fixed' | 'projection';
     frustum: any;
-    frustumLineLayer: any;
+    private _videoOptions;
+    private _preRenderEvent;
     constructor(map: any, options: any);
-    addToMap(): void;
+    addToMap(): Promise<unknown>;
+    private _create;
     show(isShow: boolean): void;
-    private _drawLine;
-    private _getInterPointByLine;
+    private _getInterPointByRayTerrain;
     destroy(): void;
 }

package/dist/esm/videoFusion/VideoProject.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -16,8 +19,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import * as Cesium from 'deeptwins-cesium';
 import { merge } from 'lodash';
-import { DEFAULT_VIDEO_TEXTURE_HLS, DEFAULT_VIDEO_TEXTURE_VIDEO } from "../constant";
-import { ClampToGround } from "../tool/common";
+import { DEFAULT_VIDEO_FUSION_STYLE, DEFAULT_VIDEO_TEXTURE_HLS, DEFAULT_VIDEO_TEXTURE_VIDEO } from "../constant";
+import ImageMaterialAppearance from "../material/primitive/ImageMaterialAppearance";
+import BuildClampedPolygonGridUnified from "../tool/BuildClampedPolygonGrid";
 import * as utils from "../tool/utils";
 import BaseVideo from "./BaseVideo";
 
@@ -28,211 +32,197 @@ var VideoProject = /*#__PURE__*/function (_BaseVideo) {
   function VideoProject(map, options) {
     var _this;
     _classCallCheck(this, VideoProject);
+    options.style = merge(DEFAULT_VIDEO_FUSION_STYLE(), options.style || {});
     _this = _super.call(this, map, options);
-    _defineProperty(_assertThisInitialized(_this), "type", 'fixed');
     _defineProperty(_assertThisInitialized(_this), "frustum", void 0);
-    _defineProperty(_assertThisInitialized(_this), "frustumLineLayer", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_videoOptions", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_preRenderEvent", void 0);
     return _this;
   }
   _createClass(VideoProject, [{
     key: "addToMap",
-    value: function addToMap() {
-      var _this2 = this;
-      if (!this._canOperate()) {
-        return;
-      }
-      var videoOptions;
-      if (this.videoType === 'video') {
-        this.options.video.autoPlay && this.play();
-        videoOptions = merge(DEFAULT_VIDEO_TEXTURE_VIDEO(), this.options.video);
-      }
-      if (this.videoType === 'hls') {
-        this.options.hls.autoPlay && this.status === 'READY' && this.play();
-        videoOptions = merge(DEFAULT_VIDEO_TEXTURE_HLS(), this.options.hls);
-      }
-      if (this.videoType === 'custom') {
-        videoOptions = merge({}, this.options.custom);
-      }
-      setTimeout(function () {
-        var _this2$options = _this2.options,
-          _this2$options$type = _this2$options.type,
-          type = _this2$options$type === void 0 ? 'fixed' : _this2$options$type,
-          frustum = _this2$options.frustum,
-          _this2$options$style = _this2$options.style,
-          _this2$options$style2 = _this2$options$style === void 0 ? {
-            edgeFeather: false,
-            clampToGround: 'terrain',
-            showLine: true
-          } : _this2$options$style,
-          edgeFeather = _this2$options$style2.edgeFeather,
-          clampToGround = _this2$options$style2.clampToGround,
-          showLine = _this2$options$style2.showLine;
-        frustum.show(false);
-        _this2.type = type;
-        _this2.frustum = frustum;
-        // 取后4个点
-        var points = _this2.frustum.getFarPlane();
-        if (_this2.type === 'projection') {
-          // 交点数组
-          var interPoints = [];
-          points.forEach(function (point) {
-            var interPoint = _this2._getInterPointByLine(_this2.frustum.options.position, point);
-            interPoints.push(interPoint);
-          });
-          if (showLine) {
-            // 绘制线
-            _this2._drawLine(interPoints);
+    value: function () {
+      var _addToMap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this2 = this;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (this._canOperate()) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 2:
+              if (this.videoType === 'video') {
+                this.options.video.autoPlay && this.play();
+                this._videoOptions = merge(DEFAULT_VIDEO_TEXTURE_VIDEO(), this.options.video);
+              }
+              if (this.videoType === 'hls') {
+                this.options.hls.autoPlay && this.status === 'READY' && this.play();
+                this._videoOptions = merge(DEFAULT_VIDEO_TEXTURE_HLS(), this.options.hls);
+              }
+              if (this.videoType === 'custom') {
+                this._videoOptions = merge({}, this.options.custom);
+              }
+              return _context2.abrupt("return", new Promise(function (resolve) {
+                setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.next = 2;
+                        return _this2._create();
+                      case 2:
+                        resolve(null);
+                      case 3:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                })), 200);
+              }));
+            case 6:
+            case "end":
+              return _context2.stop();
           }
-          _this2.videoPolygonLayer = _this2.getMap().addGraphicLayer({
-            type: 'Feature',
-            geometry: {
-              type: 'Polygon',
-              coordinates: [interPoints]
-            }
-          }, {
-            type: 'polygon',
-            style: {
-              material: edgeFeather ? new Cesium.ImageMaterialProperty({
-                image: new Cesium.CallbackProperty(function () {
-                  return _this2._drawCanvas(videoOptions);
-                }, false),
-                transparent: true
-              }) : _this2.videoElement,
-              heightReference: clampToGround ? Cesium.HeightReference.CLAMP_TO_GROUND : Cesium.HeightReference.NONE,
-              perPositionHeight: !clampToGround
-            }
-          });
-        }
-        if (_this2.type === 'fixed') {
-          if (showLine) {
-            // 绘制线
-            _this2._drawLine(points);
+        }, _callee2, this);
+      }));
+      function addToMap() {
+        return _addToMap.apply(this, arguments);
+      }
+      return addToMap;
+    }()
+  }, {
+    key: "_create",
+    value: function () {
+      var _create2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this3 = this;
+        var _this$options, frustum, _this$options$style, clampToGround, _this$options$style$b, gridSize, heightBuffer, stRotation, points, canvas, material, interPoints, feature, data, _feature;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _this$options = this.options, frustum = _this$options.frustum, _this$options$style = _this$options.style, clampToGround = _this$options$style.clampToGround, _this$options$style$b = _this$options$style.buildClampedPolygonGrid, gridSize = _this$options$style$b.gridSize, heightBuffer = _this$options$style$b.heightBuffer, stRotation = _this$options$style.stRotation;
+              this.frustum = frustum;
+              // 远平面的点
+              points = this.frustum.getFarPlane();
+              canvas = this._drawCanvas({
+                videoOptions: this._videoOptions,
+                style: this.options.style
+              });
+              material = new ImageMaterialAppearance({
+                image: canvas,
+                color: '#ffffff',
+                mixRatio: 0
+              });
+              if (!clampToGround) {
+                _context3.next = 20;
+                break;
+              }
+              _context3.next = 8;
+              return utils.isTerrainReady(this.getMap());
+            case 8:
+              // 交点数组
+              interPoints = [];
+              points.forEach(function (point) {
+                var interPoint = _this3._getInterPointByRayTerrain(_this3.frustum.options.position, point);
+                interPoints.push(interPoint);
+              });
+              if (!interPoints.includes(null)) {
+                _context3.next = 13;
+                break;
+              }
+              utils.error('未找到与地形/模型相交的点');
+              return _context3.abrupt("return");
+            case 13:
+              feature = {
+                type: 'Feature',
+                geometry: {
+                  type: 'Polygon',
+                  coordinates: [interPoints]
+                }
+              };
+              _context3.next = 16;
+              return BuildClampedPolygonGridUnified(this.getMap(), feature, gridSize, heightBuffer);
+            case 16:
+              data = _context3.sent;
+              this.videoPolygonLayer = this.getMap().addGraphicLayer(data, {
+                type: 'polygonGroundImageP',
+                style: {
+                  material: material,
+                  stRotation: stRotation
+                }
+              });
+              _context3.next = 22;
+              break;
+            case 20:
+              _feature = {
+                type: 'Feature',
+                geometry: {
+                  type: 'Polygon',
+                  coordinates: [points]
+                }
+              };
+              this.videoPolygonLayer = this.getMap().addGraphicLayer(_feature, {
+                type: 'polygonImageP',
+                style: {
+                  material: material,
+                  stRotation: stRotation
+                }
+              });
+            case 22:
+              this.status = 'START';
+              this._preRenderEvent = function () {
+                if (_this3.videoElement && _this3.status != 'PAUSE') {
+                  // 通知 Cesium 更新纹理
+                  material.material.uniforms.image = _this3._drawCanvas({
+                    videoOptions: _this3._videoOptions,
+                    style: _this3.options.style
+                  });
+                }
+              };
+              this.getMap().scene.preRender.addEventListener(this._preRenderEvent);
+            case 25:
+            case "end":
+              return _context3.stop();
           }
-          _this2.videoPolygonLayer = _this2.getMap().addGraphicLayer({
-            type: 'Feature',
-            geometry: {
-              type: 'Polygon',
-              coordinates: [points]
-            }
-          }, {
-            type: 'polygon',
-            style: {
-              material: edgeFeather ? new Cesium.ImageMaterialProperty({
-                image: new Cesium.CallbackProperty(function () {
-                  return _this2._drawCanvas(videoOptions);
-                }, false),
-                transparent: true
-              }) : _this2.videoElement,
-              heightReference: Cesium.HeightReference.NONE,
-              perPositionHeight: true
-            }
-          });
-        }
-        _this2.status = 'START';
-      }, 200);
-    }
-
-    // 显示隐藏
+        }, _callee3, this);
+      }));
+      function _create() {
+        return _create2.apply(this, arguments);
+      }
+      return _create;
+    }() // 显示隐藏
   }, {
     key: "show",
     value: function show(isShow) {
-      if (!this._canOperate()) {
-        return;
-      }
-      this.frustumLineLayer && this.frustumLineLayer.show(isShow);
       _get(_getPrototypeOf(VideoProject.prototype), "show", this).call(this, isShow);
+      this.frustum && this.frustum.show(isShow);
     }
-
-    // 绘制线
   }, {
-    key: "_drawLine",
-    value: function _drawLine(interPoints) {
-      var _this3 = this,
-        _this$options$style;
-      var draw = function draw(geoJson) {
-        _this3.frustumLineLayer = _this3.getMap().addGraphicLayer(geoJson, {
-          type: 'polylineP',
-          style: {
-            color: '#ffffff'
-          }
-        });
-      };
-      var linePoints = [];
-      // 是否计算贴地
-      if ((_this$options$style = this.options.style) !== null && _this$options$style !== void 0 && _this$options$style.clampToGround && this.type === 'projection') {
-        var clampToGround = new ClampToGround(this.getMap());
-        var c3arr = utils.lngLatAltArrayToCartesian3Array(interPoints);
-        clampToGround.getLngLatAltArrToHeight(c3arr, 'terrain').then(function (result) {
-          result.coordinates.forEach(function (point) {
-            linePoints.push({
-              type: 'Feature',
-              geometry: {
-                type: 'LineString',
-                coordinates: [_this3.frustum.options.position, point]
-              }
-            });
-          });
-          draw({
-            type: 'FeatureCollection',
-            features: linePoints
-          });
-        });
-      } else {
-        interPoints.forEach(function (interPoint) {
-          linePoints.push({
-            type: 'Feature',
-            geometry: {
-              type: 'LineString',
-              coordinates: [_this3.frustum.options.position, interPoint]
-            }
-          });
-        });
-        draw({
-          type: 'FeatureCollection',
-          features: linePoints
-        });
-      }
-    }
-
-    // 求射线的交点
-  }, {
-    key: "_getInterPointByLine",
-    value: function _getInterPointByLine(start, end) {
-      var startPoint = utils.lngLatAltToCartographic(start[0], start[1], start[2]);
-      var endPoint = utils.lngLatAltToCartographic(end[0], end[1], end[2]);
-      // 创建起点和终点的笛卡尔坐标
-      var startCartesian = this.getMap().scene.globe.ellipsoid.cartographicToCartesian(startPoint);
-      var endCartesian = this.getMap().scene.globe.ellipsoid.cartographicToCartesian(endPoint);
-      // 通过原点和方向 创建射线
+    key: "_getInterPointByRayTerrain",
+    value: function _getInterPointByRayTerrain(start, end) {
+      var ellipsoid = this.getMap().scene.globe.ellipsoid;
+      var startCarto = Cesium.Cartographic.fromDegrees(start[0], start[1], start[2]);
+      var endCarto = Cesium.Cartographic.fromDegrees(end[0], end[1], end[2]);
+      var startCartesian = ellipsoid.cartographicToCartesian(startCarto);
+      var endCartesian = ellipsoid.cartographicToCartesian(endCarto);
       var direction = Cesium.Cartesian3.subtract(endCartesian, startCartesian, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(direction, direction);
       var ray = new Cesium.Ray(startCartesian, direction);
 
-      // 计算射线与地球表面的交点
-      var result = Cesium.IntersectionTests.rayEllipsoid(ray, this.getMap().scene.globe.ellipsoid);
-      if (result && result.start !== result.stop) {
-        // 计算交点的位置
-        var intersectionPoint = Cesium.Ray.getPoint(ray, result.start);
-        // 将交点的笛卡尔坐标转换为地理坐标
-        var cartographic = Cesium.Cartographic.fromCartesian(intersectionPoint);
-        var lng = utils.toDegrees(cartographic.longitude); //经度
-        var lat = utils.toDegrees(cartographic.latitude); //纬度
-        var alt = cartographic.height || 0;
-        return [lng, lat, alt];
-      } else {
-        return null;
-      }
+      // 与地形求交
+      var intersection = this.getMap().scene.globe.pick(ray, this.getMap().scene);
+      if (!intersection) return null;
+      var cartographic = Cesium.Cartographic.fromCartesian(intersection);
+      return [Cesium.Math.toDegrees(cartographic.longitude), Cesium.Math.toDegrees(cartographic.latitude), cartographic.height];
     }
   }, {
     key: "destroy",
     value: function destroy() {
-      if (!this._canOperate()) {
-        return;
-      }
+      _get(_getPrototypeOf(VideoProject.prototype), "destroy", this).call(this);
       this.frustum && this.frustum.destroy();
       this.frustum = null;
-      this.frustumLineLayer && this.getMap().removeGraphicSource(this.frustumLineLayer.id);
-      this.frustumLineLayer = null;
-      _get(_getPrototypeOf(VideoProject.prototype), "destroy", this).call(this);
+      this.getMap().scene.preRender.removeEventListener(this._preRenderEvent);
+      this._preRenderEvent = null;
     }
   }]);
   return VideoProject;

package/dist/esm/videoFusion/VideoTexture.d.ts

@@ -1,5 +1,9 @@
 import BaseVideo from './BaseVideo';
 export default class VideoTexture extends BaseVideo {
+    private _videoOptions;
+    private _preRenderEvent;
     constructor(map: any, options: any);
-    addToMap(): void;
+    addToMap(): Promise<unknown>;
+    private _create;
+    destroy(): void;
 }