@realsee/dnalogel 0.1.3 → 0.1.7-alpha.10

package/plugins/PanoMaskSelectorPlugin/createBox.js

@@ -1,12 +1,32 @@
 "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); }
+require("core-js/modules/es.array.iterator.js");
+
+require("core-js/modules/es.object.to-string.js");
+
+require("core-js/modules/es.string.iterator.js");
+
+require("core-js/modules/es.weak-map.js");
+
+require("core-js/modules/web.dom-collections.iterator.js");
+
+require("core-js/modules/es.object.define-property.js");
+
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBox = createBox;
 
+require("core-js/modules/es.object.assign.js");
+
+require("core-js/modules/es.array.map.js");
+
+require("core-js/modules/es.function.name.js");
+
 var THREE = _interopRequireWildcard(require("three"));
 
 var _vertexShader = require("./vertexShader");
@@ -57,5 +77,6 @@ function createBox(textures, observer, _config) {
   box.geometry.scale(-1, 1, 1);
   box.position.set(observer.position.x, observer.position.y, observer.position.z);
   box.quaternion.multiply(observer.quaternion);
+  box.name = 'PanoMaskSelectorPlugin';
   return box;
 }

package/plugins/PanoMaskSelectorPlugin/createTextures.js

@@ -1,12 +1,28 @@
 "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); }
+require("core-js/modules/es.array.iterator.js");
+
+require("core-js/modules/es.object.to-string.js");
+
+require("core-js/modules/es.string.iterator.js");
+
+require("core-js/modules/es.weak-map.js");
+
+require("core-js/modules/web.dom-collections.iterator.js");
+
+require("core-js/modules/es.object.define-property.js");
+
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTextures = createTextures;
 
+require("core-js/modules/es.array.map.js");
+
 var THREE = _interopRequireWildcard(require("three"));
 
 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); }

package/plugins/PanoMaskSelectorPlugin/fragmentShader.js

@@ -1,5 +1,7 @@
 "use strict";
 
+require("core-js/modules/es.object.define-property.js");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });

package/plugins/PanoMaskSelectorPlugin/index.js

@@ -1,12 +1,92 @@
 "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); }
+require("core-js/modules/es.string.iterator.js");
+
+require("core-js/modules/es.weak-map.js");
+
+require("core-js/modules/web.dom-collections.iterator.js");
+
+require("core-js/modules/es.object.define-property.js");
+
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PanoMaskSelectorPlugin = void 0;
 
+require("core-js/modules/es.array.iterator.js");
+
+require("core-js/modules/es.array-buffer.slice.js");
+
+require("core-js/modules/es.object.to-string.js");
+
+require("core-js/modules/es.typed-array.uint8-array.js");
+
+require("core-js/modules/es.typed-array.copy-within.js");
+
+require("core-js/modules/es.typed-array.every.js");
+
+require("core-js/modules/es.typed-array.fill.js");
+
+require("core-js/modules/es.typed-array.filter.js");
+
+require("core-js/modules/es.typed-array.find.js");
+
+require("core-js/modules/es.typed-array.find-index.js");
+
+require("core-js/modules/es.typed-array.for-each.js");
+
+require("core-js/modules/es.typed-array.includes.js");
+
+require("core-js/modules/es.typed-array.index-of.js");
+
+require("core-js/modules/es.typed-array.iterator.js");
+
+require("core-js/modules/es.typed-array.join.js");
+
+require("core-js/modules/es.typed-array.last-index-of.js");
+
+require("core-js/modules/es.typed-array.map.js");
+
+require("core-js/modules/es.typed-array.reduce.js");
+
+require("core-js/modules/es.typed-array.reduce-right.js");
+
+require("core-js/modules/es.typed-array.reverse.js");
+
+require("core-js/modules/es.typed-array.set.js");
+
+require("core-js/modules/es.typed-array.slice.js");
+
+require("core-js/modules/es.typed-array.some.js");
+
+require("core-js/modules/es.typed-array.sort.js");
+
+require("core-js/modules/es.typed-array.subarray.js");
+
+require("core-js/modules/es.typed-array.to-locale-string.js");
+
+require("core-js/modules/es.typed-array.to-string.js");
+
+require("core-js/modules/es.array.fill.js");
+
+require("core-js/modules/es.array.slice.js");
+
+require("core-js/modules/es.array.find.js");
+
+require("core-js/modules/es.array.for-each.js");
+
+require("core-js/modules/web.dom-collections.for-each.js");
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var THREE = _interopRequireWildcard(require("three"));
 
 var _five = require("@realsee/five");
@@ -21,10 +101,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 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); }); }; }
-
 var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
   var parameters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var state = {
@@ -57,9 +133,11 @@ var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
 
     if (state.box) {
       five.scene.remove(state.box);
+      state.box = undefined;
     }
 
     var panoramaImgs = state.data.panoramaImgs[five.panoIndex];
+    state.currentLoadedIndex = five.panoIndex;
 
     if (!panoramaImgs) {
       state.textures = undefined;
@@ -73,13 +151,13 @@ var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
       thickness: ((_state$data$config2 = state.data.config) === null || _state$data$config2 === void 0 ? void 0 : _state$data$config2.thickness) || 0.005
     });
     five.scene.add(state.box);
-    state.currentLoadedIndex = five.panoIndex;
+    five.needsRender = true;
     return true;
   };
 
   var load = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(data) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -95,17 +173,17 @@ var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
       }, _callee);
     }));
 
-    return function load(_x) {
+    return function load(_x2) {
       return _ref.apply(this, arguments);
     };
   }();
 
   var select = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(x, y) {
+    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_x, _y) {
       var _state$data;
 
-      var element, pixel, renderTarget, pickingBuffer, camera, renderer, newScence, observer, newBox, unit8ArrayGroup, i, selectedColor, colorMaps, object;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var element, pixel, x, y, renderTarget, pickingBuffer, camera, renderer, newScence, observer, newBox, unit8ArrayGroup, i, selectedColor, colorMaps, object;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -141,17 +219,27 @@ var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
               return _context2.abrupt("return", false);
 
             case 8:
+              if (five.renderer) {
+                _context2.next = 10;
+                break;
+              }
+
+              return _context2.abrupt("return", false);
+
+            case 10:
               element = five.getElement();
 
               if (element) {
-                _context2.next = 11;
+                _context2.next = 13;
                 break;
               }
 
               return _context2.abrupt("return", false);
 
-            case 11:
+            case 13:
               pixel = 1;
+              x = _x * five.renderer.getPixelRatio();
+              y = _y * five.renderer.getPixelRatio();
               renderTarget = new THREE.WebGLRenderTarget(pixel, pixel);
               pickingBuffer = new Uint8Array(4 * pixel * pixel);
               camera = five.camera.clone();
@@ -183,20 +271,20 @@ var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
               });
 
               if (object) {
-                _context2.next = 34;
+                _context2.next = 38;
                 break;
               }
 
               return _context2.abrupt("return", false);
 
-            case 34:
+            case 38:
               state.box.material.forEach(function (m) {
                 return m.uniforms.selectedColor.value = selectedColor;
               });
               five.needsRender = true;
               return _context2.abrupt("return", object);
 
-            case 37:
+            case 41:
             case "end":
               return _context2.stop();
           }
@@ -204,7 +292,7 @@ var PanoMaskSelectorPlugin = function PanoMaskSelectorPlugin(five) {
       }, _callee2);
     }));
 
-    return function select(_x2, _x3) {
+    return function select(_x3, _x4) {
       return _ref2.apply(this, arguments);
     };
   }();

package/plugins/PanoMaskSelectorPlugin/vertexShader.js

@@ -1,5 +1,7 @@
 "use strict";
 
+require("core-js/modules/es.object.define-property.js");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });

package/plugins/PanoMeasurePlugin/Controller/BaseController.d.ts

@@ -0,0 +1,36 @@
+import Line from '../Model/line';
+import Magnifier from '../Modules/Magnifier';
+import FiveHelper from '../Modules/FiveHelper';
+import { Group } from 'three';
+import { Model } from '../Model';
+import { PluginEvent } from '../typings/event.type';
+import { Five, Intersection, IntersectMeshInterface, Subscribe } from '@realsee/five';
+import { UserDistanceItem } from '../utils/distanceDom';
+export interface IControllerParams {
+    five: Five;
+    group: Group;
+    model: Model;
+    mouseGroup: Group;
+    container: Element;
+    magnifier: Magnifier;
+    fiveHelper: FiveHelper;
+    hook: Subscribe<PluginEvent>;
+    userDistanceItemCreator?: () => UserDistanceItem;
+}
+export default abstract class BaseController {
+    protected five: Five;
+    protected group: Group;
+    protected model: Model;
+    protected disposed: boolean;
+    protected mouseGroup: Group;
+    protected container: Element;
+    protected fiveHelper: FiveHelper;
+    protected hook: IControllerParams['hook'];
+    protected magnifier: IControllerParams['magnifier'];
+    protected userDistanceItemCreator: IControllerParams['userDistanceItemCreator'];
+    constructor(params: IControllerParams);
+    protected removeLine(line: Line): void;
+    protected updateDistanceUI: () => void;
+    protected updateMouseGroup(intersection: Intersection, mesh?: IntersectMeshInterface): Group;
+    protected dispose(): void;
+}

package/plugins/PanoMeasurePlugin/Controller/BaseController.js

@@ -0,0 +1,103 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+require("core-js/modules/es.array.for-each.js");
+
+require("core-js/modules/web.dom-collections.for-each.js");
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _ironbox = require("../utils/ironbox");
+
+var BaseController = /*#__PURE__*/function () {
+  function BaseController(params) {
+    var _this = this;
+
+    (0, _classCallCheck2["default"])(this, BaseController);
+    (0, _defineProperty2["default"])(this, "disposed", false);
+    (0, _defineProperty2["default"])(this, "updateDistanceUI", function () {
+      _this.model.lines.forEach(function (line) {
+        return line.distanceItem.update(_this.five);
+      });
+    });
+    // ==================== Params ====================
+    this.five = params.five;
+    this.hook = params.hook;
+    this.model = params.model;
+    this.magnifier = params.magnifier;
+    this.container = params.container;
+    this.fiveHelper = params.fiveHelper;
+    this.userDistanceItemCreator = params.userDistanceItemCreator; // ==================== Groups ====================
+
+    this.group = params.group;
+    this.mouseGroup = params.mouseGroup;
+    var fiveElement = this.five.getElement();
+
+    if (fiveElement) {
+      fiveElement.addEventListener('touchstart', _ironbox.preventDefault);
+      fiveElement.addEventListener('contextmenu', _ironbox.preventDefault);
+    }
+  }
+
+  (0, _createClass2["default"])(BaseController, [{
+    key: "removeLine",
+    value: function removeLine(line) {
+      this.group.remove(line.mesh, line.lightMesh);
+      line.distanceItem.remove();
+      this.five.needsRender = true;
+    }
+  }, {
+    key: "updateMouseGroup",
+    value: function updateMouseGroup(intersection, mesh) {
+      if (!intersection) return this.mouseGroup; // ============ update mouseGroup position ============
+
+      var adsorbentPoint = this.fiveHelper.getAdsorbentPoint(intersection);
+      var viewPosition = adsorbentPoint ? adsorbentPoint : intersection.point;
+      this.mouseGroup.position.copy(viewPosition); // ============ update mouseGroup quaternion ============
+
+      if (mesh) {
+        this.mouseGroup.quaternion.copy(mesh.quaternion);
+      } else if (intersection.face) {
+        var normal = intersection.face.normal;
+        var positionVector = normal.clone().multiplyScalar(0.05);
+        var position = intersection.point.clone().add(positionVector);
+        var lookAtVector = position.clone().add(positionVector);
+        this.mouseGroup.lookAt(lookAtVector);
+      }
+
+      return this.mouseGroup;
+    }
+  }, {
+    key: "dispose",
+    value: function dispose() {
+      var _this2 = this;
+
+      this.disposed = true;
+      this.magnifier.dispose();
+      this.model.lines.forEach(function (line) {
+        return _this2.removeLine(line);
+      });
+      var fiveElement = this.five.getElement();
+
+      if (fiveElement) {
+        fiveElement.removeEventListener('touchstart', _ironbox.preventDefault);
+        fiveElement.removeEventListener('contextmenu', _ironbox.preventDefault);
+      }
+    }
+  }]);
+  return BaseController;
+}();
+
+exports["default"] = BaseController;

package/plugins/PanoMeasurePlugin/Controller/EditController.d.ts

@@ -0,0 +1,52 @@
+import { Model } from '../Model';
+import Line from '../Model/line';
+import { LineJson } from '../typings/data';
+import BaseController, { IControllerParams } from './BaseController';
+export interface EditEvent {
+    editedLineChange: (lines: LineJson[]) => void;
+}
+export default class EditController extends BaseController {
+    type: string;
+    model: Model;
+    private pressPoint?;
+    private hasAppendDashed;
+    private hasAppendMouseGroup;
+    private fiveElement?;
+    /** 上一个端点位置 */
+    private lastPoint;
+    /** 鼠标点到上一个端点连接的虚线 */
+    private dashed;
+    private hammer?;
+    /** 根据 intersection 更新放大镜和吸附点 */
+    private onIntersectionUpdate;
+    constructor(params: IControllerParams);
+    dispose(): void;
+    getEditingLines(): Line[];
+    /** 撤销编辑 */
+    revoke: () => void;
+    private onMouseLeave;
+    /** 编辑线条发生改变时通知外部 */
+    private onLineChanged;
+    private onPress;
+    /**
+     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
+     * 2. 如果有长按点，把长按点位置更新为当前位置
+     */
+    private onPan;
+    private onPanEnd;
+    /**
+     * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
+     * 2. 把上一个点的位置更新为当前点的位置
+     * 3. 清除 mouseGroup 和 magnifier
+     */
+    private onTap;
+    private onWantsTapGesture;
+    /** 编辑时取消走点 */
+    private onWantsToMoveToPano;
+    /** 存在长按点时不能移动全景 */
+    private onWantsPanGesture;
+    /** 移动全景时更新 distanceItem 在屏幕上的位置 */
+    private onCameraUpdate;
+    /** 更新虚线 */
+    private updateDashed;
+}