@realsee/vreo 0.2.0-alpha.9 → 1.0.0-alpha.10

package/lib/Player/modules/keyframes/ModelVideo/index.js

@@ -1,28 +1,21 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModelVideo = ModelVideo;
-
 var React = _interopRequireWildcard(require("react"));
-
+var THREE = _interopRequireWildcard(require("three"));
+var _hooks = require("../../../hooks");
 var _ModelTVVideoPlugin = require("../../../../fivePlugins/ModelTVVideoPlugin");
-
+var _createTransMatrix = require("../../../../shared-utils/createTransMatrix");
 var _VreoUnit = require("../../../../typings/VreoUnit");
-
-var _hooks = require("../../../hooks");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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 ModelVideo() {
   var controller = (0, _hooks.useController)();
   var five = (0, _hooks.useFiveInstance)();
@@ -30,54 +23,72 @@ function ModelVideo() {
   var timeoutRef = React.useRef();
   React.useEffect(function () {
     var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(keyframe) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyframe) {
         var _controller$configs, _controller$configs$v;
-
-        var start, end, _ref2, videoSrc, videoPosterSrc, vertexs;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+        var start, end, _ref2, videoSrc, videoPosterSrc, vertexs, matrixWorld, position, points;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 if (!ref.current) {
                   ref.current = (0, _ModelTVVideoPlugin.ModelTVVideoPlugin)(five, {});
                 }
-
                 start = keyframe.start, end = keyframe.end;
-                _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs;
+                _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs, matrixWorld = _ref2.matrixWorld;
+                position = function () {
+                  if (vertexs.length < 4) {
+                    throw new Error('ModelVideo: 顶点数据集合不够，无法组成矩形 ....');
+                  }
+                  if (vertexs.length === 4) {
+                    return vertexs;
+                  }
+                  var box = new THREE.Box3();
+                  vertexs.forEach(function (v) {
+                    return box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z));
+                  });
+                  return [new THREE.Vector3(box.min.x, box.max.y, box.max.z), new THREE.Vector3(box.min.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.max.y, box.max.z)];
+                }();
+                points = function () {
+                  if (matrixWorld) {
+                    var transMatrix = (0, _createTransMatrix.createTransMatrix)(matrixWorld);
+                    return [position.map(function (p) {
+                      var res = transMatrix([p.x, p.y, p.z]);
+                      return {
+                        x: res[0],
+                        y: res[1],
+                        z: res[2]
+                      };
+                    })];
+                  }
+                  return [position];
+                }();
                 ref.current.disable();
-                _context.next = 6;
+                _context.next = 8;
                 return ref.current.load({
                   video_src: videoSrc,
                   video_poster_src: videoPosterSrc,
-                  points: [vertexs]
+                  points: points
                 }, (_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : (_controller$configs$v = _controller$configs.videos) === null || _controller$configs$v === void 0 ? void 0 : _controller$configs$v.modelTVVideo);
-
-              case 6:
+              case 8:
                 ref.current.enable();
                 timeoutRef.current = setTimeout(function () {
                   var _ref$current;
-
                   return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disable();
                 }, end - start);
-
-              case 8:
+              case 10:
               case "end":
                 return _context.stop();
             }
           }
         }, _callee);
       }));
-
       return function callback(_x) {
         return _ref.apply(this, arguments);
       };
     }();
-
     controller.on(_VreoUnit.VreoKeyframeEnum.ModelVideo, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.ModelVideo, callback);
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }

package/lib/Player/modules/keyframes/PanoEffect/index.js

@@ -1,77 +1,53 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PanoEffect = PanoEffect;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _three = require("three");
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _lineAnime = _interopRequireDefault(require("./lineAnime"));
-
 var _hooks = require("../../../hooks");
-
 var _VreoUnit = require("../../../../typings/VreoUnit");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function PanoEffect() {
   var _React$useState = React.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      state = _React$useState2[0],
-      setState = _React$useState2[1];
-
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    state = _React$useState2[0],
+    setState = _React$useState2[1];
   var five = (0, _hooks.useFiveInstance)();
   var lineRef = React.useRef(null);
-
   var _React$useState3 = React.useState(null),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      pos = _React$useState4[0],
-      setPos = _React$useState4[1];
-
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    pos = _React$useState4[0],
+    setPos = _React$useState4[1];
   var timeoutRef = React.useRef();
   var controller = (0, _hooks.useController)();
   var project2d = (0, _hooks.useFiveProject2d)();
-
   var delLine = function delLine() {
     if (lineRef.current) {
       lineRef.current.dispose();
     }
   };
-
   React.useEffect(function () {
     var callback = function callback(keyframe) {
       var start = keyframe.start,
-          end = keyframe.end,
-          data = keyframe.data;
+        end = keyframe.end,
+        data = keyframe.data;
       var videoEffectData = data;
-
       var _videoEffectData$twoV = _slicedToArray(videoEffectData.twoVertexs, 2),
-          v1 = _videoEffectData$twoV[0],
-          v2 = _videoEffectData$twoV[1];
-
+        v1 = _videoEffectData$twoV[0],
+        v2 = _videoEffectData$twoV[1];
       var p1 = new _three.Vector3(v1.x, v1.y, v1.z);
       var p2 = new _three.Vector3(v2.x, v2.y, v2.z);
       lineRef.current = (0, _lineAnime["default"])(five, p1.clone(), p2.clone());
@@ -81,7 +57,7 @@ function PanoEffect() {
       var p = project2d(center);
       if (!p) return;
       var left = p.x,
-          top = p.y;
+        top = p.y;
       setState({
         center: center,
         distance: distance
@@ -96,15 +72,12 @@ function PanoEffect() {
         delLine();
       }, end - start);
     };
-
     controller.on(_VreoUnit.VreoKeyframeEnum.PanoEffect, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.PanoEffect, callback);
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
-
       delLine();
     };
   }, [controller]);
@@ -112,19 +85,18 @@ function PanoEffect() {
     var callback = function callback() {
       if (!(state !== null && state !== void 0 && state.center)) return;
       var _state$center = state.center,
-          x = _state$center.x,
-          y = _state$center.y,
-          z = _state$center.z;
+        x = _state$center.x,
+        y = _state$center.y,
+        z = _state$center.z;
       var res = project2d(new _three.Vector3(x, y, z));
       if (!res) return;
       var left = res.x,
-          top = res.y;
+        top = res.y;
       setPos({
         left: left,
         top: top
       });
     };
-
     five.on('currentStateChange', callback);
     return function () {
       five.off('currentStateChange', callback);

package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js

@@ -1,22 +1,15 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = lineAnime;
-
 var THREE = _interopRequireWildcard(require("three"));
-
 var _line = require("@realsee/five/line");
-
 var _BetterTween = require("../../../../shared-utils/animationFrame/BetterTween");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function lineAnime(five, startPoint, endPoint) {
   var pointImage = 'data:image/png;base64,' + 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAIVBMVEUAAAD////////////////////////////////////////PIev5AAAACnRSTlMAG/Py2baba05un7UgfgAAAHJJREFUKM9joBpgLHVSCRdA4metAoJlCJHmVWBgAeNzroKCCVCBLpjACqgJVjCBxRBT2FbBQQJYQAohsBAsUIUQWA4WiEIILAULeCEEloAFtBACizAEMLRgGIphLabDMJ2O6TlM72MGECIIMQIZIxqoBQCPvpJ/e9FaAAAAAABJRU5ErkJggg==';
   var pointTexture = new THREE.TextureLoader().load(pointImage);

package/lib/Player/modules/keyframes/PanoTag/index.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
-export declare function PanoTag(): JSX.Element;
+export declare function PanoTag(): null;

package/lib/Player/modules/keyframes/PanoTag/index.js

@@ -1,168 +1,111 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PanoTag = PanoTag;
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var React = _interopRequireWildcard(require("react"));
-
-var _three = require("three");
-
 var _hooks = require("../../../hooks");
-
 var _VreoUnit = require("../../../../typings/VreoUnit");
-
+var _dnalogel = require("@realsee/dnalogel");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function PanoTag() {
-  var _React$useState = React.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      state = _React$useState2[0],
-      setState = _React$useState2[1];
-
-  var _React$useState3 = React.useState(null),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      pos = _React$useState4[0],
-      setPos = _React$useState4[1];
-
   var timeoutRef = React.useRef();
   var controller = (0, _hooks.useController)();
   var five = (0, _hooks.useFiveInstance)();
-  var project2d = (0, _hooks.useFiveProject2d)();
+  var panoTagPlugin = React.useRef((0, _dnalogel.PanoTagPlugin)(five, {
+    config: {
+      globalConfig: {
+        visibleConfig: {
+          keep: 'visible'
+        },
+        unfoldedConfig: {
+          autoUnfold: {
+            strategy: 'MinimumDistance'
+          },
+          unfoldDistance: {
+            max: 100
+          }
+        }
+      }
+    }
+  }));
   React.useEffect(function () {
     var _controller$configs;
-
     if (((_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : _controller$configs.keyframeMap.PanoTag) === false) {
       return;
     }
-
     var callback = function callback(keyframe) {
+      if (!panoTagPlugin.current) return;
       var start = keyframe.start,
-          end = keyframe.end,
-          data = keyframe.data;
+        end = keyframe.end,
+        data = keyframe.data;
       var panoTagData = data;
-      var vertex = panoTagData.vertex;
-      var _panoTagData$vertex = panoTagData.vertex,
-          x = _panoTagData$vertex.x,
-          y = _panoTagData$vertex.y,
-          z = _panoTagData$vertex.z;
-      var res = project2d(new _three.Vector3(x, y, z));
-      if (!res) return;
-      var left = res.x,
-          top = res.y;
-      setState({
-        vertex: vertex,
-        text: panoTagData.text || _VreoUnit.PanoTagEnum.Text,
-        type: panoTagData.type,
-        imgUrl: panoTagData.imgUrl
-      });
-      setPos({
-        left: left,
-        top: top
+      var id = Date.now().toString();
+      var pointType = _dnalogel.PointType.PointTag;
+      var dimensionType = _dnalogel.DimensionType.Two;
+      var position = [panoTagData.vertex.x, panoTagData.vertex.y, panoTagData.vertex.z];
+      var tag = function () {
+        if (panoTagData.imgUrl) {
+          return {
+            id: id,
+            pointType: pointType,
+            position: position,
+            dimensionType: dimensionType,
+            contentType: _dnalogel.ContentType.ImageText,
+            data: {
+              text: panoTagData.text,
+              mediaData: [{
+                type: 'Image',
+                url: panoTagData.imgUrl
+              }]
+            }
+          };
+        } else {
+          return {
+            id: id,
+            pointType: pointType,
+            position: position,
+            dimensionType: dimensionType,
+            contentType: _dnalogel.ContentType.Text,
+            data: {
+              text: panoTagData.text
+            }
+          };
+        }
+      }();
+
+      // show
+      panoTagPlugin.current.load({
+        tagList: [tag]
       });
       timeoutRef.current = setTimeout(function () {
-        setState(null);
-        setPos(null);
+        var _tag$hooks;
+        // clear
+        var tag = panoTagPlugin.current.getTagById(id);
+        if (tag.state) {
+          tag.state.unfolded = false;
+          panoTagPlugin.current.updateRenderAllTags();
+        }
+        (_tag$hooks = tag.hooks) === null || _tag$hooks === void 0 ? void 0 : _tag$hooks.on('folded', function () {
+          setTimeout(function () {
+            if (tag.state) {
+              tag.state.visible = false;
+              panoTagPlugin.current.destroyTagById(id);
+            }
+          }, 1500);
+        });
       }, end - start);
     };
-
     controller.on(_VreoUnit.VreoKeyframeEnum.PanoTag, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.PanoTag, callback);
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
     };
   }, [controller]);
-  React.useEffect(function () {
-    var callback = function callback() {
-      if (!(state !== null && state !== void 0 && state.vertex)) return;
-      var _state$vertex = state.vertex,
-          x = _state$vertex.x,
-          y = _state$vertex.y,
-          z = _state$vertex.z;
-      var res = project2d(new _three.Vector3(x, y, z));
-      if (!res) return;
-      var left = res.x,
-          top = res.y;
-      setPos({
-        left: left,
-        top: top
-      });
-    };
-
-    five.on('currentStateChange', callback);
-    return function () {
-      five.off('currentStateChange', callback);
-    };
-  }, [state === null || state === void 0 ? void 0 : state.vertex]);
-
-  var boxContent = function () {
-    if (!state) return undefined;
-
-    if (state.type === _VreoUnit.PanoTagEnum.Text) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, state.text));
-    }
-
-    if (state.type === _VreoUnit.PanoTagEnum.Image) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("img", {
-        className: "PanoTag-img",
-        src: state.imgUrl,
-        alt: state.text || ''
-      }), /*#__PURE__*/React.createElement("span", {
-        className: "PanoTag-txt"
-      }, state.text));
-    }
-
-    return undefined;
-  }();
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames["default"])('PanoTag', {
-      'PanoTag--notHidden': state
-    }),
-    style: {
-      left: ((pos === null || pos === void 0 ? void 0 : pos.left) || 0) + 'px',
-      top: ((pos === null || pos === void 0 ? void 0 : pos.top) || 0) + 'px'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "PanoTag-point"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "PanoTag-content"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "PanoTag-linewrap"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "PanoTag-slashline"
-  }), /*#__PURE__*/React.createElement("span", {
-    className: "PanoTag-straightline"
-  })), /*#__PURE__*/React.createElement("div", {
-    onClick: function onClick() {
-      if (state !== null && state !== void 0 && state.imgUrl) {// @TODO
-        // setDrawerVisible(true)
-      }
-    },
-    className: 'PanoTag-box PanoTag-box--' + ((state === null || state === void 0 ? void 0 : state.type) || '')
-  }, boxContent))));
+  return null;
 }

package/lib/Player/modules/keyframes/PanoTextLabel/index.d.ts

@@ -1,2 +1,5 @@
 /// <reference types="react" />
+/**
+ * 空间文本标签。
+ */
 export declare function PanoTextLabel(): JSX.Element;