ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Math: improve test coverage of basic vector and matrix operators. 

In particular verify also the compound assignment operators and that
they correctly return a reference to self. And make sure the
non-mutating operators can be called on const instances.

The tests were mostly written back in 2010 and it shows. It survived all
that time because I didn't need any larger refactor of the math library
until now, but I'm going to make some changes and it'll be embarrassing
to introduce nasty regressions because the test coverage was lacking.
pull/168/head
Vladimír Vondruš 2 years ago
parent
8c7679c7b1
commit
9f754539f3
2 changed files with 385 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 203
      src/Magnum/Math/Test/RectangularMatrixTest.cpp
  2. 315
      src/Magnum/Math/Test/VectorTest.cpp

203
src/Magnum/Math/Test/RectangularMatrixTest.cpp
Unescape View File

@ -493,82 +493,117 @@ void RectangularMatrixTest::promotedNegated() {
} }
void RectangularMatrixTest::addSubtract() { void RectangularMatrixTest::addSubtract() {
Matrix4x3 a(Vector3(0.0f, 1.0f, 3.0f), const Matrix4x3 a{Vector3{0.0f, 1.0f, 3.0f},
Vector3(4.0f, 5.0f, 7.0f), Vector3{4.0f, 5.0f, 7.0f},
Vector3(8.0f, 9.0f, 11.0f), Vector3{8.0f, 9.0f, 11.0f},
Vector3(12.0f, 13.0f, 15.0f)); Vector3{12.0f, 13.0f, 15.0f}};
Matrix4x3 b(Vector3(-4.0f, 0.5f, 9.0f), const Matrix4x3 b{Vector3{-4.0f, 0.5f, 9.0f},
Vector3(-9.0f, 11.0f, 0.25f), Vector3{-9.0f, 11.0f, 0.25f},
Vector3( 0.0f, -8.0f, 19.0f), Vector3{ 0.0f, -8.0f, 19.0f},
Vector3(-3.0f, -5.0f, 2.0f)); Vector3{-3.0f, -5.0f, 2.0f}};
Matrix4x3 c(Vector3(-4.0f, 1.5f, 12.0f), const Matrix4x3 c{Vector3{-4.0f, 1.5f, 12.0f},
Vector3(-5.0f, 16.0f, 7.25f), Vector3{-5.0f, 16.0f, 7.25f},
Vector3( 8.0f, 1.0f, 30.0f), Vector3{ 8.0f, 1.0f, 30.0f},
Vector3( 9.0f, 8.0f, 17.0f)); Vector3{ 9.0f, 8.0f, 17.0f}};
CORRADE_COMPARE(a + b, c); CORRADE_COMPARE(a + b, c);
{
Matrix4x3 m{Vector3{0.0f, 1.0f, 3.0f},
Vector3{4.0f, 5.0f, 7.0f},
Vector3{8.0f, 9.0f, 11.0f},
Vector3{12.0f, 13.0f, 15.0f}};
CORRADE_COMPARE(&(m += b), &m);
CORRADE_COMPARE(m, c);
}
CORRADE_COMPARE(c - b, a); CORRADE_COMPARE(c - b, a);
{
Matrix4x3 m{Vector3{-4.0f, 1.5f, 12.0f},
Vector3{-5.0f, 16.0f, 7.25f},
Vector3{ 8.0f, 1.0f, 30.0f},
Vector3{ 9.0f, 8.0f, 17.0f}};
CORRADE_COMPARE(&(m -= b), &m);
CORRADE_COMPARE(m, a);
}
} }
void RectangularMatrixTest::multiplyDivide() { void RectangularMatrixTest::multiplyDivide() {
Matrix2x2 matrix(Vector2(1.0f, 2.0f), const Matrix2x2 matrix{Vector2{1.0f, 2.0f},
Vector2(3.0f, 4.0f)); Vector2{3.0f, 4.0f}};
Matrix2x2 multiplied(Vector2(-1.5f, -3.0f), const Matrix2x2 multiplied{Vector2{-1.5f, -3.0f},
Vector2(-4.5f, -6.0f)); Vector2{-4.5f, -6.0f}};
CORRADE_COMPARE(matrix*-1.5f, multiplied); CORRADE_COMPARE(matrix*-1.5f, multiplied);
CORRADE_COMPARE(-1.5f*matrix, multiplied); CORRADE_COMPARE(-1.5f*matrix, multiplied);
{
Matrix2x2 m{Vector2{1.0f, 2.0f},
Vector2{3.0f, 4.0f}};
CORRADE_COMPARE(&(m *= -1.5f), &m);
CORRADE_COMPARE(m, multiplied);
}
CORRADE_COMPARE(multiplied/-1.5f, matrix); CORRADE_COMPARE(multiplied/-1.5f, matrix);
{
Matrix2x2 m{Vector2{-1.5f, -3.0f},
Vector2{-4.5f, -6.0f}};
CORRADE_COMPARE(&(m /= -1.5f), &m);
CORRADE_COMPARE(m, matrix);
}
/* Divide vector with number and inverse */ /* Divide vector with number and inverse */
Matrix2x2 divisor(Vector2( 1.0f, 2.0f), const Matrix2x2 divisor{Vector2{ 1.0f, 2.0f},
Vector2(-4.0f, 8.0f)); Vector2{-4.0f, 8.0f}};
Matrix2x2 result(Vector2( 1.0f, 0.5f), const Matrix2x2 result{Vector2{ 1.0f, 0.5f},
Vector2(-0.25f, 0.125f)); Vector2{-0.25f, 0.125f}};
CORRADE_COMPARE(1.0f/divisor, result); CORRADE_COMPARE(1.0f/divisor, result);
} }
void RectangularMatrixTest::multiply() { void RectangularMatrixTest::multiply() {
RectangularMatrix<4, 6, Int> left( const RectangularMatrix<4, 6, Int> left{
Vector<6, Int>(-5, 27, 10, 33, 0, -15), Vector<6, Int>{-5, 27, 10, 33, 0, -15},
Vector<6, Int>( 7, 56, 66, 1, 0, -24), Vector<6, Int>{ 7, 56, 66, 1, 0, -24},
Vector<6, Int>( 4, 41, 4, 0, 1, -4), Vector<6, Int>{ 4, 41, 4, 0, 1, -4},
Vector<6, Int>( 9, -100, 19, -49, 1, 9) Vector<6, Int>{ 9, -100, 19, -49, 1, 9}
); };
RectangularMatrix<5, 4, Int> right( const RectangularMatrix<5, 4, Int> right{
Vector<4, Int>(1, -7, 0, 158), Vector<4, Int>{1, -7, 0, 158},
Vector<4, Int>(2, 24, -3, 40), Vector<4, Int>{2, 24, -3, 40},
Vector<4, Int>(3, -15, -2, -50), Vector<4, Int>{3, -15, -2, -50},
Vector<4, Int>(4, 17, -1, -284), Vector<4, Int>{4, 17, -1, -284},
Vector<4, Int>(5, 30, 4, 18) Vector<4, Int>{5, 30, 4, 18}
); };
RectangularMatrix<5, 6, Int> expected( const RectangularMatrix<5, 6, Int> expected{
Vector<6, Int>( 1368, -16165, 2550, -7716, 158, 1575), Vector<6, Int>{ 1368, -16165, 2550, -7716, 158, 1575},
Vector<6, Int>( 506, -2725, 2352, -1870, 37, -234), Vector<6, Int>{ 506, -2725, 2352, -1870, 37, -234},
Vector<6, Int>( -578, 4159, -1918, 2534, -52, -127), Vector<6, Int>{ -578, 4159, -1918, 2534, -52, -127},
Vector<6, Int>(-2461, 29419, -4238, 14065, -285, -3020), Vector<6, Int>{-2461, 29419, -4238, 14065, -285, -3020},
Vector<6, Int>( 363, 179, 2388, -687, 22, -649) Vector<6, Int>{ 363, 179, 2388, -687, 22, -649}
); };
CORRADE_COMPARE(left*right, expected); CORRADE_COMPARE(left*right, expected);
/* There's no *= for matrix multiplication as it makes operation order
unclear */
} }
void RectangularMatrixTest::multiplyVector() { void RectangularMatrixTest::multiplyVector() {
Vector4i a(-5, 27, 10, 33); const Vector4i a{-5, 27, 10, 33};
RectangularMatrix<3, 1, Int> b(1, 2, 3); const RectangularMatrix<3, 1, Int> b{1, 2, 3};
CORRADE_COMPARE(a*b, Matrix3x4i( CORRADE_COMPARE(a*b, (Matrix3x4i{
Vector4i( -5, 27, 10, 33), Vector4i{ -5, 27, 10, 33},
Vector4i(-10, 54, 20, 66), Vector4i{-10, 54, 20, 66},
Vector4i(-15, 81, 30, 99) Vector4i{-15, 81, 30, 99}
)); }));
Matrix3x4i c(Vector4i(0, 4, 8, 12), const Matrix3x4i c{Vector4i{0, 4, 8, 12},
Vector4i(1, 5, 9, 13), Vector4i{1, 5, 9, 13},
Vector4i(3, 7, 11, 15)); Vector4i{3, 7, 11, 15}};
Vector3i d(2, -2, 3); const Vector3i d{2, -2, 3};
CORRADE_COMPARE(c*d, Vector4i(7, 19, 31, 43)); CORRADE_COMPARE(c*d, (Vector4i{7, 19, 31, 43}));
/* There's no *= for vector and matrix multiplication either */
} }
void RectangularMatrixTest::transposed() { void RectangularMatrixTest::transposed() {
@ -728,33 +763,55 @@ void RectangularMatrixTest::subclass() {
CORRADE_COMPARE(-a, Mat2x2(Vector2(-1.0f, 3.0f), CORRADE_COMPARE(-a, Mat2x2(Vector2(-1.0f, 3.0f),
Vector2(3.0f, -1.0f))); Vector2(3.0f, -1.0f)));
Mat2x2 b(Vector2(-2.0f, 5.0f), const Mat2x2 b{Vector2{-2.0f, 5.0f},
Vector2(5.0f, -2.0f)); Vector2{5.0f, -2.0f}};
const Mat2x2 bExpected(Vector2(-1.0f, 2.0f), const Mat2x2 bExpected{Vector2{-1.0f, 2.0f},
Vector2(2.0f, -1.0f)); Vector2{2.0f, -1.0f}};
CORRADE_COMPARE(b + a, bExpected); CORRADE_COMPARE(b + a, bExpected);
{
Mat2x2 m{Vector2{-2.0f, 5.0f},
Vector2{5.0f, -2.0f}};
CORRADE_COMPARE(&(m += a), &m);
CORRADE_COMPARE(m, bExpected);
}
Mat2x2 c(Vector2(-2.0f, 5.0f), const Mat2x2 c{Vector2{-2.0f, 5.0f},
Vector2(5.0f, -2.0f)); Vector2{5.0f, -2.0f}};
const Mat2x2 cExpected(Vector2(-3.0f, 8.0f), const Mat2x2 cExpected{Vector2{-3.0f, 8.0f},
Vector2(8.0f, -3.0f)); Vector2{8.0f, -3.0f}};
CORRADE_COMPARE(c - a, cExpected); CORRADE_COMPARE(c - a, cExpected);
{
Mat2x2 m{Vector2{-2.0f, 5.0f},
Vector2{5.0f, -2.0f}};
CORRADE_COMPARE(&(m -= a), &m);
CORRADE_COMPARE(m, cExpected);
}
Mat2x2 d(Vector2(-2.0f, 5.0f), const Mat2x2 d{Vector2{-2.0f, 5.0f},
Vector2(5.0f, -2.0f)); Vector2{5.0f, -2.0f}};
const Mat2x2 dExpected(Vector2(-4.0f, 10.0f), const Mat2x2 dExpected{Vector2{-4.0f, 10.0f},
Vector2(10.0f, -4.0f)); Vector2{10.0f, -4.0f}};
CORRADE_COMPARE(d*2.0f, dExpected); CORRADE_COMPARE(d*2.0f, dExpected);
CORRADE_COMPARE(2.0f*d, dExpected); CORRADE_COMPARE(2.0f*d, dExpected);
{
Mat2x2 m{Vector2{-2.0f, 5.0f},
Vector2{5.0f, -2.0f}};
CORRADE_COMPARE(&(m *= 2.0f), &m);
CORRADE_COMPARE(m, dExpected);
}
/* No need to test in-place operators as the other ones are implemented const Mat2x2 e{Vector2{-2.0f, 5.0f},
using them */ Vector2{5.0f, -2.0f}};
Mat2x2 e(Vector2(-2.0f, 5.0f),
Vector2(5.0f, -2.0f));
CORRADE_COMPARE(e/0.5f, dExpected); CORRADE_COMPARE(e/0.5f, dExpected);
CORRADE_COMPARE(2.0f/e, Mat2x2(Vector2(-1.0f, 0.4f), CORRADE_COMPARE(2.0f/e, (Mat2x2{Vector2{-1.0f, 0.4f},
Vector2(0.4f, -1.0f))); Vector2{0.4f, -1.0f}}));
{
Mat2x2 m{Vector2{-2.0f, 5.0f},
Vector2{5.0f, -2.0f}};
CORRADE_COMPARE(&(m /= 0.5f), &m);
CORRADE_COMPARE(m, dExpected);
}
const Vector2 f(2.0f, 5.0f); const Vector2 f(2.0f, 5.0f);
const Math::RectangularMatrix<2, 1, Float> g(3.0f, -1.0f); const Math::RectangularMatrix<2, 1, Float> g(3.0f, -1.0f);
CORRADE_COMPARE(f*g, Mat2x2(Vector2(6.0f, 15.0f), CORRADE_COMPARE(f*g, Mat2x2(Vector2(6.0f, 15.0f),

315
src/Magnum/Math/Test/VectorTest.cpp
Unescape View File

@ -407,78 +407,172 @@ void VectorTest::promotedNegated() {
} }
void VectorTest::addSubtract() { void VectorTest::addSubtract() {
Vector4 a(1.0f, -3.0f, 5.0f, -10.0f); const Vector4 a{1.0f, -3.0f, 5.0f, -10.0f};
Vector4 b(7.5f, 33.0f, -15.0f, 0.0f); const Vector4 b{7.5f, 33.0f, -15.0f, 0.0f};
Vector4 c(8.5f, 30.0f, -10.0f, -10.0f); const Vector4 c{8.5f, 30.0f, -10.0f, -10.0f};
CORRADE_COMPARE(a + b, c); CORRADE_COMPARE(a + b, c);
CORRADE_COMPARE(c - b, a); CORRADE_COMPARE(c - b, a);
{
Vector4 v{1.0f, -3.0f, 5.0f, -10.0f};
CORRADE_COMPARE(&(v += b), &v);
CORRADE_COMPARE(v, c);
} {
Vector4 v{8.5f, 30.0f, -10.0f, -10.0f};
CORRADE_COMPARE(&(v -= b), &v);
CORRADE_COMPARE(v, a);
}
} }
void VectorTest::multiplyDivide() { void VectorTest::multiplyDivide() {
Vector4 vector(1.0f, 2.0f, 3.0f, 4.0f); const Vector4 vector{1.0f, 2.0f, 3.0f, 4.0f};
Vector4 multiplied(-1.5f, -3.0f, -4.5f, -6.0f); const Vector4 multiplied{-1.5f, -3.0f, -4.5f, -6.0f};
CORRADE_COMPARE(vector*-1.5f, multiplied); CORRADE_COMPARE(vector*-1.5f, multiplied);
CORRADE_COMPARE(-1.5f*vector, multiplied); CORRADE_COMPARE(-1.5f*vector, multiplied);
{
Vector4 v{1.0f, 2.0f, 3.0f, 4.0f};
CORRADE_COMPARE(&(v *= -1.5f), &v);
CORRADE_COMPARE(v, multiplied);
}
CORRADE_COMPARE(multiplied/-1.5f, vector); CORRADE_COMPARE(multiplied/-1.5f, vector);
{
Vector4 v{-1.5f, -3.0f, -4.5f, -6.0f};
CORRADE_COMPARE(&(v /= -1.5f), &v);
CORRADE_COMPARE(v, vector);
}
/* Divide vector with number and invert */ /* Divide a vector with a scalar and invert */
Vector4 divisor(1.0f, 2.0f, -4.0f, 8.0f); const Vector4 divisor{1.0f, 2.0f, -4.0f, 8.0f};
Vector4 result(1.0f, 0.5f, -0.25f, 0.125f); const Vector4 result{1.0f, 0.5f, -0.25f, 0.125f};
CORRADE_COMPARE(1.0f/divisor, result); CORRADE_COMPARE(1.0f/divisor, result);
} }
void VectorTest::multiplyDivideIntegral() { void VectorTest::multiplyDivideIntegral() {
Vector4i vector(32, 10, -6, 2); const Vector4i vector{32, 10, -6, 2};
Vector4i multiplied(-48, -15, 9, -3); const Vector4i multiplied{-48, -15, 9, -3};
CORRADE_COMPARE(vector*-1.5f, multiplied); CORRADE_COMPARE(vector*-1.5f, multiplied);
CORRADE_COMPARE(-1.5f*vector, multiplied); CORRADE_COMPARE(-1.5f*vector, multiplied);
{
Vector4i v{32, 10, -6, 2};
CORRADE_COMPARE(&(v *= -1.5f), &v);
CORRADE_COMPARE(v, multiplied);
}
CORRADE_COMPARE(multiplied/-1.5f, vector); CORRADE_COMPARE(multiplied/-1.5f, vector);
{
Vector4i v{-48, -15, 9, -3};
CORRADE_COMPARE(&(v /= -1.5f), &v);
CORRADE_COMPARE(v, vector);
}
/* Using integer vector as divisor is not supported */ /* Using integer vector as divisor is not supported */
} }
void VectorTest::multiplyDivideComponentWise() { void VectorTest::multiplyDivideComponentWise() {
Vector4 vec(1.0f, 2.0f, 3.0f, 4.0f); const Vector4 vec{1.0f, 2.0f, 3.0f, 4.0f};
Vector4 multiplier(7.0f, -4.0f, -1.5f, 1.0f); const Vector4 multiplier{7.0f, -4.0f, -1.5f, 1.0f};
Vector4 multiplied(7.0f, -8.0f, -4.5f, 4.0f); const Vector4 multiplied{7.0f, -8.0f, -4.5f, 4.0f};
CORRADE_COMPARE(vec*multiplier, multiplied); CORRADE_COMPARE(vec*multiplier, multiplied);
{
Vector4 v{1.0f, 2.0f, 3.0f, 4.0f};
CORRADE_COMPARE(&(v *= multiplier), &v);
CORRADE_COMPARE(v, multiplied);
}
CORRADE_COMPARE(multiplied/multiplier, vec); CORRADE_COMPARE(multiplied/multiplier, vec);
{
Vector4 v{7.0f, -8.0f, -4.5f, 4.0f};
CORRADE_COMPARE(&(v /= multiplier), &v);
CORRADE_COMPARE(v, vec);
}
} }
void VectorTest::multiplyDivideComponentWiseIntegral() { void VectorTest::multiplyDivideComponentWiseIntegral() {
Vector4i vec(7, 2, -16, -1); const Vector4i vec{7, 2, -16, -1};
Vector4 multiplier(2.0f, -1.5f, 0.5f, 10.0f); const Vector4 multiplier{2.0f, -1.5f, 0.5f, 10.0f};
Vector4i multiplied(14, -3, -8, -10); const Vector4i multiplied{14, -3, -8, -10};
CORRADE_COMPARE(vec*multiplier, multiplied); CORRADE_COMPARE(vec*multiplier, multiplied);
CORRADE_COMPARE(multiplier*vec, multiplied); CORRADE_COMPARE(multiplier*vec, multiplied);
{
Vector4i v{7, 2, -16, -1};
CORRADE_COMPARE(&(v *= multiplier), &v);
CORRADE_COMPARE(v, multiplied);
}
CORRADE_COMPARE(multiplied/multiplier, vec); CORRADE_COMPARE(multiplied/multiplier, vec);
{
Vector4i v{14, -3, -8, -10};
CORRADE_COMPARE(&(v /= multiplier), &v);
CORRADE_COMPARE(v, vec);
}
/* Using integer vector as divisor is not supported */ /* Using integer vector as divisor is not supported */
} }
void VectorTest::modulo() { void VectorTest::modulo() {
const Vector2i a(4, 13); const Vector4i a{4, 13, 255, -6};
const Vector2i b(2, 5); const Vector4i b{2, 5, 64, -4};
CORRADE_COMPARE(a % 2, Vector2i(0, 1));
CORRADE_COMPARE(a % b, Vector2i(0, 3)); CORRADE_COMPARE(a % 2, (Vector4i{0, 1, 1, 0}));
{
Vector4i v{4, 13, 255, -6};
CORRADE_COMPARE(&(v %= 2), &v);
CORRADE_COMPARE(v, (Vector4i{0, 1, 1, 0}));
}
CORRADE_COMPARE(a % b, (Vector4i{0, 3, 63, -2}));
{
Vector4i v{4, 13, 255, -6};
CORRADE_COMPARE(&(v %= b), &v);
CORRADE_COMPARE(v, (Vector4i{0, 3, 63, -2}));
}
} }
void VectorTest::bitwise() { void VectorTest::bitwise() {
const Vector2i a(85, 240); const Vector4i a{85, 240, -241, 33};
const Vector2i b(170, 85); const Vector4i b{170, 85, 13, -11};
CORRADE_COMPARE(~a, Vector2i(-86, -241)); CORRADE_COMPARE(~a, (Vector4i{-86, -241, 240, -34}));
CORRADE_COMPARE(a & b, Vector2i(0, 80));
CORRADE_COMPARE(a | b, Vector2i(255, 245));
CORRADE_COMPARE(a ^ b, Vector2i(255, 165));
const Vector2i c(7, 32); CORRADE_COMPARE(a & b, (Vector4i{0, 80, 13, 33}));
CORRADE_COMPARE(c << 2, Vector2i(28, 128)); {
CORRADE_COMPARE(c >> 2, Vector2i(1, 8)); Vector4i v{85, 240, -241, 33};
CORRADE_COMPARE(&(v &= b), &v);
CORRADE_COMPARE(v, (Vector4i{0, 80, 13, 33}));
}
CORRADE_COMPARE(a | b, (Vector4i{255, 245, -241, -11}));
{
Vector4i v{85, 240, -241, 33};
CORRADE_COMPARE(&(v |= b), &v);
CORRADE_COMPARE(v, (Vector4i{255, 245, -241, -11}));
}
CORRADE_COMPARE(a ^ b, (Vector4i{255, 165, -254, -44}));
{
Vector4i v{85, 240, -241, 33};
CORRADE_COMPARE(&(v ^= b), &v);
CORRADE_COMPARE(v, (Vector4i{255, 165, -254, -44}));
}
const Vector4i c{7, 32, 1, 15};
CORRADE_COMPARE(c << 2, (Vector4i{28, 128, 4, 60}));
{
Vector4i v{7, 32, 1, 15};
CORRADE_COMPARE(&(v <<= 2), &v);
CORRADE_COMPARE(v, (Vector4i{28, 128, 4, 60}));
}
CORRADE_COMPARE(c >> 2, (Vector4i{1, 8, 0, 3}));
{
Vector4i v{7, 32, 1, 15};
CORRADE_COMPARE(&(v >>= 2), &v);
CORRADE_COMPARE(v, (Vector4i{1, 8, 0, 3}));
}
} }
void VectorTest::dot() { void VectorTest::dot() {
@ -724,71 +818,171 @@ void VectorTest::subclass() {
CORRADE_COMPARE(Vec2::from(cdata), Vec2(1.0f, -2.0f)); CORRADE_COMPARE(Vec2::from(cdata), Vec2(1.0f, -2.0f));
{ {
constexpr Vector<1, Float> a = 5.0f; const Vector<1, Float> a = 5.0f;
Vec2 b = Vec2::pad(a);
Vec2 c = Vec2::pad(a, -1.0f);
CORRADE_COMPARE(b, Vec2(5.0f, 0.0f));
CORRADE_COMPARE(c, Vec2(5.0f, -1.0f));
constexpr Vector<1, Float> ca = 5.0f;
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Probably because copy is not constexpr */ #ifndef CORRADE_MSVC2015_COMPATIBILITY /* Probably because copy is not constexpr */
constexpr constexpr
#endif #endif
Vec2 b = Vec2::pad(a); Vec2 cb = Vec2::pad(ca);
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Probably because copy is not constexpr */ #ifndef CORRADE_MSVC2015_COMPATIBILITY /* Probably because copy is not constexpr */
constexpr constexpr
#endif #endif
Vec2 c = Vec2::pad(a, -1.0f); Vec2 cc = Vec2::pad(ca, -1.0f);
CORRADE_COMPARE(b, Vec2(5.0f, 0.0f)); CORRADE_COMPARE(cb, Vec2(5.0f, 0.0f));
CORRADE_COMPARE(c, Vec2(5.0f, -1.0f)); CORRADE_COMPARE(cc, Vec2(5.0f, -1.0f));
} }
/* Constexpr constructor */ /* Unary operators */
constexpr const Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(a[0], -2.0f);
CORRADE_COMPARE(+Vec2(-2.0f, 5.0f), Vec2(-2.0f, 5.0f)); CORRADE_COMPARE(+Vec2(-2.0f, 5.0f), Vec2(-2.0f, 5.0f));
CORRADE_COMPARE(-Vec2(-2.0f, 5.0f), Vec2(2.0f, -5.0f)); CORRADE_COMPARE(-Vec2(-2.0f, 5.0f), Vec2(2.0f, -5.0f));
/* Addition / subtraction */
CORRADE_COMPARE(Vec2(-2.0f, 5.0f) + Vec2(1.0f, -3.0f), Vec2(-1.0f, 2.0f)); CORRADE_COMPARE(Vec2(-2.0f, 5.0f) + Vec2(1.0f, -3.0f), Vec2(-1.0f, 2.0f));
{
Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(&(a += Vec2{1.0f, -3.0f}), &a);
CORRADE_COMPARE(a, (Vec2{-1.0f, 2.0f}));
}
CORRADE_COMPARE(Vec2(-2.0f, 5.0f) - Vec2(1.0f, -3.0f), Vec2(-3.0f, 8.0f)); CORRADE_COMPARE(Vec2(-2.0f, 5.0f) - Vec2(1.0f, -3.0f), Vec2(-3.0f, 8.0f));
{
Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(&(a -= Vec2{1.0f, -3.0f}), &a);
CORRADE_COMPARE(a, (Vec2{-3.0f, 8.0f}));
}
/* Multiplication and division with a scalar */
CORRADE_COMPARE(Vec2(-2.0f, 5.0f)*2.0f, Vec2(-4.0f, 10.0f)); CORRADE_COMPARE(Vec2(-2.0f, 5.0f)*2.0f, Vec2(-4.0f, 10.0f));
CORRADE_COMPARE(2.0f*Vec2(-2.0f, 5.0f), Vec2(-4.0f, 10.0f)); CORRADE_COMPARE(2.0f*Vec2(-2.0f, 5.0f), Vec2(-4.0f, 10.0f));
{
Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(&(a *= 2.0f), &a);
CORRADE_COMPARE(a, (Vec2{-4.0f, 10.0f}));
}
CORRADE_COMPARE(Vec2(-2.0f, 5.0f)/0.5f, Vec2(-4.0f, 10.0f)); CORRADE_COMPARE(Vec2(-2.0f, 5.0f)/0.5f, Vec2(-4.0f, 10.0f));
CORRADE_COMPARE(2.0f/Vec2(-2.0f, 5.0f), Vec2(-1.0f, 0.4f)); CORRADE_COMPARE(2.0f/Vec2(-2.0f, 5.0f), Vec2(-1.0f, 0.4f));
{
Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(&(a /= 0.5f), &a);
CORRADE_COMPARE(a, (Vec2{-4.0f, 10.0f}));
}
CORRADE_COMPARE(Vec2(-2.0f, 5.0f)*Vec2(1.5f, -2.0f), Vec2(-3.0f, -10.0f)); /* Multiplication/division with an integer scalar */
CORRADE_COMPARE(Vec2(-2.0f, 5.0f)/Vec2(2.0f/3.0f, -0.5f), Vec2(-3.0f, -10.0f));
/* No need to test in-place operators as the other ones are implemented
using them */
/* Modulo operations */
CORRADE_COMPARE(Vec2i(4, 13) % 2, Vec2i(0, 1));
CORRADE_COMPARE(Vec2i(4, 13) % Vec2i(2, 5), Vec2i(0, 3));
/* Bitwise operations */
CORRADE_COMPARE(~Vec2i(85, 240), Vec2i(-86, -241));
CORRADE_COMPARE(Vec2i(85, 240) & Vec2i(170, 85), Vec2i(0, 80));
CORRADE_COMPARE(Vec2i(85, 240) | Vec2i(170, 85), Vec2i(255, 245));
CORRADE_COMPARE(Vec2i(85, 240) ^ Vec2i(170, 85), Vec2i(255, 165));
CORRADE_COMPARE(Vec2i(7, 32) << 2, Vec2i(28, 128));
CORRADE_COMPARE(Vec2i(7, 32) >> 2, Vec2i(1, 8));
/* Integral multiplication/division */
CORRADE_COMPARE(Vec2i(2, 4)*1.5f, Vec2i(3, 6)); CORRADE_COMPARE(Vec2i(2, 4)*1.5f, Vec2i(3, 6));
CORRADE_COMPARE(1.5f*Vec2i(2, 4), Vec2i(3, 6)); CORRADE_COMPARE(1.5f*Vec2i(2, 4), Vec2i(3, 6));
{
Vec2i a{2, 4};
CORRADE_COMPARE(&(a *= 1.5f), &a);
CORRADE_COMPARE(a, (Vec2i{3, 6}));
}
{ {
#ifdef CORRADE_TARGET_EMSCRIPTEN #ifdef CORRADE_TARGET_EMSCRIPTEN
CORRADE_EXPECT_FAIL_IF(Vec2i(2, 4)/(2.0f/3.0f) == Vec2i(2, 5), CORRADE_EXPECT_FAIL_IF(Vec2i(2, 4)/(2.0f/3.0f) == Vec2i(2, 5),
"Emscripten -O1 misoptimizes the following (-O2 works)."); "Emscripten -O1 misoptimizes the following (-O2 works).");
#endif #endif
CORRADE_COMPARE(Vec2i(2, 4)/(2.0f/3.0f), Vec2i(3, 6)); CORRADE_COMPARE(Vec2i(2, 4)/(2.0f/3.0f), Vec2i(3, 6));
} {
Vec2i a{2, 4};
CORRADE_COMPARE(&(a /= (2.0f/3.0f)), &a);
CORRADE_COMPARE(a, (Vec2i{3, 6}));
}
/* Multiplication and division with a vector */
CORRADE_COMPARE(Vec2(-2.0f, 5.0f)*Vec2(1.5f, -2.0f), Vec2(-3.0f, -10.0f));
{
Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(&(a *= Vec2{1.5f, -2.0f}), &a);
CORRADE_COMPARE(a, (Vec2{-3.0f, -10.0f}));
} }
CORRADE_COMPARE(Vec2(-2.0f, 5.0f)/Vec2(2.0f/3.0f, -0.5f), Vec2(-3.0f, -10.0f));
{
Vec2 a{-2.0f, 5.0f};
CORRADE_COMPARE(&(a /= Vec2{2.0f/3.0f, -0.5f}), &a);
CORRADE_COMPARE(a, (Vec2{-3.0f, -10.0f}));
}
/* Multiplication/division with an integer vector */
CORRADE_COMPARE(Vec2i(2, 4)*Vec2(-1.5f, 0.5f), Vec2i(-3, 2)); CORRADE_COMPARE(Vec2i(2, 4)*Vec2(-1.5f, 0.5f), Vec2i(-3, 2));
CORRADE_COMPARE(Vec2(-1.5f, 0.5f)*Vec2i(2, 4), Vec2i(-3, 2)); CORRADE_COMPARE(Vec2(-1.5f, 0.5f)*Vec2i(2, 4), Vec2i(-3, 2));
{
Vec2i a{2, 4};
CORRADE_COMPARE(&(a *= Vec2{-1.5f, 0.5f}), &a);
CORRADE_COMPARE(a, (Vec2i{-3, 2}));
}
{ {
#ifdef CORRADE_TARGET_EMSCRIPTEN #ifdef CORRADE_TARGET_EMSCRIPTEN
CORRADE_EXPECT_FAIL_IF(Vec2i(2, 4)/Vec2(-2.0f/3.0f, 2.0f) == Vec2i(-2, 2), CORRADE_EXPECT_FAIL_IF(Vec2i(2, 4)/Vec2(-2.0f/3.0f, 2.0f) == Vec2i(-2, 2),
"Emscripten -O1 misoptimizes the following (-O2 works)."); "Emscripten -O1 misoptimizes the following (-O2 works).");
#endif #endif
CORRADE_COMPARE(Vec2i(2, 4)/Vec2(-2.0f/3.0f, 2.0f), Vec2i(-3, 2)); CORRADE_COMPARE(Vec2i(2, 4)/Vec2(-2.0f/3.0f, 2.0f), Vec2i(-3, 2));
} {
Vec2i a{2, 4};
CORRADE_COMPARE(&(a /= Vec2{-2.0f/3.0f, 2.0f}), &a);
CORRADE_COMPARE(a, (Vec2i{-3, 2}));
}
/* Modulo operations */
CORRADE_COMPARE(Vec2i(4, 13) % 2, Vec2i(0, 1));
{
Vec2i a{4, 13};
CORRADE_COMPARE(&(a %= 2), &a);
CORRADE_COMPARE(a, (Vec2i{0, 1}));
}
CORRADE_COMPARE(Vec2i(4, 13) % Vec2i(2, 5), Vec2i(0, 3));
{
Vec2i a{4, 13};
CORRADE_COMPARE(&(a %= Vec2i{2, 5}), &a);
CORRADE_COMPARE(a, (Vec2i{0, 3}));
}
/* Unary bitwise operations */
CORRADE_COMPARE(~Vec2i(85, 240), Vec2i(-86, -241));
/* Bitwise AND, OR and XOR */
CORRADE_COMPARE(Vec2i(85, 240) & Vec2i(170, 85), Vec2i(0, 80));
{
Vec2i a{85, 240};
CORRADE_COMPARE(&(a &= Vec2i{170, 85}), &a);
CORRADE_COMPARE(a, (Vec2i{0, 80}));
}
CORRADE_COMPARE(Vec2i(85, 240) | Vec2i(170, 85), Vec2i(255, 245));
{
Vec2i a{85, 240};
CORRADE_COMPARE(&(a |= Vec2i{170, 85}), &a);
CORRADE_COMPARE(a, (Vec2i{255, 245}));
}
CORRADE_COMPARE(Vec2i(85, 240) ^ Vec2i(170, 85), Vec2i(255, 165));
{
Vec2i a{85, 240};
CORRADE_COMPARE(&(a ^= Vec2i{170, 85}), &a);
CORRADE_COMPARE(a, (Vec2i{255, 165}));
}
/* Bit shift */
CORRADE_COMPARE(Vec2i(7, 32) << 2, Vec2i(28, 128));
{
Vec2i a{7, 32};
CORRADE_COMPARE(&(a <<= 2), &a);
CORRADE_COMPARE(a, (Vec2i{28, 128}));
}
CORRADE_COMPARE(Vec2i(7, 32) >> 2, Vec2i(1, 8));
{
Vec2i a{7, 32};
CORRADE_COMPARE(&(a >>= 2), &a);
CORRADE_COMPARE(a, (Vec2i{1, 8}));
} }
/* Functions */ /* Functions */
@ -796,11 +990,12 @@ void VectorTest::subclass() {
CORRADE_COMPARE(Vec2(3.0f, 0.0f).resized(6.0f), Vec2(6.0f, 0.0f)); CORRADE_COMPARE(Vec2(3.0f, 0.0f).resized(6.0f), Vec2(6.0f, 0.0f));
CORRADE_COMPARE(Vec2(1.0f, 1.0f).projected({0.0f, 2.0f}), Vec2(0.0f, 1.0f)); CORRADE_COMPARE(Vec2(1.0f, 1.0f).projected({0.0f, 2.0f}), Vec2(0.0f, 1.0f));
CORRADE_COMPARE(Vec2(1.0f, 1.0f).projectedOntoNormalized({0.0f, 1.0f}), Vec2(0.0f, 1.0f)); CORRADE_COMPARE(Vec2(1.0f, 1.0f).projectedOntoNormalized({0.0f, 1.0f}), Vec2(0.0f, 1.0f));
CORRADE_COMPARE((Vec2{1.0f, 0.4f}).flipped(), (Vec2{0.4f, 1.0f}));
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Probably because copy is not constexpr */ #ifndef CORRADE_MSVC2015_COMPATIBILITY /* Probably because copy is not constexpr */
constexpr constexpr
#endif #endif
Vec2 flipped = Vec2{1.0f, 0.4f}.flipped(); Vec2 cflipped = Vec2{1.0f, 0.4f}.flipped();
CORRADE_COMPARE(flipped, (Vec2{0.4f, 1.0f})); CORRADE_COMPARE(cflipped, (Vec2{0.4f, 1.0f}));
} }
void VectorTest::strictWeakOrdering() { void VectorTest::strictWeakOrdering() {

Write Preview
Loading…
Cancel
Save