Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate rotation operations (#44429)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44429

`Transform::Rotation(x, y, z)` creates an empty transform with the associated operation, then [multiplies by xyz rotation vectors](https://en.wikipedia.org/wiki/Rotation_matrix#General_3D_rotations).

Multiplication chains each transform operation, so afterward, we end up with correct transform matrix, but duplicate operations.

This removes the first transform operation, and lets the per-axis multiplications set them.

Changelog:
[General][Fixed] - Fix duplicate rotation operations

Reviewed By: rshest

Differential Revision: D57025602

fbshipit-source-id: 5eb47dbf9a72eab89a351fd5ae02261566b35ffb
This commit is contained in:
Nick Gerleman
2024-05-09 18:30:56 -07:00
committed by Facebook GitHub Bot
parent cea5309839
commit 54f582f651
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp
-2
View File
@@ -129,8 +129,6 @@ Transform Transform::RotateZ(Float radians) {
Transform Transform::Rotate(Float x, Float y, Float z) {
auto transform = Transform{};
transform.operations.push_back(
TransformOperation{TransformOperationType::Rotate, x, y, z});
if (!isZero(x)) {
transform = transform * Transform::RotateX(x);
}
packages/react-native/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
+20
View File
@@ -77,6 +77,26 @@ TEST(TransformTest, rotatingRect) {
ASSERT_NEAR(transformedRect.size.height, 14.1421, 0.0001);
}
TEST(TransformTest, rotate3dOverload) {
auto point = facebook::react::Point{10, 10};
auto size = facebook::react::Size{10, 10};
auto rect = facebook::react::Rect{point, size};
auto transform = Transform::Rotate(0, 0, M_PI_4);
EXPECT_EQ(transform.operations.size(), 1);
EXPECT_EQ(transform.operations[0].type, TransformOperationType::Rotate);
EXPECT_EQ(transform.operations[0].x, 0);
EXPECT_EQ(transform.operations[0].y, 0);
ASSERT_NEAR(transform.operations[0].z, M_PI_4, 0.0001);
auto transformedRect = rect * Transform::Rotate(0, 0, M_PI_4);
ASSERT_NEAR(transformedRect.origin.x, 7.9289, 0.0001);
ASSERT_NEAR(transformedRect.origin.y, 7.9289, 0.0001);
ASSERT_NEAR(transformedRect.size.width, 14.1421, 0.0001);
ASSERT_NEAR(transformedRect.size.height, 14.1421, 0.0001);
}
TEST(TransformTest, scalingAndTranslatingRect) {
auto point = facebook::react::Point{100, 200};
auto size = facebook::react::Size{300, 400};