openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-27 01:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!16222 优化MapAndUpdateChildrenRect矩阵运算以减少指令数

Browse Source 
Merge pull request !16222 from 陈思屹/master
This commit is contained in:
openharmony_ci 2024-10-26 12:02:47 +00:00 committed by Gitee
commit 61df9748c4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rosen/modules/render_service_base/src/pipeline/rs_render_node.cpp
View File

@ -1808,21 +1808,24 @@ void RSRenderNode::MapAndUpdateChildrenRect()
childRect = childRect.JoinRect(childrenRect_.ConvertTo<float>());
}
// map before update parent, if parent has clip property, use clipped children rect instead.
// node with sharedTransitionParam should recalculate childRelativeToParentMatrix due to sandbox.
// node with sharedTransitionParam should recalculate childRelativeToParentMatrix from absMatrix due to sandbox.
if (auto parentNode = parent_.lock()) {
auto childRelativeToParentMatrix = Drawing::Matrix();
const auto& parentProperties = parentNode->GetRenderProperties();
const auto& parentGeoPtr = parentProperties.GetBoundsGeometry();
const auto& sandbox = GetRenderProperties().GetSandBox();
auto invertAbsParentMatrix = Drawing::Matrix();
if (sandbox.has_value() && sharedTransitionParam_ &&
parentGeoPtr->GetAbsMatrix().Invert(invertAbsParentMatrix)) {
auto absChildMatrix = geoPtr->GetAbsMatrix();
childRelativeToParentMatrix = absChildMatrix * invertAbsParentMatrix;
RectI childRectMapped;
if (LIKELY(!sandbox.has_value())) {
childRectMapped = geoPtr->MapRect(childRect, geoPtr->GetMatrix());
} else {
childRelativeToParentMatrix = geoPtr->GetMatrix();
Drawing::Matrix invertAbsParentMatrix;
const auto& parentGeoPtr = parentProperties.GetBoundsGeometry();
if (parentGeoPtr && parentGeoPtr->GetAbsMatrix().Invert(invertAbsParentMatrix)) {
auto childRelativeToParentMatrix = geoPtr->GetAbsMatrix();
childRelativeToParentMatrix.PostConcat(invertAbsParentMatrix);
childRectMapped = geoPtr->MapRect(childRect, childRelativeToParentMatrix);
} else {
childRectMapped = geoPtr->MapRect(childRect, geoPtr->GetMatrix());
}
}
RectI childRectMapped = geoPtr->MapRect(childRect, childRelativeToParentMatrix);
if (parentProperties.GetClipToBounds() || parentProperties.GetClipToFrame()) {
childRectMapped = parentNode->GetSelfDrawRect().ConvertTo<int>().IntersectRect(childRectMapped);
}