@galacean/engine-ui 1.4.11 → 1.4.13

package/dist/module.js

@@ -1,4 +1,4 @@
-import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, deepClone, Vector2, Transform, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, Script, MathUtil, CameraModifyFlags, SafeLoopArray, SpriteDrawMode, RenderQueueFlags, SpriteModifyFlags, SpriteTileMode, TiledSpriteAssembler, SlicedSpriteAssembler, SimpleSpriteAssembler, BoundingBox, ShaderData, ShaderDataGroup, TextUtils, Engine, TextVerticalAlignment, TextHorizontalAlignment, OverflowMode, CharRenderInfo, FontStyle, ReferResource, registerPointerEventEmitter, PointerEventEmitter, CameraClearFlags, ReflectionParser, Shader, ShaderPass, PipelineStage, Material, BlendFactor, BlendOperation, CullMode, RenderQueueType, Entity, Loader, Font } from '@galacean/engine';
+import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, deepClone, Vector2, Transform, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, Script, MathUtil, CameraModifyFlags, Logger, SafeLoopArray, SpriteDrawMode, RenderQueueFlags, SpriteModifyFlags, SpriteTileMode, TiledSpriteAssembler, SlicedSpriteAssembler, SimpleSpriteAssembler, BoundingBox, ShaderData, ShaderDataGroup, TextUtils, Engine, TextVerticalAlignment, TextHorizontalAlignment, OverflowMode, CharRenderInfo, FontStyle, ReferResource, registerPointerEventEmitter, PointerEventEmitter, CameraClearFlags, ReflectionParser, Shader, ShaderPass, PipelineStage, Material, BlendFactor, BlendOperation, CullMode, RenderQueueType, Entity, Loader, Font } from '@galacean/engine';
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -1159,8 +1159,9 @@ var UICanvas = /*#__PURE__*/ function(Component) {
             case CanvasRenderMode.WorldSpace:
                 var boundsCenter = this._getCenter();
                 if (isOrthographic) {
-                    Vector3.subtract(boundsCenter, cameraPosition, boundsCenter);
-                    this._sortDistance = Vector3.dot(boundsCenter, cameraForward);
+                    var distance = UICanvas._tempVec3;
+                    Vector3.subtract(boundsCenter, cameraPosition, distance);
+                    this._sortDistance = Vector3.dot(distance, cameraForward);
                 } else {
                     this._sortDistance = Vector3.distanceSquared(boundsCenter, cameraPosition);
                 }
@@ -1201,6 +1202,11 @@ var UICanvas = /*#__PURE__*/ function(Component) {
             }
         }
     };
+    /**
+   * @internal
+   */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+        target.renderMode = this._renderMode;
+    };
     _proto._getRenderers = function _getRenderers() {
         var _this = this, renderers = _this._orderedRenderers, entity = _this.entity;
         var uiHierarchyVersion = entity._uiHierarchyVersion;
@@ -1216,11 +1222,14 @@ var UICanvas = /*#__PURE__*/ function(Component) {
         var transform = this.entity.transform;
         var realRenderMode = this._realRenderMode;
         if (realRenderMode === CanvasRenderMode.ScreenSpaceCamera) {
-            var _this__renderCamera_entity = this._renderCamera.entity, cameraTransform = _this__renderCamera_entity.transform;
-            var cameraWorldPosition = cameraTransform.worldPosition, cameraWorldForward = cameraTransform.worldForward;
-            var distance = this._distance;
-            transform.setWorldPosition(cameraWorldPosition.x + cameraWorldForward.x * distance, cameraWorldPosition.y + cameraWorldForward.y * distance, cameraWorldPosition.z + cameraWorldForward.z * distance);
-            transform.worldRotationQuaternion.copyFrom(cameraTransform.worldRotationQuaternion);
+            var cameraEntity = this._renderCamera.entity;
+            if (!this._isSameOrChildEntity(cameraEntity)) {
+                var cameraTransform = cameraEntity.transform;
+                var cameraWorldPosition = cameraTransform.worldPosition, cameraWorldForward = cameraTransform.worldForward;
+                var distance = this._distance;
+                transform.setWorldPosition(cameraWorldPosition.x + cameraWorldForward.x * distance, cameraWorldPosition.y + cameraWorldForward.y * distance, cameraWorldPosition.z + cameraWorldForward.z * distance);
+                transform.worldRotationQuaternion.copyFrom(cameraTransform.worldRotationQuaternion);
+            }
         } else {
             var canvas = this.engine.canvas;
             transform.setWorldPosition(canvas.width * 0.5, canvas.height * 0.5, 0);
@@ -1443,6 +1452,14 @@ var UICanvas = /*#__PURE__*/ function(Component) {
             }
         }
     };
+    _proto._isSameOrChildEntity = function _isSameOrChildEntity(cameraEntity) {
+        var canvasEntity = this.entity;
+        while(cameraEntity){
+            if (cameraEntity === canvasEntity) return true;
+            cameraEntity = cameraEntity.parent;
+        }
+        return false;
+    };
     _create_class(UICanvas, [
         {
             key: "referenceResolutionPerUnit",
@@ -1500,9 +1517,19 @@ var UICanvas = /*#__PURE__*/ function(Component) {
             set: function set(value) {
                 var preCamera = this._renderCamera;
                 if (preCamera !== value) {
+                    this._isSameOrChildEntity(value.entity) && Logger.warn("Camera entity matching or nested within the canvas entity disables canvas auto-adaptation in ScreenSpaceCamera mode.");
                     this._renderCamera = value;
                     this._updateCameraObserver();
-                    this._setRealRenderMode(this._getRealRenderMode());
+                    var preRenderMode = this._realRenderMode;
+                    var curRenderMode = this._getRealRenderMode();
+                    if (preRenderMode === curRenderMode) {
+                        if (curRenderMode === CanvasRenderMode.ScreenSpaceCamera) {
+                            this._adapterPoseInScreenSpace();
+                            this._adapterSizeInScreenSpace();
+                        }
+                    } else {
+                        this._setRealRenderMode(curRenderMode);
+                    }
                 }
             }
         },
@@ -1599,25 +1626,25 @@ __decorate([
     ignoreClone
 ], UICanvas.prototype, "_renderMode", void 0);
 __decorate([
-    ignoreClone
+    assignmentClone
 ], UICanvas.prototype, "_renderCamera", void 0);
 __decorate([
     ignoreClone
 ], UICanvas.prototype, "_cameraObserver", void 0);
 __decorate([
-    ignoreClone
+    assignmentClone
 ], UICanvas.prototype, "_resolutionAdaptationMode", void 0);
 __decorate([
-    ignoreClone
+    assignmentClone
 ], UICanvas.prototype, "_sortOrder", void 0);
 __decorate([
-    ignoreClone
+    assignmentClone
 ], UICanvas.prototype, "_distance", void 0);
 __decorate([
     deepClone
 ], UICanvas.prototype, "_referenceResolution", void 0);
 __decorate([
-    deepClone
+    assignmentClone
 ], UICanvas.prototype, "_referenceResolutionPerUnit", void 0);
 __decorate([
     ignoreClone
@@ -1726,6 +1753,14 @@ var Button = /*#__PURE__*/ function(UIInteractive) {
             }
         }
     };
+    /**
+   * @internal
+   */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+        // @ts-ignore
+        UIRenderer1.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
+        target.sprite = this._sprite;
+        target.drawMode = this._drawMode;
+    };
     _proto._updateBounds = function _updateBounds(worldBounds) {
         var sprite = this._sprite;
         var rootCanvas = this._getRootCanvas();
@@ -1938,7 +1973,7 @@ __decorate([
     ignoreClone
 ], Image.prototype, "_drawMode", void 0);
 __decorate([
-    assignmentClone
+    ignoreClone
 ], Image.prototype, "_assembler", void 0);
 __decorate([
     assignmentClone
@@ -2950,7 +2985,6 @@ var UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
         var draggedPath = this._draggedPath;
         if (draggedPath.length > 0) {
             this._bubble(draggedPath, pointer, this._fireDrag);
-            draggedPath.length = 0;
         }
     };
     _proto.processDown = function processDown(pointer) {
@@ -3028,6 +3062,7 @@ var UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
             }
             add.length = del.length = 0;
         }
+        curPath.length = 0;
     };
     _proto._composedPath = function _composedPath(element, path) {
         if (!element) {