diff --git a/src/Test/CMakeLists.txt b/src/Test/CMakeLists.txt index 2fe1df812..0aafb02ab 100644 --- a/src/Test/CMakeLists.txt +++ b/src/Test/CMakeLists.txt @@ -1,2 +1,4 @@ magnum_add_test(VectorTest VectorTest.h VectorTest.cpp) +magnum_add_test(Vector3Test Vector3Test.h Vector3Test.cpp) + magnum_add_test(MatrixTest MatrixTest.h MatrixTest.cpp) diff --git a/src/Test/Vector3Test.cpp b/src/Test/Vector3Test.cpp new file mode 100644 index 000000000..b4dead5a4 --- /dev/null +++ b/src/Test/Vector3Test.cpp @@ -0,0 +1,35 @@ +/* + Copyright © 2010 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +#include "Vector3Test.h" + +#include + +#include "Vector3.h" + +QTEST_APPLESS_MAIN(Magnum::Test::Vector3Test) + +namespace Magnum { namespace Test { + +typedef Magnum::Vector3 Vector3; + +void Vector3Test::cross() { + Vector3 a(1, -1, 1); + Vector3 b(4, 3, 7); + + QVERIFY(Vector3::cross(a, b) == Vector3(-10, -3, 7)); +} + +}} diff --git a/src/Test/Vector3Test.h b/src/Test/Vector3Test.h new file mode 100644 index 000000000..f902119c3 --- /dev/null +++ b/src/Test/Vector3Test.h @@ -0,0 +1,31 @@ +#ifndef Magnum_Test_Vector3Test_h +#define Magnum_Test_Vector3Test_h +/* + Copyright © 2010 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +#include + +namespace Magnum { namespace Test { + +class Vector3Test: public QObject { + Q_OBJECT + + private slots: + void cross(); +}; + +}} + +#endif diff --git a/src/Vector3.h b/src/Vector3.h new file mode 100644 index 000000000..f06f607bf --- /dev/null +++ b/src/Vector3.h @@ -0,0 +1,74 @@ +#ifndef Magnum_Vector3_h +#define Magnum_Vector3_h +/* + Copyright © 2010 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +/** @file + * @brief Class Magnum::Vector3 + */ + +#include "Vector.h" + +namespace Magnum { + +/** @brief Vector (three-component) */ +template class Vector3: public Vector { + public: + /** @brief Cross product */ + static Vector3 cross(const Vector3& a, const Vector3& b) { + return Vector3(a[1]*b[2]-a[2]*b[1], + a[2]*b[0]-a[0]*b[2], + a[0]*b[1]-a[1]*b[0]); + } + + /** @copydoc Vector::Vector */ + inline Vector3() {} + + /** @copydoc Vector::Vector(const T*) */ + inline Vector3(const T* data): Vector(data) {} + + /** @copydoc Vector::Vector(const Vector&) */ + inline Vector3(const Vector& other): Vector(other) {} + + /** + * @brief Constructor + * @param x X / R value + * @param y Y / G value + * @param z Z / B value + */ + inline Vector3(T x, T y, T z) { + setX(x); setY(y); setZ(z); + } + + inline T x() const { return Vector::at(0); } /**< @brief X component */ + inline T y() const { return Vector::at(1); } /**< @brief Y component */ + inline T z() const { return Vector::at(2); } /**< @brief Z component */ + + inline void setX(T value) { set(0, value); } /**< @brief Set X component */ + inline void setY(T value) { set(1, value); } /**< @brief Set Y component */ + inline void setZ(T value) { set(2, value); } /**< @brief Set Z component */ + + inline T r() const { return x(); } /**< @brief R component */ + inline T g() const { return x(); } /**< @brief G component */ + inline T b() const { return z(); } /**< @brief B component */ + + inline void setR(T value) { setX(value); } /**< @brief Set R component */ + inline void setG(T value) { setY(value); } /**< @brief Set G component */ + inline void setB(T value) { setZ(value); } /**< @brief Set B component */ +}; + +} + +#endif