DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] Correct the results of 'GetRight()' and 'GetBottom()' for maximum rect (flutter/engine#40271)

Browse Source 
[Impeller] Correct the results of 'GetRight()' and 'GetBottom()' for maximum rect
This commit is contained in:
ColdPaleLight 2023-03-15 07:49:16 +08:00 committed by GitHub
parent b89acc989c
commit f64288a55e
2 changed files with 75 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
engine/src/flutter/impeller/geometry/geometry_unittests.cc
View File

@ -1493,6 +1493,22 @@ TEST(GeometryTest, RectIntersection) {
auto u = a.Intersection(b);
ASSERT_FALSE(u.has_value());
}
{
Rect a = Rect::MakeMaximum();
Rect b(10, 10, 300, 300);
auto u = a.Intersection(b);
ASSERT_TRUE(u);
ASSERT_RECT_NEAR(u.value(), b);
}
{
Rect a = Rect::MakeMaximum();
Rect b = Rect::MakeMaximum();
auto u = a.Intersection(b);
ASSERT_TRUE(u);
ASSERT_EQ(u, Rect::MakeMaximum());
}
}
TEST(GeometryTest, RectIntersectsWithRect) {
@ -1519,6 +1535,18 @@ TEST(GeometryTest, RectIntersectsWithRect) {
Rect b(100, 100, 100, 100);
ASSERT_FALSE(a.IntersectsWithRect(b));
}
{
Rect a = Rect::MakeMaximum();
Rect b(10, 10, 100, 100);
ASSERT_TRUE(a.IntersectsWithRect(b));
}
{
Rect a = Rect::MakeMaximum();
Rect b = Rect::MakeMaximum();
ASSERT_TRUE(a.IntersectsWithRect(b));
}
}
TEST(GeometryTest, RectCutout) {
@ -1603,6 +1631,12 @@ TEST(GeometryTest, RectContainsPoint) {
Point p(199, 199);
ASSERT_TRUE(r.Contains(p));
}
{
Rect r = Rect::MakeMaximum();
Point p(199, 199);
ASSERT_TRUE(r.Contains(p));
}
}
TEST(GeometryTest, RectContainsRect) {
@ -1635,15 +1669,35 @@ TEST(GeometryTest, RectContainsRect) {
Rect b(0, 0, 300, 300);
ASSERT_FALSE(a.Contains(b));
}
{
Rect a = Rect::MakeMaximum();
Rect b(0, 0, 300, 300);
ASSERT_TRUE(a.Contains(b));
}
}
TEST(GeometryTest, RectGetPoints) {
Rect r(100, 200, 300, 400);
auto points = r.GetPoints();
ASSERT_POINT_NEAR(points[0], Point(100, 200));
ASSERT_POINT_NEAR(points[1], Point(400, 200));
ASSERT_POINT_NEAR(points[2], Point(100, 600));
ASSERT_POINT_NEAR(points[3], Point(400, 600));
{
Rect r(100, 200, 300, 400);
auto points = r.GetPoints();
ASSERT_POINT_NEAR(points[0], Point(100, 200));
ASSERT_POINT_NEAR(points[1], Point(400, 200));
ASSERT_POINT_NEAR(points[2], Point(100, 600));
ASSERT_POINT_NEAR(points[3], Point(400, 600));
}
{
Rect r = Rect::MakeMaximum();
auto points = r.GetPoints();
ASSERT_EQ(points[0], Point(-std::numeric_limits<float>::infinity(),
-std::numeric_limits<float>::infinity()));
ASSERT_EQ(points[1], Point(std::numeric_limits<float>::infinity(),
-std::numeric_limits<float>::infinity()));
ASSERT_EQ(points[2], Point(-std::numeric_limits<float>::infinity(),
std::numeric_limits<float>::infinity()));
ASSERT_EQ(points[3], Point(std::numeric_limits<float>::infinity(),
std::numeric_limits<float>::infinity()));
}
}
TEST(GeometryTest, RectShift) {

22
engine/src/flutter/impeller/geometry/rect.h
View File

@ -109,8 +109,8 @@ struct TRect {
}
constexpr bool Contains(const TPoint<Type>& p) const {
return p.x >= origin.x && p.x < origin.x + size.width && p.y >= origin.y &&
p.y < origin.y + size.height;
return p.x >= GetLeft() && p.x < GetRight() && p.y >= GetTop() &&
p.y < GetBottom();
}
constexpr bool Contains(const TRect& o) const {
@ -124,27 +124,35 @@ struct TRect {
constexpr bool IsMaximum() const { return *this == MakeMaximum(); }
constexpr auto GetLeft() const {
if (IsMaximum()) {
return -std::numeric_limits<Type>::infinity();
}
return std::min(origin.x, origin.x + size.width);
}
constexpr auto GetTop() const {
if (IsMaximum()) {
return -std::numeric_limits<Type>::infinity();
}
return std::min(origin.y, origin.y + size.height);
}
constexpr auto GetRight() const {
if (IsMaximum()) {
return std::numeric_limits<Type>::infinity();
}
return std::max(origin.x, origin.x + size.width);
}
constexpr auto GetBottom() const {
if (IsMaximum()) {
return std::numeric_limits<Type>::infinity();
}
return std::max(origin.y, origin.y + size.height);
}
constexpr std::array<T, 4> GetLTRB() const {
const auto left = std::min(origin.x, origin.x + size.width);
const auto top = std::min(origin.y, origin.y + size.height);
const auto right = std::max(origin.x, origin.x + size.width);
const auto bottom = std::max(origin.y, origin.y + size.height);
return {left, top, right, bottom};
return {GetLeft(), GetTop(), GetRight(), GetBottom()};
}
/// @brief Get a version of this rectangle that has a non-negative size.