From bdae8e370d0fa0ecdacb454eeddbbf4a69f0ae63 Mon Sep 17 00:00:00 2001 From: PP Date: Wed, 27 Jan 2021 15:56:56 +0800 Subject: [PATCH] cache camera priority in event listener (#8216) * Revert "cache first render camera (#8215)" This reverts commit 4cdb7043c90594f79f943fb161cbba916d623f93. * cut down touch move callback * cache camera priority in event listener * Revert "cut down touch move callback" This reverts commit 19da61e3f16c3d1c14c1e8111b0da98b4997dea4. * fix esLint --- cocos/2d/framework/ui-transform.ts | 23 ++++--------------- .../platform/event-manager/event-listener.ts | 5 ++++ .../platform/event-manager/event-manager.ts | 14 +++++++---- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/cocos/2d/framework/ui-transform.ts b/cocos/2d/framework/ui-transform.ts index fa468d78bc..c5926735c6 100644 --- a/cocos/2d/framework/ui-transform.ts +++ b/cocos/2d/framework/ui-transform.ts @@ -30,7 +30,6 @@ import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, displayOrder, serializable, disallowMultiple } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { Camera } from 'cocos/core/renderer/scene'; import { Component } from '../../core/components'; import { SystemEventType } from '../../core/platform/event-manager/event-enum'; import { EventListener } from '../../core/platform/event-manager/event-listener'; @@ -62,7 +61,6 @@ const _rect = new Rect(); @disallowMultiple @executeInEditMode export class UITransform extends Component { - private _camera: Camera|null = null; /** * @en * Size of the UI node. @@ -222,24 +220,14 @@ export class UITransform extends Component { @serializable protected _priority = 0; - private _updateCamera (force = false) { - if (!this._camera || force) { - this._camera = director.root!.batcher2D.getFirstRenderCamera(this.node); - } - } - - private _removeCamera () { - this._camera = null; - } - /** * @en Get the visibility bit-mask of the rendering camera * @zh 查找被渲染相机的可见性掩码。 * @deprecated since v3.0 */ get visibility () { - this._updateCamera(); - return this._camera ? this._camera.visibility : 0; + const camera = director.root!.batcher2D.getFirstRenderCamera(this.node); + return camera ? camera.visibility : 0; } /** @@ -247,8 +235,8 @@ export class UITransform extends Component { * @zh 查找被渲染相机的渲染优先级。 */ get cameraPriority () { - this._updateCamera(); - return this._camera ? this._camera.priority : 0; + const camera = director.root!.batcher2D.getFirstRenderCamera(this.node); + return camera ? camera.priority : 0; } public static EventType = SystemEventType; @@ -269,13 +257,10 @@ export class UITransform extends Component { if (changed) { this.node.parent!._updateSiblingIndex(); } - - this._updateCamera(); } public onDisable () { this.node.off(SystemEventType.PARENT_CHANGED, this._parentChanged, this); - this._removeCamera(); } public onDestroy () { diff --git a/cocos/core/platform/event-manager/event-listener.ts b/cocos/core/platform/event-manager/event-listener.ts index de244b28f0..7e254a820f 100644 --- a/cocos/core/platform/event-manager/event-listener.ts +++ b/cocos/core/platform/event-manager/event-listener.ts @@ -55,6 +55,11 @@ export interface IListenerMask { * 注意:这是一个抽象类,开发者不应该直接实例化这个类,请参考 [[create]] 。 */ export class EventListener { + /** + * to cache camera priority + * @internal + */ + public _cameraPriority = 0; /** * @en The type code of unknown event listener.
* @zh 未知的事件监听器类型 diff --git a/cocos/core/platform/event-manager/event-manager.ts b/cocos/core/platform/event-manager/event-manager.ts index 48a230ce26..686d7bbe37 100644 --- a/cocos/core/platform/event-manager/event-manager.ts +++ b/cocos/core/platform/event-manager/event-manager.ts @@ -759,7 +759,13 @@ class EventManager { } // After sort: priority < 0, > 0 - listeners.getSceneGraphPriorityListeners().sort(this._sortEventListenersOfSceneGraphPriorityDes); + const eventListeners = listeners.getSceneGraphPriorityListeners(); + eventListeners.forEach((listener) => { + const node: any = listener._getSceneGraphPriority(); + const trans = node._uiProps.uiTransformComp; + listener._cameraPriority = trans.cameraPriority; + }); + eventListeners.sort(this._sortEventListenersOfSceneGraphPriorityDes); } private _sortEventListenersOfSceneGraphPriorityDes (l1: EventListener, l2: EventListener) { @@ -773,10 +779,8 @@ class EventManager { } let p1 = node1; let p2 = node2; let ex = false; - const trans1 = node1._uiProps.uiTransformComp; - const trans2 = node2._uiProps.uiTransformComp; - if (trans1.cameraPriority !== trans2.cameraPriority) { - return trans2.cameraPriority - trans1.cameraPriority; + if (l1._cameraPriority !== l2._cameraPriority) { + return l2._cameraPriority - l1._cameraPriority; } while (p1.parent._id !== p2.parent._id) { p1 = p1.parent.parent === null ? (ex = true) && node2 : p1.parent;