@galacean/effects-threejs 2.8.0 → 2.8.2

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.8.0
+ * Version: v2.8.2
  */
 
 'use strict';
@@ -13372,22 +13372,34 @@ function _loadVideo() {
             return [
                 2,
                 new Promise(function(resolve, reject) {
-                    var handleCanPlay = function() {
+                    var settled = false;
+                    var handleSuccess = function() {
+                        if (settled) {
+                            return;
+                        }
+                        settled = true;
+                        cleanup();
                         resolve(video);
-                        video.removeEventListener("error", handleError);
                     };
-                    var handleError = function(e) {
-                        video.removeEventListener("canplay", handleCanPlay);
+                    var handleError = function() {
+                        if (settled) {
+                            return;
+                        }
+                        settled = true;
+                        cleanup();
                         reject("Load video fail.");
                     };
-                    video.addEventListener("canplay", handleCanPlay, {
-                        once: true
-                    });
-                    video.addEventListener("error", handleError, {
-                        once: true
+                    var cleanup = function() {
+                        video.removeEventListener("loadeddata", handleSuccess);
+                        video.removeEventListener("canplay", handleSuccess);
+                        video.removeEventListener("error", handleError);
+                    };
+                    video.addEventListener("loadeddata", handleSuccess);
+                    video.addEventListener("canplay", handleSuccess);
+                    video.addEventListener("error", handleError);
+                    video.play().catch(function(err) {
+                        console.warn("Autoplay blocked:", err);
                     });
-                    // 显式触发视频加载
-                    video.load();
                 })
             ];
         });
@@ -16689,10 +16701,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         }
         var regions = [];
         var ray = this.getHitTestRay(x, y);
-        this.refContent.forEach(function(ref) {
-            var _ref_getComponent;
-            (_ref_getComponent = ref.getComponent(exports.CompositionComponent)) == null ? void 0 : _ref_getComponent.hitTest(ray, x, y, regions, force, options);
-        });
+        this.rootComposition.hitTest(ray, x, y, regions, force, options);
         return regions;
     };
     /**
@@ -17769,10 +17778,32 @@ exports.CompositionComponent = /*#__PURE__*/ function(Component) {
         });
     };
     _proto.hitTest = function hitTest(ray, x, y, regions, force, options) {
-        var _this, _loop = function(i) {
-            var item = _this.items[i];
-            if (item.isActive && item.transform.getValid() && !exports.VFXItem.isComposition(item) && !skip(item)) {
-                var hitParams = item.getHitTestParams(force);
+        var _this_item_composition;
+        var isHitTestSuccess = this.hitTestRecursive(this.item, ray, x, y, regions, force, options);
+        // 子元素碰撞测试成功加入当前预合成元素，判断是否是合成根元素，根元素不加入
+        if (isHitTestSuccess && this.item !== ((_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.rootItem)) {
+            var item = this.item;
+            var lastRegion = regions[regions.length - 1];
+            var hitPositions = lastRegion.hitPositions;
+            var region = {
+                id: item.getInstanceId(),
+                name: item.name,
+                position: hitPositions[hitPositions.length - 1],
+                parentId: item.parentId,
+                hitPositions: hitPositions,
+                behavior: InteractBehavior.NONE,
+                item: item,
+                composition: item.composition
+            };
+            regions.push(region);
+        }
+        return isHitTestSuccess;
+    };
+    _proto.hitTestRecursive = function hitTestRecursive(item, ray, x, y, regions, force, options) {
+        var _this, _loop = function() {
+            var hitTestItem = _step.value;
+            if (hitTestItem.isActive && hitTestItem.transform.getValid() && !skip(hitTestItem)) {
+                var hitParams = hitTestItem.getHitTestParams(force);
                 if (hitParams) {
                     var success = false;
                     var intersectPoint = new Vector3();
@@ -17817,35 +17848,48 @@ exports.CompositionComponent = /*#__PURE__*/ function(Component) {
                     }
                     if (success) {
                         var region = {
-                            compContent: _this.item,
-                            id: item.getInstanceId(),
-                            name: item.name,
+                            id: hitTestItem.getInstanceId(),
+                            name: hitTestItem.name,
                             position: hitPositions[hitPositions.length - 1],
-                            parentId: item.parentId,
+                            parentId: hitTestItem.parentId,
                             hitPositions: hitPositions,
                             behavior: hitParams.behavior,
-                            item: item,
+                            item: hitTestItem,
                             composition: _this.item.composition
                         };
                         regions.push(region);
+                        hitTestSuccess = true;
                         if (stop(region)) {
                             return {
-                                v: regions
+                                v: true
                             };
                         }
                     }
                 }
+                if (exports.VFXItem.isComposition(hitTestItem)) {
+                    if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
+                        hitTestSuccess = true;
+                    }
+                } else {
+                    if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
+                        hitTestSuccess = true;
+                    }
+                }
             }
         };
         var hitPositions = [];
         var stop = (options == null ? void 0 : options.stop) || noop;
         var skip = (options == null ? void 0 : options.skip) || noop;
-        var maxCount = (options == null ? void 0 : options.maxCount) || this.items.length;
-        for(var i = 0; i < this.items.length && regions.length < maxCount; i++){
-            var _ret = (_this = this, _loop(i));
+        var maxCount = options == null ? void 0 : options.maxCount;
+        if (maxCount !== undefined && regions.length >= maxCount) {
+            return false;
+        }
+        var hitTestSuccess = false;
+        for(var _iterator = _create_for_of_iterator_helper_loose(item.children), _step; !(_step = _iterator()).done;){
+            var _ret = (_this = this, _loop());
             if (_type_of(_ret) === "object") return _ret.v;
         }
-        return regions;
+        return hitTestSuccess;
     };
     /**
    * 设置当前合成子元素的渲染顺序
@@ -29417,14 +29461,11 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
         this.isDirty = true;
     };
     _proto.setFontSize = function setFontSize(value) {
-        if (this.textStyle.fontSize === value) {
+        var size = Math.max(1, Number(value) || 1);
+        if (this.textStyle.fontSize === size) {
             return;
         }
-        // 保证字号变化后位置正常
-        var diff = this.textStyle.fontSize - value;
-        var layout = this.textLayout;
-        layout.lineHeight += diff;
-        this.textStyle.fontSize = value;
+        this.textStyle.fontSize = size;
         this.isDirty = true;
     };
     _proto.setOutlineWidth = function setOutlineWidth(value) {
@@ -31518,7 +31559,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.8.0";
+var version$2 = "2.8.2";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -32863,7 +32904,7 @@ function _createTextureOptionsBySource() {
         scene.jsonScene.items.forEach(function(item) {
             if (item.type === ItemType.text || item.type === ItemType.richtext) {
                 var textVariable = variables[item.name];
-                if (!textVariable) {
+                if (textVariable === undefined || textVariable === null) {
                     return;
                 }
                 item.components.forEach(function(param) {
@@ -35218,7 +35259,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.8.0";
+var version$1 = "2.8.2";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36795,7 +36836,7 @@ applyMixins(exports.ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.8.0";
+var version = "2.8.2";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;