@anov/3d 0.0.263 → 0.0.264

package/dist/module/entity/index.js

@@ -20,6 +20,10 @@ import { entityStrategy, eventPenetrateType } from "./strategy";
 import createDisposeFn from "./dispose";
 import { getMinimumEntity } from "./utils";
 export var hybridList = new HybridList();
+
+/**
+ * todo: 统一优化
+ */
 var Entity = /*#__PURE__*/function () {
   function Entity(app) {
     _classCallCheck(this, Entity);
@@ -93,7 +97,7 @@ var Entity = /*#__PURE__*/function () {
     value: function () {
       var _singleCreate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(id, strategy, option, group, layerId) {
         var _this = this;
-        var entityInfoArray, targetEntityInfo, _option$interactable, interactable, _option$interactiveEf, interactiveEffect, entity;
+        var entityInfoArray, targetEntityInfo, _option$interactable, interactable, _option$interactiveEf, interactiveEffect, _option$collision, collision, entity;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -102,13 +106,14 @@ var Entity = /*#__PURE__*/function () {
             case 2:
               entityInfoArray = _context2.sent;
               targetEntityInfo = entityInfoArray[0];
-              _option$interactable = option.interactable, interactable = _option$interactable === void 0 ? true : _option$interactable, _option$interactiveEf = option.interactiveEffect, interactiveEffect = _option$interactiveEf === void 0 ? false : _option$interactiveEf;
+              _option$interactable = option.interactable, interactable = _option$interactable === void 0 ? true : _option$interactable, _option$interactiveEf = option.interactiveEffect, interactiveEffect = _option$interactiveEf === void 0 ? false : _option$interactiveEf, _option$collision = option.collision, collision = _option$collision === void 0 ? true : _option$collision;
+              interactable = interactable && collision;
               if (!(targetEntityInfo.status === 'rejected')) {
-                _context2.next = 7;
+                _context2.next = 8;
                 break;
               }
               throw new Error(targetEntityInfo.reason);
-            case 7:
+            case 8:
               entity = targetEntityInfo.value;
               entity.tag = 'entity'; // used for event penetration identification
               entity.entityId = id;
@@ -137,7 +142,7 @@ var Entity = /*#__PURE__*/function () {
                 scale: entity.scale.toArray(),
                 visible: entity.visible
               }));
-            case 16:
+            case 17:
             case "end":
               return _context2.stop();
           }
@@ -159,11 +164,15 @@ var Entity = /*#__PURE__*/function () {
         legends = _json$legends === void 0 ? [] : _json$legends,
         _json$interactable = json.interactable,
         interactable = _json$interactable === void 0 ? true : _json$interactable,
+        _json$collision = json.collision,
+        collision = _json$collision === void 0 ? true : _json$collision,
         name = json.name;
+      interactable = interactable && collision;
       var group = new Group();
 
       // TODO 优化，定制化非实体逻辑
-      items.forEach( /*#__PURE__*/function () {
+
+      var promises = items.map( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item) {
           var currentData;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -179,6 +188,8 @@ var Entity = /*#__PURE__*/function () {
                 _context3.next = 5;
                 return _this2.singleCreate(item.id, strategy, currentData, group, id);
               case 5:
+                return _context3.abrupt("return", _context3.sent);
+              case 6:
               case "end":
                 return _context3.stop();
             }
@@ -188,21 +199,23 @@ var Entity = /*#__PURE__*/function () {
           return _ref2.apply(this, arguments);
         };
       }());
-      group.userData.entityParams = {
-        id: id,
-        type: 'layer',
-        itemType: itemType,
-        interactable: interactable,
-        name: name
-      };
-      hybridList.add(id, group);
-      use.useScene().scene.add(group);
-      return _objectSpread(_objectSpread({}, json), {}, {
-        id: id,
-        position: group.position.toArray(),
-        rotation: group.rotation.toArray(),
-        scale: group.scale.toArray(),
-        visible: group.visible
+      return Promise.all(promises).then(function () {
+        group.userData.entityParams = {
+          id: id,
+          type: 'layer',
+          itemType: itemType,
+          interactable: interactable,
+          name: name
+        };
+        hybridList.add(id, group);
+        use.useScene().scene.add(group);
+        return _objectSpread(_objectSpread({}, json), {}, {
+          id: id,
+          position: group.position.toArray(),
+          rotation: group.rotation.toArray(),
+          scale: group.scale.toArray(),
+          visible: group.visible
+        });
       });
     }
 
@@ -216,11 +229,11 @@ var Entity = /*#__PURE__*/function () {
     value: (function () {
       var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(json) {
         var _this3 = this;
-        var id, type, itemType, _json$interactable2, interactable, asyncTask;
+        var id, type, itemType, asyncTask;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              id = json.id, type = json.type, itemType = json.itemType, _json$interactable2 = json.interactable, interactable = _json$interactable2 === void 0 ? true : _json$interactable2;
+              id = json.id, type = json.type, itemType = json.itemType;
               asyncTask = Promise.resolve().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
                 var strategy, res;
                 return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -231,7 +244,7 @@ var Entity = /*#__PURE__*/function () {
                     case 2:
                       strategy = _context4.sent;
                       if (itemType && type === 'layer') res = _this3.multiCreate(id, strategy, json);else res = _this3.singleCreate(id, strategy, json);
-                      return _context4.abrupt("return", _this3.handleResult(id, res, interactable));
+                      return _context4.abrupt("return", _this3.handleResult(id, res));
                     case 5:
                     case "end":
                       return _context4.stop();
@@ -257,7 +270,7 @@ var Entity = /*#__PURE__*/function () {
     value: function () {
       var _singleUpdate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id, strategy, option, group) {
         var _this4 = this;
-        var target, _target$userData$enti, entityParams, entityInfoArray, targetEntityInfo, _option$interactiveEf2, interactiveEffect, entity;
+        var target, _target$userData$enti, entityParams, entityInfoArray, targetEntityInfo, _option$interactiveEf2, interactiveEffect, entity, interactable;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -279,7 +292,11 @@ var Entity = /*#__PURE__*/function () {
               entity = targetEntityInfo.value;
               entity.tag = 'entity'; // use used for event penetration identification
               entity.entityId = id;
-              entity.userData.entityParams = entityParams;
+              interactable = entityParams.interactable;
+              if (option.collision !== undefined) interactable = option.collision;
+              entity.userData.entityParams = _objectSpread(_objectSpread({}, entityParams), {}, {
+                interactable: interactable
+              }, option);
 
               // 兼容修改图层下的单个实体
               if (!group && entityParams.layerId) group = hybridList.get(entityParams.layerId);
@@ -304,7 +321,7 @@ var Entity = /*#__PURE__*/function () {
                 scale: entity.scale.toArray(),
                 visible: entity.visible
               }));
-            case 20:
+            case 22:
             case "end":
               return _context6.stop();
           }
@@ -317,54 +334,75 @@ var Entity = /*#__PURE__*/function () {
     }()
   }, {
     key: "multiUpdate",
-    value: function multiUpdate(id, strategy, option) {
-      var _this5 = this;
-      var group = hybridList.get(id);
-      var items = option.items,
-        legends = option.legends,
-        itemType = option.itemType;
-      items.forEach( /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(item) {
-          var legendItem, currentItem;
-          return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-            while (1) switch (_context7.prev = _context7.next) {
-              case 0:
-                legendItem = legends === null || legends === void 0 ? void 0 : legends.find(function (legend) {
-                  return legend.name === item.legend;
-                });
-                currentItem = legendItem ? _objectSpread(_objectSpread({}, legendItem), item) : item;
-                if (!hybridList.get(item.id)) {
-                  _context7.next = 7;
-                  break;
-                }
-                _context7.next = 5;
-                return _this5.singleUpdate(item.id, strategy, currentItem, group);
-              case 5:
-                _context7.next = 10;
-                break;
-              case 7:
-                currentItem.type = itemType;
-                _context7.next = 10;
-                return _this5.singleCreate(item.id, strategy, currentItem, group);
-              case 10:
-              case "end":
-                return _context7.stop();
-            }
-          }, _callee7);
-        }));
-        return function (_x13) {
-          return _ref4.apply(this, arguments);
-        };
-      }());
-      return _objectSpread(_objectSpread({}, option), {}, {
-        id: id,
-        position: group.position.toArray(),
-        rotation: group.rotation.toArray(),
-        scale: group.scale.toArray(),
-        visible: group.visible
-      });
-    }
-
+    value: function () {
+      var _multiUpdate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id, strategy, option) {
+        var _this5 = this;
+        var group, items, legends, itemType, promises, interactable;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              group = hybridList.get(id);
+              items = option.items, legends = option.legends, itemType = option.itemType;
+              promises = items.map( /*#__PURE__*/function () {
+                var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(item) {
+                  var legendItem, currentItem;
+                  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                    while (1) switch (_context7.prev = _context7.next) {
+                      case 0:
+                        legendItem = legends === null || legends === void 0 ? void 0 : legends.find(function (legend) {
+                          return legend.name === item.legend;
+                        });
+                        currentItem = legendItem ? _objectSpread(_objectSpread({}, legendItem), item) : item;
+                        if (!hybridList.get(item.id)) {
+                          _context7.next = 8;
+                          break;
+                        }
+                        _context7.next = 5;
+                        return _this5.singleUpdate(item.id, strategy, currentItem, group);
+                      case 5:
+                        return _context7.abrupt("return", _context7.sent);
+                      case 8:
+                        currentItem.type = itemType;
+                        _context7.next = 11;
+                        return _this5.singleCreate(item.id, strategy, currentItem, group);
+                      case 11:
+                        return _context7.abrupt("return", _context7.sent);
+                      case 12:
+                      case "end":
+                        return _context7.stop();
+                    }
+                  }, _callee7);
+                }));
+                return function (_x16) {
+                  return _ref4.apply(this, arguments);
+                };
+              }());
+              _context8.next = 5;
+              return Promise.all(promises);
+            case 5:
+              interactable = group.userData.entityParams.interactable;
+              if (option.collision !== undefined) interactable = option.collision;
+              group.userData.entityParams = _objectSpread(_objectSpread({}, group.userData.entityParams), {}, {
+                interactable: interactable
+              }, option);
+              return _context8.abrupt("return", _objectSpread(_objectSpread({}, option), {}, {
+                id: id,
+                position: group.position.toArray(),
+                rotation: group.rotation.toArray(),
+                scale: group.scale.toArray(),
+                visible: group.visible
+              }));
+            case 9:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8);
+      }));
+      function multiUpdate(_x13, _x14, _x15) {
+        return _multiUpdate.apply(this, arguments);
+      }
+      return multiUpdate;
+    }()
     /**
      * update entity
      * @param json
@@ -373,42 +411,42 @@ var Entity = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: (function () {
-      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(json) {
+      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(json) {
         var _this6 = this;
-        var id, _json$interactable3, interactable;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        var id;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              id = json.id, _json$interactable3 = json.interactable, interactable = _json$interactable3 === void 0 ? true : _json$interactable3;
-              Promise.resolve().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+              id = json.id;
+              Promise.resolve().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
                 var target, _target$userData$enti2, type, itemType, strategy, res;
-                return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-                  while (1) switch (_context8.prev = _context8.next) {
+                return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+                  while (1) switch (_context9.prev = _context9.next) {
                     case 0:
                       target = hybridList.get(id);
                       _target$userData$enti2 = target.userData.entityParams, type = _target$userData$enti2.type, itemType = _target$userData$enti2.itemType;
-                      _context8.next = 4;
+                      _context9.next = 4;
                       return _this6.registerStrategy(itemType || type);
                     case 4:
-                      strategy = _context8.sent;
-                      if (itemType && type === 'layer') res = Promise.all(_this6.multiUpdate(id, strategy, _objectSpread({
+                      strategy = _context9.sent;
+                      if (itemType && type === 'layer') res = _this6.multiUpdate(id, strategy, _objectSpread({
                         itemType: itemType
-                      }, json)));else res = _this6.singleUpdate(id, strategy, json);
-                      _this6.handleResult(id, res, interactable);
+                      }, json));else res = _this6.singleUpdate(id, strategy, json);
+                      _this6.handleResult(id, res);
                     case 7:
                     case "end":
-                      return _context8.stop();
+                      return _context9.stop();
                   }
-                }, _callee8);
+                }, _callee9);
               })));
-              return _context9.abrupt("return", json);
+              return _context10.abrupt("return", json);
             case 3:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9);
+        }, _callee10);
       }));
-      function update(_x14) {
+      function update(_x17) {
         return _update.apply(this, arguments);
       }
       return update;
@@ -416,32 +454,32 @@ var Entity = /*#__PURE__*/function () {
   }, {
     key: "execute",
     value: function () {
-      var _execute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(json) {
+      var _execute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(json) {
         var _this7 = this;
-        var id, method, args, _json$interactable4, interactable;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        var id, method, args;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              id = json.id, method = json.method, args = json.args, _json$interactable4 = json.interactable, interactable = _json$interactable4 === void 0 ? true : _json$interactable4;
+              id = json.id, method = json.method, args = json.args;
               if (id && method) {
-                Promise.resolve().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+                Promise.resolve().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
                   var target, type, strategy, entityInfoArray, targetEntityInfo, entity;
-                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-                    while (1) switch (_context10.prev = _context10.next) {
+                  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                    while (1) switch (_context11.prev = _context11.next) {
                       case 0:
                         target = hybridList.get(id);
                         type = target.userData.entityParams.type;
-                        _context10.next = 4;
+                        _context11.next = 4;
                         return _this7.registerStrategy(type);
                       case 4:
-                        strategy = _context10.sent;
-                        _context10.next = 7;
+                        strategy = _context11.sent;
+                        _context11.next = 7;
                         return Promise.allSettled([strategy[method](args, target)]);
                       case 7:
-                        entityInfoArray = _context10.sent;
+                        entityInfoArray = _context11.sent;
                         targetEntityInfo = entityInfoArray[0];
                         if (!(targetEntityInfo.status === 'rejected')) {
-                          _context10.next = 11;
+                          _context11.next = 11;
                           break;
                         }
                         throw new Error(targetEntityInfo.reason);
@@ -454,22 +492,22 @@ var Entity = /*#__PURE__*/function () {
                           rotation: entity.rotation.toArray(),
                           scale: entity.scale.toArray(),
                           visible: entity.visible
-                        }), interactable);
+                        }));
                       case 14:
                       case "end":
-                        return _context10.stop();
+                        return _context11.stop();
                     }
-                  }, _callee10);
+                  }, _callee11);
                 })));
               }
-              return _context11.abrupt("return", json);
+              return _context12.abrupt("return", json);
             case 3:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11);
+        }, _callee12);
       }));
-      function execute(_x15) {
+      function execute(_x18) {
         return _execute.apply(this, arguments);
       }
       return execute;
@@ -482,11 +520,11 @@ var Entity = /*#__PURE__*/function () {
   }, {
     key: "handleResult",
     value: (function () {
-      var _handleResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(id, res, interactable) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _handleResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(id, res) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              return _context12.abrupt("return", Promise.resolve(res).then(function () {
+              return _context13.abrupt("return", Promise.resolve(res).then(function () {
                 sendToMessage({
                   messageType: MessageType.Event,
                   messageName: 'onLoaded',
@@ -507,17 +545,17 @@ var Entity = /*#__PURE__*/function () {
                   success: false
                 });
               }).finally(function () {
-                interactable && utils.emitter.emit('onEntityLoaded', {
+                utils.emitter.emit('onEntityLoaded', {
                   id: id
                 });
               }));
             case 1:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12);
+        }, _callee13);
       }));
-      function handleResult(_x16, _x17, _x18) {
+      function handleResult(_x19, _x20) {
         return _handleResult.apply(this, arguments);
       }
       return handleResult;
@@ -609,6 +647,10 @@ var Entity = /*#__PURE__*/function () {
       var target = hybridList.get(id);
       if (!target) throw new Error("entity ".concat(id, " is not exist"));
       if (!(target.userData.entityParams.type === 'model' || target.userData.entityParams.type === 'poi')) return;
+      if (!target.userData.entityParams.interactable) {
+        this.unregisterEvents(opts);
+        return;
+      }
 
       // @ts-ignore
       if (eventPenetrateType.includes(target.entityType)) {