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

Add Matrix GetDirectionScale (flutter/engine#35562)

Browse Source
This commit is contained in:
Brandon DeRosier 2022-08-20 14:56:45 -07:00 committed by GitHub
parent 2f130272ac
commit 5674e4e04c
3 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,6 +302,53 @@ TEST(GeometryTest, MatrixMakePerspective) {
}
}
TEST(GeometryTest, MatrixGetBasisVectors) {
{
auto m = Matrix();
Vector3 x = m.GetBasisX();
Vector3 y = m.GetBasisY();
Vector3 z = m.GetBasisZ();
ASSERT_VECTOR3_NEAR(x, Vector3(1, 0, 0));
ASSERT_VECTOR3_NEAR(y, Vector3(0, 1, 0));
ASSERT_VECTOR3_NEAR(z, Vector3(0, 0, 1));
}
{
auto m = Matrix::MakeRotationZ(Radians{kPiOver2}) *
Matrix::MakeRotationX(Radians{kPiOver2}) *
Matrix::MakeScale(Vector3(2, 3, 4));
Vector3 x = m.GetBasisX();
Vector3 y = m.GetBasisY();
Vector3 z = m.GetBasisZ();
ASSERT_VECTOR3_NEAR(x, Vector3(0, 2, 0));
ASSERT_VECTOR3_NEAR(y, Vector3(0, 0, 3));
ASSERT_VECTOR3_NEAR(z, Vector3(4, 0, 0));
}
}
TEST(GeometryTest, MatrixGetDirectionScale) {
{
auto m = Matrix();
Scalar result = m.GetDirectionScale(Vector3{1, 0, 0});
ASSERT_FLOAT_EQ(result, 1);
}
{
auto m = Matrix::MakeRotationX(Degrees{10}) *
Matrix::MakeRotationY(Degrees{83}) *
Matrix::MakeRotationZ(Degrees{172});
Scalar result = m.GetDirectionScale(Vector3{0, 1, 0});
ASSERT_FLOAT_EQ(result, 1);
}
{
auto m = Matrix::MakeRotationZ(Radians{kPiOver2}) *
Matrix::MakeScale(Vector3(3, 4, 5));
Scalar result = m.GetDirectionScale(Vector3{2, 0, 0});
ASSERT_FLOAT_EQ(result, 8);
}
}
TEST(GeometryTest, QuaternionLerp) {
auto q1 = Quaternion{{0.0, 0.0, 1.0}, 0.0};
auto q2 = Quaternion{{0.0, 0.0, 1.0}, kPiOver4};

16
engine/src/flutter/impeller/geometry/matrix.h
View File

@ -236,10 +236,20 @@ struct Matrix {
Scalar GetMaxBasisLength() const;
constexpr Vector3 GetBasisX() const { return Vector3(m[0], m[1], m[2]); }
constexpr Vector3 GetBasisY() const { return Vector3(m[4], m[5], m[6]); }
constexpr Vector3 GetBasisZ() const { return Vector3(m[8], m[9], m[10]); }
constexpr Vector3 GetScale() const {
return Vector3(Vector3(m[0], m[1], m[2]).Length(),
Vector3(m[4], m[5], m[6]).Length(),
Vector3(m[8], m[9], m[10]).Length());
return Vector3(GetBasisX().Length(), GetBasisY().Length(),
GetBasisZ().Length());
}
constexpr Scalar GetDirectionScale(Vector3 direction) const {
return 1.0 / (this->Invert() * direction.Normalize()).Length() *
direction.Length();
}
constexpr bool IsAffine() const {

14
engine/src/flutter/impeller/geometry/vector.h
View File

@ -41,7 +41,7 @@ struct Vector3 {
*
* @return the calculated length.
*/
Scalar Length() const { return sqrt(x * x + y * y + z * z); }
constexpr Scalar Length() const { return sqrt(x * x + y * y + z * z); }
constexpr Vector3 Normalize() const {
const auto len = Length();
@ -130,6 +130,18 @@ struct Vector3 {
std::string ToString() const;
};
// RHS algebraic operations with arithmetic types.
template <class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
constexpr Vector3 operator*(U s, const Vector3& p) {
return p * s;
}
template <class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
constexpr Vector3 operator/(U s, const Vector3& p) {
return {static_cast<Scalar>(s) / p.x, static_cast<Scalar>(s) / p.y};
}
struct Vector4 {
union {
struct {