@galacean/effects-threejs 1.1.0-alpha.0 → 1.1.0-alpha.1

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.1.0-alpha.0
+ * Version: v1.1.0-alpha.1
  */
 
 'use strict';
@@ -19203,7 +19203,7 @@ var InteractVFXItem = /** @class */ (function (_super) {
                 (_b = event.origin) === null || _b === void 0 ? void 0 : _b.preventDefault();
             }
         }
-        this.composition.camera.position.set(nx, ny, depth);
+        this.composition.camera.position = new Vector3(nx, ny, depth);
     };
     return InteractVFXItem;
 }(VFXItem));
@@ -29920,7 +29920,8 @@ var CompVFXItem = /** @class */ (function (_super) {
         configurable: true
     });
     CompVFXItem.prototype.onConstructed = function (props) {
-        var _a = props.items, items = _a === void 0 ? [] : _a, _b = props.startTime, startTime = _b === void 0 ? 0 : _b, content = props.content;
+        var _a = props.items, items = _a === void 0 ? [] : _a, _b = props.startTime, startTime = _b === void 0 ? 0 : _b, content = props.content, refId = props.refId;
+        this.refId = refId;
         this.itemProps = items;
         this.contentProps = content;
         var endBehavior = this.endBehavior;
@@ -29947,13 +29948,8 @@ var CompVFXItem = /** @class */ (function (_super) {
                     if (!props) {
                         throw new Error("\u5F15\u7528\u7684Id: ".concat(refId, " \u7684\u9884\u5408\u6210\u4E0D\u5B58\u5728"));
                     }
-                    props.name = itemProps.name;
-                    props.duration = itemProps.duration;
-                    props.endBehavior = itemProps.endBehavior;
-                    props.delay = itemProps.delay;
-                    props.parentId = itemProps.parentId;
                     props.content = itemProps.content;
-                    item = new CompVFXItem(props, this.composition);
+                    item = new CompVFXItem(__assign$1(__assign$1({}, props), { refId: refId, id: itemProps.id, name: itemProps.name, duration: itemProps.duration, endBehavior: itemProps.endBehavior, parentId: itemProps.parentId, transform: itemProps.transform }), this.composition);
                     item.contentProps = itemProps.content;
                     item.transform.parentTransform = this.transform;
                     this.composition.refContent.push(item);
@@ -30208,6 +30204,74 @@ var CompVFXItem = /** @class */ (function (_super) {
         }
         return res;
     };
+    CompVFXItem.prototype.hitTest = function (ray, x, y, regions, force, options) {
+        var hitPositions = [];
+        var stop = (options === null || options === void 0 ? void 0 : options.stop) || noop;
+        var skip = (options === null || options === void 0 ? void 0 : options.skip) || noop;
+        var maxCount = (options === null || options === void 0 ? void 0 : options.maxCount) || this.items.length;
+        for (var i = 0; i < this.items.length && regions.length < maxCount; i++) {
+            var item = this.items[i];
+            if (item.lifetime >= 0 && item.lifetime <= 1 && !VFXItem.isComposition(item) && !skip(item)) {
+                var hitParams = item.getHitTestParams(force);
+                if (hitParams) {
+                    var success = false;
+                    var intersectPoint = new Vector3();
+                    if (hitParams.type === exports.HitTestType.triangle) {
+                        var triangles = hitParams.triangles, backfaceCulling = hitParams.backfaceCulling;
+                        for (var j = 0; j < triangles.length; j++) {
+                            var triangle = triangles[j];
+                            if (ray.intersectTriangle(triangle, intersectPoint, backfaceCulling)) {
+                                success = true;
+                                hitPositions.push(intersectPoint);
+                                break;
+                            }
+                        }
+                    }
+                    else if (hitParams.type === exports.HitTestType.box) {
+                        var center = hitParams.center, size = hitParams.size;
+                        var boxMin = center.clone().addScaledVector(size, 0.5);
+                        var boxMax = center.clone().addScaledVector(size, -0.5);
+                        if (ray.intersectBox({ min: boxMin, max: boxMax }, intersectPoint)) {
+                            success = true;
+                            hitPositions.push(intersectPoint);
+                        }
+                    }
+                    else if (hitParams.type === exports.HitTestType.sphere) {
+                        var center = hitParams.center, radius = hitParams.radius;
+                        if (ray.intersectSphere({ center: center, radius: radius }, intersectPoint)) {
+                            success = true;
+                            hitPositions.push(intersectPoint);
+                        }
+                    }
+                    else if (hitParams.type === exports.HitTestType.custom) {
+                        var tempPosition = hitParams.collect(ray, new Vector2(x, y));
+                        if (tempPosition && tempPosition.length > 0) {
+                            tempPosition.forEach(function (pos) {
+                                hitPositions.push(pos);
+                            });
+                            success = true;
+                        }
+                    }
+                    if (success) {
+                        var region = {
+                            compContent: this,
+                            id: item.id,
+                            name: item.name,
+                            position: hitPositions[hitPositions.length - 1],
+                            parentId: item.parentId,
+                            hitPositions: hitPositions,
+                            behavior: hitParams.behavior,
+                        };
+                        regions.push(region);
+                        if (stop(region)) {
+                            return regions;
+                        }
+                    }
+                }
+            }
+        }
+        return regions;
+    };
     CompVFXItem.prototype.isEnded = function (now) {
         return now >= this.durInms;
     };
@@ -30671,7 +30735,7 @@ var Composition = /** @class */ (function () {
         this.pluginSystem.plugins.forEach(func);
     };
     /**
-     *
+     * 获取指定位置和相机连成的射线
      * @param x
      * @param y
      * @returns
@@ -30699,73 +30763,12 @@ var Composition = /** @class */ (function () {
         if (this.isDestroyed) {
             return [];
         }
-        var hitPositions = [];
         var regions = [];
-        var _a = this.renderFrame.editorTransform, a = _a.x, b = _a.y, c = _a.z, d = _a.w;
-        var ray = setRayFromCamera((x - c) / a, (y - d) / b, this.camera);
-        var stop = (options === null || options === void 0 ? void 0 : options.stop) || noop;
-        var skip = (options === null || options === void 0 ? void 0 : options.skip) || noop;
-        var maxCount = (options === null || options === void 0 ? void 0 : options.maxCount) || this.items.length;
-        for (var i = 0; i < this.items.length && regions.length < maxCount; i++) {
-            var item = this.items[i];
-            if (item.lifetime >= 0 && item.lifetime <= 1 && !skip(item)) {
-                var hitParams = item.getHitTestParams(force);
-                if (hitParams) {
-                    var success = false;
-                    var intersectPoint = new Vector3();
-                    if (hitParams.type === exports.HitTestType.triangle) {
-                        var triangles = hitParams.triangles, backfaceCulling = hitParams.backfaceCulling;
-                        for (var j = 0; j < triangles.length; j++) {
-                            var triangle = triangles[j];
-                            if (ray.intersectTriangle(triangle, intersectPoint, backfaceCulling)) {
-                                success = true;
-                                hitPositions.push(intersectPoint);
-                                break;
-                            }
-                        }
-                    }
-                    else if (hitParams.type === exports.HitTestType.box) {
-                        var center = hitParams.center, size = hitParams.size;
-                        var boxMin = center.clone().addScaledVector(size, 0.5);
-                        var boxMax = center.clone().addScaledVector(size, -0.5);
-                        if (ray.intersectBox({ min: boxMin, max: boxMax }, intersectPoint)) {
-                            success = true;
-                            hitPositions.push(intersectPoint);
-                        }
-                    }
-                    else if (hitParams.type === exports.HitTestType.sphere) {
-                        var center = hitParams.center, radius = hitParams.radius;
-                        if (ray.intersectSphere({ center: center, radius: radius }, intersectPoint)) {
-                            success = true;
-                            hitPositions.push(intersectPoint);
-                        }
-                    }
-                    else if (hitParams.type === exports.HitTestType.custom) {
-                        var tempPosition = hitParams.collect(ray, new Vector2(x, y));
-                        if (tempPosition && tempPosition.length > 0) {
-                            tempPosition.forEach(function (pos) {
-                                hitPositions.push(pos);
-                            });
-                            success = true;
-                        }
-                    }
-                    if (success) {
-                        var region = {
-                            id: item.id,
-                            name: item.name,
-                            position: hitPositions[hitPositions.length - 1],
-                            parentId: item.parentId,
-                            hitPositions: hitPositions,
-                            behavior: hitParams.behavior,
-                        };
-                        regions.push(region);
-                        if (stop(region)) {
-                            return regions;
-                        }
-                    }
-                }
-            }
-        }
+        var ray = this.getHitTestRay(x, y);
+        this.content.hitTest(ray, x, y, regions, force, options);
+        this.refContent.forEach(function (ref) {
+            ref.hitTest(ray, x, y, regions, force, options);
+        });
         return regions;
     };
     /**
@@ -32736,9 +32739,9 @@ Geometry.create = function (engine, options) {
 Mesh.create = function (engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "1.1.0-alpha.0";
+var version = "1.1.0-alpha.1";
 console.info({
-    content: '[Galacean Effects THREEJS] version: ' + "1.1.0-alpha.0",
+    content: '[Galacean Effects THREEJS] version: ' + "1.1.0-alpha.1",
     type: LOG_TYPE,
 });