@galacean/engine-ui 1.4.11 → 1.4.13

package/dist/browser.js

@@ -1163,8 +1163,9 @@
                 case CanvasRenderMode.WorldSpace:
                     var boundsCenter = this._getCenter();
                     if (isOrthographic) {
-                        engine.Vector3.subtract(boundsCenter, cameraPosition, boundsCenter);
-                        this._sortDistance = engine.Vector3.dot(boundsCenter, cameraForward);
+                        var distance = UICanvas._tempVec3;
+                        engine.Vector3.subtract(boundsCenter, cameraPosition, distance);
+                        this._sortDistance = engine.Vector3.dot(distance, cameraForward);
                     } else {
                         this._sortDistance = engine.Vector3.distanceSquared(boundsCenter, cameraPosition);
                     }
@@ -1205,6 +1206,11 @@
                 }
             }
         };
+        /**
+       * @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;
@@ -1220,11 +1226,14 @@
             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);
@@ -1447,6 +1456,14 @@
                 }
             }
         };
+        _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",
@@ -1504,9 +1521,19 @@
                 set: function set(value) {
                     var preCamera = this._renderCamera;
                     if (preCamera !== value) {
+                        this._isSameOrChildEntity(value.entity) && engine.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);
+                        }
                     }
                 }
             },
@@ -1603,25 +1630,25 @@
         engine.ignoreClone
     ], exports.UICanvas.prototype, "_renderMode", void 0);
     __decorate([
-        engine.ignoreClone
+        engine.assignmentClone
     ], exports.UICanvas.prototype, "_renderCamera", void 0);
     __decorate([
         engine.ignoreClone
     ], exports.UICanvas.prototype, "_cameraObserver", void 0);
     __decorate([
-        engine.ignoreClone
+        engine.assignmentClone
     ], exports.UICanvas.prototype, "_resolutionAdaptationMode", void 0);
     __decorate([
-        engine.ignoreClone
+        engine.assignmentClone
     ], exports.UICanvas.prototype, "_sortOrder", void 0);
     __decorate([
-        engine.ignoreClone
+        engine.assignmentClone
     ], exports.UICanvas.prototype, "_distance", void 0);
     __decorate([
         engine.deepClone
     ], exports.UICanvas.prototype, "_referenceResolution", void 0);
     __decorate([
-        engine.deepClone
+        engine.assignmentClone
     ], exports.UICanvas.prototype, "_referenceResolutionPerUnit", void 0);
     __decorate([
         engine.ignoreClone
@@ -1730,6 +1757,14 @@
                 }
             }
         };
+        /**
+       * @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();
@@ -1942,7 +1977,7 @@
         engine.ignoreClone
     ], Image.prototype, "_drawMode", void 0);
     __decorate([
-        engine.assignmentClone
+        engine.ignoreClone
     ], Image.prototype, "_assembler", void 0);
     __decorate([
         engine.assignmentClone
@@ -2954,7 +2989,6 @@
             var draggedPath = this._draggedPath;
             if (draggedPath.length > 0) {
                 this._bubble(draggedPath, pointer, this._fireDrag);
-                draggedPath.length = 0;
             }
         };
         _proto.processDown = function processDown(pointer) {
@@ -3032,6 +3066,7 @@
                 }
                 add.length = del.length = 0;
             }
+            curPath.length = 0;
         };
         _proto._composedPath = function _composedPath(element, path) {
             if (!element) {