Skip to content

Commit

Permalink
Revert "Fix rotation around Y axis (#262)" (#300)
Browse files Browse the repository at this point in the history
This reverts commit 048777a.
  • Loading branch information
johnmccutchan authored Jul 26, 2023
1 parent 048777a commit 88bada3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 29 deletions.
4 changes: 2 additions & 2 deletions lib/src/vector_math/matrix3.dart
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,11 @@ class Matrix3 {
final s = math.sin(radians);
_m3storage[0] = c;
_m3storage[1] = 0.0;
_m3storage[2] = -s;
_m3storage[2] = s;
_m3storage[3] = 0.0;
_m3storage[4] = 1.0;
_m3storage[5] = 0.0;
_m3storage[6] = s;
_m3storage[6] = -s;
_m3storage[7] = 0.0;
_m3storage[8] = c;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/src/vector_math_64/matrix3.dart
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,11 @@ class Matrix3 {
final s = math.sin(radians);
_m3storage[0] = c;
_m3storage[1] = 0.0;
_m3storage[2] = -s;
_m3storage[2] = s;
_m3storage[3] = 0.0;
_m3storage[4] = 1.0;
_m3storage[5] = 0.0;
_m3storage[6] = s;
_m3storage[6] = -s;
_m3storage[7] = 0.0;
_m3storage[8] = c;
}
Expand Down
26 changes: 1 addition & 25 deletions test/matrix3_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -194,32 +194,11 @@ void testMatrix3Transform() {

relativeTest(rotX.transformed(input), input);
relativeTest(rotY.transformed(input),
Vector3(1.0 / math.sqrt(2.0), 0.0, -1.0 / math.sqrt(2.0)));
Vector3(1.0 / math.sqrt(2.0), 0.0, 1.0 / math.sqrt(2.0)));
relativeTest(rotZ.transformed(input),
Vector3(1.0 / math.sqrt(2.0), 1.0 / math.sqrt(2.0), 0.0));
}

void testMatrix3RotationX() {
final rotX = Matrix3.rotationX(math.pi / 2);
final input = Vector3(0.0, 1.0, 0.0);

relativeTest(rotX.transformed(input), Vector3(0.0, 0.0, 1.0));
}

void testMatrix3RotationY() {
final rotY = Matrix3.rotationY(math.pi / 2);
final input = Vector3(0.0, 0.0, 1.0);

relativeTest(rotY.transformed(input), Vector3(1.0, 0.0, 0.0));
}

void testMatrix3RotationZ() {
final rotZ = Matrix3.rotationZ(math.pi / 2);
final input = Vector3(1.0, 0.0, 0.0);

relativeTest(rotZ.transformed(input), Vector3(0.0, 1.0, 0.0));
}

void testMatrix3Transform2() {
final rotZ = Matrix3.rotationZ(math.pi / 4);
final trans = Matrix3(1.0, 0.0, 3.0, 0.0, 1.0, 2.0, 3.0, 2.0, 1.0);
Expand Down Expand Up @@ -355,9 +334,6 @@ void main() {
test('transform 2D', testMatrix3Transform2);
test('rotation 2D', testMatrix3AbsoluteRotate2);
test('transform', testMatrix3Transform);
test('rotation 3D x', testMatrix3RotationX);
test('rotation 3D y', testMatrix3RotationY);
test('rotation 3D z', testMatrix3RotationZ);
test('constructor', testMatrix3ConstructorCopy);
test('inversion', testMatrix3Inversion);
test('dot product', testMatrix3Dot);
Expand Down

0 comments on commit 88bada3

Please sign in to comment.