From 24f7de82c04c03ea71fdd14168fdc71fc35b77fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 Jan 2014 11:15:19 +0100 Subject: [PATCH 01/79] Get rid of unnecessary internal MagnumObjects OBJECT library. It was needed for running some tests with graceful assert, but is not needed anymore. This should also fix issues with CMake-generated XCode 5 project. Also fixed a few oddities: * Setting CMAKE_SHARED_LIBRARY_CXX_FLAGS only if it's really needed. * Don't add -DGLLoadGen_EXPORTS when building Math library, as it is not needed at all. --- src/CMakeLists.txt | 33 ++++++++++++++------------------- src/Test/CMakeLists.txt | 2 +- src/magnumVisibility.h | 2 +- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b36a263b..1e41aaa82 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -94,7 +94,6 @@ set(Magnum_SRCS Trade/PhongMaterialData.cpp Trade/SceneData.cpp Trade/TextureData.cpp) -set(Magnum_OBJECTS $) # Desktop-only code if(NOT TARGET_GLES) @@ -161,7 +160,7 @@ if(NOT TARGET_GLES) set(Magnum_HEADERS ${Magnum_HEADERS} BufferTexture.h CubeMapTextureArray.h) - set(Magnum_OBJECTS ${Magnum_OBJECTS} $) + set(Magnum_SRCS ${Magnum_SRCS} $) endif() # Not-ES2 headers @@ -175,21 +174,23 @@ set(MagnumMath_SRCS Math/Functions.cpp Math/instantiation.cpp) -# Set shared library flags for the objects, as they will be part of shared lib -# TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well -add_library(MagnumMathObjects OBJECT ${MagnumMath_SRCS}) -add_library(MagnumObjects OBJECT ${Magnum_SRCS}) -set_target_properties(MagnumMathObjects PROPERTIES COMPILE_FLAGS "-DMagnumMathObjects_EXPORTS -DGLLoadGen_EXPORTS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") -set_target_properties(MagnumObjects PROPERTIES COMPILE_FLAGS "-DMagnumObjects_EXPORTS -DGLLoadGen_EXPORTS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") - # Main library +add_library(MagnumMathObjects OBJECT ${MagnumMath_SRCS}) add_library(Magnum ${SHARED_OR_STATIC} - ${Magnum_OBJECTS} + ${Magnum_SRCS} $) -if(BUILD_STATIC_PIC) + +# TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well +if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) + # Set shared library flags for the objects, as they will be part of shared lib # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(Magnum PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") + set_target_properties(MagnumMathObjects PROPERTIES COMPILE_FLAGS "-DMagnumMathObjects_EXPORTS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") + set_target_properties(Magnum PROPERTIES COMPILE_FLAGS "-DGLLoadGen_EXPORTS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") +else() + set_target_properties(MagnumMathObjects PROPERTIES COMPILE_FLAGS "-DMagnumMathObjects_EXPORTS") + set_target_properties(Magnum PROPERTIES COMPILE_FLAGS "-DGLLoadGen_EXPORTS") endif() + set(Magnum_LIBS ${CORRADE_UTILITY_LIBRARIES} ${CORRADE_PLUGINMANAGER_LIBRARIES}) @@ -257,16 +258,10 @@ if(BUILD_TESTS) set_target_properties(MagnumMathTestLib PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) target_link_libraries(MagnumMathTestLib ${CORRADE_UTILITY_LIBRARY}) - add_library(MagnumTestLib ${SHARED_OR_STATIC} - ${Magnum_OBJECTS} - $) - set_target_properties(MagnumTestLib PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) - target_link_libraries(MagnumTestLib ${Magnum_LIBS}) - # On Windows we need to install first and then run the tests to avoid "DLL # not found" hell, thus we need to install this too if(WIN32 AND NOT CMAKE_CROSSCOMPILING) - install(TARGETS MagnumMathTestLib MagnumTestLib + install(TARGETS MagnumMathTestLib RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) diff --git a/src/Test/CMakeLists.txt b/src/Test/CMakeLists.txt index d747f50b1..68a132084 100644 --- a/src/Test/CMakeLists.txt +++ b/src/Test/CMakeLists.txt @@ -33,7 +33,7 @@ corrade_add_test(ImageTest ImageTest.cpp LIBRARIES Magnum) corrade_add_test(ImageReferenceTest ImageReferenceTest.cpp LIBRARIES Magnum) corrade_add_test(MeshTest MeshTest.cpp LIBRARIES Magnum) corrade_add_test(RendererTest RendererTest.cpp LIBRARIES Magnum) -corrade_add_test(ResourceManagerTest ResourceManagerTest.cpp LIBRARIES MagnumTestLib) +corrade_add_test(ResourceManagerTest ResourceManagerTest.cpp LIBRARIES Magnum) corrade_add_test(SamplerTest SamplerTest.cpp LIBRARIES Magnum) corrade_add_test(ShaderTest ShaderTest.cpp LIBRARIES Magnum) corrade_add_test(VersionTest VersionTest.cpp LIBRARIES Magnum) diff --git a/src/magnumVisibility.h b/src/magnumVisibility.h index d85a39fff..3916257c3 100644 --- a/src/magnumVisibility.h +++ b/src/magnumVisibility.h @@ -29,7 +29,7 @@ #include "magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC - #if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) || defined(MagnumMathObjects_EXPORTS) + #if defined(Magnum_EXPORTS) || defined(MagnumMathObjects_EXPORTS) #define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT #else #define MAGNUM_EXPORT CORRADE_VISIBILITY_IMPORT From 4846b4b2ed1b165c921b4d884c6e09b12b00113a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 19:44:56 +0100 Subject: [PATCH 02/79] Math: these aren't constexpr by a long shot. --- src/Math/RectangularMatrix.h | 8 ++++---- src/Math/Vector.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index cbb0a685f..244100af0 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -76,11 +76,11 @@ template class RectangularMatrix { * @attention Use with caution, the function doesn't check whether the * array is long enough. */ - constexpr static RectangularMatrix& from(T* data) { + static RectangularMatrix& from(T* data) { return *reinterpret_cast*>(data); } /** @overload */ - constexpr static const RectangularMatrix& from(const T* data) { + static const RectangularMatrix& from(const T* data) { return *reinterpret_cast*>(data); } @@ -531,10 +531,10 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit #endif #define MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(cols, rows, ...) \ - constexpr static __VA_ARGS__& from(T* data) { \ + static __VA_ARGS__& from(T* data) { \ return *reinterpret_cast<__VA_ARGS__*>(data); \ } \ - constexpr static const __VA_ARGS__& from(const T* data) { \ + static const __VA_ARGS__& from(const T* data) { \ return *reinterpret_cast(data); \ } \ \ diff --git a/src/Math/Vector.h b/src/Math/Vector.h index 89e7b8f55..1b47329c7 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -71,11 +71,11 @@ template class Vector { * @attention Use with caution, the function doesn't check whether the * array is long enough. */ - constexpr static Vector& from(T* data) { + static Vector& from(T* data) { return *reinterpret_cast*>(data); } /** @overload */ - constexpr static const Vector& from(const T* data) { + static const Vector& from(const T* data) { return *reinterpret_cast*>(data); } @@ -1042,10 +1042,10 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit #ifndef DOXYGEN_GENERATING_OUTPUT #define MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(size, Type) \ - constexpr static Type& from(T* data) { \ + static Type& from(T* data) { \ return *reinterpret_cast*>(data); \ } \ - constexpr static const Type& from(const T* data) { \ + static const Type& from(const T* data) { \ return *reinterpret_cast*>(data); \ } \ \ From b648f9674c767fbde54807d928e539c6cd595c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 19:52:26 +0100 Subject: [PATCH 03/79] Math: constexpr *Matrix::{fromDiagonal,diagonal}() and also Matrix(T). Besides all the good things it is now possible to do even more insane and useless constexpr-fu: constexpr auto a = Math::Matrix3x3::fromDiagonal({1, 3, 2}); /* 7 0 0 7 */ constexpr Math::Matrix c(7); --- src/Math/Matrix.h | 6 +-- src/Math/Matrix3.h | 7 +--- src/Math/Matrix4.h | 8 +--- src/Math/RectangularMatrix.h | 51 ++++++++++++++----------- src/Math/Test/MatrixTest.cpp | 6 +-- src/Math/Test/RectangularMatrixTest.cpp | 30 ++++++++------- 6 files changed, 51 insertions(+), 57 deletions(-) diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h index 0a4165e21..f6f998cd4 100644 --- a/src/Math/Matrix.h +++ b/src/Math/Matrix.h @@ -69,12 +69,8 @@ template class Matrix: public RectangularMatrix(typename Implementation::GenerateSequence::Type(), Vector(value)) {} /** * @brief %Matrix from column vectors diff --git a/src/Math/Matrix3.h b/src/Math/Matrix3.h index cbcc8e972..60a64ddcd 100644 --- a/src/Math/Matrix3.h +++ b/src/Math/Matrix3.h @@ -128,13 +128,8 @@ template class Matrix3: public Matrix<3, T> { * Creates identity matrix. You can also explicitly call this * constructor with `Matrix3 m(Matrix3::Identity);`. Optional parameter * @p value allows you to specify value on diagonal. - * @todo Use constexpr implementation in Matrix, when done */ - constexpr /*implicit*/ Matrix3(typename Matrix<3, T>::IdentityType = (Matrix<3, T>::Identity), T value = T(1)): Matrix<3, T>( - Vector<3, T>(value, T(0), T(0)), - Vector<3, T>( T(0), value, T(0)), - Vector<3, T>( T(0), T(0), value) - ) {} + constexpr /*implicit*/ Matrix3(typename Matrix<3, T>::IdentityType identity = (Matrix<3, T>::Identity), T value = T(1)): Matrix<3, T>(identity, value) {} /** @brief %Matrix from column vectors */ constexpr /*implicit*/ Matrix3(const Vector3& first, const Vector3& second, const Vector3& third): Matrix<3, T>(first, second, third) {} diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index c71dfe634..e1270c132 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -190,14 +190,8 @@ template class Matrix4: public Matrix<4, T> { * Creates identity matrix. You can also explicitly call this * constructor with `Matrix4 m(Matrix4::Identity);`. Optional parameter * @p value allows you to specify value on diagonal. - * @todo Use constexpr implementation in Matrix, when done */ - constexpr /*implicit*/ Matrix4(typename Matrix<4, T>::IdentityType = (Matrix<4, T>::Identity), T value = T(1)): Matrix<4, T>( - Vector<4, T>(value, T(0), T(0), T(0)), - Vector<4, T>( T(0), value, T(0), T(0)), - Vector<4, T>( T(0), T(0), value, T(0)), - Vector<4, T>( T(0), T(0), T(0), value) - ) {} + constexpr /*implicit*/ Matrix4(typename Matrix<4, T>::IdentityType = (Matrix<4, T>::Identity), T value = T(1)): Matrix<4, T>({}, value) {} /** @brief %Matrix from column vectors */ constexpr /*implicit*/ Matrix4(const Vector4& first, const Vector4& second, const Vector4& third, const Vector4& fourth): Matrix<4, T>(first, second, third, fourth) {} diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index 244100af0..311d545c7 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -84,14 +84,6 @@ template class RectangularMatrix { return *reinterpret_cast*>(data); } - /** - * @brief Construct diagonal matrix - * - * @see diagonal() - * @todo make this constexpr - */ - static RectangularMatrix fromDiagonal(const Vector& diagonal); - /** * @brief Construct matrix from vector * @@ -103,6 +95,15 @@ template class RectangularMatrix { return *reinterpret_cast*>(vector.data()); } + /** + * @brief Construct diagonal matrix + * + * @see diagonal() + */ + constexpr static RectangularMatrix fromDiagonal(const Vector& diagonal) { + return RectangularMatrix(typename Implementation::GenerateSequence::Type(), diagonal); + } + /** @brief Construct zero-filled matrix */ constexpr /*implicit*/ RectangularMatrix() {} @@ -342,9 +343,8 @@ template class RectangularMatrix { * @brief Values on diagonal * * @see fromDiagonal() - * @todo constexpr */ - Vector diagonal() const; + constexpr Vector diagonal() const; /** * @brief Convert matrix to vector @@ -359,10 +359,16 @@ template class RectangularMatrix { return *reinterpret_cast*>(data()); } + protected: + /* Implementation for RectangularMatrix::fromDiagonal() and Matrix(T) */ + template constexpr explicit RectangularMatrix(Implementation::Sequence, const Vector& diagonal); + private: /* Implementation for RectangularMatrix::RectangularMatrix(const RectangularMatrix&) */ template constexpr explicit RectangularMatrix(Implementation::Sequence, const RectangularMatrix& matrix): _data{Vector(matrix[sequence])...} {} + template constexpr Vector diagonalInternal(Implementation::Sequence) const; + Vector _data[cols]; }; @@ -593,15 +599,17 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit } #endif -template inline RectangularMatrix RectangularMatrix::fromDiagonal(const Vector& diagonal) { - RectangularMatrix out; - - for(std::size_t i = 0; i != DiagonalSize; ++i) - out[i][i] = diagonal[i]; - - return out; +namespace Implementation { + template inline constexpr Vector diagonalMatrixColumn2(Implementation::Sequence, const T& number) { + return {(sequence == i ? number : T(0))...}; + } + template inline constexpr Vector diagonalMatrixColumn(const T& number) { + return diagonalMatrixColumn2(typename Implementation::GenerateSequence::Type(), number); + } } +template template inline constexpr RectangularMatrix::RectangularMatrix(Implementation::Sequence, const Vector& diagonal): _data{Implementation::diagonalMatrixColumn(sequence < DiagonalSize ? diagonal[sequence] : T{})...} {} + template inline Vector RectangularMatrix::row(std::size_t row) const { Vector out; @@ -641,13 +649,10 @@ template inline RectangularMatrix auto RectangularMatrix::diagonal() const -> Vector { - Vector out; - - for(std::size_t i = 0; i != DiagonalSize; ++i) - out[i] = _data[i][i]; +template inline constexpr auto RectangularMatrix::diagonal() const -> Vector { return diagonalInternal(typename Implementation::GenerateSequence::Type()); } - return out; +template template inline constexpr auto RectangularMatrix::diagonalInternal(Implementation::Sequence) const -> Vector { + return {(*this)[sequence][sequence]...}; } }} diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp index 5e8c905b9..ff67f4e30 100644 --- a/src/Math/Test/MatrixTest.cpp +++ b/src/Math/Test/MatrixTest.cpp @@ -126,9 +126,9 @@ void MatrixTest::construct() { } void MatrixTest::constructIdentity() { - Matrix4x4 identity; - Matrix4x4 identity2(Matrix4x4::Identity); - Matrix4x4 identity3(Matrix4x4::Identity, 4.0f); + constexpr Matrix4x4 identity; + constexpr Matrix4x4 identity2(Matrix4x4::Identity); + constexpr Matrix4x4 identity3(Matrix4x4::Identity, 4.0f); Matrix4x4 identityExpected(Vector4(1.0f, 0.0f, 0.0f, 0.0f), Vector4(0.0f, 1.0f, 0.0f, 0.0f), diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Math/Test/RectangularMatrixTest.cpp index 872c253ee..d53544fa4 100644 --- a/src/Math/Test/RectangularMatrixTest.cpp +++ b/src/Math/Test/RectangularMatrixTest.cpp @@ -181,18 +181,20 @@ void RectangularMatrixTest::constructFromData() { } void RectangularMatrixTest::constructFromDiagonal() { - Vector3 diagonal(-1.0f, 5.0f, 11.0f); + constexpr Vector3 diagonal(-1.0f, 5.0f, 11.0f); + constexpr auto a = Matrix3x4::fromDiagonal(diagonal); Matrix3x4 expectedA(Vector4(-1.0f, 0.0f, 0.0f, 0.0f), Vector4( 0.0f, 5.0f, 0.0f, 0.0f), Vector4( 0.0f, 0.0f, 11.0f, 0.0f)); - CORRADE_COMPARE(Matrix3x4::fromDiagonal(diagonal), expectedA); + CORRADE_COMPARE(a, expectedA); + constexpr auto b = Matrix4x3::fromDiagonal(diagonal); Matrix4x3 expectedB(Vector3(-1.0f, 0.0f, 0.0f), Vector3( 0.0f, 5.0f, 0.0f), Vector3( 0.0f, 0.0f, 11.0f), Vector3( 0.0f, 0.0f, 0.0f)); - CORRADE_COMPARE(Matrix4x3::fromDiagonal(diagonal), expectedB); + CORRADE_COMPARE(b, expectedB); } void RectangularMatrixTest::constructCopy() { @@ -387,16 +389,18 @@ void RectangularMatrixTest::transposed() { void RectangularMatrixTest::diagonal() { Vector3 diagonal(-1.0f, 5.0f, 11.0f); - Matrix4x3 a(Vector3(-1.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(a.diagonal(), diagonal); - - Matrix3x4 b(Vector4(-1.0f, 4.0f, 8.0f, 12.0f), - Vector4( 1.0f, 5.0f, 9.0f, 13.0f), - Vector4( 3.0f, 7.0f, 11.0f, 15.0f)); - CORRADE_COMPARE(b.diagonal(), diagonal); + constexpr Matrix4x3 a(Vector3(-1.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)); + constexpr Vector3 aDiagonal = a.diagonal(); + CORRADE_COMPARE(aDiagonal, diagonal); + + constexpr Matrix3x4 b(Vector4(-1.0f, 4.0f, 8.0f, 12.0f), + Vector4( 1.0f, 5.0f, 9.0f, 13.0f), + Vector4( 3.0f, 7.0f, 11.0f, 15.0f)); + constexpr Vector3 bDiagonal = b.diagonal(); + CORRADE_COMPARE(bDiagonal, diagonal); } void RectangularMatrixTest::vector() { From 01599e7d118f13858365e95818245599d97c87ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 19:59:55 +0100 Subject: [PATCH 04/79] Math: overload RectangularMatrix::diagonal() in subclasses. ...to return proper type. --- src/Math/RectangularMatrix.h | 3 +++ src/Math/Test/RectangularMatrixTest.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index 311d545c7..8f1450364 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -542,6 +542,9 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit } \ static const __VA_ARGS__& from(const T* data) { \ return *reinterpret_cast(data); \ + } \ + constexpr static __VA_ARGS__ fromDiagonal(const Vector::DiagonalSize, T>& diagonal) { \ + return Math::RectangularMatrix::fromDiagonal(diagonal); \ } \ \ __VA_ARGS__ operator-() const { \ diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Math/Test/RectangularMatrixTest.cpp index d53544fa4..689ea1fee 100644 --- a/src/Math/Test/RectangularMatrixTest.cpp +++ b/src/Math/Test/RectangularMatrixTest.cpp @@ -444,6 +444,7 @@ void RectangularMatrixTest::subclassTypes() { const Float* const cdata = nullptr; CORRADE_VERIFY((std::is_same::value)); CORRADE_VERIFY((std::is_same::value)); + CORRADE_VERIFY((std::is_same::value)); /* Const operators */ const Mat2x2 c; @@ -479,6 +480,9 @@ void RectangularMatrixTest::subclass() { CORRADE_COMPARE(Mat2x2::from(cdata), Mat2x2(Vector2(1.0f, -2.0f), Vector2(3.0f, -4.5f))); + CORRADE_COMPARE(Mat2x2::fromDiagonal({1.0f, -2.0f}), Mat2x2(Vector2(1.0f, 0.0f), + Vector2(0.0f, -2.0f))); + const Mat2x2 a(Vector2(1.0f, -3.0f), Vector2(-3.0f, 1.0f)); CORRADE_COMPARE(-a, Mat2x2(Vector2(-1.0f, 3.0f), From c3a9f429be4462d242206b4bf723f3741fd9a9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 20:00:37 +0100 Subject: [PATCH 05/79] Math: overload Matrix::diagonal() in subclasses to return proper type. --- src/Math/Matrix.h | 1 + src/Math/Test/MatrixTest.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h index f6f998cd4..bcc5c5db3 100644 --- a/src/Math/Matrix.h +++ b/src/Math/Matrix.h @@ -240,6 +240,7 @@ template inline Corrade::Utility::Debug operator<<(Co } \ \ Type transposed() const { return Matrix::transposed(); } \ + constexpr VectorType diagonal() const { return Matrix::diagonal(); } \ Type inverted() const { return Matrix::inverted(); } \ Type invertedOrthogonal() const { \ return Matrix::invertedOrthogonal(); \ diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp index ff67f4e30..d0940bc9a 100644 --- a/src/Math/Test/MatrixTest.cpp +++ b/src/Math/Test/MatrixTest.cpp @@ -314,6 +314,7 @@ void MatrixTest::subclassTypes() { CORRADE_VERIFY((std::is_same::value)); CORRADE_VERIFY((std::is_same::value)); + CORRADE_VERIFY((std::is_same::value)); CORRADE_VERIFY((std::is_same::value)); CORRADE_VERIFY((std::is_same::value)); } @@ -333,6 +334,7 @@ void MatrixTest::subclass() { CORRADE_COMPARE(a.transposed(), Mat2(Vec2(2.0f, 3.0f), Vec2(3.5f, 1.0f))); + CORRADE_COMPARE(a.diagonal(), Vec2(2.0f, 1.0f)); Mat2 c(Vec2(Constants::sqrt2()/2.0f, Constants::sqrt2()/2.0f), Vec2(-Constants::sqrt2()/2.0f, Constants::sqrt2()/2.0f)); From 340d02050752d6a48efd9d702311d8743c723118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 20:21:52 +0100 Subject: [PATCH 06/79] Math: make Matrix::Matrix(T) constexpr also under CC 4.6. --- src/Math/Matrix.h | 9 ++++++++- src/Math/Vector.h | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h index bcc5c5db3..9833bbc16 100644 --- a/src/Math/Matrix.h +++ b/src/Math/Matrix.h @@ -70,7 +70,14 @@ template class Matrix: public RectangularMatrix(typename Implementation::GenerateSequence::Type(), Vector(value)) {} + constexpr /*implicit*/ Matrix(IdentityType = Identity, T value = T(1)): RectangularMatrix(typename Implementation::GenerateSequence::Type(), + /* The original one is not constexpr under GCC 4.6 */ + #ifndef CORRADE_GCC46_COMPATIBILITY + Vector(value) + #else + Vector(typename Implementation::GenerateSequence::Type(), value) + #endif + ) {} /** * @brief %Matrix from column vectors diff --git a/src/Math/Vector.h b/src/Math/Vector.h index 1b47329c7..a8ec1e645 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -59,6 +59,11 @@ template class Vector { template friend class Vector; + #ifdef CORRADE_GCC46_COMPATIBILITY + /* So it can call internal constexpr constructor from one value */ + template friend class Matrix; + #endif + public: typedef T Type; /**< @brief Underlying data type */ const static std::size_t Size = size; /**< @brief %Vector size */ From 18682203effad0bf80042934be5cbb8524b6c279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 20:22:58 +0100 Subject: [PATCH 07/79] Don't expose unneeded ES2 extensions under ES3. They provide the same or slightly different functionality as is present in ES3 itself, causing confusion. Fortunately this change required only one modification in Context test and nowhere else. --- src/Context.cpp | 9 ++++++++- src/Extensions.h | 28 ++++++++++++++++++++++++++++ src/Test/ContextGLTest.cpp | 11 ++++------- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/Context.cpp b/src/Context.cpp index 33d8c87b1..1306cb5c5 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -213,6 +213,7 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,OES,stencil1), _extension(GL,OES,stencil4), _extension(GL,OES,texture_3D)}; + #ifdef MAGNUM_TARGET_GLES2 static const std::vector extensionsES300{ _extension(GL,ANGLE,framebuffer_blit), _extension(GL,ANGLE,framebuffer_multisample), @@ -246,6 +247,7 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,OES,required_internalformat), _extension(GL,OES,surfaceless_context)}; // done #endif + #endif switch(version) { case Version::None: return extensions; @@ -264,7 +266,12 @@ const std::vector& Extension::extensions(Version version) { case Version::GL440: return extensions440; #else case Version::GLES200: return empty; - case Version::GLES300: return extensionsES300; + case Version::GLES300: + #ifdef MAGNUM_TARGET_GLES2 + return extensionsES300; + #else + return empty; + #endif #endif } diff --git a/src/Extensions.h b/src/Extensions.h index a9df50b48..a4d3c5c53 100644 --- a/src/Extensions.h +++ b/src/Extensions.h @@ -200,56 +200,83 @@ namespace GL { #else #line 1 namespace ANGLE { + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,ANGLE,framebuffer_blit, GLES200, GLES300) // #83 _extension(GL,ANGLE,framebuffer_multisample, GLES200, GLES300) // #84 _extension(GL,ANGLE,depth_texture, GLES200, GLES300) // #138 + #endif } namespace APPLE { + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,APPLE,framebuffer_multisample, GLES200, GLES300) // #78 + #endif _extension(GL,APPLE,texture_format_BGRA8888, GLES200, None) // #79 } namespace ARM { + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,ARM,rgba8, GLES200, GLES300) // #82 + #endif } namespace CHROMIUM { _extension(GL,CHROMIUM,map_sub, GLES200, None) } namespace EXT { _extension(GL,EXT,texture_filter_anisotropic, GLES200, None) // #41 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,EXT,texture_type_2_10_10_10_REV, GLES200, GLES300) // #42 + #endif _extension(GL,EXT,texture_format_BGRA8888, GLES200, None) // #51 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,EXT,discard_framebuffer, GLES200, GLES300) // #64 _extension(GL,EXT,blend_minmax, GLES200, GLES300) // #65 + #endif _extension(GL,EXT,read_format_bgra, GLES200, None) // #66 _extension(GL,EXT,debug_label, GLES200, None) // #98 _extension(GL,EXT,debug_marker, GLES200, None) // #99 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,EXT,occlusion_query_boolean, GLES200, GLES300) // #100 + #endif _extension(GL,EXT,separate_shader_objects, GLES200, None) // #101 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,EXT,texture_rg, GLES200, GLES300) // #103 + #endif _extension(GL,EXT,sRGB, GLES200, None) // #105 _extension(GL,EXT,multisampled_render_to_texture, GLES200, None) // #106 _extension(GL,EXT,robustness, GLES200, None) // #107 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,EXT,texture_storage, GLES200, GLES300) // #108 _extension(GL,EXT,map_buffer_range, GLES200, GLES300) // #121 + #endif _extension(GL,EXT,disjoint_timer_query, GLES200, None) // #150 } namespace KHR { _extension(GL,KHR,debug, GLES200, None) // #118 } namespace NV { + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,NV,draw_buffers, GLES200, GLES300) // #91 _extension(GL,NV,fbo_color_attachments, GLES200, GLES300) // #92 _extension(GL,NV,read_buffer, GLES200, GLES300) // #93 + #endif _extension(GL,NV,read_buffer_front, GLES200, None) // #93 _extension(GL,NV,read_depth, GLES200, None) // #94 _extension(GL,NV,read_stencil, GLES200, None) // #94 _extension(GL,NV,read_depth_stencil, GLES200, None) // #94 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,NV,framebuffer_blit, GLES200, GLES300) // #142 _extension(GL,NV,framebuffer_multisample, GLES200, GLES300) // #143 + #endif _extension(GL,NV,texture_border_clamp, GLES200, None) // #149 } namespace OES { + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,OES,depth24, GLES200, GLES300) // #24 + #endif _extension(GL,OES,depth32, GLES200, None) // #25 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,OES,element_index_uint, GLES200, GLES300) // #26 + #endif _extension(GL,OES,mapbuffer, GLES200, None) // #29 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,OES,rgb8_rgba8, GLES200, GLES300) // #30 + #endif _extension(GL,OES,stencil1, GLES200, None) // #31 _extension(GL,OES,stencil4, GLES200, None) // #32 _extension(GL,OES,texture_3D, GLES200, None) // #34 + #ifdef MAGNUM_TARGET_GLES2 _extension(GL,OES,texture_half_float_linear, GLES200, GLES300) // #35 _extension(GL,OES,texture_float_linear, GLES200, GLES300) // #35 _extension(GL,OES,texture_half_float, GLES200, GLES300) // #36 @@ -261,6 +288,7 @@ namespace GL { _extension(GL,OES,vertex_array_object, GLES200, GLES300) // #71 _extension(GL,OES,required_internalformat, GLES200, GLES300) // #115 _extension(GL,OES,surfaceless_context, GLES200, GLES300) // #116 + #endif } #endif } diff --git a/src/Test/ContextGLTest.cpp b/src/Test/ContextGLTest.cpp index 74c74d49d..44b1ef6a9 100644 --- a/src/Test/ContextGLTest.cpp +++ b/src/Test/ContextGLTest.cpp @@ -101,18 +101,15 @@ void ContextGLTest::unsupportedExtension() { void ContextGLTest::pastExtension() { #ifndef MAGNUM_TARGET_GLES if(!Context::current()->isVersionSupported(Version::GL300)) - CORRADE_SKIP("No already supported extensions exist in OpenGL 2.1"); + CORRADE_SKIP("No already supported extensions are listed for OpenGL 2.1"); CORRADE_VERIFY(Context::current()->isExtensionSupported()); /* No assertion should be fired */ MAGNUM_ASSERT_EXTENSION_SUPPORTED(Extensions::GL::APPLE::vertex_array_object); + #elif defined(MAGNUM_TARGET_GLES2) + CORRADE_SKIP("No already supported extensions are listed for OpenGL ES 2.0"); #else - if(!Context::current()->isVersionSupported(Version::GLES300)) - CORRADE_SKIP("No already supported extensions exist in OpenGL ES 2.0"); - - CORRADE_VERIFY(Context::current()->isExtensionSupported()); - /* No assertion should be fired */ - MAGNUM_ASSERT_EXTENSION_SUPPORTED(Extensions::GL::EXT::texture_rg); + CORRADE_SKIP("No already supported extensions are listed for OpenGL ES 3.0"); #endif } From 18eb3cd0dcfa6a0cf672293b03a0e8392f63a258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 20:24:47 +0100 Subject: [PATCH 08/79] Update and fix documentation, remove obsolete TODO. Don't link to inexistent or deprecated things. --- src/AbstractShaderProgram.h | 27 ++++++++++++--------------- src/Mesh.h | 1 - 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index df2dd6ce6..9b14b8111 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -270,32 +270,29 @@ See @ref types for more information, only types with GLSL equivalent can be used @ref Magnum::Vector4i "Vector4i") or unsigned integer uniforms (i.e. @ref Magnum::UnsignedInt "UnsignedInt", @ref Magnum::Vector2ui "Vector2ui", @ref Magnum::Vector3ui "Vector3ui" and @ref Magnum::Vector4ui "Vector4ui"). -@requires_gles30 Integer attributes and unsigned integer uniforms are not - available in OpenGL ES 2.0. - @requires_gl40 %Extension @extension{ARB,gpu_shader_fp64} is required when using double uniforms (i.e. @ref Magnum::Double "Double", @ref Magnum::Vector2d "Vector2d", @ref Magnum::Vector3d "Vector3d", - @ref Magnum::Vector4d "Vector4d", @ref Magnum::Matrix2d "Matrix2d", - @ref Magnum::Matrix3d "Matrix3d", @ref Magnum::Matrix4d "Matrix4d", + @ref Magnum::Vector4d "Vector4d", @ref Magnum::Matrix2x2d "Matrix2x2d", + @ref Magnum::Matrix3x3d "Matrix3x3d", @ref Magnum::Matrix4x4d "Matrix4x4d", @ref Magnum::Matrix2x3d "Matrix2x3d", @ref Magnum::Matrix3x2d "Matrix3x2d", @ref Magnum::Matrix2x4d "Matrix2x4d", @ref Magnum::Matrix4x2d "Matrix4x2d", @ref Magnum::Matrix3x4d "Matrix3x4d" and @ref Magnum::Matrix4x3d "Matrix4x3d"). @requires_gl41 %Extension @extension{ARB,vertex_attrib_64bit} is required when using double attributes (i.e. @ref Magnum::Double "Double", @ref Magnum::Vector2d "Vector2d", @ref Magnum::Vector3d "Vector3d", - @ref Magnum::Vector4d "Vector4d", @ref Magnum::Matrix2d "Matrix2d", - @ref Magnum::Matrix3d "Matrix3d", @ref Magnum::Matrix4d "Matrix4d", + @ref Magnum::Vector4d "Vector4d", @ref Magnum::Matrix2x2d "Matrix2x2d", + @ref Magnum::Matrix3x3d "Matrix3x3d", @ref Magnum::Matrix4x4d "Matrix4x4d", @ref Magnum::Matrix2x3d "Matrix2x3d", @ref Magnum::Matrix3x2d "Matrix3x2d", @ref Magnum::Matrix2x4d "Matrix2x4d", @ref Magnum::Matrix4x2d "Matrix4x2d", @ref Magnum::Matrix3x4d "Matrix3x4d" and @ref Magnum::Matrix4x3d "Matrix4x3d"). -@requires_gl Double attributes and uniforms are not available in OpenGL ES. -@requires_gles30 Non-square matrix attributes and uniforms (i.e. - @ref Magnum::Matrix2x3 "Matrix2x3", @ref Magnum::Matrix3x2 "Matrix3x2", - @ref Magnum::Matrix2x4 "Matrix2x4", @ref Magnum::Matrix4x2d "Matrix4x2", - @ref Magnum::Matrix3x4 "Matrix3x4" and @ref Magnum::Matrix4x3 "Matrix4x3") - are not available in OpenGL ES 2.0. +@requires_gles30 Integer attributes, unsigned integer uniforms and non-square + matrix attributes and uniforms (i.e. @ref Magnum::Matrix2x3 "Matrix2x3", + @ref Magnum::Matrix3x2 "Matrix3x2", @ref Magnum::Matrix2x4 "Matrix2x4", + @ref Magnum::Matrix4x2d "Matrix4x2", @ref Magnum::Matrix3x4 "Matrix3x4" and + @ref Magnum::Matrix4x3 "Matrix4x3") are not available in OpenGL ES 2.0. +@requires_gl Double attributes and uniforms are not available in OpenGL ES. @section AbstractShaderProgram-performance-optimization Performance optimizations @@ -1158,7 +1155,7 @@ to floating-point shader inputs. In this case you may want to normalize the values (e.g. color components from 0-255 to 0.0f - 1.0f) -- see @ref DataOption::Normalize. Only some types are allowed as attribute types, see @ref AbstractShaderProgram-types -or TypeTraits::AttributeType for more information. +for more information. See @ref AbstractShaderProgram-subclassing for example usage in shaders and @ref Mesh-configuration for example usage when adding vertex buffers to mesh. @@ -1296,7 +1293,7 @@ template class AbstractShaderProgram::Attribute { * Normalize integer components. Only for float attribute types. * Default is to not normalize. */ - Normalize = 1 << 0 + Normalized = 1 << 0 }; #else typedef typename Implementation::Attribute::DataOption DataOption; diff --git a/src/Mesh.h b/src/Mesh.h index 893615125..f6dadbf7c 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -552,7 +552,6 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { * @fn_gl_extension{EnableVertexArrayAttrib,EXT,direct_state_access}, * @fn_gl_extension{VertexArrayVertexAttribOffset,EXT,direct_state_access} * if @extension{APPLE,vertex_array_object} is available - * @todoc Add back the *s when Doxygen is sane again */ template inline Mesh& addVertexBuffer(Buffer& buffer, GLintptr offset, const T&... attributes) { addVertexBufferInternal(buffer, offset, strideOfInterleaved(attributes...), attributes...); From 1b9ff6a2dfc31781697afb26a35fd50bb14b79ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2014 20:25:39 +0100 Subject: [PATCH 09/79] Test Mesh::indexSize(). I wonder if it is possible to test the function even more. --- src/Test/MeshTest.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Test/MeshTest.cpp b/src/Test/MeshTest.cpp index afe8d57db..b3b4fe283 100644 --- a/src/Test/MeshTest.cpp +++ b/src/Test/MeshTest.cpp @@ -34,6 +34,8 @@ class MeshTest: public TestSuite::Tester { public: MeshTest(); + void indexSize(); + void debugPrimitive(); void debugIndexType(); void configurationPrimitive(); @@ -41,12 +43,20 @@ class MeshTest: public TestSuite::Tester { }; MeshTest::MeshTest() { - addTests({&MeshTest::debugPrimitive, + addTests({&MeshTest::indexSize, + + &MeshTest::debugPrimitive, &MeshTest::debugIndexType, &MeshTest::configurationPrimitive, &MeshTest::configurationIndexType}); } +void MeshTest::indexSize() { + CORRADE_COMPARE(Mesh::indexSize(Mesh::IndexType::UnsignedByte), 1); + CORRADE_COMPARE(Mesh::indexSize(Mesh::IndexType::UnsignedShort), 2); + CORRADE_COMPARE(Mesh::indexSize(Mesh::IndexType::UnsignedInt), 4); +} + void MeshTest::debugPrimitive() { std::ostringstream o; Debug(&o) << MeshPrimitive::TriangleFan; From 7530605f2966f43ef4c77a3bead1b7920b5c1f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 6 Jan 2014 23:49:55 +0100 Subject: [PATCH 10/79] Documentation update for shader classes. --- src/AbstractShaderProgram.h | 103 +++++++++++++++++++----------------- src/Shader.h | 17 +++--- 2 files changed, 65 insertions(+), 55 deletions(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 9b14b8111..edc16ea46 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::AbstractShaderProgram + * @brief Class @ref Magnum::AbstractShaderProgram */ #include @@ -48,38 +48,38 @@ namespace Implementation { This class is designed to be used via subclassing. Subclasses define these functions and properties: - - %Attribute definitions with location and type for - configuring meshes, for example: +- %Attribute definitions with location and type for + configuring meshes, for example: @code typedef Attribute<0, Vector3> Position; typedef Attribute<1, Vector3> Normal; typedef Attribute<2, Vector2> TextureCoordinates; @endcode - - **Output attribute locations**, if desired, for example: +- **Output attribute locations**, if desired, for example: @code enum: UnsignedInt { ColorOutput = 0, NormalOutput = 1 }; @endcode - - **Layers for texture uniforms** to which the textures will be bound before - rendering, for example: +- **Layers for texture uniforms** to which the textures will be bound before + rendering, for example: @code enum: Int { DiffuseTextureLayer = 0, SpecularTextureLayer = 1 }; @endcode - - **Uniform locations** for setting uniform data (see below) (private - variables), for example: +- **Uniform locations** for setting uniform data (see below) (private + variables), for example: @code Int TransformationUniform = 0, ProjectionUniform = 1, DiffuseTextureUniform = 2, SpecularTextureUniform = 3; @endcode - - **Constructor**, which attaches particular shaders, links the program and - gets uniform locations, for example: +- **Constructor**, which attaches particular shaders, links the program and + gets uniform locations, for example: @code MyShader() { // Load shaders, compile them and attach them to the program @@ -97,9 +97,9 @@ MyShader() { CORRADE_INTERNAL_ASSERT_OUTPUT(link()); } @endcode - - **Uniform setting functions**, which will provide public interface for - protected setUniform() functions. For usability purposes you can implement - also method chaining. Example: +- **Uniform setting functions**, which will provide public interface for + protected @ref setUniform() functions. For usability purposes you can + implement also method chaining. Example: @code MyShader& setTransformation(const Matrix4& matrix) { setUniform(TransformationUniform, matrix); @@ -113,9 +113,9 @@ MyShader& setProjection(const Matrix4& matrix) { @subsection AbstractShaderProgram-attribute-location Binding attribute location -The preferred workflow is to specify attribute location for vertex shader -input attributes and fragment shader output attributes explicitly in the -shader code, e.g.: +The preferred workflow is to specify attribute location for vertex shader input +attributes and fragment shader output attributes explicitly in the shader code, +e.g.: @code // GLSL 3.30, or #extension GL_ARB_explicit_attrib_location: enable @@ -124,9 +124,9 @@ layout(location = 1) in vec3 normal; layout(location = 2) in vec2 textureCoordinates; @endcode -Similarly for ouput attributes, you can also specify blend equation color -index for them (see Framebuffer::BlendFunction for more information about -using color input index): +Similarly for ouput attributes, you can also specify blend equation color index +for them (see @ref Renderer::BlendFunction for more information about using +color input index): @code layout(location = 0, index = 0) out vec4 color; layout(location = 1, index = 1) out vec3 normal; @@ -161,14 +161,14 @@ bindFragmentDataLocationIndexed(NormalOutput, 1, "normal"); @see @ref Mesh::maxVertexAttributes(), @ref AbstractFramebuffer::maxDrawBuffers() @requires_gl30 %Extension @extension{EXT,gpu_shader4} for using - bindFragmentDataLocation(). + @ref bindFragmentDataLocation(). @requires_gl33 %Extension @extension{ARB,blend_func_extended} for using - bindFragmentDataLocationIndexed(). + @ref bindFragmentDataLocationIndexed(). @requires_gl33 %Extension @extension{ARB,explicit_attrib_location} for - explicit attribute location instead of using bindAttributeLocation(), - bindFragmentDataLocation() or bindFragmentDataLocationIndexed(). + explicit attribute location instead of using @ref bindAttributeLocation(), + @ref bindFragmentDataLocation() or @ref bindFragmentDataLocationIndexed(). @requires_gles30 Explicit location specification of input attributes is not - supported in OpenGL ES 2.0, use bindAttributeLocation() instead. + supported in OpenGL ES 2.0, use @ref bindAttributeLocation() instead. @requires_gles30 Multiple fragment shader outputs are not available in OpenGL ES 2.0, similar functionality is available in extension @es_extension{NV,draw_buffers}. @@ -199,9 +199,9 @@ Int projectionUniform = uniformLocation("projection"); @see @ref maxUniformLocations() @requires_gl43 %Extension @extension{ARB,explicit_uniform_location} for - explicit uniform location instead of using uniformLocation(). + explicit uniform location instead of using @ref uniformLocation(). @requires_gl Explicit uniform location is not supported in OpenGL ES. Use - uniformLocation() instead. + @ref uniformLocation() instead. @subsection AbstractShaderProgram-texture-layer Binding texture layer uniforms @@ -244,8 +244,8 @@ for more information) and map shader outputs to framebuffer attachments if needed (see @ref Framebuffer-usage "Framebuffer documentation" for more information). In each draw event set uniforms, mark the shader for use, bind specific framebuffer (if needed) and bind required textures to their -respective layers using AbstractTexture::bind(Int). Then call Mesh::draw(). -Example: +respective layers using @ref AbstractTexture::bind(Int). Then call +@ref Mesh::draw(). Example: @code shader.setTransformation(transformation) .setProjection(projection) @@ -260,7 +260,8 @@ mesh.draw(); @section AbstractShaderProgram-types Mapping between GLSL and Magnum types See @ref types for more information, only types with GLSL equivalent can be used -(and their super- or subclasses with the same size and underlying type). +(and their super- or subclasses with the same size and underlying type). See +also @ref Attribute::DataType enum for additional type options. @requires_gl30 %Extension @extension{EXT,gpu_shader4} is required when using integer attributes (i.e. @ref Magnum::UnsignedInt "UnsignedInt", @@ -300,10 +301,10 @@ The engine tracks currently used shader program to avoid unnecessary calls to @fn_gl{UseProgram}. %Shader limits (such as @ref maxVertexAttributes()) are cached, so repeated queries don't result in repeated @fn_gl{Get} calls. -If extension @extension{ARB,separate_shader_objects} or +If extension @extension{ARB,separate_shader_objects} (part of OpenGL 4.1) or @extension{EXT,direct_state_access} is available, uniform setting functions use DSA functions to avoid unnecessary calls to @fn_gl{UseProgram}. See -setUniform() documentation for more information. +@ref setUniform() documentation for more information. To achieve least state changes, set all uniforms in one run -- method chaining comes in handy. @@ -606,11 +607,11 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { /** * @brief Bind fragment data to given location and color input index * @param location Location - * @param name Fragment output variable name * @param index Blend equation color input index (`0` or `1`) + * @param name Fragment output variable name * * Binds fragment data to location which is used later for framebuffer - * operations. See also Framebuffer::BlendFunction for more + * operations. See also @ref Renderer::BlendFunction for more * information about using color input index. * @deprecated_gl Preferred usage is to specify attribute location * explicitly in the shader instead of using this function. See @@ -628,12 +629,13 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * @param location Location * @param name Fragment output variable name * - * The same as bindFragmentDataLocationIndexed(), but with `index` set - * to `0`. + * The same as @ref bindFragmentDataLocationIndexed(), but with `index` + * set to `0`. * @see @fn_gl{BindFragDataLocation} * @requires_gl30 %Extension @extension{EXT,gpu_shader4} * @requires_gl Use explicit location specification in OpenGL ES 3.0 - * instead. + * and `gl_FragData[n]` provided by @es_extension2{NV,draw_buffers,GL_NV_draw_buffers} + * in OpenGL ES 2.0. */ void bindFragmentDataLocation(UnsignedInt location, const std::string& name); #endif @@ -643,7 +645,7 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * * Returns `false` if linking failed, `true` otherwise. Compiler * message (if any) is printed to error output. All attached shaders - * must be explicitly compiled with Shader::compile() before linking. + * must be compiled with @ref Shader::compile() before linking. * @see @fn_gl{LinkProgram}, @fn_gl{GetProgram} with * @def_gl{LINK_STATUS} and @def_gl{INFO_LOG_LENGTH}, * @fn_gl{GetProgramInfoLog} @@ -668,7 +670,8 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * @param value Value * * Convenience alternative for setting one value, see - * setUniform(Int, UnsignedInt, const Float*) for more information. + * @ref setUniform(Int, UnsignedInt, const Float*) for more + * information. */ #ifdef DOXYGEN_GENERATING_OUTPUT template inline void setUniform(Int location, const T& value); @@ -703,10 +706,10 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * @param count Value count * @param values Values * - * If neither @extension{ARB,separate_shader_objects} nor - * @extension{EXT,direct_state_access} is available, the shader is - * marked for use before the operation. - * @see setUniform(Int, const T&), @fn_gl{UseProgram}, @fn_gl{Uniform} + * If neither @extension{ARB,separate_shader_objects} (part of OpenGL + * 4.1) nor @extension{EXT,direct_state_access} is available, the + * shader is marked for use before the operation. + * @see @ref setUniform(Int, const T&), @fn_gl{UseProgram}, @fn_gl{Uniform} * or @fn_gl{ProgramUniform}/@fn_gl_extension{ProgramUniform,EXT,direct_state_access}. */ void setUniform(Int location, UnsignedInt count, const Float* values) { @@ -1170,7 +1173,7 @@ template class AbstractShaderProgram::Attribute { * @brief Type * * Type used in shader code. - * @see DataType + * @see @ref DataType */ typedef typename Implementation::Attribute::Type Type; @@ -1213,12 +1216,13 @@ template class AbstractShaderProgram::Attribute { #ifndef MAGNUM_TARGET_GLES /** * Four components with BGRA ordering. Only for four-component - * float vector type. + * float vector type. Must be used along with @ref DataType::UnsignedByte + * and @ref DataOption::Normalized. * @requires_gl32 %Extension @extension{ARB,vertex_array_bgra} * @requires_gl Only RGBA component ordering is supported in OpenGL * ES. */ - BGRA = 1 << 1 + BGRA = GL_BGRA #endif }; #else @@ -1229,7 +1233,7 @@ template class AbstractShaderProgram::Attribute { * @brief Data type * * Type of data passed to shader. - * @see Type, DataOptions, Attribute() + * @see @ref Type, @ref DataOptions, @ref Attribute() */ #ifdef DOXYGEN_GENERATING_OUTPUT enum class DataType: GLenum { @@ -1285,7 +1289,7 @@ template class AbstractShaderProgram::Attribute { /** * @brief Data option - * @see DataOptions, Attribute() + * @see @ref DataOptions, @ref Attribute() */ #ifdef DOXYGEN_GENERATING_OUTPUT enum class DataOption: UnsignedByte { @@ -1301,7 +1305,7 @@ template class AbstractShaderProgram::Attribute { /** * @brief Data options - * @see Attribute() + * @see @ref Attribute() */ #ifdef DOXYGEN_GENERATING_OUTPUT typedef typename Containers::EnumSet DataOptions; @@ -1313,7 +1317,8 @@ template class AbstractShaderProgram::Attribute { * @brief Constructor * @param components Component count * @param dataType Type of passed data. Default is the same as - * type used in shader (e.g. DataType::Integer for Vector4i). + * type used in shader (e.g. @ref DataType::Integer for + * @ref Vector4i). * @param dataOptions Data options. Default is no options. */ constexpr Attribute(Components components, DataType dataType = Implementation::Attribute::DefaultDataType, DataOptions dataOptions = DataOptions()): _components(components), _dataType(dataType), _dataOptions(dataOptions) {} diff --git a/src/Shader.h b/src/Shader.h index 57680b960..952e9e046 100644 --- a/src/Shader.h +++ b/src/Shader.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::Shader + * @brief Class @ref Magnum::Shader */ #include @@ -40,7 +40,12 @@ namespace Magnum { /** @brief %Shader -See AbstractShaderProgram for more information. +See @ref AbstractShaderProgram for more information. + +@section Shader-performance-optimization Performance optimizations + +%Shader limits and implementation-defined values (such as @ref maxUniformComponents()) +are cached, so repeated queries don't result in repeated @fn_gl{Get} calls. */ class MAGNUM_EXPORT Shader: public AbstractObject { public: @@ -430,7 +435,7 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * @param type %Shader type * * Creates empty OpenGL shader and adds @c \#version directive at the - * beginning. Sources can be added with addSource() or addFile(). + * beginning. * @see @fn_gl{CreateShader} */ explicit Shader(Version version, Type type); @@ -498,7 +503,7 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * Adds given source to source list, preceeded with @c \#line directive * marking first line of the source as `n(1)` where n is number of * added source. If passed string is empty, the function does nothing. - * @see addFile() + * @see @ref addFile() */ Shader& addSource(std::string source); @@ -507,8 +512,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * @param filename Name of source file to read from * @return Reference to self (for method chaining) * - * The file must exist and must be readable. Calls addSource() with - * the contents. + * The file must exist and must be readable. Calls @ref addSource() + * with the contents. */ Shader& addFile(const std::string& filename); From 4d252ac6438bf58b20386d111fcb84124cf0de86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:20:51 +0100 Subject: [PATCH 11/79] Fully test shader functionality. --- src/Test/AbstractShaderProgramGLTest.cpp | 291 +++++++++++++++++- .../MyShader.frag | 7 + .../MyShader.vert | 7 + .../MyShaderFragmentOutputs.frag | 7 + .../resources.conf | 10 + src/Test/CMakeLists.txt | 13 +- src/Test/ShaderGLTest.cpp | 83 ++++- src/Test/ShaderGLTestConfigure.h.cmake | 25 ++ src/Test/ShaderGLTestFiles/shader.glsl | 1 + 9 files changed, 425 insertions(+), 19 deletions(-) create mode 100644 src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag create mode 100644 src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert create mode 100644 src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag create mode 100644 src/Test/AbstractShaderProgramGLTestFiles/resources.conf create mode 100644 src/Test/ShaderGLTestConfigure.h.cmake create mode 100644 src/Test/ShaderGLTestFiles/shader.glsl diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Test/AbstractShaderProgramGLTest.cpp index 2f0ac36fe..3c9ef6fa7 100644 --- a/src/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Test/AbstractShaderProgramGLTest.cpp @@ -22,9 +22,14 @@ DEALINGS IN THE SOFTWARE. */ +#include + +#include "Math/Matrix.h" +#include "Math/Vector4.h" #include "AbstractShaderProgram.h" #include "Context.h" #include "Extensions.h" +#include "Shader.h" #include "Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { @@ -38,6 +43,17 @@ class AbstractShaderProgramGLTest: public AbstractOpenGLTester { void constructMove(); void label(); + + void create(); + void createMultipleOutputs(); + #ifndef MAGNUM_TARGET_GLES + void createMultipleOutputsIndexed(); + #endif + + void uniform(); + void uniformVector(); + void uniformMatrix(); + void uniformArray(); }; AbstractShaderProgramGLTest::AbstractShaderProgramGLTest() { @@ -45,21 +61,30 @@ AbstractShaderProgramGLTest::AbstractShaderProgramGLTest() { &AbstractShaderProgramGLTest::constructCopy, &AbstractShaderProgramGLTest::constructMove, - &AbstractShaderProgramGLTest::label}); -} + &AbstractShaderProgramGLTest::label, -namespace { + &AbstractShaderProgramGLTest::create, + &AbstractShaderProgramGLTest::createMultipleOutputs, + #ifndef MAGNUM_TARGET_GLES + &AbstractShaderProgramGLTest::createMultipleOutputsIndexed, + #endif -class MyShader: public AbstractShaderProgram { - public: - explicit MyShader() {} -}; + &AbstractShaderProgramGLTest::uniform, + &AbstractShaderProgramGLTest::uniformVector, + &AbstractShaderProgramGLTest::uniformMatrix, + &AbstractShaderProgramGLTest::uniformArray}); +} +namespace { + class DummyShader: public AbstractShaderProgram { + public: + explicit DummyShader() {} + }; } void AbstractShaderProgramGLTest::construct() { { - const MyShader shader; + const DummyShader shader; MAGNUM_VERIFY_NO_ERROR(); CORRADE_VERIFY(shader.id() > 0); @@ -69,26 +94,26 @@ void AbstractShaderProgramGLTest::construct() { } void AbstractShaderProgramGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); + CORRADE_VERIFY(!(std::is_constructible{})); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_assignable{})); #endif } void AbstractShaderProgramGLTest::constructMove() { - MyShader a; + DummyShader a; const Int id = a.id(); MAGNUM_VERIFY_NO_ERROR(); CORRADE_VERIFY(id > 0); - MyShader b(std::move(a)); + DummyShader b(std::move(a)); CORRADE_COMPARE(a.id(), 0); CORRADE_COMPARE(b.id(), id); - MyShader c; + DummyShader c; const Int cId = c.id(); c = std::move(b); @@ -104,11 +129,245 @@ void AbstractShaderProgramGLTest::label() { !Context::current()->isExtensionSupported()) CORRADE_SKIP("Required extension is not available"); - MyShader shader; + DummyShader shader; CORRADE_COMPARE(shader.label(), ""); - shader.setLabel("MyShader"); - CORRADE_COMPARE(shader.label(), "MyShader"); + shader.setLabel("DummyShader"); + CORRADE_COMPARE(shader.label(), "DummyShader"); + + MAGNUM_VERIFY_NO_ERROR(); +} + +namespace { + struct MyPublicShader: AbstractShaderProgram { + using AbstractShaderProgram::attachShader; + using AbstractShaderProgram::bindAttributeLocation; + #ifndef MAGNUM_TARGET_GLES + using AbstractShaderProgram::bindFragmentDataLocationIndexed; + using AbstractShaderProgram::bindFragmentDataLocation; + #endif + using AbstractShaderProgram::link; + using AbstractShaderProgram::uniformLocation; + }; +} + +void AbstractShaderProgramGLTest::create() { + Utility::Resource rs("MyShader"); + + #ifndef MAGNUM_TARGET_GLES + Shader vert(Version::GL210, Shader::Type::Vertex); + #else + Shader vert(Version::GLES200, Shader::Type::Vertex); + #endif + vert.addSource(rs.get("MyShader.vert")); + const bool vertCompiled = vert.compile(); + + #ifndef MAGNUM_TARGET_GLES + Shader frag(Version::GL210, Shader::Type::Fragment); + #else + Shader frag(Version::GLES200, Shader::Type::Fragment); + #endif + frag.addSource(rs.get("MyShader.frag")); + const bool fragCompiled = frag.compile(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(vertCompiled); + CORRADE_VERIFY(fragCompiled); + + MyPublicShader program; + program.attachShader(vert); + program.attachShader(frag); + + MAGNUM_VERIFY_NO_ERROR(); + + program.bindAttributeLocation(0, "position"); + const bool linked = program.link(); + const bool valid = program.validate().first; + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(linked); + CORRADE_VERIFY(valid); + + const Int matrixUniform = program.uniformLocation("matrix"); + const Int multiplierUniform = program.uniformLocation("multiplier"); + const Int colorUniform = program.uniformLocation("color"); + const Int additionsUniform = program.uniformLocation("additions"); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(matrixUniform >= 0); + CORRADE_VERIFY(multiplierUniform >= 0); + CORRADE_VERIFY(colorUniform >= 0); + CORRADE_VERIFY(additionsUniform >= 0); + + program.use(); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void AbstractShaderProgramGLTest::createMultipleOutputs() { + #ifndef MAGNUM_TARGET_GLES + Utility::Resource rs("MyShader"); + + Shader vert(Version::GL210, Shader::Type::Vertex); + vert.addSource(rs.get("MyShader.vert")); + const bool vertCompiled = vert.compile(); + + Shader frag(Version::GL300, Shader::Type::Fragment); + frag.addSource(rs.get("MyShaderFragmentOutputs.frag")); + const bool fragCompiled = frag.compile(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(vertCompiled); + CORRADE_VERIFY(fragCompiled); + + MyPublicShader program; + program.attachShader(vert); + program.attachShader(frag); + + MAGNUM_VERIFY_NO_ERROR(); + + program.bindAttributeLocation(0, "position"); + program.bindFragmentDataLocation(0, "first"); + program.bindFragmentDataLocation(1, "second"); + const bool linked = program.link(); + const bool valid = program.validate().first; + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(linked); + CORRADE_VERIFY(valid); + + program.use(); + + MAGNUM_VERIFY_NO_ERROR(); + #elif !defined(MAGNUM_TARGET_GLES2) + CORRADE_SKIP("Only explicit location specification supported in ES 3.0."); + #else + CORRADE_SKIP("Only gl_FragData[n] supported in ES 2.0."); + #endif +} + +#ifndef MAGNUM_TARGET_GLES +void AbstractShaderProgramGLTest::createMultipleOutputsIndexed() { + Utility::Resource rs("MyShader"); + + Shader vert(Version::GL210, Shader::Type::Vertex); + vert.addSource(rs.get("MyShader.vert")); + const bool vertCompiled = vert.compile(); + + Shader frag(Version::GL300, Shader::Type::Fragment); + frag.addSource(rs.get("MyShaderFragmentOutputs.frag")); + const bool fragCompiled = frag.compile(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(vertCompiled); + CORRADE_VERIFY(fragCompiled); + + MyPublicShader program; + program.attachShader(vert); + program.attachShader(frag); + + MAGNUM_VERIFY_NO_ERROR(); + + program.bindAttributeLocation(0, "position"); + program.bindFragmentDataLocationIndexed(0, 0, "first"); + program.bindFragmentDataLocationIndexed(0, 1, "second"); + const bool linked = program.link(); + const bool valid = program.validate().first; + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(linked); + CORRADE_VERIFY(valid); + + program.use(); + + MAGNUM_VERIFY_NO_ERROR(); +} +#endif + +namespace { + struct MyShader: AbstractShaderProgram { + explicit MyShader(); + + using AbstractShaderProgram::setUniform; + + Int matrixUniform, + multiplierUniform, + colorUniform, + additionsUniform; + }; +} + +MyShader::MyShader() { + Utility::Resource rs("MyShader"); + + #ifndef MAGNUM_TARGET_GLES + Shader vert(Version::GL210, Shader::Type::Vertex); + #else + Shader vert(Version::GLES200, Shader::Type::Vertex); + #endif + vert.addSource(rs.get("MyShader.vert")) + .compile(); + attachShader(vert); + + #ifndef MAGNUM_TARGET_GLES + Shader frag(Version::GL210, Shader::Type::Fragment); + #else + Shader frag(Version::GLES200, Shader::Type::Fragment); + #endif + frag.addSource(rs.get("MyShader.frag")) + .compile(); + attachShader(frag); + + bindAttributeLocation(0, "position"); + link(); + + matrixUniform = uniformLocation("matrix"); + multiplierUniform = uniformLocation("multiplier"); + colorUniform = uniformLocation("color"); + additionsUniform = uniformLocation("additions"); +} + +void AbstractShaderProgramGLTest::uniform() { + MyShader shader; + + MAGNUM_VERIFY_NO_ERROR(); + + shader.setUniform(shader.multiplierUniform, 0.35f); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void AbstractShaderProgramGLTest::uniformVector() { + MyShader shader; + + MAGNUM_VERIFY_NO_ERROR(); + + shader.setUniform(shader.colorUniform, Vector4(0.3f, 0.7f, 1.0f, 0.25f)); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void AbstractShaderProgramGLTest::uniformMatrix() { + MyShader shader; + + MAGNUM_VERIFY_NO_ERROR(); + + shader.setUniform(shader.matrixUniform, Matrix4x4::fromDiagonal({0.3f, 0.7f, 1.0f, 0.25f})); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void AbstractShaderProgramGLTest::uniformArray() { + MyShader shader; + + MAGNUM_VERIFY_NO_ERROR(); + + constexpr Vector4 values[] = { + {0.5f, 1.0f, 0.4f, 0.0f}, + {0.0f, 0.1f, 0.7f, 0.3f}, + {0.9f, 0.8f, 0.3f, 0.1f} + }; + shader.setUniform(shader.additionsUniform, 3, values); MAGNUM_VERIFY_NO_ERROR(); } diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag b/src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag new file mode 100644 index 000000000..39b15b1a2 --- /dev/null +++ b/src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag @@ -0,0 +1,7 @@ +uniform lowp float multiplier; +uniform lowp vec4 color; +uniform lowp vec4 additions[3]; + +void main() { + gl_FragColor = color*multiplier + additions[0] + additions[1] + additions[2]; +} diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert b/src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert new file mode 100644 index 000000000..3d2907e68 --- /dev/null +++ b/src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert @@ -0,0 +1,7 @@ +attribute mediump vec4 position; + +uniform mediump mat4 matrix; + +void main() { + gl_Position = matrix*position; +} diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag b/src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag new file mode 100644 index 000000000..ae85b17ba --- /dev/null +++ b/src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag @@ -0,0 +1,7 @@ +out vec4 first; +out vec3 second; + +void main() { + first = vec4(1.0, 0.3, 0.5, 0.1); + second = vec3(0.5, 0.7, 0.4); +} diff --git a/src/Test/AbstractShaderProgramGLTestFiles/resources.conf b/src/Test/AbstractShaderProgramGLTestFiles/resources.conf new file mode 100644 index 000000000..51723f0ab --- /dev/null +++ b/src/Test/AbstractShaderProgramGLTestFiles/resources.conf @@ -0,0 +1,10 @@ +group=MyShader + +[file] +filename=MyShader.frag + +[file] +filename=MyShader.vert + +[file] +filename=MyShaderFragmentOutputs.frag diff --git a/src/Test/CMakeLists.txt b/src/Test/CMakeLists.txt index 68a132084..9ad7c65f9 100644 --- a/src/Test/CMakeLists.txt +++ b/src/Test/CMakeLists.txt @@ -41,7 +41,6 @@ corrade_add_test(VersionTest VersionTest.cpp LIBRARIES Magnum) if(BUILD_GL_TESTS) corrade_add_test(AbstractObjectGLTest AbstractObjectGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(AbstractQueryGLTest AbstractQueryGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) - corrade_add_test(AbstractShaderProgramGLTest AbstractShaderProgramGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(AbstractTextureGLTest AbstractTextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(BufferGLTest BufferGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(ContextGLTest ContextGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) @@ -50,9 +49,19 @@ if(BUILD_GL_TESTS) corrade_add_test(FramebufferGLTest FramebufferGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(MeshGLTest MeshGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(RenderbufferGLTest RenderbufferGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) - corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(TextureGLTest TextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) + corrade_add_resource(AbstractShaderProgramGLTest_RES AbstractShaderProgramGLTestFiles/resources.conf) + corrade_add_test(AbstractShaderProgramGLTest + AbstractShaderProgramGLTest.cpp + ${AbstractShaderProgramGLTest_RES} + LIBRARIES ${GL_TEST_LIBRARIES}) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ShaderGLTestConfigure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/ShaderGLTestConfigure.h) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) + if(NOT MAGNUM_TARGET_GLES2) corrade_add_test(BufferImageGLTest BufferImageGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) endif() diff --git a/src/Test/ShaderGLTest.cpp b/src/Test/ShaderGLTest.cpp index 86d7fbeb0..37bba4647 100644 --- a/src/Test/ShaderGLTest.cpp +++ b/src/Test/ShaderGLTest.cpp @@ -22,11 +22,15 @@ DEALINGS IN THE SOFTWARE. */ +#include + #include "Context.h" #include "Extensions.h" #include "Shader.h" #include "Test/AbstractOpenGLTester.h" +#include "ShaderGLTestConfigure.h" + namespace Magnum { namespace Test { class ShaderGLTest: public AbstractOpenGLTester { @@ -38,6 +42,10 @@ class ShaderGLTest: public AbstractOpenGLTester { void constructMove(); void label(); + + void addSource(); + void addFile(); + void compile(); }; ShaderGLTest::ShaderGLTest() { @@ -45,7 +53,11 @@ ShaderGLTest::ShaderGLTest() { &ShaderGLTest::constructCopy, &ShaderGLTest::constructMove, - &ShaderGLTest::label}); + &ShaderGLTest::label, + + &ShaderGLTest::addSource, + &ShaderGLTest::addFile, + &ShaderGLTest::compile}); } void ShaderGLTest::construct() { @@ -138,6 +150,75 @@ void ShaderGLTest::label() { MAGNUM_VERIFY_NO_ERROR(); } +void ShaderGLTest::addSource() { + #ifndef MAGNUM_TARGET_GLES + Shader shader(Version::GL210, Shader::Type::Fragment); + #else + Shader shader(Version::GLES200, Shader::Type::Fragment); + #endif + + shader.addSource("#define FOO BAR\n") + .addSource("void main() {}\n"); + + #ifndef MAGNUM_TARGET_GLES + CORRADE_COMPARE(shader.sources(), (std::vector{ + "#version 120\n", + "#line 1 1\n", + "#define FOO BAR\n", + "#line 1 2\n", + "void main() {}\n" + })); + #else + CORRADE_COMPARE(shader.sources(), (std::vector{ + "#version 100\n", + "#line 1 1\n", + "#define FOO BAR\n", + "#line 1 2\n", + "void main() {}\n" + })); + #endif +} + +void ShaderGLTest::addFile() { + #ifndef MAGNUM_TARGET_GLES + Shader shader(Version::GL210, Shader::Type::Fragment); + #else + Shader shader(Version::GLES200, Shader::Type::Fragment); + #endif + + shader.addFile(Utility::Directory::join(SHADERGLTEST_FILES_DIR, "shader.glsl")); + + #ifndef MAGNUM_TARGET_GLES + CORRADE_COMPARE(shader.sources(), (std::vector{ + "#version 120\n", + "#line 1 1\n", + "void main() {}\n" + })); + #else + CORRADE_COMPARE(shader.sources(), (std::vector{ + "#version 100\n", + "#line 1 1\n", + "void main() {}\n" + })); + #endif +} + +void ShaderGLTest::compile() { + #ifndef MAGNUM_TARGET_GLES + constexpr Version v = Version::GL210; + #else + constexpr Version v = Version::GLES200; + #endif + + Shader shader(v, Shader::Type::Fragment); + shader.addSource("void main() {}\n"); + CORRADE_VERIFY(shader.compile()); + + Shader shader2(v, Shader::Type::Fragment); + shader2.addSource("[fu] bleh error #:! stuff\n"); + CORRADE_VERIFY(!shader2.compile()); +} + }} CORRADE_TEST_MAIN(Magnum::Test::ShaderGLTest) diff --git a/src/Test/ShaderGLTestConfigure.h.cmake b/src/Test/ShaderGLTestConfigure.h.cmake new file mode 100644 index 000000000..7e0dfb21e --- /dev/null +++ b/src/Test/ShaderGLTestConfigure.h.cmake @@ -0,0 +1,25 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#define SHADERGLTEST_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ShaderGLTestFiles" diff --git a/src/Test/ShaderGLTestFiles/shader.glsl b/src/Test/ShaderGLTestFiles/shader.glsl new file mode 100644 index 000000000..ab73b3a23 --- /dev/null +++ b/src/Test/ShaderGLTestFiles/shader.glsl @@ -0,0 +1 @@ +void main() {} From 5e5b5e9c4cbfa1ff4d9b476c38e200ba76de1a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:39:21 +0100 Subject: [PATCH 12/79] Updated documentation of mesh classes. --- src/Mesh.h | 12 ++++++------ src/MeshView.h | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Mesh.h b/src/Mesh.h index f6dadbf7c..7afc54bf6 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::Mesh + * @brief Class @ref Magnum::Mesh */ #include @@ -285,10 +285,10 @@ for more infromation) and call @ref Mesh::draw(). @section Mesh-performance-optimization Performance optimizations -If @extension{APPLE,vertex_array_object}, OpenGL ES 3.0 or +If @extension{APPLE,vertex_array_object} (part of OpenGL 3.0), OpenGL ES 3.0 or @es_extension{OES,vertex_array_object} on OpenGL ES 2.0 is supported, VAOs are used instead of binding the buffers and specifying vertex attribute pointers -in each draw() call. The engine tracks currently bound VAO to avoid +in each @ref draw() call. The engine tracks currently bound VAO to avoid unnecessary calls to @fn_gl{BindVertexArray}. %Mesh limits and implementation-defined values (such as @ref maxVertexAttributes()) are cached, so repeated queries don't result in repeated @fn_gl{Get} calls. @@ -410,8 +410,8 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { /** * @brief OpenGL mesh ID * - * If @extension{APPLE,vertex_array_object} is not available, returns - * `0`. + * If @extension{APPLE,vertex_array_object} (part of OpenGL 3.0) is not + * available, returns `0`. */ GLuint id() const { return _id; } @@ -590,7 +590,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { * * Prefer to use @ref setIndexBuffer(Buffer&, GLintptr, IndexType, UnsignedInt, UnsignedInt) * for better performance. - * @see setIndexCount(), MeshTools::compressIndices(), + * @see @ref setIndexCount(), @ref MeshTools::compressIndices(), * @fn_gl{BindVertexArray}, @fn_gl{BindBuffer} (if * @extension{APPLE,vertex_array_object} is available) */ diff --git a/src/MeshView.h b/src/MeshView.h index cc7c38b4e..8804b3227 100644 --- a/src/MeshView.h +++ b/src/MeshView.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::MeshView + * @brief Class @ref Magnum::MeshView */ #include "Magnum.h" @@ -42,10 +42,10 @@ index count and offset. It is then possible to reuse one mesh buffer configuration for different views. %Mesh primitive, index type, attribute bindings and attached buffers are reused from original mesh. -The same rules as in Mesh apply, i.e. if the view has non-zero index count, it -is treated as indexed mesh, otherwise it is treated as non-indexed mesh. If -both index and vertex count is zero, the view is treated as empty and no draw -commands are issued when calling draw(). +The same rules as in @ref Mesh apply, i.e. if the view has non-zero index +count, it is treated as indexed mesh, otherwise it is treated as non-indexed +mesh. If both index and vertex count is zero, the view is treated as empty and +no draw commands are issued when calling @ref draw(). You must ensure that the original mesh remains available for whole view lifetime. From f0a8d5d047008f4129212bcfd0f77169c3447a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:46:48 +0100 Subject: [PATCH 13/79] Updated documentation of framebuffer classes. --- src/AbstractFramebuffer.h | 28 ++++++------ src/DefaultFramebuffer.h | 29 ++++++------ src/Framebuffer.h | 95 ++++++++++++++++++++------------------- src/Renderbuffer.h | 8 ++-- src/RenderbufferFormat.h | 4 +- 5 files changed, 84 insertions(+), 80 deletions(-) diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index f66f378b6..7b4e2282a 100644 --- a/src/AbstractFramebuffer.h +++ b/src/AbstractFramebuffer.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::AbstractFramebuffer + * @brief Class @ref Magnum::AbstractFramebuffer, enum @ref Magnum::FramebufferClear, @ref Magnum::FramebufferBlit, @ref Magnum::FramebufferBlitFilter, @ref Magnum::FramebufferTarget, enum set @ref FramebufferClearMask */ #include @@ -128,7 +128,7 @@ enum class FramebufferTarget: GLenum { /** @brief Base for default and named framebuffers -See DefaultFramebuffer and Framebuffer for more information. +See @ref DefaultFramebuffer and @ref Framebuffer for more information. @section AbstractFramebuffer-performance-optimization Performance optimizations and security @@ -138,8 +138,8 @@ switching framebuffers. %Framebuffer limits and implementation-defined values (such as @ref maxViewportSize()) are cached, so repeated queries don't result in repeated @fn_gl{Get} calls. -If @extension{ARB,robustness} is available, read() operations are protected -from buffer overflow. +If @extension{ARB,robustness} is available, @ref read() operations are +protected from buffer overflow. @todo @extension{ARB,viewport_array} (and `GL_MAX_VIEWPORTS`) */ class MAGNUM_EXPORT AbstractFramebuffer { @@ -229,9 +229,9 @@ class MAGNUM_EXPORT AbstractFramebuffer { * @brief Bind framebuffer for rendering * * Binds the framebuffer and updates viewport to saved dimensions. - * @see setViewport(), DefaultFramebuffer::mapForRead(), - * Framebuffer::mapForRead(), DefaultFramebuffer::mapForDraw(), - * Framebuffer::mapForDraw(), @fn_gl{BindFramebuffer}, + * @see @ref setViewport(), @ref DefaultFramebuffer::mapForRead(), + * @ref Framebuffer::mapForRead(), @ref DefaultFramebuffer::mapForDraw(), + * @ref Framebuffer::mapForDraw(), @fn_gl{BindFramebuffer}, * @fn_gl{Viewport} * @todo Bind internally to ReadDraw if separate binding points are not * supported @@ -245,7 +245,7 @@ class MAGNUM_EXPORT AbstractFramebuffer { * @brief Set viewport * @return Reference to self (for method chaining) * - * Saves the viewport to be used at later time in bind(). If the + * Saves the viewport to be used at later time in @ref bind(). If the * framebuffer is currently bound, updates the viewport to given * rectangle. * @see @ref maxViewportSize(), @fn_gl{Viewport} @@ -257,11 +257,11 @@ class MAGNUM_EXPORT AbstractFramebuffer { * @param mask Which buffers to clear * * To improve performance you can also use - * DefaultFramebuffer::invalidate() / Framebuffer::invalidate() instead - * of clearing given buffer if you will not use it anymore or fully - * overwrite it later. - * @see Renderer::setClearColor(), Renderer::setClearDepth(), - * Renderer::setClearStencil(), @fn_gl{BindFramebuffer}, + * @ref DefaultFramebuffer::invalidate() / @ref Framebuffer::invalidate() + * instead of clearing given buffer if you will not use it anymore or + * fully overwrite it later. + * @see @ref Renderer::setClearColor(), @ref Renderer::setClearDepth(), + * @ref Renderer::setClearStencil(), @fn_gl{BindFramebuffer}, * @fn_gl{Clear} */ void clear(FramebufferClearMask mask); @@ -290,7 +290,7 @@ class MAGNUM_EXPORT AbstractFramebuffer { * @param image %Buffer image where to put the data * @param usage %Buffer usage * - * See read(const Vector2i&, const Vector2i&, Image2D*) for more + * See @ref read(const Vector2i&, const Vector2i&, Image2D*) for more * information. * @requires_gles30 Pixel buffer objects are not available in OpenGL ES 2.0. */ diff --git a/src/DefaultFramebuffer.h b/src/DefaultFramebuffer.h index eb8706cbd..3bc545ffd 100644 --- a/src/DefaultFramebuffer.h +++ b/src/DefaultFramebuffer.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::DefaultFramebuffer + * @brief Class @ref Magnum::DefaultFramebuffer */ #include "AbstractFramebuffer.h" @@ -36,8 +36,9 @@ namespace Magnum { @brief Default framebuffer Default framebuffer, i.e. the actual screen surface. It is automatically -created when Context is created and it is available through global variable -@ref defaultFramebuffer. It is by default mapped to whole screen surface. +created when @ref Context is created and it is available through global +variable @ref defaultFramebuffer. It is by default mapped to whole screen +surface. @section DefaultFramebuffer-usage Usage @@ -72,7 +73,7 @@ multiple framebuffers. See also @ref AbstractFramebuffer-performance-optimization "relevant section in AbstractFramebuffer". If extension @extension{EXT,direct_state_access} is available, functions -mapForDraw() and mapForRead() use DSA to avoid unnecessary calls to +@ref mapForDraw() and @ref mapForRead() use DSA to avoid unnecessary calls to @fn_gl{BindFramebuffer}. See their respective documentation for more information. */ @@ -83,7 +84,7 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { /** * @brief Status * - * @see checkStatus() + * @see @ref checkStatus() * @requires_gl30 %Extension @extension{ARB,framebuffer_object} */ enum class Status: GLenum { @@ -105,7 +106,7 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { /** * @brief Draw attachment * - * @see mapForDraw() + * @see @ref mapForDraw() * @requires_gles30 Draw attachments for default framebuffer are * available only in OpenGL ES 3.0. */ @@ -166,7 +167,7 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { /** * @brief Read attachment * - * @see mapForRead() + * @see @ref mapForRead() * @requires_gles30 %Extension @es_extension2{NV,read_buffer,GL_NV_read_buffer} */ enum class ReadAttachment: GLenum { @@ -236,7 +237,7 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { /** * @brief Invalidation attachment * - * @see invalidate() + * @see @ref invalidate() * @requires_gl43 %Extension @extension{ARB,invalidate_subdata} * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer} */ @@ -354,8 +355,8 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { * If @extension{EXT,direct_state_access} is not available and the * framebuffer is not currently bound, it is bound before the * operation. - * @see mapForRead(), @fn_gl{BindFramebuffer}, @fn_gl{DrawBuffer} or - * @fn_gl_extension{FramebufferDrawBuffer,EXT,direct_state_access}, + * @see @ref mapForRead(), @fn_gl{BindFramebuffer}, @fn_gl{DrawBuffer} + * or @fn_gl_extension{FramebufferDrawBuffer,EXT,direct_state_access}, * @fn_gl{DrawBuffers} in OpenGL ES 3.0 * @requires_gles30 Draw attachments for default framebuffer are * available only in OpenGL ES 3.0. @@ -392,9 +393,9 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { * @see @fn_gl{InvalidateFramebuffer} or @fn_gles_extension{DiscardFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * clear() instead where the extension is not supported. + * @ref clear() instead where the extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use clear() instead where the extension is not supported. + * Use @ref clear() instead where the extension is not supported. */ void invalidate(std::initializer_list attachments); @@ -408,9 +409,9 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { * @see @fn_gl{InvalidateSubFramebuffer} or @fn_gles_extension{DiscardSubFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * clear() instead where the extension is not supported. + * @ref clear() instead where the extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use clear() instead where the extension is not supported. + * Use @ref clear() instead where the extension is not supported. */ void invalidate(std::initializer_list attachments, const Range2Di& rectangle); diff --git a/src/Framebuffer.h b/src/Framebuffer.h index d168e0e22..83e98e6b3 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::Framebuffer + * @brief Class @ref Magnum::Framebuffer */ #include "AbstractFramebuffer.h" @@ -40,9 +40,9 @@ namespace Magnum { /** @brief %Framebuffer -Unlike DefaultFramebuffer, which is used for on-screen rendering, this class -is used for off-screen rendering, usable either in windowless applications, -texture generation or for various post-processing effects. +Unlike @ref DefaultFramebuffer, which is used for on-screen rendering, this +class is used for off-screen rendering, usable either in windowless +applications, texture generation or for various post-processing effects. @section Framebuffer-usage Example usage @@ -71,10 +71,9 @@ framebuffer.mapForDraw({{MyShader::ColorOutput, Framebuffer::ColorAttachment(0)} {MyShader::NormalOutput, Framebuffer::ColorAttachment(1)}}); @endcode -The actual @ref Platform::GlutApplication::drawEvent() "drawEvent()" might -look like this. First you clear all buffers you need, perform drawing to -off-screen framebuffer, then bind the default and render the textures on -screen: +The actual @ref Platform::Sdl2Application::drawEvent() "drawEvent()" might look +like this. First you clear all buffers you need, perform drawing to off-screen +framebuffer, then bind the default and render the textures on screen: @code void drawEvent() { defaultFramebuffer.clear(FramebufferClear::Color) @@ -93,10 +92,10 @@ void drawEvent() { See also @ref AbstractFramebuffer-performance-optimization "relevant section in AbstractFramebuffer". If extension @extension{EXT,direct_state_access} is available, functions -mapForDraw(), mapForRead(), attachRenderbuffer(), attachTexture1D(), -attachTexture2D(), attachCubeMapTexture() and attachTexture3D() use DSA -to avoid unnecessary calls to @fn_gl{BindFramebuffer}. See their respective -documentation for more information. +@ref mapForDraw(), @ref mapForRead(), @ref attachRenderbuffer(), +@ref attachTexture1D(), @ref attachTexture2D(), @ref attachCubeMapTexture() and +@ref attachTexture3D() use DSA to avoid unnecessary calls to @fn_gl{BindFramebuffer}. +See their respective documentation for more information. @requires_gl30 %Extension @extension{ARB,framebuffer_object} @todo `MAX_COLOR_ATTACHMENTS` @@ -108,8 +107,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje /** * @brief Color attachment * - * @see Attachment, attachRenderbuffer(), attachTexture1D(), - * attachTexture2D(), attachCubeMapTexture(), attachTexture3D() + * @see @ref Attachment, @ref attachRenderbuffer(), + * @ref attachTexture1D(), @ref attachTexture2D(), + * @ref attachCubeMapTexture(), @ref attachTexture3D() */ class ColorAttachment { friend class Framebuffer; @@ -117,7 +117,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje public: /** * @brief Constructor - * @param id Color attachment id + * @param id Color attachment ID * * @requires_gles30 %Extension @es_extension{NV,fbo_color_attachments} * is required for @p id greater than 0. @@ -135,7 +135,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje /** * @brief Draw attachment * - * @see mapForDraw() + * @see @ref mapForDraw() */ class DrawAttachment { public: @@ -158,8 +158,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje /** * @brief %Buffer attachment * - * @see attachRenderbuffer(), attachTexture1D(), attachTexture2D(), - * attachCubeMapTexture(), attachTexture3D() + * @see @ref attachRenderbuffer(), @ref attachTexture1D(), + * @ref attachTexture2D(), @ref attachCubeMapTexture(), + * @ref attachTexture3D() */ class MAGNUM_EXPORT BufferAttachment { public: @@ -174,7 +175,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @brief Both depth and stencil buffer * * @requires_gles30 Combined depth and stencil attachment is - * not available in OpenGL ES 2.0. + * not available in OpenGL ES 2.0. Attach the same object + * to both @ref Depth and @ref Stencil instead. + * @todo Support this in ES2 (bind to both depth and stencil internally) */ static const BufferAttachment DepthStencil; #endif @@ -195,7 +198,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje /** * @brief Invalidation attachment * - * @see invalidate() + * @see @ref invalidate() * @requires_gl43 %Extension @extension{ARB,invalidate_subdata} * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer} */ @@ -223,7 +226,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje /** * @brief Status * - * @see checkStatus() + * @see @ref checkStatus() */ enum class Status: GLenum { /** The framebuffer is complete */ @@ -296,7 +299,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @brief Constructor * * Generates new OpenGL framebuffer. - * @see setViewport(), @fn_gl{GenFramebuffers} + * @see @ref setViewport(), @fn_gl{GenFramebuffers} */ explicit Framebuffer(const Range2Di& viewport); @@ -369,7 +372,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * * @p attachments is list of shader outputs mapped to framebuffer * color attachment IDs. %Shader outputs which are not listed are not - * used, you can achieve the same by passing Framebuffer::DrawAttachment::None + * used, you can achieve the same by passing @ref Framebuffer::DrawAttachment::None * as color attachment ID. Example usage: * @code * framebuffer.mapForDraw({{MyShader::ColorOutput, Framebuffer::ColorAttachment(0)}, @@ -409,6 +412,23 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje return *this; } + /** + * @brief Map given color attachment for reading + * @param attachment Color attachment + * @return Reference to self (for method chaining) + * + * If @extension{EXT,direct_state_access} is not available and the + * framebufferbuffer is not currently bound, it is bound before the + * operation. + * @see @ref mapForDraw(), @fn_gl{BindFramebuffer}, @fn_gl{ReadBuffer} + * or @fn_gl_extension{FramebufferReadBuffer,EXT,direct_state_access} + * @requires_gles30 %Extension @es_extension2{NV,read_buffer,GL_NV_read_buffer} + */ + Framebuffer& mapForRead(ColorAttachment attachment) { + (this->*readBufferImplementation)(GLenum(attachment)); + return *this; + } + /** * @brief Invalidate framebuffer * @param attachments Attachments to invalidate @@ -418,9 +438,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @see @fn_gl{InvalidateFramebuffer} or @fn_gles_extension{DiscardFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * clear() instead where the extension is not supported. + * @ref clear() instead where the extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use clear() instead where the extension is not supported. + * Use @ref clear() instead where the extension is not supported. */ void invalidate(std::initializer_list attachments); @@ -434,29 +454,12 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @see @fn_gl{InvalidateSubFramebuffer} or @fn_gles_extension{DiscardSubFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * clear() instead where the extension is not supported. + * @ref clear() instead where the extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use clear() instead where the extension is not supported. + * Use @ref clear() instead where the extension is not supported. */ void invalidate(std::initializer_list attachments, const Range2Di& rectangle); - /** - * @brief Map given color attachment for reading - * @param attachment Color attachment - * @return Reference to self (for method chaining) - * - * If @extension{EXT,direct_state_access} is not available and the - * framebufferbuffer is not currently bound, it is bound before the - * operation. - * @see mapForDraw(), @fn_gl{BindFramebuffer}, @fn_gl{ReadBuffer} or - * @fn_gl_extension{FramebufferReadBuffer,EXT,direct_state_access} - * @requires_gles30 %Extension @es_extension2{NV,read_buffer,GL_NV_read_buffer} - */ - Framebuffer& mapForRead(ColorAttachment attachment) { - (this->*readBufferImplementation)(GLenum(attachment)); - return *this; - } - /** * @brief Attach renderbuffer to given buffer * @param attachment %Buffer attachment @@ -505,7 +508,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * If @extension{EXT,direct_state_access} is not available and the * framebufferbuffer is not currently bound, it is bound before the * operation. - * @see attachCubeMapTexture(), @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} + * @see @ref attachCubeMapTexture(), @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} * or @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} */ Framebuffer& attachTexture2D(BufferAttachment attachment, Texture2D& texture, Int level); @@ -521,7 +524,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * If @extension{EXT,direct_state_access} is not available and the * framebufferbuffer is not currently bound, it is bound before the * operation. - * @see attachTexture2D(), @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} + * @see @ref attachTexture2D(), @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} * or @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} */ Framebuffer& attachCubeMapTexture(BufferAttachment attachment, CubeMapTexture& texture, CubeMapTexture::Coordinate coordinate, Int level) { diff --git a/src/Renderbuffer.h b/src/Renderbuffer.h index 8ff9b4c15..33e641ef2 100644 --- a/src/Renderbuffer.h +++ b/src/Renderbuffer.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::Renderbuffer + * @brief Class @ref Magnum::Renderbuffer */ #include "AbstractObject.h" @@ -37,18 +37,18 @@ namespace Magnum { /** @brief %Renderbuffer -Attachable to framebuffer as render target, see Framebuffer documentation +Attachable to framebuffer as render target, see @ref Framebuffer documentation for more information. @section Renderbuffer-performance-optimization Performance optimizations The engine tracks currently bound renderbuffer to avoid unnecessary calls to -@fn_gl{BindRenderbuffer} in setStorage(). %Renderbuffer limits and +@fn_gl{BindRenderbuffer} in @ref setStorage(). %Renderbuffer limits and implementation-defined values (such as @ref maxSize()) are cached, so repeated queries don't result in repeated @fn_gl{Get} calls. If extension @extension{EXT,direct_state_access} is available, function -setStorage() uses DSA to avoid unnecessary calls to @fn_gl{BindRenderbuffer}. +@ref setStorage() uses DSA to avoid unnecessary calls to @fn_gl{BindRenderbuffer}. See its documentation for more information. @requires_gl30 %Extension @extension{ARB,framebuffer_object} diff --git a/src/RenderbufferFormat.h b/src/RenderbufferFormat.h index 9ba15e5eb..b1e1d542c 100644 --- a/src/RenderbufferFormat.h +++ b/src/RenderbufferFormat.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Enum Magnum::RenderbufferFormat + * @brief Enum @ref Magnum::RenderbufferFormat */ #include "OpenGL.h" @@ -35,7 +35,7 @@ namespace Magnum { /** @brief Internal renderbuffer format -@see Renderbuffer +@see @ref Renderbuffer @requires_gl30 %Extension @extension{ARB,framebuffer_object} @todo RGB, RGB8 ES only (ES3 + @es_extension{OES,rgb8_rgba8}) */ From f31cbccbcc8bfc42acc62a24955442a343c8aecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 16:05:45 +0100 Subject: [PATCH 14/79] Default template parameter for Buffer::data(), templated Image::data(). To have BufferImage::buffer().data() consistent with Image::data() (default is unsigned char data type, but it is possible to reinterpret the data). Saves some ugly code: Image2D image(ColorFormat::RGB, ColorType::UnsignedByte, ...); Color3ub a = reinterpret_cast(image.data())[0]; // before Color3ub b = image.data()[0]; // after --- src/Buffer.h | 4 ++-- src/Image.h | 10 ++++++++-- src/ImageReference.h | 5 +++++ src/Trade/ImageData.h | 10 ++++++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/Buffer.h b/src/Buffer.h index 5c787b7a7..5b0f5dd8a 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -636,7 +636,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @requires_gl %Buffer data queries are not available in OpenGL ES. * Use @ref Magnum::Buffer::map() "map()" instead. */ - template Containers::Array data(); + template Containers::Array data(); /** * @brief %Buffer subdata @@ -652,7 +652,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @requires_gl %Buffer data queries are not available in OpenGL ES. * Use @ref Magnum::Buffer::map() "map()" instead. */ - template Containers::Array subData(GLintptr offset, GLsizeiptr size); + template Containers::Array subData(GLintptr offset, GLsizeiptr size); #endif /** diff --git a/src/Image.h b/src/Image.h index 9c9881e86..7af8728e0 100644 --- a/src/Image.h +++ b/src/Image.h @@ -101,8 +101,14 @@ template class Image: public AbstractImage { * * @see @ref release() */ - unsigned char* data() { return _data; } - const unsigned char* data() const { return _data; } /**< @overload */ + template T* data() { + return reinterpret_cast(_data); + } + + /** @overload */ + template const T* data() const { + return reinterpret_cast(_data); + } /** * @brief Set image data diff --git a/src/ImageReference.h b/src/ImageReference.h index d2f754e16..02bd8141f 100644 --- a/src/ImageReference.h +++ b/src/ImageReference.h @@ -79,6 +79,11 @@ template class ImageReference: public AbstractImage { /** @brief Pointer to raw data */ constexpr const unsigned char* data() const { return _data; } + /** @overload */ + template const T* data() const { + return reinterpret_cast(_data); + } + /** * @brief Set image data * @param data %Image data diff --git a/src/Trade/ImageData.h b/src/Trade/ImageData.h index 181b768bb..bc2f09dd4 100644 --- a/src/Trade/ImageData.h +++ b/src/Trade/ImageData.h @@ -91,8 +91,14 @@ template class ImageData: public AbstractImage { * * @see @ref release() */ - unsigned char* data() { return _data; } - const unsigned char* data() const { return _data; } /**< @overload */ + template T* data() { + return reinterpret_cast(_data); + } + + /** @overload */ + template const T* data() const { + return reinterpret_cast(_data); + } /** * @brief Release data storage From c5bab9bb520c2e2e2f14affb8211f56f591b1b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:23:33 +0100 Subject: [PATCH 15/79] Added convenience Color3ub and Color4ub typedefs. --- src/Color.h | 10 ++++++++-- src/Magnum.h | 2 ++ src/Test/ColorTest.cpp | 6 ------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Color.h b/src/Color.h index eb592f799..279387dc8 100644 --- a/src/Color.h +++ b/src/Color.h @@ -151,7 +151,7 @@ Conversion from and to HSV is done always using floating-point types, so hue is always in range in range @f$ [0.0, 360.0] @f$, saturation and value in range @f$ [0.0, 1.0] @f$. -@see @ref Color3, @ref BasicColor4 +@see @ref Color3, @ref Color3ub, @ref BasicColor4 */ /* Not using template specialization because some internal functions are impossible to explicitly instantiate */ @@ -332,13 +332,16 @@ template class BasicColor3: public Math::Vector3 { /** @brief Three-component (RGB) float color */ typedef BasicColor3 Color3; +/** @brief Three-component (RGB) unsigned byte color */ +typedef BasicColor3 Color3ub; + MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(3, BasicColor3) /** @brief Four-component (RGBA) color See @ref BasicColor3 for more information. -@see @ref Color4 +@see @ref Color4, @ref Color4ub */ /* Not using template specialization because some internal functions are impossible to explicitly instantiate */ @@ -500,6 +503,9 @@ class BasicColor4: public Math::Vector4 { /** @brief Four-component (RGBA) float color */ typedef BasicColor4 Color4; +/** @brief Four-component (RGBA) unsigned byte color */ +typedef BasicColor4 Color4ub; + MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(4, BasicColor4) /** @debugoperator{Magnum::BasicColor3} */ diff --git a/src/Magnum.h b/src/Magnum.h index b32c26603..96d5f8e70 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -549,7 +549,9 @@ enum class BufferTextureFormat: GLenum; template class BasicColor3; template class BasicColor4; typedef BasicColor3 Color3; +typedef BasicColor3 Color3ub; typedef BasicColor4 Color4; +typedef BasicColor4 Color4ub; enum class ColorFormat: GLenum; enum class ColorType: GLenum; diff --git a/src/Test/ColorTest.cpp b/src/Test/ColorTest.cpp index 4f70770d0..dfb1ac2c5 100644 --- a/src/Test/ColorTest.cpp +++ b/src/Test/ColorTest.cpp @@ -61,9 +61,6 @@ class ColorTest: public TestSuite::Tester { void configuration(); }; -typedef BasicColor3 Color3ub; -typedef BasicColor4 Color4ub; - ColorTest::ColorTest() { addTests({&ColorTest::construct, &ColorTest::constructDefault, @@ -152,9 +149,6 @@ void ColorTest::constructParts() { } void ColorTest::constructConversion() { - typedef BasicColor3 Color3ub; - typedef BasicColor4 Color4ub; - constexpr Color3 a(10.1f, 12.5f, 0.75f); #ifndef CORRADE_GCC46_COMPATIBILITY constexpr /* Not constexpr under GCC < 4.7 */ From ae2b2cd0f6fdd00377df4a1f2f5cb44b99cee1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:40:04 +0100 Subject: [PATCH 16/79] Platform: undefine more Xlib nonsense. Status conflicts with *Framebuffer::Status enum. --- src/Platform/AbstractXApplication.h | 3 ++- src/Platform/Implementation/GlxContextHandler.h | 4 +++- src/Platform/WindowlessGlxApplication.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h index 954e9a027..62a4407d8 100644 --- a/src/Platform/AbstractXApplication.h +++ b/src/Platform/AbstractXApplication.h @@ -35,9 +35,10 @@ #include #include /* undef Xlib nonsense to avoid conflicts */ +#undef Always #undef Complex #undef None -#undef Always +#undef Status #include "Math/Vector2.h" diff --git a/src/Platform/Implementation/GlxContextHandler.h b/src/Platform/Implementation/GlxContextHandler.h index e8eb487bd..a1e99f90e 100644 --- a/src/Platform/Implementation/GlxContextHandler.h +++ b/src/Platform/Implementation/GlxContextHandler.h @@ -25,11 +25,13 @@ */ #include "OpenGL.h" +#define Status int #include /* undef Xlib nonsense to avoid conflicts */ +#undef Always #undef Complex #undef None -#undef Always +#undef Status #include "Platform/AbstractXApplication.h" #include "Platform/Implementation/AbstractContextHandler.h" diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Platform/WindowlessGlxApplication.h index dd5ec4193..8088b06d9 100644 --- a/src/Platform/WindowlessGlxApplication.h +++ b/src/Platform/WindowlessGlxApplication.h @@ -34,9 +34,10 @@ #include #include /* undef Xlib nonsense to avoid conflicts */ +#undef Always #undef Complex #undef None -#undef Always +#undef Status #include "Magnum.h" From bdc77c744b9ef12e1a665c19738de10ce81e3f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 16:11:21 +0100 Subject: [PATCH 17/79] Verify that framebuffer extension is available for test on desktop GL. --- src/Test/FramebufferGLTest.cpp | 15 +++++++++++++++ src/Test/RenderbufferGLTest.cpp | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/Test/FramebufferGLTest.cpp b/src/Test/FramebufferGLTest.cpp index f02fcd538..5546e2bcf 100644 --- a/src/Test/FramebufferGLTest.cpp +++ b/src/Test/FramebufferGLTest.cpp @@ -49,6 +49,11 @@ FramebufferGLTest::FramebufferGLTest() { } void FramebufferGLTest::construct() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + { const Framebuffer framebuffer({{32, 16}, {128, 256}}); @@ -69,6 +74,11 @@ void FramebufferGLTest::constructCopy() { } void FramebufferGLTest::constructMove() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + Framebuffer a({{32, 16}, {128, 256}}); const Int id = a.id(); @@ -93,6 +103,11 @@ void FramebufferGLTest::constructMove() { } void FramebufferGLTest::label() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + /* No-Op version is tested in AbstractObjectGLTest */ if(!Context::current()->isExtensionSupported() && !Context::current()->isExtensionSupported()) diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Test/RenderbufferGLTest.cpp index 58572a93b..3d79a4d19 100644 --- a/src/Test/RenderbufferGLTest.cpp +++ b/src/Test/RenderbufferGLTest.cpp @@ -49,6 +49,11 @@ RenderbufferGLTest::RenderbufferGLTest() { } void RenderbufferGLTest::construct() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + { const Renderbuffer renderbuffer; @@ -68,6 +73,11 @@ void RenderbufferGLTest::constructCopy() { } void RenderbufferGLTest::constructMove() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + Renderbuffer a; const Int id = a.id(); @@ -90,6 +100,11 @@ void RenderbufferGLTest::constructMove() { } void RenderbufferGLTest::label() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + /* No-Op version is tested in AbstractObjectGLTest */ if(!Context::current()->isExtensionSupported() && !Context::current()->isExtensionSupported()) From dff292a5f1e72ba39f5a83f0f325830646c9ae7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 16:12:01 +0100 Subject: [PATCH 18/79] Test framebuffer functionality. The attach() functions are a total mess, need to be reworked along with typesafe array etc. textures. The test doesn't link or pass due to some issues, see the following commits. --- src/Test/FramebufferGLTest.cpp | 740 +++++++++++++++++++++++++++++++- src/Test/RenderbufferGLTest.cpp | 48 ++- 2 files changed, 786 insertions(+), 2 deletions(-) diff --git a/src/Test/FramebufferGLTest.cpp b/src/Test/FramebufferGLTest.cpp index 5546e2bcf..85c46a37c 100644 --- a/src/Test/FramebufferGLTest.cpp +++ b/src/Test/FramebufferGLTest.cpp @@ -22,9 +22,16 @@ DEALINGS IN THE SOFTWARE. */ +#include "BufferImage.h" +#include "ColorFormat.h" #include "Context.h" #include "Extensions.h" #include "Framebuffer.h" +#include "Image.h" +#include "Renderbuffer.h" +#include "RenderbufferFormat.h" +#include "Texture.h" +#include "TextureFormat.h" #include "Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { @@ -38,6 +45,41 @@ class FramebufferGLTest: public AbstractOpenGLTester { void constructMove(); void label(); + + void attachRenderbuffer(); + void attachRenderbufferMultisample(); + + #ifndef MAGNUM_TARGET_GLES + void attachTexture1D(); + #endif + void attachTexture2D(); + void attachTexture3D(); + #ifndef MAGNUM_TARGET_GLES + void attachTexture1DArray(); + #endif + #ifndef MAGNUM_TARGET_GLES2 + void attachTexture2DArray(); + #endif + #ifndef MAGNUM_TARGET_GLES + void attachTexture2DMultisample(); + void attachTexture2DMultisampleArray(); + void attachRectangleTexture(); + #endif + void attachCubeMapTexture(); + #ifndef MAGNUM_TARGET_GLES + void attachCubeMapTextureArray(); + #endif + + void multipleColorOutputs(); + + void clear(); + void invalidate(); + void invalidateSub(); + void read(); + #ifndef MAGNUM_TARGET_GLES2 + void readBuffer(); + #endif + void blit(); }; FramebufferGLTest::FramebufferGLTest() { @@ -45,7 +87,42 @@ FramebufferGLTest::FramebufferGLTest() { &FramebufferGLTest::constructCopy, &FramebufferGLTest::constructMove, - &FramebufferGLTest::label}); + &FramebufferGLTest::label, + + &FramebufferGLTest::attachRenderbuffer, + &FramebufferGLTest::attachRenderbufferMultisample, + + #ifndef MAGNUM_TARGET_GLES + &FramebufferGLTest::attachTexture1D, + #endif + &FramebufferGLTest::attachTexture2D, + &FramebufferGLTest::attachTexture3D, + #ifndef MAGNUM_TARGET_GLES + &FramebufferGLTest::attachTexture1DArray, + #endif + #ifndef MAGNUM_TARGET_GLES2 + &FramebufferGLTest::attachTexture2DArray, + #endif + #ifndef MAGNUM_TARGET_GLES + &FramebufferGLTest::attachTexture2DMultisample, + &FramebufferGLTest::attachTexture2DMultisampleArray, + &FramebufferGLTest::attachRectangleTexture, + #endif + &FramebufferGLTest::attachCubeMapTexture, + #ifndef MAGNUM_TARGET_GLES + &FramebufferGLTest::attachCubeMapTextureArray, + #endif + + &FramebufferGLTest::multipleColorOutputs, + + &FramebufferGLTest::clear, + &FramebufferGLTest::invalidate, + &FramebufferGLTest::invalidateSub, + &FramebufferGLTest::read, + #ifndef MAGNUM_TARGET_GLES2 + &FramebufferGLTest::readBuffer, + #endif + &FramebufferGLTest::blit}); } void FramebufferGLTest::construct() { @@ -124,6 +201,667 @@ void FramebufferGLTest::label() { CORRADE_COMPARE(framebuffer.label(), "MyFramebuffer"); } +void FramebufferGLTest::attachRenderbuffer() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + + Renderbuffer color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + /* Separate depth and stencil renderbuffers are not supported (or at least + on my NVidia, thus we need to do this juggling with one renderbuffer */ + Renderbuffer depthStencil; + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES2 + Debug() << "Using" << Extensions::GL::OES::packed_depth_stencil::string(); + #endif + depthStencil.setStorage(RenderbufferFormat::Depth24Stencil8, Vector2i(128)); + } + #ifdef MAGNUM_TARGET_GLES2 + else depthStencil.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128)); + #endif + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + .attachRenderbuffer(Framebuffer::BufferAttachment::Depth, depthStencil); + + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + framebuffer.attachRenderbuffer(Framebuffer::BufferAttachment::Stencil, depthStencil); + } + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} + +void FramebufferGLTest::attachRenderbufferMultisample() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported() && + !Context::current()->isExtensionSupported()) + CORRADE_SKIP("Required extension is not available."); + #endif + + Renderbuffer color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorageMultisample(Renderbuffer::maxSamples(), RenderbufferFormat::RGBA8, Vector2i(128)); + #else + color.setStorageMultisample(Renderbuffer::maxSamples(), RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + #ifdef MAGNUM_TARGET_GLES2 + MAGNUM_ASSERT_EXTENSION_SUPPORTED(Extensions::GL::OES::packed_depth_stencil); + #endif + + Renderbuffer depthStencil; + depthStencil.setStorageMultisample(Renderbuffer::maxSamples(), RenderbufferFormat::Depth24Stencil8, Vector2i(128)); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + #ifndef MAGNUM_TARGET_GLES2 + .attachRenderbuffer(Framebuffer::BufferAttachment::DepthStencil, depthStencil); + #else + .attachRenderbuffer(Framebuffer::BufferAttachment::Depth, depthStencil) + .attachRenderbuffer(Framebuffer::BufferAttachment::Stencil, depthStencil); + #endif + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} + +#ifndef MAGNUM_TARGET_GLES +void FramebufferGLTest::attachTexture1D() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + + Texture1D color; + color.setStorage(1, TextureFormat::RGBA8, 128); + + Texture1D depthStencil; + depthStencil.setStorage(1, TextureFormat::Depth24Stencil8, 128); + + Framebuffer framebuffer({{}, {128, 1}}); + framebuffer.attachTexture1D(Framebuffer::ColorAttachment(0), color, 0) + .attachTexture1D(Framebuffer::BufferAttachment::DepthStencil, depthStencil, 0); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} +#endif + +void FramebufferGLTest::attachTexture2D() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + + MAGNUM_VERIFY_NO_ERROR(); + + Framebuffer framebuffer({{}, Vector2i(128)}); + + MAGNUM_VERIFY_NO_ERROR(); + + Texture2D color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(1, TextureFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(1, TextureFormat::RGBA, Vector2i(128)); + #endif + + MAGNUM_VERIFY_NO_ERROR(); + + framebuffer.attachTexture2D(Framebuffer::ColorAttachment(0), color, 0); + + MAGNUM_VERIFY_NO_ERROR(); + + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES2 + Debug() << "Using" << Extensions::GL::OES::packed_depth_stencil::string(); + #endif + + Texture2D depthStencil; + #ifndef MAGNUM_TARGET_GLES2 + depthStencil.setStorage(1, TextureFormat::Depth24Stencil8, Vector2i(128)); + framebuffer.attachTexture2D(Framebuffer::BufferAttachment::DepthStencil, depthStencil, 0); + #else + depthStencil.setStorage(1, TextureFormat::DepthStencil, Vector2i(128)); + framebuffer.attachTexture2D(Framebuffer::BufferAttachment::Depth, depthStencil, 0) + .attachTexture2D(Framebuffer::BufferAttachment::Stencil, depthStencil, 0); + #endif + } + + #ifdef MAGNUM_TARGET_GLES2 + else if(Context::current()->isExtensionSupported()) { + Debug() << "Using" << Extensions::GL::OES::depth_texture::string(); + + Texture2D depth; + depth.setStorage(1, TextureFormat::DepthComponent16, Vector2i(128)); + framebuffer.attachTexture2D(Framebuffer::BufferAttachment::Depth, depth, 0); + } + #endif + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} + +void FramebufferGLTest::attachTexture3D() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::OES::texture_3D::string() + std::string(" is not available.")); + #else + CORRADE_SKIP("Not properly implemented yet."); + #endif + + Texture3D color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(1, TextureFormat::RGBA8, Vector3i(128)); + #else + color.setStorage(1, TextureFormat::RGBA4, Vector3i(128)); + #endif + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachTexture3D(Framebuffer::ColorAttachment(0), color, 0, 0); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} + +#ifndef MAGNUM_TARGET_GLES +void FramebufferGLTest::attachTexture1DArray() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + + Texture2D color(Texture2D::Target::Texture1DArray); + color.setStorage(1, TextureFormat::RGBA8, {128, 8}); + + Texture2D depthStencil(Texture2D::Target::Texture1DArray); + depthStencil.setStorage(1, TextureFormat::Depth24Stencil8, {128, 8}); + + Framebuffer framebuffer({{}, {128, 1}}); + framebuffer.attachTexture2D(Framebuffer::ColorAttachment(0), color, 0) + .attachTexture2D(Framebuffer::BufferAttachment::DepthStencil, depthStencil, 0); + + CORRADE_EXPECT_FAIL("Not properly implemented yet."); + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} +#endif + +#ifndef MAGNUM_TARGET_GLES2 +void FramebufferGLTest::attachTexture2DArray() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #else + CORRADE_SKIP("Not properly implemented yet."); + #endif + + Texture3D color(Texture3D::Target::Texture2DArray); + color.setStorage(1, TextureFormat::RGBA8, {128, 128, 8}); + + Texture3D depthStencil(Texture3D::Target::Texture2DArray); + depthStencil.setStorage(1, TextureFormat::Depth24Stencil8, {128, 128, 8}); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachTexture3D(Framebuffer::ColorAttachment(0), color, 0, 0) + .attachTexture3D(Framebuffer::BufferAttachment::DepthStencil, depthStencil, 0, 0); + + CORRADE_EXPECT_FAIL("Not properly implemented yet."); + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} +#endif + +#ifndef MAGNUM_TARGET_GLES +void FramebufferGLTest::attachTexture2DMultisample() { + CORRADE_SKIP("Multisample textures are not implemented yet."); +} + +void FramebufferGLTest::attachTexture2DMultisampleArray() { + CORRADE_SKIP("Multisample textures are not implemented yet."); +} + +void FramebufferGLTest::attachRectangleTexture() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::texture_rectangle::string() + std::string(" is not available.")); + + Texture2D color(Texture2D::Target::Rectangle); + color.setStorage(1, TextureFormat::RGBA8, Vector2i(128)); + + Texture2D depthStencil(Texture2D::Target::Rectangle); + depthStencil.setStorage(1, TextureFormat::Depth24Stencil8, Vector2i(128)); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachTexture2D(Framebuffer::ColorAttachment(0), color, 0) + .attachTexture2D(Framebuffer::BufferAttachment::DepthStencil, depthStencil, 0); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} +#endif + +void FramebufferGLTest::attachCubeMapTexture() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + + Framebuffer framebuffer({{}, Vector2i(128)}); + + CubeMapTexture color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(1, TextureFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(1, TextureFormat::RGBA, Vector2i(128)); + #endif + framebuffer.attachCubeMapTexture(Framebuffer::ColorAttachment(0), color, CubeMapTexture::Coordinate::NegativeZ, 0); + + CubeMapTexture depthStencil; + + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES2 + Debug() << "Using" << Extensions::GL::OES::packed_depth_stencil::string(); + #endif + + #ifndef MAGNUM_TARGET_GLES2 + depthStencil.setStorage(1, TextureFormat::Depth24Stencil8, Vector2i(128)); + framebuffer.attachCubeMapTexture(Framebuffer::BufferAttachment::DepthStencil, depthStencil, CubeMapTexture::Coordinate::NegativeZ, 0); + #else + depthStencil.setStorage(1, TextureFormat::DepthStencil, Vector2i(128)); + framebuffer.attachCubeMapTexture(Framebuffer::BufferAttachment::Depth, depthStencil, CubeMapTexture::Coordinate::NegativeZ, 0) + .attachCubeMapTexture(Framebuffer::BufferAttachment::Stencil, depthStencil, CubeMapTexture::Coordinate::NegativeZ, 0); + #endif + } + + #ifdef MAGNUM_TARGET_GLES2 + else if(Context::current()->isExtensionSupported()) { + Debug() << "Using" << Extensions::GL::OES::depth_texture::string(); + + depthStencil.setStorage(1, TextureFormat::DepthComponent16, Vector2i(128)); + framebuffer.attachCubeMapTexture(Framebuffer::BufferAttachment::Depth, depthStencil, CubeMapTexture::Coordinate::NegativeZ, 0); + } + #endif + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} + +#ifndef MAGNUM_TARGET_GLES +void FramebufferGLTest::attachCubeMapTextureArray() { + CORRADE_SKIP("Not implemented yet."); +} +#endif + +void FramebufferGLTest::multipleColorOutputs() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::NV::draw_buffers::string() + std::string(" is not available.")); + #endif + + Texture2D color1; + #ifndef MAGNUM_TARGET_GLES2 + color1.setStorage(1, TextureFormat::RGBA8, Vector2i(128)); + #else + color1.setStorage(1, TextureFormat::RGBA, Vector2i(128)); + #endif + + Texture2D color2; + #ifndef MAGNUM_TARGET_GLES2 + color2.setStorage(1, TextureFormat::RGBA8, Vector2i(128)); + #else + color2.setStorage(1, TextureFormat::RGBA, Vector2i(128)); + #endif + + Renderbuffer depth; + depth.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128)); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachTexture2D(Framebuffer::ColorAttachment(0), color1, 0) + .attachTexture2D(Framebuffer::ColorAttachment(1), color2, 0) + .attachRenderbuffer(Framebuffer::BufferAttachment::Depth, depth) + .mapForDraw({{0, Framebuffer::ColorAttachment(1)}, + {1, Framebuffer::ColorAttachment(0)}}); + + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES2 + Debug() << "Using" << Extensions::GL::NV::read_buffer::string(); + #endif + framebuffer.mapForRead(Framebuffer::ColorAttachment(1)); + } + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); +} + +void FramebufferGLTest::clear() { + Renderbuffer color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + /* Separate depth and stencil renderbuffers are not supported (or at least + on my NVidia, thus we need to do this juggling with one renderbuffer */ + Renderbuffer depthStencil; + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES2 + Debug() << "Using" << Extensions::GL::OES::packed_depth_stencil::string(); + #endif + depthStencil.setStorage(RenderbufferFormat::Depth24Stencil8, Vector2i(128)); + } + #ifdef MAGNUM_TARGET_GLES2 + else depthStencil.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128)); + #endif + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + .attachRenderbuffer(Framebuffer::BufferAttachment::Depth, depthStencil); + + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + framebuffer.attachRenderbuffer(Framebuffer::BufferAttachment::Stencil, depthStencil); + } + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::Draw), Framebuffer::Status::Complete); + + framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void FramebufferGLTest::invalidate() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::invalidate_subdata::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::discard_framebuffer::string() + std::string(" is not available.")); + #endif + + Renderbuffer color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + Renderbuffer stencil; + stencil.setStorage(RenderbufferFormat::StencilIndex8, Vector2i(128)); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + .attachRenderbuffer(Framebuffer::BufferAttachment::Stencil, stencil); + + MAGNUM_VERIFY_NO_ERROR(); + + framebuffer.invalidate({Framebuffer::InvalidationAttachment::Depth, Framebuffer::ColorAttachment(0)}); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void FramebufferGLTest::invalidateSub() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::invalidate_subdata::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::discard_framebuffer::string() + std::string(" is not available.")); + #endif + + Renderbuffer color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + Renderbuffer depth; + depth.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128)); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + .attachRenderbuffer(Framebuffer::BufferAttachment::Depth, depth); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); + + framebuffer.invalidate({Framebuffer::InvalidationAttachment::Depth, Framebuffer::ColorAttachment(0)}, + {{32, 16}, {79, 64}}); + + MAGNUM_VERIFY_NO_ERROR(); +} + +void FramebufferGLTest::read() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + + Renderbuffer color; + #ifndef MAGNUM_TARGET_GLES2 + color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + #else + color.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + /* Separate depth and stencil renderbuffers are not supported (or at least + on my NVidia, thus we need to do this juggling with one renderbuffer */ + Renderbuffer depthStencil; + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES2 + Debug() << "Using" << Extensions::GL::OES::packed_depth_stencil::string(); + #endif + depthStencil.setStorage(RenderbufferFormat::Depth24Stencil8, Vector2i(128)); + } + #ifdef MAGNUM_TARGET_GLES2 + else depthStencil.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128)); + #endif + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + .attachRenderbuffer(Framebuffer::BufferAttachment::Depth, depthStencil); + + #ifdef MAGNUM_TARGET_GLES2 + if(Context::current()->isExtensionSupported()) + #endif + { + framebuffer.attachRenderbuffer(Framebuffer::BufferAttachment::Stencil, depthStencil); + } + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); + + Renderer::setClearColor(Math::normalize(Color4ub(128, 64, 32, 17))); + Renderer::setClearDepth(Math::normalize(48352)); + Renderer::setClearStencil(67); + framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil); + + Image2D colorImage(ColorFormat::RGBA, ColorType::UnsignedByte); + framebuffer.read({16, 8}, {8, 16}, colorImage); + CORRADE_COMPARE(colorImage.size(), Vector2i(8, 16)); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(colorImage.data()[0], Color4ub(128, 64, 32, 17)); + + #ifdef MAGNUM_TARGET_GLES + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES + Debug() << "Using" << Extensions::GL::NV::read_depth::string(); + #endif + + Image2D depthImage(ColorFormat::DepthComponent, ColorType::UnsignedShort); + framebuffer.read({}, Vector2i(1), depthImage); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(depthImage.data()[0], 48352); + } + + #ifdef MAGNUM_TARGET_GLES + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES + Debug() << "Using" << Extensions::GL::NV::read_stencil::string(); + #endif + + Image2D stencilImage(ColorFormat::StencilIndex, ColorType::UnsignedByte); + framebuffer.read({}, Vector2i(1), stencilImage); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(stencilImage.data()[0], 67); + } + + #ifdef MAGNUM_TARGET_GLES + if(Context::current()->isExtensionSupported()) + #endif + { + #ifdef MAGNUM_TARGET_GLES + Debug() << "Using" << Extensions::GL::NV::read_depth_stencil::string(); + #endif + + Image2D depthStencilImage(ColorFormat::DepthStencil, ColorType::UnsignedInt248); + framebuffer.read({}, Vector2i(1), depthStencilImage); + + MAGNUM_VERIFY_NO_ERROR(); + /** @todo This will probably fail on different systems */ + CORRADE_COMPARE(depthStencilImage.data()[0] >> 8, 12378300); + CORRADE_COMPARE(depthStencilImage.data()[0], 67); + } +} + +#ifndef MAGNUM_TARGET_GLES2 +void FramebufferGLTest::readBuffer() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + + Renderbuffer color; + color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + + Renderbuffer depthStencil; + depthStencil.setStorage(RenderbufferFormat::Depth24Stencil8, Vector2i(128)); + + Framebuffer framebuffer({{}, Vector2i(128)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), color) + .attachRenderbuffer(Framebuffer::BufferAttachment::DepthStencil, depthStencil); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); + + Renderer::setClearColor(Math::normalize(Color4ub(128, 64, 32, 17))); + Renderer::setClearDepth(Math::normalize(48352)); + Renderer::setClearStencil(67); + framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil); + + BufferImage2D colorImage(ColorFormat::RGBA, ColorType::UnsignedByte); + framebuffer.read({16, 8}, {8, 16}, colorImage, BufferUsage::StaticRead); + CORRADE_COMPARE(colorImage.size(), Vector2i(8, 16)); + + MAGNUM_VERIFY_NO_ERROR(); + /** @todo How to test this on ES? */ + #ifndef MAGNUM_TARGET_GLES + const auto colorData = colorImage.buffer().data(); + CORRADE_COMPARE(colorData.size(), 8*16); + CORRADE_COMPARE(colorData[0], Color4ub(128, 64, 32, 17)); + #endif +} +#endif + +void FramebufferGLTest::blit() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported() && + !Context::current()->isExtensionSupported()) + CORRADE_SKIP("Required extension is not available."); + #endif + + Renderbuffer colorA, colorB; + #ifndef MAGNUM_TARGET_GLES2 + colorA.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + colorB.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); + #else + colorA.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + colorB.setStorage(RenderbufferFormat::RGBA4, Vector2i(128)); + #endif + + Framebuffer a({{}, Vector2i(128)}), b({{}, Vector2i(128)});; + a.attachRenderbuffer(Framebuffer::ColorAttachment(0), colorA); + b.attachRenderbuffer(Framebuffer::ColorAttachment(0), colorB); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(a.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); + CORRADE_COMPARE(b.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete); + + /* Clear first with some color and second with another */ + Renderer::setClearColor(Math::normalize(Color4ub(128, 64, 32, 17))); + a.clear(FramebufferClear::Color); + Renderer::setClearColor({}); + b.clear(FramebufferClear::Color); + + /* The framebuffer should be black before */ + Image2D image(ColorFormat::RGBA, ColorType::UnsignedByte); + b.read({}, Vector2i(1), image); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(image.data()[0], Color4ub()); + + /* And have given color after */ + Framebuffer::blit(a, b, a.viewport(), FramebufferBlit::ColorBuffer); + b.read({}, Vector2i(1), image); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(image.data()[0], Color4ub(128, 64, 32, 17)); +} + }} CORRADE_TEST_MAIN(Magnum::Test::FramebufferGLTest) diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Test/RenderbufferGLTest.cpp index 3d79a4d19..c7481506f 100644 --- a/src/Test/RenderbufferGLTest.cpp +++ b/src/Test/RenderbufferGLTest.cpp @@ -22,9 +22,11 @@ DEALINGS IN THE SOFTWARE. */ +#include "Math/Vector2.h" #include "Context.h" #include "Extensions.h" #include "Renderbuffer.h" +#include "RenderbufferFormat.h" #include "Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { @@ -38,6 +40,9 @@ class RenderbufferGLTest: public AbstractOpenGLTester { void constructMove(); void label(); + + void setStorage(); + void setStorageMultisample(); }; RenderbufferGLTest::RenderbufferGLTest() { @@ -45,7 +50,10 @@ RenderbufferGLTest::RenderbufferGLTest() { &RenderbufferGLTest::constructCopy, &RenderbufferGLTest::constructMove, - &RenderbufferGLTest::label}); + &RenderbufferGLTest::label, + + &RenderbufferGLTest::setStorage, + &RenderbufferGLTest::setStorageMultisample}); } void RenderbufferGLTest::construct() { @@ -119,6 +127,44 @@ void RenderbufferGLTest::label() { MAGNUM_VERIFY_NO_ERROR(); } +void RenderbufferGLTest::setStorage() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + + Renderbuffer renderbuffer; + + #ifndef MAGNUM_TARGET_GLES2 + renderbuffer.setStorage(RenderbufferFormat::RGBA8, {128, 128}); + #else + renderbuffer.setStorage(RenderbufferFormat::RGBA4, {128, 128}); + #endif + + MAGNUM_VERIFY_NO_ERROR(); +} + +void RenderbufferGLTest::setStorageMultisample() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported() && + !Context::current()->isExtensionSupported()) + CORRADE_SKIP("Required extension is not available."); + #endif + + Renderbuffer renderbuffer; + + #ifndef MAGNUM_TARGET_GLES2 + renderbuffer.setStorageMultisample(Renderbuffer::maxSamples(), RenderbufferFormat::RGBA8, {128, 128}); + #else + renderbuffer.setStorageMultisample(Renderbuffer::maxSamples(), RenderbufferFormat::RGBA4, {128, 128}); + #endif + + MAGNUM_VERIFY_NO_ERROR(); +} + }} CORRADE_TEST_MAIN(Magnum::Test::RenderbufferGLTest) From 1fcabbdfcb709c95ab4e4baa7f965730c29f8078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 16:13:41 +0100 Subject: [PATCH 19/79] Export publicly used symbol. Framebuffer test now at least links. --- src/Framebuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framebuffer.h b/src/Framebuffer.h index 83e98e6b3..d9072fdf0 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -583,7 +583,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL texture2DImplementationDSA(BufferAttachment attachment, GLenum textureTarget, GLuint textureId, GLint level); #endif - static MAGNUM_LOCAL Texture2DImplementation texture2DImplementation; + static Texture2DImplementation texture2DImplementation; typedef void(Framebuffer::*Texture3DImplementation)(BufferAttachment, Texture3D&, GLint, GLint); void MAGNUM_LOCAL texture3DImplementationDefault(BufferAttachment attachment, Texture3D& texture, GLint level, GLint layer); From 2826345111eaec9dfbff4fd28e0e2fdab8df38d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:27:20 +0100 Subject: [PATCH 20/79] Fix AbstractImage::pixelSize() for depth and stencil types. Also make the assertion more descriptive and add "to sleep better" test. This fixes the assertion failure in FramebufferGLTest. --- src/AbstractImage.cpp | 6 +++--- src/Test/AbstractImageTest.cpp | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index 4442dad7b..8b646f9fe 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -97,6 +97,8 @@ std::size_t AbstractImage::pixelSize(ColorFormat format, ColorType type) { #ifdef MAGNUM_TARGET_GLES2 case ColorFormat::Luminance: #endif + case ColorFormat::DepthComponent: + case ColorFormat::StencilIndex: return 1*size; case ColorFormat::RG: #ifndef MAGNUM_TARGET_GLES2 @@ -126,10 +128,8 @@ std::size_t AbstractImage::pixelSize(ColorFormat format, ColorType type) { return 4*size; /* Handled above */ - case ColorFormat::DepthComponent: - case ColorFormat::StencilIndex: case ColorFormat::DepthStencil: - CORRADE_ASSERT_UNREACHABLE(); + CORRADE_ASSERT(false, "AbstractImage::pixelSize(): invalid ColorType specified for depth/stencil ColorFormat", 0); } CORRADE_ASSERT_UNREACHABLE(); diff --git a/src/Test/AbstractImageTest.cpp b/src/Test/AbstractImageTest.cpp index 2b4e23916..fce4f355c 100644 --- a/src/Test/AbstractImageTest.cpp +++ b/src/Test/AbstractImageTest.cpp @@ -34,15 +34,26 @@ class AbstractImageTest: public TestSuite::Tester { public: explicit AbstractImageTest(); + void pixelSize(); + void debugFormat(); void debugType(); }; AbstractImageTest::AbstractImageTest() { - addTests({&AbstractImageTest::debugFormat, + addTests({&AbstractImageTest::pixelSize, + + &AbstractImageTest::debugFormat, &AbstractImageTest::debugType}); } +void AbstractImageTest::pixelSize() { + CORRADE_COMPARE(AbstractImage::pixelSize(ColorFormat::RGBA, ColorType::UnsignedInt), 4*4); + CORRADE_COMPARE(AbstractImage::pixelSize(ColorFormat::DepthComponent, ColorType::UnsignedShort), 2); + CORRADE_COMPARE(AbstractImage::pixelSize(ColorFormat::StencilIndex, ColorType::UnsignedByte), 1); + CORRADE_COMPARE(AbstractImage::pixelSize(ColorFormat::DepthStencil, ColorType::UnsignedInt248), 4); +} + void AbstractImageTest::debugFormat() { std::ostringstream o; Debug(&o) << ColorFormat::RGBA; From 73cb5572912a0560cd797a24623adacc35b5b118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 00:35:19 +0100 Subject: [PATCH 21/79] Added *Image::dataSize(). Will be used to compute size of data array needed to store image of given size. --- src/AbstractImage.cpp | 15 +++++++++++++++ src/AbstractImage.h | 2 ++ src/BufferImage.h | 5 +++++ src/Image.h | 11 +++++++++++ src/ImageReference.h | 5 +++++ src/Test/AbstractImageTest.cpp | 14 ++++++++++++++ src/Trade/ImageData.h | 5 +++++ 7 files changed, 57 insertions(+) diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index 8b646f9fe..fa6f7d599 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -26,6 +26,7 @@ #include +#include "Math/Vector.h" #include "ColorFormat.h" namespace Magnum { @@ -135,4 +136,18 @@ std::size_t AbstractImage::pixelSize(ColorFormat format, ColorType type) { CORRADE_ASSERT_UNREACHABLE(); } +template std::size_t AbstractImage::dataSize(Math::Vector size) const { + /** @todo Code this properly when all @fn_gl{PixelStore} parameters are implemented */ + /* Row size, rounded to multiple of 4 bytes */ + const std::size_t rowSize = ((size[0]*pixelSize() + 3)/4)*4; + + /** @todo Can't this be done somewhat nicer? */ + size[0] = 1; + return rowSize*size.product(); +} + +template std::size_t AbstractImage::dataSize<1>(Math::Vector<1, Int>) const; +template std::size_t AbstractImage::dataSize<2>(Math::Vector<2, Int>) const; +template std::size_t AbstractImage::dataSize<3>(Math::Vector<3, Int>) const; + } diff --git a/src/AbstractImage.h b/src/AbstractImage.h index f8506c399..fee386cea 100644 --- a/src/AbstractImage.h +++ b/src/AbstractImage.h @@ -79,6 +79,8 @@ class MAGNUM_EXPORT AbstractImage { ~AbstractImage() = default; + template std::size_t dataSize(Math::Vector size) const; + #ifdef DOXYGEN_GENERATING_OUTPUT private: #else diff --git a/src/BufferImage.h b/src/BufferImage.h index 637a995e5..d60e0692b 100644 --- a/src/BufferImage.h +++ b/src/BufferImage.h @@ -88,6 +88,11 @@ template class MAGNUM_EXPORT BufferImage: public Abstrac /** @brief %Image size */ typename DimensionTraits::VectorType size() const { return _size; } + /** @copydoc Image::dataSize() */ + std::size_t dataSize(const typename DimensionTraits::VectorType& size) const { + return AbstractImage::dataSize(size); + } + /** @brief %Image buffer */ Buffer& buffer() { return _buffer; } diff --git a/src/Image.h b/src/Image.h index 7af8728e0..abf1eb8ba 100644 --- a/src/Image.h +++ b/src/Image.h @@ -96,6 +96,17 @@ template class Image: public AbstractImage { /** @brief %Image size */ typename DimensionTraits::VectorType size() const { return _size; } + /** + * @brief Size of data required to store image of given size + * + * Takes color format, type and row alignment of this image into + * account. + * @see @ref pixelSize() + */ + std::size_t dataSize(const typename DimensionTraits::VectorType& size) const { + return AbstractImage::dataSize(size); + } + /** * @brief Pointer to raw data * diff --git a/src/ImageReference.h b/src/ImageReference.h index 02bd8141f..85661d201 100644 --- a/src/ImageReference.h +++ b/src/ImageReference.h @@ -76,6 +76,11 @@ template class ImageReference: public AbstractImage { /** @brief %Image size */ constexpr typename DimensionTraits::VectorType size() const { return _size; } + /** @copydoc Image::dataSize() */ + std::size_t dataSize(const typename DimensionTraits::VectorType& size) const { + return AbstractImage::dataSize(size); + } + /** @brief Pointer to raw data */ constexpr const unsigned char* data() const { return _data; } diff --git a/src/Test/AbstractImageTest.cpp b/src/Test/AbstractImageTest.cpp index fce4f355c..864a9e601 100644 --- a/src/Test/AbstractImageTest.cpp +++ b/src/Test/AbstractImageTest.cpp @@ -26,6 +26,7 @@ #include #include "AbstractImage.h" +#include "Image.h" #include "ColorFormat.h" namespace Magnum { namespace Test { @@ -35,6 +36,7 @@ class AbstractImageTest: public TestSuite::Tester { explicit AbstractImageTest(); void pixelSize(); + void dataSize(); void debugFormat(); void debugType(); @@ -42,6 +44,7 @@ class AbstractImageTest: public TestSuite::Tester { AbstractImageTest::AbstractImageTest() { addTests({&AbstractImageTest::pixelSize, + &AbstractImageTest::dataSize, &AbstractImageTest::debugFormat, &AbstractImageTest::debugType}); @@ -54,6 +57,17 @@ void AbstractImageTest::pixelSize() { CORRADE_COMPARE(AbstractImage::pixelSize(ColorFormat::DepthStencil, ColorType::UnsignedInt248), 4); } +void AbstractImageTest::dataSize() { + /* Verify that row size is properly rounded */ + CORRADE_COMPARE(Image2D(ColorFormat::RGBA, ColorType::UnsignedByte).dataSize({}), 0); + CORRADE_COMPARE(Image2D(ColorFormat::Red, ColorType::UnsignedByte).dataSize({4, 2}), 8); + CORRADE_COMPARE(Image2D(ColorFormat::Red, ColorType::UnsignedByte).dataSize({2, 4}), 16); + CORRADE_COMPARE(Image2D(ColorFormat::RGBA, ColorType::UnsignedByte).dataSize(Vector2i(1)), 4); + + CORRADE_COMPARE(Image2D(ColorFormat::RGBA, ColorType::UnsignedShort).dataSize({16, 8}), + 4*2*16*8); +} + void AbstractImageTest::debugFormat() { std::ostringstream o; Debug(&o) << ColorFormat::RGBA; diff --git a/src/Trade/ImageData.h b/src/Trade/ImageData.h index bc2f09dd4..2fd5ae143 100644 --- a/src/Trade/ImageData.h +++ b/src/Trade/ImageData.h @@ -86,6 +86,11 @@ template class ImageData: public AbstractImage { /** @brief %Image size */ typename DimensionTraits::VectorType size() const { return _size; } + /** @copydoc Image::dataSize() */ + std::size_t dataSize(const typename DimensionTraits::VectorType& size) const { + return AbstractImage::dataSize(size); + } + /** * @brief Pointer to raw data * From 98df39d9c280d5c32611636f851c4e9766547301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 16:15:10 +0100 Subject: [PATCH 22/79] Use *Image::dataSize() in Framebuffer::read(). Fixes Framebuffer test when ARB_robustness is used (without ARB_robustness it was overwriting memory and could lead to weird behavior). --- src/AbstractFramebuffer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/AbstractFramebuffer.cpp b/src/AbstractFramebuffer.cpp index aceb75896..2c0d67627 100644 --- a/src/AbstractFramebuffer.cpp +++ b/src/AbstractFramebuffer.cpp @@ -194,7 +194,7 @@ void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Ima #else bindInternal(readTarget); #endif - const std::size_t dataSize = image.pixelSize()*size.product(); + const std::size_t dataSize = image.dataSize(size); char* const data = new char[dataSize]; readImplementation(offset, size, image.format(), image.type(), dataSize, data); image.setData(image.format(), image.type(), size, data); @@ -213,8 +213,7 @@ void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Buf image.setData(image.format(), image.type(), size, nullptr, usage); image.buffer().bind(Buffer::Target::PixelPack); - /** @todo De-duplicate buffer size computation */ - readImplementation(offset, size, image.format(), image.type(), image.pixelSize()*size.product(), nullptr); + readImplementation(offset, size, image.format(), image.type(), image.dataSize(size), nullptr); } #endif From 47b16d11b1cb9df3e68f582fcfb8a0ebc5637f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:04:41 +0100 Subject: [PATCH 23/79] Use more descriptive resource group name. --- src/Test/AbstractShaderProgramGLTest.cpp | 8 ++++---- src/Test/AbstractShaderProgramGLTestFiles/resources.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Test/AbstractShaderProgramGLTest.cpp index 3c9ef6fa7..775aebafd 100644 --- a/src/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Test/AbstractShaderProgramGLTest.cpp @@ -152,7 +152,7 @@ namespace { } void AbstractShaderProgramGLTest::create() { - Utility::Resource rs("MyShader"); + Utility::Resource rs("AbstractShaderProgramGLTest"); #ifndef MAGNUM_TARGET_GLES Shader vert(Version::GL210, Shader::Type::Vertex); @@ -206,7 +206,7 @@ void AbstractShaderProgramGLTest::create() { void AbstractShaderProgramGLTest::createMultipleOutputs() { #ifndef MAGNUM_TARGET_GLES - Utility::Resource rs("MyShader"); + Utility::Resource rs("AbstractShaderProgramGLTest"); Shader vert(Version::GL210, Shader::Type::Vertex); vert.addSource(rs.get("MyShader.vert")); @@ -248,7 +248,7 @@ void AbstractShaderProgramGLTest::createMultipleOutputs() { #ifndef MAGNUM_TARGET_GLES void AbstractShaderProgramGLTest::createMultipleOutputsIndexed() { - Utility::Resource rs("MyShader"); + Utility::Resource rs("AbstractShaderProgramGLTest"); Shader vert(Version::GL210, Shader::Type::Vertex); vert.addSource(rs.get("MyShader.vert")); @@ -298,7 +298,7 @@ namespace { } MyShader::MyShader() { - Utility::Resource rs("MyShader"); + Utility::Resource rs("AbstractShaderProgramGLTest"); #ifndef MAGNUM_TARGET_GLES Shader vert(Version::GL210, Shader::Type::Vertex); diff --git a/src/Test/AbstractShaderProgramGLTestFiles/resources.conf b/src/Test/AbstractShaderProgramGLTestFiles/resources.conf index 51723f0ab..80d20b68e 100644 --- a/src/Test/AbstractShaderProgramGLTestFiles/resources.conf +++ b/src/Test/AbstractShaderProgramGLTestFiles/resources.conf @@ -1,4 +1,4 @@ -group=MyShader +group=AbstractShaderProgramGLTest [file] filename=MyShader.frag From bc8368fcf28488019963a43232964b7b5b53a7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:05:24 +0100 Subject: [PATCH 24/79] MeshTools: don't return naked pointer from fullScreenTriangle(). Also make it possible to specify version for which we want it. --- src/MeshTools/FullScreenTriangle.cpp | 14 +++++++++----- src/MeshTools/FullScreenTriangle.h | 21 +++++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/MeshTools/FullScreenTriangle.cpp b/src/MeshTools/FullScreenTriangle.cpp index 14ba470d1..ca8e19a77 100644 --- a/src/MeshTools/FullScreenTriangle.cpp +++ b/src/MeshTools/FullScreenTriangle.cpp @@ -33,19 +33,19 @@ namespace Magnum { namespace MeshTools { -std::pair fullScreenTriangle() { +std::pair, Mesh> fullScreenTriangle(Version version) { Mesh mesh; mesh.setPrimitive(MeshPrimitive::Triangles) .setVertexCount(3); - Buffer* buffer = nullptr; + std::unique_ptr buffer; #ifndef MAGNUM_TARGET_GLES - if(!Context::current()->isVersionSupported(Version::GL300)) + if(version < Version::GL300) #else - if(!Context::current()->isVersionSupported(Version::GLES300)) + if(version < Version::GLES300) #endif { - buffer = new Buffer; + buffer.reset(new Buffer); constexpr Vector2 triangle[] = { Vector2(-1.0, 1.0), Vector2(-1.0, -3.0), @@ -60,4 +60,8 @@ std::pair fullScreenTriangle() { return {std::move(buffer), std::move(mesh)}; } +std::pair, Mesh> fullScreenTriangle() { + return fullScreenTriangle(Context::current()->version()); +} + }} diff --git a/src/MeshTools/FullScreenTriangle.h b/src/MeshTools/FullScreenTriangle.h index 3067719ef..70290b48c 100644 --- a/src/MeshTools/FullScreenTriangle.h +++ b/src/MeshTools/FullScreenTriangle.h @@ -28,6 +28,7 @@ * @brief Function @ref Magnum::MeshTools::fullScreenTriangle() */ +#include #include #include "Magnum.h" @@ -49,11 +50,11 @@ computed from them. The vertex positions are, in order: \begin{pmatrix} 3 \\ 1 \end{pmatrix} @f] -On OpenGL 2.1 and OpenGL ES 2.0 the vertex positions are passed explicitly as -attribute `0`, contained in the buffer. On OpenGL 3.0+ and OpenGL ES 3.0+ the -mesh is attribute-less and the vertex positions can be computed using -`gl_VertexID` builtin shader variable, thus `nullptr` is returned instead of -vertex buffer. +Based on @p version parameter, on OpenGL 2.1 and OpenGL ES 2.0 the vertex +positions are passed explicitly as attribute `0`, contained in the buffer. On +OpenGL 3.0+ and OpenGL ES 3.0+ the mesh is attribute-less and the vertex +positions can be computed using `gl_VertexID` builtin shader variable, thus +`nullptr` is returned instead of vertex buffer. Computing positions in vertex shader in a portable way might be done like this. For OpenGL 2.1 and OpenGL ES 2.0 you then need to bind the location of `position` @@ -76,11 +77,15 @@ void main() { #endif } @endcode +*/ +std::pair, Mesh> MAGNUM_MESHTOOLS_EXPORT fullScreenTriangle(Version version); + +/** +@overload -@attention The implementation needs to check OpenGL version, so it expects - active context. +This function implicitly uses current context version. */ -std::pair MAGNUM_MESHTOOLS_EXPORT fullScreenTriangle(); +std::pair, Mesh> MAGNUM_MESHTOOLS_EXPORT fullScreenTriangle(); }} From 29489dc21a231e89406b3d9982948e5756fe2f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:14:37 +0100 Subject: [PATCH 25/79] MeshTools: simplified fullScreenTriangle() code, fixed literals. --- src/MeshTools/FullScreenTriangle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MeshTools/FullScreenTriangle.cpp b/src/MeshTools/FullScreenTriangle.cpp index ca8e19a77..5ccea0a09 100644 --- a/src/MeshTools/FullScreenTriangle.cpp +++ b/src/MeshTools/FullScreenTriangle.cpp @@ -47,9 +47,9 @@ std::pair, Mesh> fullScreenTriangle(Version version) { { buffer.reset(new Buffer); constexpr Vector2 triangle[] = { - Vector2(-1.0, 1.0), - Vector2(-1.0, -3.0), - Vector2( 3.0, 1.0) + {-1.0f, 1.0f}, + {-1.0f, -3.0f}, + { 3.0f, 1.0f} }; buffer->setData(triangle, BufferUsage::StaticDraw); /** @todo Is it possible to attach moveable buffer here to avoid heap From b72533602c06d9eeb2626ec5e96b97e1f2f881ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:16:29 +0100 Subject: [PATCH 26/79] Minor cleanup. --- src/Query.h | 1 - src/Test/AbstractQueryGLTest.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/Query.h b/src/Query.h index 3e97e4e6c..4cd2905da 100644 --- a/src/Query.h +++ b/src/Query.h @@ -437,7 +437,6 @@ class TimeQuery: public AbstractQuery { #endif }; - inline AbstractQuery::AbstractQuery(AbstractQuery&& other) noexcept: _id(other._id), target(other.target) { other._id = 0; } diff --git a/src/Test/AbstractQueryGLTest.cpp b/src/Test/AbstractQueryGLTest.cpp index 39c00c777..750f07286 100644 --- a/src/Test/AbstractQueryGLTest.cpp +++ b/src/Test/AbstractQueryGLTest.cpp @@ -22,8 +22,6 @@ DEALINGS IN THE SOFTWARE. */ -#include "Context.h" -#include "Extensions.h" #include "Query.h" #include "Test/AbstractOpenGLTester.h" From df69909a121d374a5b0fc8a411190206dbe30ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:08:04 +0100 Subject: [PATCH 27/79] Fully test query functionality. The test now fails due to wrong result() implementation. --- src/Test/CMakeLists.txt | 13 ++ src/Test/PrimitiveQueryGLTest.cpp | 118 +++++++++++++ src/Test/QueryGLTestFiles/MyShader.frag | 3 + src/Test/QueryGLTestFiles/MyShader.vert | 5 + src/Test/QueryGLTestFiles/resources.conf | 7 + src/Test/SampleQueryGLTest.cpp | 208 +++++++++++++++++++++++ src/Test/TimeQueryGLTest.cpp | 100 +++++++++++ 7 files changed, 454 insertions(+) create mode 100644 src/Test/PrimitiveQueryGLTest.cpp create mode 100644 src/Test/QueryGLTestFiles/MyShader.frag create mode 100644 src/Test/QueryGLTestFiles/MyShader.vert create mode 100644 src/Test/QueryGLTestFiles/resources.conf create mode 100644 src/Test/SampleQueryGLTest.cpp create mode 100644 src/Test/TimeQueryGLTest.cpp diff --git a/src/Test/CMakeLists.txt b/src/Test/CMakeLists.txt index 9ad7c65f9..f3d69c991 100644 --- a/src/Test/CMakeLists.txt +++ b/src/Test/CMakeLists.txt @@ -50,6 +50,7 @@ if(BUILD_GL_TESTS) corrade_add_test(MeshGLTest MeshGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(RenderbufferGLTest RenderbufferGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_test(TextureGLTest TextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) + corrade_add_test(TimeQueryGLTest TimeQueryGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) corrade_add_resource(AbstractShaderProgramGLTest_RES AbstractShaderProgramGLTestFiles/resources.conf) corrade_add_test(AbstractShaderProgramGLTest @@ -57,6 +58,18 @@ if(BUILD_GL_TESTS) ${AbstractShaderProgramGLTest_RES} LIBRARIES ${GL_TEST_LIBRARIES}) + corrade_add_resource(QueryGLTest_RES QueryGLTestFiles/resources.conf) + if(NOT MAGNUM_TARGET_GLES2) + corrade_add_test(PrimitiveQueryGLTest + PrimitiveQueryGLTest.cpp + ${QueryGLTest_RES} + LIBRARIES ${GL_TEST_LIBRARIES}) + endif() + corrade_add_test(SampleQueryGLTest + SampleQueryGLTest.cpp + ${QueryGLTest_RES} + LIBRARIES ${GL_TEST_LIBRARIES}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ShaderGLTestConfigure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/ShaderGLTestConfigure.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/Test/PrimitiveQueryGLTest.cpp b/src/Test/PrimitiveQueryGLTest.cpp new file mode 100644 index 000000000..7e6691454 --- /dev/null +++ b/src/Test/PrimitiveQueryGLTest.cpp @@ -0,0 +1,118 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include +#include + +#include "AbstractShaderProgram.h" +#include "Buffer.h" +#include "Framebuffer.h" +#include "Mesh.h" +#include "Query.h" +#include "Renderbuffer.h" +#include "RenderbufferFormat.h" +#include "Shader.h" +#include "Test/AbstractOpenGLTester.h" + +namespace Magnum { namespace Test { + +class PrimitiveQueryGLTest: public AbstractOpenGLTester { + public: + explicit PrimitiveQueryGLTest(); + + void query(); +}; + +PrimitiveQueryGLTest::PrimitiveQueryGLTest() { + addTests({&PrimitiveQueryGLTest::query}); +} + +void PrimitiveQueryGLTest::query() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::transform_feedback::string() + std::string(" is not available.")); + #endif + + #ifndef MAGNUM_TARGET_GLES + class MyShader: public AbstractShaderProgram { + public: + typedef Attribute<0, Vector2> Position; + + explicit MyShader() { + Utility::Resource rs("QueryGLTest"); + Shader vert(Version::GL210, Shader::Type::Vertex); + vert.addSource(rs.get("MyShader.vert")); + CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); + attachShader(vert); + + Shader frag(Version::GL210, Shader::Type::Fragment); + frag.addSource(rs.get("MyShader.frag")); + CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); + attachShader(frag); + + CORRADE_INTERNAL_ASSERT_OUTPUT(link()); + } + } shader; + + Renderbuffer renderbuffer; + renderbuffer.setStorage(RenderbufferFormat::RGBA8, Vector2i(32)); + + Framebuffer framebuffer({{}, Vector2i(32)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), renderbuffer); + + constexpr Vector2 data[9]; + Buffer vertices; + vertices.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.setPrimitive(MeshPrimitive::Triangles) + .setVertexCount(9) + .addVertexBuffer(vertices, 0, MyShader::Position()); + + MAGNUM_VERIFY_NO_ERROR(); + + PrimitiveQuery q; + q.begin(PrimitiveQuery::Target::PrimitivesGenerated); + + framebuffer.bind(FramebufferTarget::ReadDraw); + shader.use(); + mesh.draw(); + + q.end(); + const bool availableBefore = q.resultAvailable(); + const UnsignedInt count = q.result(); + const bool availableAfter = q.resultAvailable(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(!availableBefore); + CORRADE_VERIFY(availableAfter); + CORRADE_COMPARE(count, 3); + #else + CORRADE_SKIP("Not implemented in OpenGL ES 3.0 yet."); + #endif +} + +}} + +CORRADE_TEST_MAIN(Magnum::Test::PrimitiveQueryGLTest) diff --git a/src/Test/QueryGLTestFiles/MyShader.frag b/src/Test/QueryGLTestFiles/MyShader.frag new file mode 100644 index 000000000..18cf87582 --- /dev/null +++ b/src/Test/QueryGLTestFiles/MyShader.frag @@ -0,0 +1,3 @@ +void main() { + gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0); +} diff --git a/src/Test/QueryGLTestFiles/MyShader.vert b/src/Test/QueryGLTestFiles/MyShader.vert new file mode 100644 index 000000000..0fd808f4b --- /dev/null +++ b/src/Test/QueryGLTestFiles/MyShader.vert @@ -0,0 +1,5 @@ +attribute lowp vec4 position; + +void main() { + gl_Position = position; +} diff --git a/src/Test/QueryGLTestFiles/resources.conf b/src/Test/QueryGLTestFiles/resources.conf new file mode 100644 index 000000000..daf955dd7 --- /dev/null +++ b/src/Test/QueryGLTestFiles/resources.conf @@ -0,0 +1,7 @@ +group=QueryGLTest + +[file] +filename=MyShader.vert + +[file] +filename=MyShader.frag diff --git a/src/Test/SampleQueryGLTest.cpp b/src/Test/SampleQueryGLTest.cpp new file mode 100644 index 000000000..d66bd6c39 --- /dev/null +++ b/src/Test/SampleQueryGLTest.cpp @@ -0,0 +1,208 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include +#include + +#include "AbstractShaderProgram.h" +#include "Buffer.h" +#include "Framebuffer.h" +#include "Mesh.h" +#include "Query.h" +#include "Renderbuffer.h" +#include "RenderbufferFormat.h" +#include "Shader.h" +#include "Test/AbstractOpenGLTester.h" + +namespace Magnum { namespace Test { + +class SampleQueryGLTest: public AbstractOpenGLTester { + public: + explicit SampleQueryGLTest(); + + void querySamplesPassed(); + #ifndef MAGNUM_TARGET_GLES + void conditionalRender(); + #endif +}; + +SampleQueryGLTest::SampleQueryGLTest() { + addTests({ + &SampleQueryGLTest::querySamplesPassed, + #ifndef MAGNUM_TARGET_GLES + &SampleQueryGLTest::conditionalRender + #endif + }); +} + +namespace { + struct MyShader: public AbstractShaderProgram { + typedef Attribute<0, Vector2> Position; + + explicit MyShader(); + }; +} + +MyShader::MyShader() { + Utility::Resource rs("QueryGLTest"); + #ifndef MAGNUM_TARGET_GLES + Shader vert(Version::GL210, Shader::Type::Vertex); + #else + Shader vert(Version::GLES200, Shader::Type::Vertex); + #endif + vert.addSource(rs.get("MyShader.vert")); + CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); + attachShader(vert); + + #ifndef MAGNUM_TARGET_GLES + Shader frag(Version::GL210, Shader::Type::Fragment); + #else + Shader frag(Version::GLES200, Shader::Type::Fragment); + #endif + frag.addSource(rs.get("MyShader.frag")); + CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); + attachShader(frag); + + CORRADE_INTERNAL_ASSERT_OUTPUT(link()); +} + +void SampleQueryGLTest::querySamplesPassed() { + #ifdef MAGNUM_TARGET_GLES2 + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::occlusion_query_boolean::string() + std::string(" is not available.")); + #endif + + Renderbuffer renderbuffer; + #ifndef MAGNUM_TARGET_GLES2 + renderbuffer.setStorage(RenderbufferFormat::RGBA8, Vector2i(32)); + #else + renderbuffer.setStorage(RenderbufferFormat::RGBA4, Vector2i(32)); + #endif + + Framebuffer framebuffer({{}, Vector2i(32)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), renderbuffer); + + Buffer buffer; + constexpr Vector2 triangle[] = {{-1.0f, 1.0f}, {-1.0f, -3.0f}, {3.0f, 1.0f}}; + buffer.setData(triangle, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.setPrimitive(MeshPrimitive::Triangles) + .setVertexCount(3) + .addVertexBuffer(buffer, 0, AbstractShaderProgram::Attribute<0, Vector2>()); + + MyShader shader; + + MAGNUM_VERIFY_NO_ERROR(); + + SampleQuery q; + #ifndef MAGNUM_TARGET_GLES + q.begin(SampleQuery::Target::SamplesPassed); + #else + q.begin(SampleQuery::Target::AnySamplesPassed); + #endif + + framebuffer.bind(FramebufferTarget::ReadDraw); + shader.use(); + mesh.draw(); + + q.end(); + const bool availableBefore = q.resultAvailable(); + const UnsignedInt count = q.result(); + const bool availableAfter = q.resultAvailable(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(!availableBefore); + CORRADE_VERIFY(availableAfter); + #ifndef MAGNUM_TARGET_GLES + CORRADE_COMPARE(count, 32*32); + #else + CORRADE_VERIFY(count > 0); + #endif +} + +#ifndef MAGNUM_TARGET_GLES +void SampleQueryGLTest::conditionalRender() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::NV::conditional_render::string() + std::string(" is not available.")); + + Renderbuffer renderbuffer; + renderbuffer.setStorage(RenderbufferFormat::RGBA8, Vector2i(32)); + + Framebuffer framebuffer({{}, Vector2i(32)}); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), renderbuffer); + + Buffer buffer; + constexpr Vector2 triangle[] = {{-1.0f, 1.0f}, {-1.0f, -3.0f}, {3.0f, 1.0f}}; + buffer.setData(triangle, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.setPrimitive(MeshPrimitive::Triangles) + .setVertexCount(3) + .addVertexBuffer(buffer, 0, AbstractShaderProgram::Attribute<0, Vector2>()); + + MyShader shader; + framebuffer.bind(FramebufferTarget::ReadDraw); + shader.use(); + + MAGNUM_VERIFY_NO_ERROR(); + + SampleQuery qYes, qNo, q; + + /* This should generate some samples */ + qYes.begin(SampleQuery::Target::SamplesPassed); + mesh.draw(); + qYes.end(); + + /* Thus this should be rendered */ + qYes.beginConditionalRender(SampleQuery::ConditionalRenderMode::Wait); + q.begin(SampleQuery::Target::SamplesPassed); + mesh.draw(); + q.end(); + qYes.endConditionalRender(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(qYes.result()); + CORRADE_VERIFY(q.result()); + + /* This shouldn't generate any samples */ + qNo.begin(SampleQuery::Target::SamplesPassed); + qNo.end(); + + /* Thus this should not be rendered */ + qNo.beginConditionalRender(SampleQuery::ConditionalRenderMode::Wait); + q.begin(SampleQuery::Target::SamplesPassed); + mesh.draw(); + q.end(); + qNo.endConditionalRender(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(!qNo.result()); + CORRADE_VERIFY(!q.result()); +} +#endif + +}} + +CORRADE_TEST_MAIN(Magnum::Test::SampleQueryGLTest) diff --git a/src/Test/TimeQueryGLTest.cpp b/src/Test/TimeQueryGLTest.cpp new file mode 100644 index 000000000..163f94a83 --- /dev/null +++ b/src/Test/TimeQueryGLTest.cpp @@ -0,0 +1,100 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include "Query.h" +#include "Test/AbstractOpenGLTester.h" + +namespace Magnum { namespace Test { + +class TimeQueryGLTest: public AbstractOpenGLTester { + public: + explicit TimeQueryGLTest(); + + void queryTime(); + void queryTimestamp(); +}; + +TimeQueryGLTest::TimeQueryGLTest() { + addTests({&TimeQueryGLTest::queryTime, + &TimeQueryGLTest::queryTimestamp}); +} + +void TimeQueryGLTest::queryTime() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::timer_query::string() + std::string(" is not available")); + #else + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::disjoint_timer_query::string() + std::string(" is not available")); + #endif + + TimeQuery q1; + q1.begin(TimeQuery::Target::TimeElapsed); + q1.end(); + const auto result1 = q1.result(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(result1 > 0); + + TimeQuery q2; + q2.begin(TimeQuery::Target::TimeElapsed); + Renderer::setFeature(Renderer::Feature::Blending, true); + Renderer::finish(); + q2.end(); + const auto result2 = q2.result(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(result2 > result1); +} + +void TimeQueryGLTest::queryTimestamp() { + #ifdef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::disjoint_timer_query::string() + std::string(" is not available")); + #endif + + TimeQuery q1, q2, q; + + q1.timestamp(); + + q.begin(TimeQuery::Target::TimeElapsed); + Renderer::setFeature(Renderer::Feature::Blending, true); + Renderer::finish(); + q.end(); + + q2.timestamp(); + + const auto result = q.result(); + const auto result1 = q1.result(); + const auto result2 = q2.result(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_VERIFY(result > 0); + CORRADE_VERIFY(result2 > result1); + CORRADE_VERIFY(result2-result1 > result); +} + +}} + +CORRADE_TEST_MAIN(Magnum::Test::TimeQueryGLTest) From 89c7d75a45b6712d97cbd9fdce8f9132120666e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:24:59 +0100 Subject: [PATCH 28/79] Fix return value from *Query::result(). This is just a convenience wrapper around result(), so we can implement it using that. And return true whenever the result is nonzero (previously was returning true for 1 and false for 0, 2, 3, etc., which is wrong). The tests now pass again. --- src/Query.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/Query.cpp b/src/Query.cpp index 1e3adfa56..d847bb635 100644 --- a/src/Query.cpp +++ b/src/Query.cpp @@ -90,21 +90,6 @@ bool AbstractQuery::resultAvailable() { } #ifndef DOXYGEN_GENERATING_OUTPUT -template<> bool AbstractQuery::result() { - CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {}); - - /** @todo Re-enable when extension loader is available for ES */ - GLuint result; - #ifndef MAGNUM_TARGET_GLES2 - glGetQueryObjectuiv(_id, GL_QUERY_RESULT, &result); - #elif defined(CORRADE_TARGET_NACL) - glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT, &result); - #else - CORRADE_INTERNAL_ASSERT(false); - #endif - return result == GL_TRUE; -} - template<> UnsignedInt AbstractQuery::result() { CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {}); @@ -120,6 +105,8 @@ template<> UnsignedInt AbstractQuery::result() { return result; } +template<> bool AbstractQuery::result() { return result() != 0; } + template<> Int AbstractQuery::result() { CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {}); From 7bda254690817aa2250ef6fb40760dcd040a8382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 00:27:48 +0100 Subject: [PATCH 29/79] Doc++ --- src/Query.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Query.h b/src/Query.h index 4cd2905da..1d1b4bf52 100644 --- a/src/Query.h +++ b/src/Query.h @@ -172,6 +172,8 @@ UnsignedInt primitiveCount = q.result(); @endcode @requires_gl30 %Extension @extension{EXT,transform_feedback} @requires_gles30 Only sample queries are available on OpenGL ES 2.0. + +@see @ref SampleQuery, @ref TimeQuery @todo glBeginQueryIndexed */ class PrimitiveQuery: public AbstractQuery { @@ -249,6 +251,8 @@ q.beginConditionalRender(SampleQuery::ConditionalRenderMode::Wait); q.endConditionalRender(); @endcode @requires_gles30 %Extension @es_extension{EXT,occlusion_query_boolean} + +@see @ref PrimitiveQuery, @ref TimeQuery */ class SampleQuery: public AbstractQuery { public: @@ -391,6 +395,8 @@ UnsignedInt timeElapsed2 = q3.result()-tmp; Using the latter results in fewer OpenGL calls when doing more measures. @requires_gl33 %Extension @extension{ARB,timer_query} @requires_es_extension %Extension @es_extension{EXT,disjoint_timer_query} + +@see @ref PrimitiveQuery, @ref SampleQuery @todo timestamp with glGet + example usage @todo @es_extension{EXT,disjoint_timer_query} -- GL_GPU_DISJOINT_EXT support? where? */ From 1456718c7c7c1081ea8074c7f291866d1c030ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 01:31:14 +0100 Subject: [PATCH 30/79] Fully test mesh functionality. This was painful. The test currently fails for a few reasons, see following commits. --- src/Mesh.h | 1 - src/Test/MeshGLTest.cpp | 1102 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 1099 insertions(+), 4 deletions(-) diff --git a/src/Mesh.h b/src/Mesh.h index 7afc54bf6..f8c7fc9ba 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -304,7 +304,6 @@ drawing commands are used on desktop OpenGL and OpenGL ES 3.0. See also @todo Support for indirect draw buffer (OpenGL 4.0, @extension{ARB,draw_indirect}) @todo Redo in a way that allows glMultiDrawArrays, glDrawArraysInstanced etc. -@todo test vertex specification & drawing @todo How to glDrawElementsBaseVertex()/vertex offset -- in draw()? */ class MAGNUM_EXPORT Mesh: public AbstractObject { diff --git a/src/Test/MeshGLTest.cpp b/src/Test/MeshGLTest.cpp index 2596a56db..948c0f325 100644 --- a/src/Test/MeshGLTest.cpp +++ b/src/Test/MeshGLTest.cpp @@ -22,13 +22,23 @@ DEALINGS IN THE SOFTWARE. */ -#include "Context.h" -#include "Extensions.h" +#include "Math/Matrix.h" +#include "Math/Vector4.h" +#include "Buffer.h" +#include "ColorFormat.h" +#include "Framebuffer.h" +#include "Image.h" #include "Mesh.h" +#include "MeshView.h" +#include "Renderbuffer.h" +#include "RenderbufferFormat.h" +#include "Shader.h" #include "Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { +/* Tests also MeshView class. */ + class MeshGLTest: public AbstractOpenGLTester { public: explicit MeshGLTest(); @@ -38,6 +48,62 @@ class MeshGLTest: public AbstractOpenGLTester { void constructMove(); void label(); + + #ifndef MAGNUM_TARGET_GLES2 + void addVertexBufferUnsignedInt(); + void addVertexBufferInt(); + #endif + void addVertexBufferFloat(); + #ifndef MAGNUM_TARGET_GLES + void addVertexBufferDouble(); + #endif + #ifndef MAGNUM_TARGET_GLES2 + void addVertexBufferVectorNui(); + void addVertexBufferVectorNi(); + #endif + void addVertexBufferVectorN(); + #ifndef MAGNUM_TARGET_GLES + void addVertexBufferVectorNd(); + #endif + void addVertexBufferMatrixNxN(); + #ifndef MAGNUM_TARGET_GLES + void addVertexBufferMatrixNxNd(); + #endif + #ifndef MAGNUM_TARGET_GLES2 + void addVertexBufferMatrixMxN(); + #endif + #ifndef MAGNUM_TARGET_GLES + void addVertexBufferMatrixMxNd(); + #endif + + #ifndef MAGNUM_TARGET_GLES2 + void addVertexBufferUnsignedIntWithUnsignedShort(); + void addVertexBufferUnsignedIntWithShort(); + void addVertexBufferIntWithUnsignedShort(); + void addVertexBufferIntWithShort(); + #endif + /* Other Float types omitted (covered by addVertexBufferNormalized()) */ + void addVertexBufferFloatWithHalfFloat(); + #ifndef MAGNUM_TARGET_GLES + void addVertexBufferFloatWithDouble(); + #endif + #ifndef MAGNUM_TARGET_GLES2 + void addVertexBufferVector4WithUnsignedInt2101010Rev(); + void addVertexBufferVector4WithInt2101010Rev(); + #endif + + void addVertexBufferLessVectorComponents(); + void addVertexBufferNormalized(); + #ifndef MAGNUM_TARGET_GLES + void addVertexBufferBGRA(); + #endif + + void addVertexBufferMultiple(); + void addVertexBufferMultipleGaps(); + + void setIndexBuffer(); + void setIndexBufferRange(); + void setIndexBufferUnsignedInt(); }; MeshGLTest::MeshGLTest() { @@ -45,7 +111,62 @@ MeshGLTest::MeshGLTest() { &MeshGLTest::constructCopy, &MeshGLTest::constructMove, - &MeshGLTest::label}); + &MeshGLTest::label, + + #ifndef MAGNUM_TARGET_GLES2 + &MeshGLTest::addVertexBufferUnsignedInt, + &MeshGLTest::addVertexBufferInt, + #endif + &MeshGLTest::addVertexBufferFloat, + #ifndef MAGNUM_TARGET_GLES + &MeshGLTest::addVertexBufferDouble, + #endif + #ifndef MAGNUM_TARGET_GLES2 + &MeshGLTest::addVertexBufferVectorNui, + &MeshGLTest::addVertexBufferVectorNi, + #endif + &MeshGLTest::addVertexBufferVectorN, + #ifndef MAGNUM_TARGET_GLES + &MeshGLTest::addVertexBufferVectorNd, + #endif + &MeshGLTest::addVertexBufferMatrixNxN, + #ifndef MAGNUM_TARGET_GLES + &MeshGLTest::addVertexBufferMatrixNxNd, + #endif + #ifndef MAGNUM_TARGET_GLES2 + &MeshGLTest::addVertexBufferMatrixMxN, + #endif + #ifndef MAGNUM_TARGET_GLES + &MeshGLTest::addVertexBufferMatrixMxNd, + #endif + + #ifndef MAGNUM_TARGET_GLES2 + &MeshGLTest::addVertexBufferUnsignedIntWithUnsignedShort, + &MeshGLTest::addVertexBufferUnsignedIntWithShort, + &MeshGLTest::addVertexBufferIntWithUnsignedShort, + &MeshGLTest::addVertexBufferIntWithShort, + #endif + &MeshGLTest::addVertexBufferFloatWithHalfFloat, + #ifndef MAGNUM_TARGET_GLES + &MeshGLTest::addVertexBufferFloatWithDouble, + #endif + #ifndef MAGNUM_TARGET_GLES2 + &MeshGLTest::addVertexBufferVector4WithUnsignedInt2101010Rev, + &MeshGLTest::addVertexBufferVector4WithInt2101010Rev, + #endif + + &MeshGLTest::addVertexBufferLessVectorComponents, + &MeshGLTest::addVertexBufferNormalized, + #ifndef MAGNUM_TARGET_GLES + &MeshGLTest::addVertexBufferBGRA, + #endif + + &MeshGLTest::addVertexBufferMultiple, + &MeshGLTest::addVertexBufferMultipleGaps, + + &MeshGLTest::setIndexBuffer, + &MeshGLTest::setIndexBufferRange, + &MeshGLTest::setIndexBufferUnsignedInt}); } void MeshGLTest::construct() { @@ -129,6 +250,981 @@ void MeshGLTest::label() { MAGNUM_VERIFY_NO_ERROR(); } +namespace { + struct FloatShader: AbstractShaderProgram { + explicit FloatShader(const std::string& type, const std::string& conversion); + }; + + #ifndef MAGNUM_TARGET_GLES2 + struct IntegerShader: AbstractShaderProgram { + explicit IntegerShader(const std::string& type); + }; + #endif + + #ifndef MAGNUM_TARGET_GLES + struct DoubleShader: AbstractShaderProgram { + explicit DoubleShader(const std::string& type, const std::string& outputType, const std::string& conversion); + }; + #endif + + struct Checker { + Checker(AbstractShaderProgram&& shader, RenderbufferFormat format, Mesh& mesh); + + template T get(ColorFormat format, ColorType type); + + Renderbuffer renderbuffer; + Framebuffer framebuffer; + }; +} + +FloatShader::FloatShader(const std::string& type, const std::string& conversion) { + /* We need special version for ES3, because GLSL in ES2 doesn't support + rectangle matrices */ + #ifndef MAGNUM_TARGET_GLES + Shader vert(Version::GL210, Shader::Type::Vertex); + #elif defined(MAGNUM_TARGET_GLES2) + Shader vert(Version::GLES200, Shader::Type::Vertex); + #else + Shader vert(Version::GLES300, Shader::Type::Vertex); + #endif + + vert.addSource( + #ifndef MAGNUM_TARGET_GLES3 + "attribute mediump " + type + " value;\n" + "varying mediump " + type + " valueInterpolated;\n" + #else + "in mediump " + type + " value;\n" + "out mediump " + type + " valueInterpolated;\n" + #endif + "void main() {\n" + " valueInterpolated = value;\n" + " gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n" + "}\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); + attachShader(vert); + + #ifndef MAGNUM_TARGET_GLES + Shader frag(Version::GL210, Shader::Type::Fragment); + #elif defined(MAGNUM_TARGET_GLES2) + Shader frag(Version::GLES200, Shader::Type::Fragment); + #else + Shader frag(Version::GLES300, Shader::Type::Fragment); + #endif + + #ifndef MAGNUM_TARGET_GLES3 + frag.addSource("varying mediump " + type + " valueInterpolated;\n" + "void main() { gl_FragColor = " + conversion + "; }\n"); + #else + frag.addSource("in mediump " + type + " valueInterpolated;\n" + "out mediump vec4 output;\n" + "void main() { output = " + conversion + "; }\n"); + #endif + CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); + attachShader(frag); + + bindAttributeLocation(0, "value"); + + CORRADE_INTERNAL_ASSERT_OUTPUT(link()); +} + +#ifndef MAGNUM_TARGET_GLES2 +IntegerShader::IntegerShader(const std::string& type) { + #ifndef MAGNUM_TARGET_GLES + Shader vert(Version::GL300, Shader::Type::Vertex); + #else + Shader vert(Version::GLES300, Shader::Type::Vertex); + #endif + vert.addSource("in mediump " + type + " value;\n" + "flat out mediump " + type + " valueInterpolated;\n" + "void main() {\n" + " valueInterpolated = value;\n" + " gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n" + "}\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); + attachShader(vert); + + #ifndef MAGNUM_TARGET_GLES + Shader frag(Version::GL300, Shader::Type::Fragment); + #else + Shader frag(Version::GLES300, Shader::Type::Fragment); + #endif + frag.addSource("flat in mediump " + type + " valueInterpolated;\n" + "out mediump " + type + " result;\n" + "void main() { result = valueInterpolated; }\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); + attachShader(frag); + + bindAttributeLocation(0, "value"); + + CORRADE_INTERNAL_ASSERT_OUTPUT(link()); +} +#endif + +#ifndef MAGNUM_TARGET_GLES +DoubleShader::DoubleShader(const std::string& type, const std::string& outputType, const std::string& conversion) { + Shader vert(Version::GL410, Shader::Type::Vertex); + vert.addSource("in " + type + " value;\n" + "out " + outputType + " valueInterpolated;\n" + "void main() {\n" + " valueInterpolated = " + conversion + ";\n" + " gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n" + "}\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); + attachShader(vert); + + Shader frag(Version::GL410, Shader::Type::Fragment); + frag.addSource("in " + outputType + " valueInterpolated;\n" + "out " + outputType + " result;\n" + "void main() { result = valueInterpolated; }\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); + attachShader(frag); + + bindAttributeLocation(0, "value"); + + CORRADE_INTERNAL_ASSERT_OUTPUT(link()); +} +#endif + +Checker::Checker(AbstractShaderProgram&& shader, RenderbufferFormat format, Mesh& mesh): framebuffer({{}, Vector2i(1)}) { + renderbuffer.setStorage(format, Vector2i(1)); + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), renderbuffer); + + framebuffer.bind(FramebufferTarget::ReadDraw); + shader.use(); + mesh.setVertexCount(2) + .setPrimitive(MeshPrimitive::Points); + + /* Skip first vertex so we test also offsets */ + MeshView(mesh).setVertexRange(1, 1).draw(); +} + +template T Checker::get(ColorFormat format, ColorType type) { + Image2D image(format, type); + framebuffer.read({}, Vector2i(1), image); + return image.data()[0]; +} + +#ifndef MAGNUM_TARGET_GLES2 +void MeshGLTest::addVertexBufferUnsignedInt() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, UnsignedInt> Attribute; + + constexpr UnsignedInt data[] = { 0, 157, 35681 }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("uint"), RenderbufferFormat::R32UI, mesh) + .get(ColorFormat::RedInteger, ColorType::UnsignedInt); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 35681); +} + +void MeshGLTest::addVertexBufferInt() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Int> Attribute; + + constexpr Int data[] = { 0, 457931, 27530 }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("int"), RenderbufferFormat::R32I, mesh) + .get(ColorFormat::RedInteger, ColorType::Int); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 27530); +} +#endif + +void MeshGLTest::addVertexBufferFloat() { + typedef AbstractShaderProgram::Attribute<0, Float> Attribute; + + const Float data[] = { 0.0f, -0.7f, Math::normalize(96) }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("float", "vec4(valueInterpolated, 0.0, 0.0, 0.0)"), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 96); +} + +#ifndef MAGNUM_TARGET_GLES +void MeshGLTest::addVertexBufferDouble() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_attrib_64bit::string() + std::string(" is not available.")); + + typedef AbstractShaderProgram::Attribute<0, Double> Attribute; + + const Double data[] = { 0.0, -0.7, Math::normalize(45828) }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 8, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(DoubleShader("double", "float", "vec4(value, 0.0, 0.0, 0.0)"), + RenderbufferFormat::R16, mesh).get(ColorFormat::Red, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 45828); +} +#endif + +#ifndef MAGNUM_TARGET_GLES2 +void MeshGLTest::addVertexBufferVectorNui() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Vector3ui> Attribute; + + constexpr Vector3ui data[] = { {}, {37448, 547686, 156}, {27592, 157, 25} }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("uvec3"), RenderbufferFormat::RGBA32UI, mesh) + .get(ColorFormat::RGBAInteger, ColorType::UnsignedInt); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Vector3ui(27592, 157, 25)); +} + +void MeshGLTest::addVertexBufferVectorNi() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Vector2i> Attribute; + + constexpr Vector2i data[] = { {}, {-37448, 547686}, {27592, -157} }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 2*4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("ivec2"), RenderbufferFormat::RG32I, mesh) + .get(ColorFormat::RGInteger, ColorType::Int); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Vector2i(27592, -157)); +} +#endif + +void MeshGLTest::addVertexBufferVectorN() { + typedef AbstractShaderProgram::Attribute<0, Vector3> Attribute; + + const Vector3 data[] = { {}, {0.0f, -0.9f, 1.0f}, Math::normalize(Color3ub(96, 24, 156)) }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("vec3", "vec4(valueInterpolated, 0.0)"), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color3ub(96, 24, 156)); +} + +#ifndef MAGNUM_TARGET_GLES +void MeshGLTest::addVertexBufferVectorNd() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_attrib_64bit::string() + std::string(" is not available.")); + + typedef AbstractShaderProgram::Attribute<0, Vector4d> Attribute; + + const Vector4d data[] = { + {}, {0.0, -0.9, 1.0, 1.25}, + Math::normalize(Math::Vector4(315, 65201, 2576, 12)) + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4*8, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(DoubleShader("dvec4", "vec4", "vec4(value)"), + RenderbufferFormat::RGBA16, mesh).get>(ColorFormat::RGBA, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Math::Vector4(315, 65201, 2576, 12)); +} +#endif + +void MeshGLTest::addVertexBufferMatrixNxN() { + typedef AbstractShaderProgram::Attribute<0, Matrix3x3> Attribute; + + const Matrix3x3 data[] = { + {}, + Matrix3x3::fromDiagonal({0.0f, -0.9f, 1.0f}), + Matrix3x3::fromDiagonal(Math::normalize(Color3ub(96, 24, 156))) + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*3*4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("mat3", + "vec4(valueInterpolated[0][0], valueInterpolated[1][1], valueInterpolated[2][2], 0.0)"), + RenderbufferFormat::RGBA8, mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color3ub(96, 24, 156)); +} + +#ifndef MAGNUM_TARGET_GLES +void MeshGLTest::addVertexBufferMatrixNxNd() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_attrib_64bit::string() + std::string(" is not available.")); + + typedef AbstractShaderProgram::Attribute<0, Matrix3x3d> Attribute; + + const Matrix3x3d data[] = { + {}, + Matrix3x3d::fromDiagonal({0.0, -0.9, 1.0}), + Matrix3x3d::fromDiagonal(Math::normalize(Math::Vector3(315, 65201, 2576))) + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*3*8, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(DoubleShader("dmat3", "vec4", + "vec4(value[0][0], value[1][1], value[2][2], 0.0)"), + RenderbufferFormat::RGBA16, mesh).get>(ColorFormat::RGB, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Math::Vector3(315, 65201, 2576)); +} +#endif + +#ifndef MAGNUM_TARGET_GLES2 +void MeshGLTest::addVertexBufferMatrixMxN() { + typedef AbstractShaderProgram::Attribute<0, Matrix3x4> Attribute; + + const Matrix3x4 data[] = { + {}, + Matrix3x4::fromDiagonal({0.0f, -0.9f, 1.0f}), + Matrix3x4::fromDiagonal(Math::normalize(Color3ub(96, 24, 156))) + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*4*4, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("mat3x4", + "vec4(valueInterpolated[0][0], valueInterpolated[1][1], valueInterpolated[2][2], 0.0)"), + RenderbufferFormat::RGBA8, mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color3ub(96, 24, 156)); +} +#endif + +#ifndef MAGNUM_TARGET_GLES +void MeshGLTest::addVertexBufferMatrixMxNd() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_attrib_64bit::string() + std::string(" is not available.")); + + typedef AbstractShaderProgram::Attribute<0, Matrix3x4d> Attribute; + + const Matrix3x4d data[] = { + {}, + Matrix3x4d::fromDiagonal({0.0f, -0.9f, 1.0f}), + Matrix3x4d::fromDiagonal(Math::normalize(Math::Vector3(315, 65201, 2576))) + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*4*8, Attribute()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(DoubleShader("dmat3x4", "vec4", + "vec4(value[0][0], value[1][1], value[2][2], 0.0)"), + RenderbufferFormat::RGBA16, mesh).get>(ColorFormat::RGB, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Math::Vector3(315, 65201, 2576)); +} +#endif + +#ifndef MAGNUM_TARGET_GLES2 +void MeshGLTest::addVertexBufferUnsignedIntWithUnsignedShort() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, UnsignedInt> Attribute; + + constexpr UnsignedShort data[] = { 0, 49563, 16583 }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::UnsignedShort)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("uint"), RenderbufferFormat::R16UI, mesh) + .get(ColorFormat::RedInteger, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 16583); +} + +void MeshGLTest::addVertexBufferUnsignedIntWithShort() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, UnsignedInt> Attribute; + + constexpr Short data[] = { 0, 24563, 16583 }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::Short)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("uint"), RenderbufferFormat::R16I, mesh) + .get(ColorFormat::RedInteger, ColorType::Short); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 16583); +} + +void MeshGLTest::addVertexBufferIntWithUnsignedShort() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Int> Attribute; + + constexpr UnsignedShort data[] = { 0, 49563, 16583 }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::UnsignedShort)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("int"), RenderbufferFormat::R16UI, mesh) + .get(ColorFormat::RedInteger, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 16583); +} + +void MeshGLTest::addVertexBufferIntWithShort() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::EXT::gpu_shader4::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Int> Attribute; + + constexpr Short data[] = { 0, 24563, -16583 }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::Short)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(IntegerShader("int"), RenderbufferFormat::R16I, mesh) + .get(ColorFormat::RedInteger, ColorType::Short); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, -16583); +} +#endif + +void MeshGLTest::addVertexBufferFloatWithHalfFloat() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::NV::half_float::string() + std::string(" is not supported.")); + #elif defined(MAGNUM_TARGET_GLES2) + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::OES::vertex_half_float::string() + std::string(" is not supported.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Float> Attribute; + + Buffer buffer; + buffer.setData({nullptr, 6}, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::HalfFloat)); + + MAGNUM_VERIFY_NO_ERROR(); + + /* Won't test the actual values */ +} + +#ifndef MAGNUM_TARGET_GLES +void MeshGLTest::addVertexBufferFloatWithDouble() { + typedef AbstractShaderProgram::Attribute<0, Float> Attribute; + + const Double data[] = { 0.0, -0.7, Math::normalize(186) }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 8, Attribute(Attribute::DataType::Double)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("float", "vec4(valueInterpolated, 0.0, 0.0, 0.0)"), + RenderbufferFormat::RGBA8, mesh).get(ColorFormat::RGBA, ColorType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, 186); +} +#endif + +#ifndef MAGNUM_TARGET_GLES2 +void MeshGLTest::addVertexBufferVector4WithUnsignedInt2101010Rev() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_type_2_10_10_10_rev::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Vector4> Attribute; + + Buffer buffer; + buffer.setData({nullptr, 12}, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4, Attribute(Attribute::DataType::UnsignedInt2101010Rev)); + + MAGNUM_VERIFY_NO_ERROR(); + /* Won't test the actual values */ +} + +void MeshGLTest::addVertexBufferVector4WithInt2101010Rev() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_type_2_10_10_10_rev::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Vector4> Attribute; + + Buffer buffer; + buffer.setData({nullptr, 12}, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4, Attribute(Attribute::DataType::Int2101010Rev)); + + MAGNUM_VERIFY_NO_ERROR(); + /* Won't test the actual values */ +} +#endif + +void MeshGLTest::addVertexBufferLessVectorComponents() { + typedef AbstractShaderProgram::Attribute<0, Vector4> Attribute; + + const Vector3 data[] = { + {}, {0.0f, -0.9f, 1.0f}, + Math::normalize(Color3ub(96, 24, 156)) + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3*4, Attribute(Attribute::Components::Three)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("vec4", "valueInterpolated"), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color4ub(96, 24, 156, 255)); +} + +void MeshGLTest::addVertexBufferNormalized() { + typedef AbstractShaderProgram::Attribute<0, Vector3> Attribute; + + constexpr Color3ub data[] = { {}, {0, 128, 64}, {32, 156, 228} }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 3, Attribute(Attribute::DataType::UnsignedByte, Attribute::DataOption::Normalized)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("vec3", "vec4(valueInterpolated, 0.0)"), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color3ub(32, 156, 228)); +} + +#ifndef MAGNUM_TARGET_GLES +void MeshGLTest::addVertexBufferBGRA() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::vertex_array_bgra::string() + std::string(" is not available.")); + #endif + + typedef AbstractShaderProgram::Attribute<0, Vector4> Attribute; + + constexpr Color4ub data[] = { {}, {0, 128, 64, 161}, {96, 24, 156, 225} }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4, Attribute(Attribute::Components::BGRA, Attribute::DataType::UnsignedByte, Attribute::DataOption::Normalized)); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(FloatShader("vec4", "valueInterpolated"), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color4ub(156, 24, 96, 225)); +} +#endif + +namespace { + struct MultipleShader: AbstractShaderProgram { + typedef Attribute<0, Vector3> Position; + typedef Attribute<1, Vector3> Normal; + typedef Attribute<2, Vector2> TextureCoordinates; + + explicit MultipleShader(); + }; +} + +MultipleShader::MultipleShader() { + #ifndef MAGNUM_TARGET_GLES + Shader vert(Version::GL210, Shader::Type::Vertex); + #else + Shader vert(Version::GLES200, Shader::Type::Vertex); + #endif + + vert.addSource("attribute mediump vec4 position;\n" + "attribute mediump vec3 normal;\n" + "attribute mediump vec2 textureCoordinates;\n" + "varying mediump vec4 valueInterpolated;\n" + "void main() {\n" + " valueInterpolated = position + vec4(normal, 0.0) + vec4(textureCoordinates, 0.0, 0.0);\n" + " gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n" + "}\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); + attachShader(vert); + + #ifndef MAGNUM_TARGET_GLES + Shader frag(Version::GL210, Shader::Type::Fragment); + #else + Shader frag(Version::GLES200, Shader::Type::Fragment); + #endif + + frag.addSource("varying mediump vec4 valueInterpolated;\n" + "void main() { gl_FragColor = valueInterpolated; }\n"); + CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); + attachShader(frag); + + bindAttributeLocation(Position::Location, "position"); + bindAttributeLocation(Normal::Location, "normal"); + bindAttributeLocation(TextureCoordinates::Location, "textureCoordinates"); + + CORRADE_INTERNAL_ASSERT_OUTPUT(link()); +} + +void MeshGLTest::addVertexBufferMultiple() { + const Float data[] = { + 0.0f, /* Offset */ + + /* First attribute */ + 0.3f, 0.1f, 0.5f, + 0.4f, 0.0f, -0.9f, + 1.0f, -0.5f, + + /* Second attribute */ + Math::normalize(64), + Math::normalize(17), + Math::normalize(56), + Math::normalize(15), + Math::normalize(164), + Math::normalize(17), + Math::normalize(97), + Math::normalize(28) + }; + + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 1*4, MultipleShader::Position(), + MultipleShader::Normal(), MultipleShader::TextureCoordinates()); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(MultipleShader(), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color4ub(64 + 15 + 97, 17 + 164 + 28, 56 + 17, 255)); +} + +void MeshGLTest::addVertexBufferMultipleGaps() { + const Float data[] = { + 0.0f, 0.0f, 0.0f, 0.0f, /* Offset */ + + /* First attribute */ + 0.3f, 0.1f, 0.5f, 0.0f, + 0.4f, 0.0f, -0.9f, 0.0f, + 1.0f, -0.5f, 0.0f, 0.0f, + + /* Second attribute */ + Math::normalize(64), + Math::normalize(17), + Math::normalize(56), 0.0f, + Math::normalize(15), + Math::normalize(164), + Math::normalize(17), 0.0f, + Math::normalize(97), + Math::normalize(28), 0.0f, 0.0f + }; + Buffer buffer; + buffer.setData(data, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(buffer, 4*4, + MultipleShader::Position(), 1*4, + MultipleShader::Normal(), 1*4, + MultipleShader::TextureCoordinates(), 2*4); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = Checker(MultipleShader(), + #ifndef MAGNUM_TARGET_GLES2 + RenderbufferFormat::RGBA8, + #else + RenderbufferFormat::RGBA4, + #endif + mesh).get(ColorFormat::RGBA, ColorType::UnsignedByte); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, Color4ub(64 + 15 + 97, 17 + 164 + 28, 56 + 17, 255)); +} + +namespace { + struct IndexChecker { + explicit IndexChecker(Mesh& mesh); + Color4ub get(); + + Renderbuffer renderbuffer; + Framebuffer framebuffer; + }; + + const Float indexedVertexData[] = { + 0.0f, /* Offset */ + + /* First attribute */ + Math::normalize(64), + Math::normalize(17), + Math::normalize(56), + Math::normalize(15), + Math::normalize(164), + Math::normalize(17), + Math::normalize(97), + Math::normalize(28), + + /* Second attribute */ + 0.3f, 0.1f, 0.5f, + 0.4f, 0.0f, -0.9f, + 1.0f, -0.5f + }; + + constexpr Color4ub indexedResult(64 + 15 + 97, 17 + 164 + 28, 56 + 17, 255); +} + +IndexChecker::IndexChecker(Mesh& mesh): framebuffer({{}, Vector2i(1)}) { + #ifndef MAGNUM_TARGET_GLES2 + renderbuffer.setStorage(RenderbufferFormat::RGBA8, Vector2i(1)); + #else + renderbuffer.setStorage(RenderbufferFormat::RGBA4, Vector2i(1)); + #endif + framebuffer.attachRenderbuffer(Framebuffer::ColorAttachment(0), renderbuffer); + + framebuffer.bind(FramebufferTarget::ReadDraw); + MultipleShader shader; + shader.use(); + mesh.setIndexCount(2) + .setPrimitive(MeshPrimitive::Points); + mesh.draw(); + + /* Skip first vertex so we test also offsets */ + MeshView(mesh).setIndexRange(1, 1).draw(); +} + +Color4ub IndexChecker::get() { + Image2D image(ColorFormat::RGBA, ColorType::UnsignedByte); + framebuffer.read({}, Vector2i(1), image); + return image.data()[0]; +} + +void MeshGLTest::setIndexBuffer() { + Buffer vertices; + vertices.setData(indexedVertexData, BufferUsage::StaticDraw); + + constexpr UnsignedShort indexData[] = { 2, 1, 0 }; + Buffer indices(Buffer::Target::ElementArray); + indices.setData(indexData, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(vertices, 1*4, MultipleShader::Position(), + MultipleShader::Normal(), MultipleShader::TextureCoordinates()) + .setIndexBuffer(indices, 2, Mesh::IndexType::UnsignedShort); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = IndexChecker(mesh).get(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, indexedResult); +} + +void MeshGLTest::setIndexBufferRange() { + Buffer vertices; + vertices.setData(indexedVertexData, BufferUsage::StaticDraw); + + constexpr UnsignedShort indexData[] = { 2, 1, 0 }; + Buffer indices(Buffer::Target::ElementArray); + indices.setData(indexData, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(vertices, 1*4, MultipleShader::Position(), + MultipleShader::Normal(), MultipleShader::TextureCoordinates()) + .setIndexBuffer(indices, 2, Mesh::IndexType::UnsignedShort, 0, 1); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = IndexChecker(mesh).get(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, indexedResult); +} + +void MeshGLTest::setIndexBufferUnsignedInt() { + #ifdef MAGNUM_TARGET_GLES2 + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::OES::element_index_uint::string() + std::string(" is not available.")); + #endif + + Buffer vertices; + vertices.setData(indexedVertexData, BufferUsage::StaticDraw); + + constexpr UnsignedInt indexData[] = { 2, 1, 0 }; + Buffer indices(Buffer::Target::ElementArray); + indices.setData(indexData, BufferUsage::StaticDraw); + + Mesh mesh; + mesh.addVertexBuffer(vertices, 1*4, MultipleShader::Position(), + MultipleShader::Normal(), MultipleShader::TextureCoordinates()) + .setIndexBuffer(indices, 4, Mesh::IndexType::UnsignedInt); + + MAGNUM_VERIFY_NO_ERROR(); + + const auto value = IndexChecker(mesh).get(); + + MAGNUM_VERIFY_NO_ERROR(); + CORRADE_COMPARE(value, indexedResult); +} + }} CORRADE_TEST_MAIN(Magnum::Test::MeshGLTest) From 5ad98d41cafc0ce41dbf8745237133e8466ab544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 01:34:17 +0100 Subject: [PATCH 31/79] Expose vertex attribute size as vector size + vector count. Makes it possible to properly compute offset when adding matrix attributes to mesh. The matrix-related test cases in Mesh test are now passing. The vector count is now enum value to make it more clear that that is compile-time constant independent of what was said in constructor. --- src/AbstractShaderProgram.h | 23 ++++-- src/Mesh.h | 12 +-- src/Test/AbstractShaderProgramTest.cpp | 102 ++++++++++++++++++------- 3 files changed, 98 insertions(+), 39 deletions(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index edc16ea46..a345ac209 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -1166,7 +1166,14 @@ See @ref AbstractShaderProgram-subclassing for example usage in shaders and template class AbstractShaderProgram::Attribute { public: enum: UnsignedInt { - Location = location /**< Location to which the attribute is bound */ + Location = location, /**< Location to which the attribute is bound */ + + /** + * Count of vectors in this type + * + * @see @ref vectorSize() + */ + VectorCount = Implementation::Attribute::VectorCount }; /** @@ -1340,9 +1347,13 @@ template class AbstractShaderProgram::Attribute { /** @brief Type of passed data */ constexpr DataType dataType() const { return _dataType; } - /** @brief Size of passed data */ - std::size_t dataSize() const { - return Implementation::Attribute::size(GLint(_components)*Implementation::Attribute::vectorCount(), _dataType); + /** + * @brief Size of each vector in passed data + * + * @see @ref VectorCount + */ + UnsignedInt vectorSize() const { + return Implementation::Attribute::size(GLint(_components), _dataType); } /** @brief Data options */ @@ -1369,7 +1380,7 @@ template struct SizedAttribute; /* Vector attribute sizes */ template struct SizedVectorAttribute { - constexpr static std::size_t vectorCount() { return cols; } + enum: UnsignedInt { VectorCount = UnsignedInt(cols) }; }; template<> struct SizedAttribute<1, 1>: SizedVectorAttribute<1> { enum class Components: GLint { One = 1 }; @@ -1565,7 +1576,7 @@ template<> struct Attribute> { }; typedef Containers::EnumSet DataOptions; - constexpr static std::size_t vectorCount() { return 1; } + enum: UnsignedInt { VectorCount = 1 }; static std::size_t MAGNUM_EXPORT size(GLint components, DataType dataType); }; diff --git a/src/Mesh.h b/src/Mesh.h index f8c7fc9ba..ed7a78b9f 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -655,7 +655,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { /* Computing stride of interleaved vertex attributes */ template inline static GLsizei strideOfInterleaved(const AbstractShaderProgram::Attribute& attribute, const U&... attributes) { - return attribute.dataSize() + strideOfInterleaved(attributes...); + return attribute.vectorSize()*AbstractShaderProgram::Attribute::VectorCount + strideOfInterleaved(attributes...); } template inline static GLsizei strideOfInterleaved(GLintptr gap, const T&... attributes) { return gap + strideOfInterleaved(attributes...); @@ -667,7 +667,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { addVertexAttribute(buffer, attribute, offset, stride); /* Add size of this attribute to offset for next attribute */ - addVertexBufferInternal(buffer, offset+attribute.dataSize(), stride, attributes...); + addVertexBufferInternal(buffer, offset+attribute.vectorSize()*AbstractShaderProgram::Attribute::VectorCount, stride, attributes...); } template inline void addVertexBufferInternal(Buffer& buffer, GLintptr offset, GLsizei stride, GLintptr gap, const T&... attributes) { /* Add the gap to offset for next attribute */ @@ -676,14 +676,14 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { inline void addVertexBufferInternal(Buffer&, GLsizei, GLintptr) {} template inline void addVertexAttribute(typename std::enable_if::Type, Float>::value, Buffer&>::type buffer, const AbstractShaderProgram::Attribute& attribute, GLintptr offset, GLsizei stride) { - for(UnsignedInt i = 0; i != Implementation::Attribute::vectorCount(); ++i) + for(UnsignedInt i = 0; i != AbstractShaderProgram::Attribute::VectorCount; ++i) (this->*attributePointerImplementation)(Attribute{ &buffer, location+i, GLint(attribute.components()), GLenum(attribute.dataType()), bool(attribute.dataOptions() & AbstractShaderProgram::Attribute::DataOption::Normalized), - offset, + offset+i*attribute.vectorSize(), stride }); } @@ -702,13 +702,13 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { #ifndef MAGNUM_TARGET_GLES template inline void addVertexAttribute(typename std::enable_if::Type, Double>::value, Buffer&>::type buffer, const AbstractShaderProgram::Attribute& attribute, GLintptr offset, GLsizei stride) { - for(UnsignedInt i = 0; i != Implementation::Attribute::vectorCount(); ++i) + for(UnsignedInt i = 0; i != AbstractShaderProgram::Attribute::VectorCount; ++i) (this->*attributeLPointerImplementation)(LongAttribute{ &buffer, location+i, GLint(attribute.components()), GLenum(attribute.dataType()), - offset, + offset+i*attribute.vectorSize(), stride }); } diff --git a/src/Test/AbstractShaderProgramTest.cpp b/src/Test/AbstractShaderProgramTest.cpp index 20d77a1dd..4df6e4eb9 100644 --- a/src/Test/AbstractShaderProgramTest.cpp +++ b/src/Test/AbstractShaderProgramTest.cpp @@ -44,8 +44,12 @@ class AbstractShaderProgramTest: public TestSuite::Tester { void attributeVector4(); void attributeVectorBGRA(); - void attributeMatrix(); - void attributeMatrixDouble(); + void attributeMatrixNxN(); + #ifndef MAGNUM_TARGET_GLES2 + void attributeMatrixMxN(); + #endif + void attributeMatrixNxNd(); + void attributeMatrixMxNd(); }; AbstractShaderProgramTest::AbstractShaderProgramTest() { @@ -61,38 +65,44 @@ AbstractShaderProgramTest::AbstractShaderProgramTest() { &AbstractShaderProgramTest::attributeVector4, &AbstractShaderProgramTest::attributeVectorBGRA, - &AbstractShaderProgramTest::attributeMatrix, - &AbstractShaderProgramTest::attributeMatrixDouble}); + &AbstractShaderProgramTest::attributeMatrixNxN, + #ifndef MAGNUM_TARGET_GLES2 + &AbstractShaderProgramTest::attributeMatrixMxN, + #endif + &AbstractShaderProgramTest::attributeMatrixNxNd, + &AbstractShaderProgramTest::attributeMatrixMxNd}); } void AbstractShaderProgramTest::attributeScalar() { typedef AbstractShaderProgram::Attribute<3, Float> Attribute; CORRADE_COMPARE(Attribute::Location, 3); + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::One); CORRADE_VERIFY(!a.dataOptions()); - CORRADE_COMPARE(a.dataSize(), 4); + CORRADE_COMPARE(a.vectorSize(), 4); CORRADE_COMPARE(a.dataType(), Attribute::DataType::Float); /* Options */ Attribute b(Attribute::DataType::UnsignedShort, Attribute::DataOption::Normalized); - CORRADE_COMPARE(b.dataSize(), 2); + CORRADE_COMPARE(b.vectorSize(), 2); CORRADE_VERIFY(b.dataOptions() <= Attribute::DataOption::Normalized); } void AbstractShaderProgramTest::attributeScalarInt() { #ifndef MAGNUM_TARGET_GLES2 typedef AbstractShaderProgram::Attribute<3, Int> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; - CORRADE_COMPARE(a.dataSize(), 4); + CORRADE_COMPARE(a.vectorSize(), 4); /* Options */ Attribute b(Attribute::DataType::Short); - CORRADE_COMPARE(b.dataSize(), 2); + CORRADE_COMPARE(b.vectorSize(), 2); #else CORRADE_SKIP("Integer attributes are not available in OpenGL ES 2."); #endif @@ -101,14 +111,15 @@ void AbstractShaderProgramTest::attributeScalarInt() { void AbstractShaderProgramTest::attributeScalarUnsignedInt() { #ifndef MAGNUM_TARGET_GLES2 typedef AbstractShaderProgram::Attribute<3, UnsignedInt> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; - CORRADE_COMPARE(a.dataSize(), 4); + CORRADE_COMPARE(a.vectorSize(), 4); /* Options */ Attribute b(Attribute::DataType::UnsignedByte); - CORRADE_COMPARE(b.dataSize(), 1); + CORRADE_COMPARE(b.vectorSize(), 1); #else CORRADE_SKIP("Integer attributes are not available in OpenGL ES 2."); #endif @@ -117,10 +128,11 @@ void AbstractShaderProgramTest::attributeScalarUnsignedInt() { void AbstractShaderProgramTest::attributeScalarDouble() { #ifndef MAGNUM_TARGET_GLES typedef AbstractShaderProgram::Attribute<3, Double> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; - CORRADE_COMPARE(a.dataSize(), 8); + CORRADE_COMPARE(a.vectorSize(), 8); #else CORRADE_SKIP("Double attributes are not available in OpenGL ES."); #endif @@ -128,38 +140,40 @@ void AbstractShaderProgramTest::attributeScalarDouble() { void AbstractShaderProgramTest::attributeVector() { typedef AbstractShaderProgram::Attribute<3, Vector3> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::Three); - CORRADE_COMPARE(a.dataSize(), 3*4); + CORRADE_COMPARE(a.vectorSize(), 3*4); CORRADE_COMPARE(a.dataType(), Attribute::DataType::Float); /* Options */ #ifndef MAGNUM_TARGET_GLES Attribute b(Attribute::Components::Two, Attribute::DataType::Double); CORRADE_COMPARE(b.components(), Attribute::Components::Two); - CORRADE_COMPARE(b.dataSize(), 2*8); + CORRADE_COMPARE(b.vectorSize(), 2*8); #else Attribute b(Attribute::Components::Two, Attribute::DataType::Float); CORRADE_COMPARE(b.components(), Attribute::Components::Two); - CORRADE_COMPARE(b.dataSize(), 2*4); + CORRADE_COMPARE(b.vectorSize(), 2*4); #endif } void AbstractShaderProgramTest::attributeVectorInt() { #ifndef MAGNUM_TARGET_GLES2 typedef AbstractShaderProgram::Attribute<3, Vector2i> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::Two); - CORRADE_COMPARE(a.dataSize(), 2*4); + CORRADE_COMPARE(a.vectorSize(), 2*4); CORRADE_COMPARE(a.dataType(), Attribute::DataType::Int); /* Options */ Attribute b(Attribute::Components::One, Attribute::DataType::Int); - CORRADE_COMPARE(b.dataSize(), 4); + CORRADE_COMPARE(b.vectorSize(), 4); #else CORRADE_SKIP("Integer attributes are not available in OpenGL ES 2."); #endif @@ -168,16 +182,17 @@ void AbstractShaderProgramTest::attributeVectorInt() { void AbstractShaderProgramTest::attributeVectorUnsignedInt() { #ifndef MAGNUM_TARGET_GLES2 typedef AbstractShaderProgram::Attribute<3, Vector4ui> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::Four); - CORRADE_COMPARE(a.dataSize(), 4*4); + CORRADE_COMPARE(a.vectorSize(), 4*4); CORRADE_COMPARE(a.dataType(), Attribute::DataType::UnsignedInt); /* Options */ Attribute b(Attribute::Components::Three, Attribute::DataType::UnsignedShort); - CORRADE_COMPARE(b.dataSize(), 3*2); + CORRADE_COMPARE(b.vectorSize(), 3*2); #else CORRADE_SKIP("Integer attributes are not available in OpenGL ES 2."); #endif @@ -186,16 +201,17 @@ void AbstractShaderProgramTest::attributeVectorUnsignedInt() { void AbstractShaderProgramTest::attributeVectorDouble() { #ifndef MAGNUM_TARGET_GLES typedef AbstractShaderProgram::Attribute<3, Vector2d> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::Two); - CORRADE_COMPARE(a.dataSize(), 2*8); + CORRADE_COMPARE(a.vectorSize(), 2*8); CORRADE_COMPARE(a.dataType(), Attribute::DataType::Double); /* Options */ Attribute b(Attribute::Components::One); - CORRADE_COMPARE(b.dataSize(), 8); + CORRADE_COMPARE(b.vectorSize(), 8); #else CORRADE_SKIP("Double attributes are not available in OpenGL ES."); #endif @@ -203,47 +219,79 @@ void AbstractShaderProgramTest::attributeVectorDouble() { void AbstractShaderProgramTest::attributeVector4() { typedef AbstractShaderProgram::Attribute<3, Vector4> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* Custom type */ #ifndef MAGNUM_TARGET_GLES Attribute a(Attribute::DataType::UnsignedInt2101010Rev); - CORRADE_COMPARE(a.dataSize(), 4); + CORRADE_COMPARE(a.vectorSize(), 4); #else Attribute a(Attribute::DataType::HalfFloat); - CORRADE_COMPARE(a.dataSize(), 8); + CORRADE_COMPARE(a.vectorSize(), 8); #endif } void AbstractShaderProgramTest::attributeVectorBGRA() { #ifndef MAGNUM_TARGET_GLES typedef AbstractShaderProgram::Attribute<3, Vector4> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 1); /* BGRA */ Attribute a(Attribute::Components::BGRA); - CORRADE_COMPARE(a.dataSize(), 4*4); + CORRADE_COMPARE(a.vectorSize(), 4*4); #else CORRADE_SKIP("BGRA attribute component ordering is not available in OpenGL ES."); #endif } -void AbstractShaderProgramTest::attributeMatrix() { +void AbstractShaderProgramTest::attributeMatrixNxN() { typedef AbstractShaderProgram::Attribute<3, Matrix3> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 3); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::Three); - CORRADE_COMPARE(a.dataSize(), 3*3*4); + CORRADE_COMPARE(a.vectorSize(), 3*4); CORRADE_COMPARE(a.dataType(), Attribute::DataType::Float); } -void AbstractShaderProgramTest::attributeMatrixDouble() { +#ifndef MAGNUM_TARGET_GLES2 +void AbstractShaderProgramTest::attributeMatrixMxN() { + typedef AbstractShaderProgram::Attribute<3, Matrix3x4> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 3); + + /* Default constructor */ + Attribute a; + CORRADE_COMPARE(a.components(), Attribute::Components::Four); + CORRADE_COMPARE(a.vectorSize(), 4*4); + CORRADE_COMPARE(a.dataType(), Attribute::DataType::Float); +} +#endif + +void AbstractShaderProgramTest::attributeMatrixNxNd() { #ifndef MAGNUM_TARGET_GLES typedef AbstractShaderProgram::Attribute<3, Matrix4d> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 4); /* Default constructor */ Attribute a; CORRADE_COMPARE(a.components(), Attribute::Components::Four); - CORRADE_COMPARE(a.dataSize(), 4*4*8); + CORRADE_COMPARE(a.vectorSize(), 4*8); + CORRADE_COMPARE(a.dataType(), Attribute::DataType::Double); + #else + CORRADE_SKIP("Double attributes are not available in OpenGL ES."); + #endif +} + +void AbstractShaderProgramTest::attributeMatrixMxNd() { + #ifndef MAGNUM_TARGET_GLES + typedef AbstractShaderProgram::Attribute<3, Matrix4x2d> Attribute; + CORRADE_COMPARE(Attribute::VectorCount, 4); + + /* Default constructor */ + Attribute a; + CORRADE_COMPARE(a.components(), Attribute::Components::Two); + CORRADE_COMPARE(a.vectorSize(), 2*8); CORRADE_COMPARE(a.dataType(), Attribute::DataType::Double); #else CORRADE_SKIP("Double attributes are not available in OpenGL ES."); From 314a47399b9c09f0545cd857514a84782ea31196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 01:36:22 +0100 Subject: [PATCH 32/79] Fix index buffer offset in MeshView. I'm not sure why I marked this as bug instead of fixing this directly. The mesh test now fully passes. --- src/MeshView.cpp | 4 ++-- src/MeshView.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/MeshView.cpp b/src/MeshView.cpp index 9eed8f255..af473a6f7 100644 --- a/src/MeshView.cpp +++ b/src/MeshView.cpp @@ -34,7 +34,7 @@ MeshView& MeshView::setIndexRange(Int first, Int count, UnsignedInt start, Unsig MeshView& MeshView::setIndexRange(Int first, Int count, UnsignedInt, UnsignedInt) #endif { - _indexOffset = first*_original->indexSize(); + _indexOffset = _original->_indexOffset + first*_original->indexSize(); _indexCount = count; #ifndef MAGNUM_TARGET_GLES2 _indexStart = start; @@ -45,7 +45,7 @@ MeshView& MeshView::setIndexRange(Int first, Int count, UnsignedInt, UnsignedInt void MeshView::draw() { #ifndef MAGNUM_TARGET_GLES2 - _original->drawInternal(_firstVertex, _vertexCount, _indexOffset, _indexCount, _indexStart, _indexEnd); + _original->drawInternal(_firstVertex, _vertexCount, _indexOffset, _indexCount, _indexStart, _indexEnd); #else _original->drawInternal(_firstVertex, _vertexCount, _indexOffset, _indexCount); #endif diff --git a/src/MeshView.h b/src/MeshView.h index 8804b3227..33eb4902c 100644 --- a/src/MeshView.h +++ b/src/MeshView.h @@ -49,8 +49,6 @@ no draw commands are issued when calling @ref draw(). You must ensure that the original mesh remains available for whole view lifetime. -@todo Might cause issues when there are more data than just indices in index - buffer (wrongly computed offset) */ class MAGNUM_EXPORT MeshView { public: From 46e2ca80cd057471a9c8f8c1000cf991f5707a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 14:21:51 +0100 Subject: [PATCH 33/79] Various documentation fixes and updates. {} in Matrix constructor caused Doxygen to forget all functions after it. --- src/AbstractFramebuffer.h | 16 +++++++-------- src/AbstractShaderProgram.h | 26 ++++++++++++++---------- src/Color.h | 18 ++++++++-------- src/DefaultFramebuffer.h | 12 +++++++---- src/Framebuffer.h | 18 ++++++++++------ src/Math/Matrix3.h | 6 +++--- src/Math/Matrix4.h | 6 +++--- src/Math/RectangularMatrix.h | 6 ++++++ src/Math/Swizzle.h | 2 +- src/Test/AbstractShaderProgramGLTest.cpp | 2 ++ src/Test/MeshGLTest.cpp | 6 ++++++ src/Test/SampleQueryGLTest.cpp | 2 ++ 12 files changed, 75 insertions(+), 45 deletions(-) diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index 7b4e2282a..705c8b859 100644 --- a/src/AbstractFramebuffer.h +++ b/src/AbstractFramebuffer.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class @ref Magnum::AbstractFramebuffer, enum @ref Magnum::FramebufferClear, @ref Magnum::FramebufferBlit, @ref Magnum::FramebufferBlitFilter, @ref Magnum::FramebufferTarget, enum set @ref FramebufferClearMask + * @brief Class @ref Magnum::AbstractFramebuffer, enum @ref Magnum::FramebufferClear, @ref Magnum::FramebufferBlit, @ref Magnum::FramebufferBlitFilter, @ref Magnum::FramebufferTarget, enum set @ref Magnum::FramebufferClearMask */ #include @@ -39,7 +39,7 @@ namespace Magnum { /** @brief Mask for framebuffer clearing -@see AbstractFramebuffer, FramebufferClearMask +@see @ref AbstractFramebuffer, @ref FramebufferClearMask */ enum class FramebufferClear: GLbitfield { Color = GL_COLOR_BUFFER_BIT, /**< Color */ @@ -50,7 +50,7 @@ enum class FramebufferClear: GLbitfield { /** @brief Mask for clearing -@see AbstractFramebuffer::clear() +@see @ref AbstractFramebuffer::clear() */ typedef Containers::EnumSet FramebufferClearMask; @@ -58,7 +58,7 @@ typedef Containers::EnumSet class AbstractShaderProgram::Attribute { * @brief Constructor * @param components Component count * @param dataType Type of passed data. Default is the same as - * type used in shader (e.g. @ref DataType::Integer for - * @ref Vector4i). + * type used in shader (e.g. @ref DataType::Int for @ref Vector4i). * @param dataOptions Data options. Default is no options. */ constexpr Attribute(Components components, DataType dataType = Implementation::Attribute::DefaultDataType, DataOptions dataOptions = DataOptions()): _components(components), _dataType(dataType), _dataOptions(dataOptions) {} diff --git a/src/Color.h b/src/Color.h index 279387dc8..4795dc5bc 100644 --- a/src/Color.h +++ b/src/Color.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::BasicColor3, Magnum::BasicColor4, typedef Magnum::Color3, Magnum::Color4 + * @brief Class @ref Magnum::BasicColor3, @ref Magnum::BasicColor4, typedef @ref Magnum::Color3, @ref Magnum::Color4 */ #include @@ -290,7 +290,7 @@ template class BasicColor3: public Math::Vector3 { * std::tie(hue, saturation, value) = color.toHSV(); * @endcode * - * @see hue(), saturation(), value(), fromHSV() + * @see @ref hue(), @ref saturation(), @ref value(), @ref fromHSV() */ constexpr HSV toHSV() const { return Implementation::toHSV(*this); @@ -300,7 +300,7 @@ template class BasicColor3: public Math::Vector3 { * @brief Hue * @return Hue in range @f$ [0.0, 360.0] @f$. * - * @see saturation(), value(), toHSV(), fromHSV() + * @see @ref saturation(), @ref value(), @ref toHSV(), @ref fromHSV() */ constexpr Math::Deg hue() const { return Math::Deg(Implementation::hue(*this)); @@ -310,7 +310,7 @@ template class BasicColor3: public Math::Vector3 { * @brief Saturation * @return Saturation in range @f$ [0.0, 1.0] @f$. * - * @see hue(), value(), toHSV(), fromHSV() + * @see @ref hue(), @ref value(), @ref toHSV(), @ref fromHSV() */ constexpr FloatingPointType saturation() const { return Implementation::saturation(*this); @@ -320,7 +320,7 @@ template class BasicColor3: public Math::Vector3 { * @brief Value * @return Value in range @f$ [0.0, 1.0] @f$. * - * @see hue(), saturation(), toHSV(), fromHSV() + * @see @ref hue(), @ref saturation(), @ref toHSV(), @ref fromHSV() */ constexpr FloatingPointType value() const { return Implementation::value(*this); @@ -420,7 +420,7 @@ class BasicColor4: public Math::Vector4 { /** * @copydoc BasicColor3::fromHSV() - * @param a Alpha value, defaults to 1.0 for floating-point types + * @param a Alpha value, defaults to `1.0` for floating-point types * and maximum positive value for integral types. */ constexpr static BasicColor4 fromHSV(HSV hsv, T a = Implementation::fullChannel()) { @@ -434,14 +434,14 @@ class BasicColor4: public Math::Vector4 { /** * @brief Default constructor * - * RGB components are set to zero, A component is set to 1.0 for + * RGB components are set to zero, A component is set to `1.0` for * floating-point types and maximum positive value for integral types. */ constexpr /*implicit*/ BasicColor4(): Math::Vector4(T(0), T(0), T(0), Implementation::fullChannel()) {} /** * @copydoc BasicColor3::BasicColor3(T) - * @param alpha Alpha value, defaults to 1.0 for floating-point types + * @param alpha Alpha value, defaults to `1.0` for floating-point types * and maximum positive value for integral types. */ constexpr explicit BasicColor4(T rgb, T alpha = Implementation::fullChannel()): Math::Vector4(rgb, rgb, rgb, alpha) {} @@ -451,7 +451,7 @@ class BasicColor4: public Math::Vector4 { * @param r R value * @param g G value * @param b B value - * @param a A value, defaults to 1.0 for floating-point types and + * @param a A value, defaults to `1.0` for floating-point types and * maximum positive value for integral types. */ constexpr /*implicit*/ BasicColor4(T r, T g, T b, T a = Implementation::fullChannel()): Math::Vector4(r, g, b, a) {} diff --git a/src/DefaultFramebuffer.h b/src/DefaultFramebuffer.h index 3bc545ffd..f264f61f4 100644 --- a/src/DefaultFramebuffer.h +++ b/src/DefaultFramebuffer.h @@ -393,9 +393,11 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { * @see @fn_gl{InvalidateFramebuffer} or @fn_gles_extension{DiscardFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * @ref clear() instead where the extension is not supported. + * @ref Magnum::DefaultFramebuffer::clear() "clear()" instead + * where the extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use @ref clear() instead where the extension is not supported. + * Use @ref Magnum::DefaultFramebuffer::clear() "clear()" instead + * where the extension is not supported. */ void invalidate(std::initializer_list attachments); @@ -409,9 +411,11 @@ class MAGNUM_EXPORT DefaultFramebuffer: public AbstractFramebuffer { * @see @fn_gl{InvalidateSubFramebuffer} or @fn_gles_extension{DiscardSubFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * @ref clear() instead where the extension is not supported. + * @ref Magnum::DefaultFramebuffer::clear() "clear()" instead + * where the extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use @ref clear() instead where the extension is not supported. + * Use @ref Magnum::DefaultFramebuffer::clear() "clear()" instead + * where the extension is not supported. */ void invalidate(std::initializer_list attachments, const Range2Di& rectangle); diff --git a/src/Framebuffer.h b/src/Framebuffer.h index d9072fdf0..8e09d8601 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -107,7 +107,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje /** * @brief Color attachment * - * @see @ref Attachment, @ref attachRenderbuffer(), + * @see @ref BufferAttachment, @ref attachRenderbuffer(), * @ref attachTexture1D(), @ref attachTexture2D(), * @ref attachCubeMapTexture(), @ref attachTexture3D() */ @@ -176,7 +176,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * * @requires_gles30 Combined depth and stencil attachment is * not available in OpenGL ES 2.0. Attach the same object - * to both @ref Depth and @ref Stencil instead. + * to both @ref Magnum::Framebuffer::BufferAttachment::Depth + * "BufferAttachment::Depth" and @ref Magnum::Framebuffer::BufferAttachment::Stencil + * "BufferAttachment::Stencil" instead. * @todo Support this in ES2 (bind to both depth and stencil internally) */ static const BufferAttachment DepthStencil; @@ -438,9 +440,11 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @see @fn_gl{InvalidateFramebuffer} or @fn_gles_extension{DiscardFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * @ref clear() instead where the extension is not supported. + * @ref Magnum::Framebuffer::clear() "clear()" instead where the + * extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use @ref clear() instead where the extension is not supported. + * Use @ref Magnum::Framebuffer::clear() "clear()" instead where + * the extension is not supported. */ void invalidate(std::initializer_list attachments); @@ -454,9 +458,11 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @see @fn_gl{InvalidateSubFramebuffer} or @fn_gles_extension{DiscardSubFramebuffer,EXT,discard_framebuffer} * on OpenGL ES 2.0 * @requires_gl43 %Extension @extension{ARB,invalidate_subdata}. Use - * @ref clear() instead where the extension is not supported. + * @ref Magnum::Framebuffer::clear() "clear()" instead where the + * extension is not supported. * @requires_gles30 %Extension @es_extension{EXT,discard_framebuffer}. - * Use @ref clear() instead where the extension is not supported. + * Use @ref Magnum::Framebuffer::clear() "clear()" instead where + * the extension is not supported. */ void invalidate(std::initializer_list attachments, const Range2Di& rectangle); diff --git a/src/Math/Matrix3.h b/src/Math/Matrix3.h index 60a64ddcd..380ba6ad6 100644 --- a/src/Math/Matrix3.h +++ b/src/Math/Matrix3.h @@ -129,7 +129,7 @@ template class Matrix3: public Matrix<3, T> { * constructor with `Matrix3 m(Matrix3::Identity);`. Optional parameter * @p value allows you to specify value on diagonal. */ - constexpr /*implicit*/ Matrix3(typename Matrix<3, T>::IdentityType identity = (Matrix<3, T>::Identity), T value = T(1)): Matrix<3, T>(identity, value) {} + constexpr /*implicit*/ Matrix3(typename Matrix<3, T>::IdentityType = (Matrix<3, T>::Identity), T value = T(1)): Matrix<3, T>(Matrix<3, T>::Identity, value) {} /** @brief %Matrix from column vectors */ constexpr /*implicit*/ Matrix3(const Vector3& first, const Vector3& second, const Vector3& third): Matrix<3, T>(first, second, third) {} @@ -206,7 +206,7 @@ template class Matrix3: public Matrix<3, T> { * to @ref uniformScaling(), because it doesn't compute the square * root. * @see @ref rotationScaling(), @ref rotation(), - * @ref rotationNormalized(), @ref scaling(const Vector2&), + * @ref rotationNormalized(), @ref scaling(const Vector2&), * @ref Matrix4::uniformScaling() */ T uniformScalingSquared() const { @@ -223,7 +223,7 @@ template class Matrix3: public Matrix<3, T> { * the scaling is the same in all axes. Use faster alternative * @ref uniformScalingSquared() where possible. * @see @ref rotationScaling(), @ref rotation(), - * @ref rotationNormalized(), @ref scaling(const Vector2&), + * @ref rotationNormalized(), @ref scaling(const Vector2&), * @ref Matrix4::uniformScaling() */ T uniformScaling() const { return std::sqrt(uniformScalingSquared()); } diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index e1270c132..702b506a8 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -191,7 +191,7 @@ template class Matrix4: public Matrix<4, T> { * constructor with `Matrix4 m(Matrix4::Identity);`. Optional parameter * @p value allows you to specify value on diagonal. */ - constexpr /*implicit*/ Matrix4(typename Matrix<4, T>::IdentityType = (Matrix<4, T>::Identity), T value = T(1)): Matrix<4, T>({}, value) {} + constexpr /*implicit*/ Matrix4(typename Matrix<4, T>::IdentityType = (Matrix<4, T>::Identity), T value = T(1)): Matrix<4, T>(Matrix<4, T>::Identity, value) {} /** @brief %Matrix from column vectors */ constexpr /*implicit*/ Matrix4(const Vector4& first, const Vector4& second, const Vector4& third, const Vector4& fourth): Matrix<4, T>(first, second, third, fourth) {} @@ -269,7 +269,7 @@ template class Matrix4: public Matrix<4, T> { * to @ref uniformScaling(), because it doesn't compute the square * root. * @see @ref rotationScaling(), @ref rotation(), - * @ref rotationNormalized(), @ref scaling(const Vector3&), + * @ref rotationNormalized(), @ref scaling(const Vector3&), * @ref Matrix3::uniformScaling() */ T uniformScalingSquared() const; @@ -281,7 +281,7 @@ template class Matrix4: public Matrix<4, T> { * the scaling is the same in all axes. Use faster alternative * @ref uniformScalingSquared() where possible. * @see @ref rotationScaling(), @ref rotation(), - * @ref rotationNormalized(), @ref scaling(const Vector3&), + * @ref rotationNormalized(), @ref scaling(const Vector3&), * @ref Matrix3::uniformScaling() */ T uniformScaling() const { return std::sqrt(uniformScalingSquared()); } diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index 8f1450364..21c17d60d 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -359,7 +359,11 @@ template class RectangularMatrix { return *reinterpret_cast*>(data()); } + #ifndef DOXYGEN_GENERATING_OUTPUT protected: + #else + private: + #endif /* Implementation for RectangularMatrix::fromDiagonal() and Matrix(T) */ template constexpr explicit RectangularMatrix(Implementation::Sequence, const Vector& diagonal); @@ -654,9 +658,11 @@ template inline RectangularMatrix inline constexpr auto RectangularMatrix::diagonal() const -> Vector { return diagonalInternal(typename Implementation::GenerateSequence::Type()); } +#ifndef DOXYGEN_GENERATING_OUTPUT template template inline constexpr auto RectangularMatrix::diagonalInternal(Implementation::Sequence) const -> Vector { return {(*this)[sequence][sequence]...}; } +#endif }} diff --git a/src/Math/Swizzle.h b/src/Math/Swizzle.h index 0a8606ffa..0575b2e91 100644 --- a/src/Math/Swizzle.h +++ b/src/Math/Swizzle.h @@ -77,7 +77,7 @@ four-component, corresponding @ref Math::Vector2, @ref Math::Vector3, @ref Math::Vector4, @ref Color3 or @ref Color4 specialization is returned. @see @ref matrix-vector-component-access, @ref Vector4::xyz(), - @ref Vector4::xy(), @ref Vector3::xy(), @ref Color4::rgb() + @ref Vector4::xy(), @ref Vector3::xy(), @ref BasicColor4::rgb() */ template constexpr typename Implementation::TypeForSize::Type swizzle(const T& vector) { return {Implementation::Component::value(vector)...}; diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Test/AbstractShaderProgramGLTest.cpp index 775aebafd..0fd679c97 100644 --- a/src/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Test/AbstractShaderProgramGLTest.cpp @@ -297,6 +297,7 @@ namespace { }; } +#ifndef DOXYGEN_GENERATING_OUTPUT MyShader::MyShader() { Utility::Resource rs("AbstractShaderProgramGLTest"); @@ -326,6 +327,7 @@ MyShader::MyShader() { colorUniform = uniformLocation("color"); additionsUniform = uniformLocation("additions"); } +#endif void AbstractShaderProgramGLTest::uniform() { MyShader shader; diff --git a/src/Test/MeshGLTest.cpp b/src/Test/MeshGLTest.cpp index 948c0f325..d23a69401 100644 --- a/src/Test/MeshGLTest.cpp +++ b/src/Test/MeshGLTest.cpp @@ -277,6 +277,7 @@ namespace { }; } +#ifndef DOXYGEN_GENERATING_OUTPUT FloatShader::FloatShader(const std::string& type, const std::string& conversion) { /* We need special version for ES3, because GLSL in ES2 doesn't support rectangle matrices */ @@ -403,6 +404,7 @@ template T Checker::get(ColorFormat format, ColorType type) { framebuffer.read({}, Vector2i(1), image); return image.data()[0]; } +#endif #ifndef MAGNUM_TARGET_GLES2 void MeshGLTest::addVertexBufferUnsignedInt() { @@ -982,6 +984,7 @@ namespace { }; } +#ifndef DOXYGEN_GENERATING_OUTPUT MultipleShader::MultipleShader() { #ifndef MAGNUM_TARGET_GLES Shader vert(Version::GL210, Shader::Type::Vertex); @@ -1017,6 +1020,7 @@ MultipleShader::MultipleShader() { CORRADE_INTERNAL_ASSERT_OUTPUT(link()); } +#endif void MeshGLTest::addVertexBufferMultiple() { const Float data[] = { @@ -1132,6 +1136,7 @@ namespace { constexpr Color4ub indexedResult(64 + 15 + 97, 17 + 164 + 28, 56 + 17, 255); } +#ifndef DOXYGEN_GENERATING_OUTPUT IndexChecker::IndexChecker(Mesh& mesh): framebuffer({{}, Vector2i(1)}) { #ifndef MAGNUM_TARGET_GLES2 renderbuffer.setStorage(RenderbufferFormat::RGBA8, Vector2i(1)); @@ -1156,6 +1161,7 @@ Color4ub IndexChecker::get() { framebuffer.read({}, Vector2i(1), image); return image.data()[0]; } +#endif void MeshGLTest::setIndexBuffer() { Buffer vertices; diff --git a/src/Test/SampleQueryGLTest.cpp b/src/Test/SampleQueryGLTest.cpp index d66bd6c39..3fae6a0f7 100644 --- a/src/Test/SampleQueryGLTest.cpp +++ b/src/Test/SampleQueryGLTest.cpp @@ -64,6 +64,7 @@ namespace { }; } +#ifndef DOXYGEN_GENERATING_OUTPUT MyShader::MyShader() { Utility::Resource rs("QueryGLTest"); #ifndef MAGNUM_TARGET_GLES @@ -86,6 +87,7 @@ MyShader::MyShader() { CORRADE_INTERNAL_ASSERT_OUTPUT(link()); } +#endif void SampleQueryGLTest::querySamplesPassed() { #ifdef MAGNUM_TARGET_GLES2 From 4395a1d21e008a0c8eec870bd53d942755a4504f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 14:46:30 +0100 Subject: [PATCH 34/79] Platform: rename Sdl2Application::Configuration::Flags to WindowFlags. Flags etc. will be used for context flags in the future and this would result in naming collision. --- src/Platform/Sdl2Application.cpp | 8 ++--- src/Platform/Sdl2Application.h | 60 ++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/Platform/Sdl2Application.cpp b/src/Platform/Sdl2Application.cpp index 93635eab7..969b852dc 100644 --- a/src/Platform/Sdl2Application.cpp +++ b/src/Platform/Sdl2Application.cpp @@ -109,8 +109,8 @@ bool Sdl2Application::tryCreateContext(const Configuration& configuration) { SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, configuration.sampleCount()); /* Flags: if not hidden, set as shown */ - Uint32 flags(configuration.flags()); - if(!(configuration.flags() & Configuration::Flag::Hidden)) flags |= SDL_WINDOW_SHOWN; + Uint32 windowFlags(configuration.windowFlags()); + if(!(configuration.windowFlags() & Configuration::WindowFlag::Hidden)) windowFlags |= SDL_WINDOW_SHOWN; /** @todo Remove when Emscripten has proper SDL2 support */ #ifndef CORRADE_TARGET_EMSCRIPTEN @@ -158,7 +158,7 @@ bool Sdl2Application::tryCreateContext(const Configuration& configuration) { if(!(window = SDL_CreateWindow(configuration.title().data(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, configuration.size().x(), configuration.size().y(), - SDL_WINDOW_OPENGL|flags))) + SDL_WINDOW_OPENGL|windowFlags))) { Error() << "Platform::Sdl2Application::tryCreateContext(): cannot create window:" << SDL_GetError(); return false; @@ -328,7 +328,7 @@ Sdl2Application::Configuration::Configuration(): #ifndef CORRADE_TARGET_EMSCRIPTEN _title("Magnum SDL2 Application"), #endif - _size(800, 600), _flags(Flag::Resizable), _sampleCount(0), _version(Version::None) {} + _size(800, 600), _windowFlags(WindowFlag::Resizable), _sampleCount(0), _version(Version::None) {} Sdl2Application::Configuration::~Configuration() = default; diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index bb03214f0..253a63111 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -41,6 +41,10 @@ #include #include +#ifdef MAGNUM_BUILD_DEPRECATED +#include +#endif + namespace Magnum { class Context; @@ -370,9 +374,9 @@ class Sdl2Application::Configuration { /** * @brief Window flag * - * @see @ref Flags, @ref setFlags() + * @see @ref WindowFlags, @ref setWindowFlags() */ - enum class Flag: Uint32 { + enum class WindowFlag: Uint32 { Resizable = SDL_WINDOW_RESIZABLE, /**< Resizable window */ Fullscreen = SDL_WINDOW_FULLSCREEN, /**< Fullscreen window */ Hidden = SDL_WINDOW_HIDDEN, /**< Hidden window */ @@ -381,14 +385,30 @@ class Sdl2Application::Configuration { MouseLocked = SDL_WINDOW_INPUT_GRABBED /**< Window with mouse locked */ }; + #ifdef MAGNUM_BUILD_DEPRECATED + /** + * @copybrief WindowFlag + * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::WindowFlag "WindowFlag" instead. + */ + typedef CORRADE_DEPRECATED("use WindowFlag instead") WindowFlag Flag; + #endif + /** * @brief Window flags * * @see @ref setFlags() */ - typedef Containers::EnumSet Flags; + SDL_WINDOW_MINIMIZED|SDL_WINDOW_INPUT_GRABBED> WindowFlags; + + #ifdef MAGNUM_BUILD_DEPRECATED + /** + * @copybrief WindowFlags + * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::WindowFlags "WindowFlags" instead. + */ + typedef CORRADE_DEPRECATED("use WindowFlags instead") WindowFlags Flags; + #endif /*implicit*/ Configuration(); ~Configuration(); @@ -435,19 +455,39 @@ class Sdl2Application::Configuration { } /** @brief Window flags */ - Flags flags() const { return _flags; } + WindowFlags windowFlags() const { return _windowFlags; } + + #ifdef MAGNUM_BUILD_DEPRECATED + /** + * @copybrief windowFlags() + * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::windowFlags() "windowFlags()" instead. + */ + CORRADE_DEPRECATED("use windowFlags() instead") WindowFlags flags() const { + return windowFlags(); + } + #endif /** * @brief Set window flags * @return Reference to self (for method chaining) * - * Default is @ref Flag::Resizable. + * Default is @ref WindowFlag::Resizable. */ - Configuration& setFlags(const Flags flags) { - _flags = flags; + Configuration& setWindowFlags(WindowFlags flags) { + _windowFlags = flags; return *this; } + #ifdef MAGNUM_BUILD_DEPRECATED + /** + * @copybrief setWindowFlags() + * @deprecated Use @ref Magnum::Platform::Sdl2Application::Configuration::setWindowFlags "setWindowFlags()" instead. + */ + CORRADE_DEPRECATED("use setWindowFlags() instead") Configuration& setFlags(WindowFlags flags) { + return setWindowFlags(flags); + } + #endif + #ifndef CORRADE_TARGET_EMSCRIPTEN /** * @brief Context version @@ -496,12 +536,12 @@ class Sdl2Application::Configuration { std::string _title; #endif Vector2i _size; - Flags _flags; + WindowFlags _windowFlags; Int _sampleCount; Version _version; }; -CORRADE_ENUMSET_OPERATORS(Sdl2Application::Configuration::Flags) +CORRADE_ENUMSET_OPERATORS(Sdl2Application::Configuration::WindowFlags) /** @brief Base for input events From 2b4d52ea3ceda91483757d29435aadffbd1b38ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 14:51:55 +0100 Subject: [PATCH 35/79] SceneGraph: template implementation file for Drawable class. The class has virtual member, so it's good to have it in one place and not in thousand five ones. --- src/SceneGraph/CMakeLists.txt | 1 + src/SceneGraph/Drawable.h | 12 +++++++++- src/SceneGraph/Drawable.hpp | 39 ++++++++++++++++++++++++++++++++ src/SceneGraph/instantiation.cpp | 4 ++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/SceneGraph/Drawable.hpp diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index 32b018ceb..72822a81a 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -51,6 +51,7 @@ set(MagnumSceneGraph_HEADERS Camera3D.h Camera3D.hpp Drawable.h + Drawable.hpp DualComplexTransformation.h DualQuaternionTransformation.h RigidMatrixTransformation2D.h diff --git a/src/SceneGraph/Drawable.h b/src/SceneGraph/Drawable.h index 305251c8d..292907f57 100644 --- a/src/SceneGraph/Drawable.h +++ b/src/SceneGraph/Drawable.h @@ -114,6 +114,16 @@ void MyApplication::drawEvent() { } @endcode +@section Drawable-explicit-specializations Explicit template specializations + +The following specializations are explicitly compiled into @ref SceneGraph +library. For other specializations (e.g. using @ref Double type) you have to +use @ref Drawable.hpp implementation file to avoid linker errors. See also +@ref compilation-speedup-hpp for more information. + +- @ref Drawable2D +- @ref Drawable3D + @see @ref scenegraph, @ref BasicDrawable2D, @ref BasicDrawable3D, @ref Drawable2D, @ref Drawable3D, @ref DrawableGroup */ @@ -127,7 +137,7 @@ template class Drawable: public AbstractGrouped * Adds the feature to the object and also to the group, if specified. * Otherwise you can use DrawableGroup::add(). */ - explicit Drawable(AbstractObject& object, DrawableGroup* drawables = nullptr): AbstractGroupedFeature, T>(object, drawables) {} + explicit Drawable(AbstractObject& object, DrawableGroup* drawables = nullptr); /** * @brief Group containing this drawable diff --git a/src/SceneGraph/Drawable.hpp b/src/SceneGraph/Drawable.hpp new file mode 100644 index 000000000..222b790ea --- /dev/null +++ b/src/SceneGraph/Drawable.hpp @@ -0,0 +1,39 @@ +#ifndef Magnum_SceneGraph_Drawable_hpp +#define Magnum_SceneGraph_Drawable_hpp +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +/** @file + * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Drawable.h + */ + +#include "Drawable.h" + +namespace Magnum { namespace SceneGraph { + +template Drawable::Drawable(AbstractObject& object, DrawableGroup* drawables): AbstractGroupedFeature, T>(object, drawables) {} + +}} + +#endif diff --git a/src/SceneGraph/instantiation.cpp b/src/SceneGraph/instantiation.cpp index 079199ddc..4530719d4 100644 --- a/src/SceneGraph/instantiation.cpp +++ b/src/SceneGraph/instantiation.cpp @@ -26,6 +26,7 @@ #include "SceneGraph/Animable.hpp" #include "SceneGraph/Camera2D.hpp" #include "SceneGraph/Camera3D.hpp" +#include "SceneGraph/Drawable.hpp" #include "SceneGraph/DualComplexTransformation.h" #include "SceneGraph/DualQuaternionTransformation.h" #include "SceneGraph/FeatureGroup.hpp" @@ -66,6 +67,9 @@ template class MAGNUM_SCENEGRAPH_EXPORT_HPP AbstractCamera<3, Float>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP BasicCamera2D; template class MAGNUM_SCENEGRAPH_EXPORT_HPP BasicCamera3D; +template class MAGNUM_SCENEGRAPH_EXPORT_HPP Drawable<2, Float>; +template class MAGNUM_SCENEGRAPH_EXPORT_HPP Drawable<3, Float>; + template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; From 40af1ed6934d18d27ea05dc6a80e09d1db705c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:09:11 +0100 Subject: [PATCH 36/79] SceneGraph: documentation update for feature classes. --- src/SceneGraph/AbstractCamera.h | 8 ++-- src/SceneGraph/AbstractCamera.hpp | 2 +- src/SceneGraph/AbstractFeature.h | 58 +++++++++++++------------ src/SceneGraph/AbstractGroupedFeature.h | 16 +++---- src/SceneGraph/Animable.h | 48 ++++++++++---------- src/SceneGraph/AnimableGroup.h | 14 +++--- src/SceneGraph/Camera2D.h | 6 +-- src/SceneGraph/Camera2D.hpp | 2 +- src/SceneGraph/Camera3D.h | 8 ++-- src/SceneGraph/Camera3D.hpp | 2 +- src/SceneGraph/Drawable.h | 41 +++++++++-------- src/SceneGraph/FeatureGroup.h | 14 +++--- 12 files changed, 113 insertions(+), 106 deletions(-) diff --git a/src/SceneGraph/AbstractCamera.h b/src/SceneGraph/AbstractCamera.h index eb2a66ae4..003c9d574 100644 --- a/src/SceneGraph/AbstractCamera.h +++ b/src/SceneGraph/AbstractCamera.h @@ -167,8 +167,8 @@ template class AbstractCamera: public AbstractF /** @brief Base camera for two-dimensional scenes -Convenience alternative to %AbstractCamera<2, T>. See AbstractCamera -for more information. +Convenience alternative to %AbstractCamera<2, T>. See +@ref AbstractCamera for more information. @note Not available on GCC < 4.7. Use %AbstractCamera<2, T> instead. @see @ref AbstractCamera2D, @ref AbstractBasicCamera3D */ @@ -190,8 +190,8 @@ typedef AbstractCamera<2, Float> AbstractCamera2D; /** @brief Base camera for three-dimensional scenes -Convenience alternative to %AbstractCamera<3, T>. See AbstractCamera -for more information. +Convenience alternative to %AbstractCamera<3, T>. See +@ref AbstractCamera for more information. @note Not available on GCC < 4.7. Use %AbstractCamera<3, T> instead. @see @ref AbstractCamera3D, @ref AbstractBasicCamera2D */ diff --git a/src/SceneGraph/AbstractCamera.hpp b/src/SceneGraph/AbstractCamera.hpp index cc1ef8e2e..684ec1ddb 100644 --- a/src/SceneGraph/AbstractCamera.hpp +++ b/src/SceneGraph/AbstractCamera.hpp @@ -25,7 +25,7 @@ */ /** @file - * @brief @ref compilation-speedup-hpp "Template implementation" for AbstractCamera.h + * @brief @ref compilation-speedup-hpp "Template implementation" for @ref AbstractCamera.h */ #include "AbstractCamera.h" diff --git a/src/SceneGraph/AbstractFeature.h b/src/SceneGraph/AbstractFeature.h index 5580afa9c..8f2a585c5 100644 --- a/src/SceneGraph/AbstractFeature.h +++ b/src/SceneGraph/AbstractFeature.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::AbstractFeature, alias Magnum::SceneGraph::BasicAbstractFeature2D, Magnum::SceneGraph::BasicAbstractFeature3D, typedef Magnum::SceneGraph::AbstractFeature2D, Magnum::SceneGraph::AbstractFeature3D, enum Magnum::SceneGraph::CachedTransformation, enum set Magnum::SceneGraph::CachedTransformations + * @brief Class @ref Magnum::SceneGraph::AbstractFeature, alias @ref Magnum::SceneGraph::AbstractBasicFeature2D, @ref Magnum::SceneGraph::AbstractBasicFeature3D, typedef @ref Magnum::SceneGraph::AbstractFeature2D, @ref Magnum::SceneGraph::AbstractFeature3D, enum @ref Magnum::SceneGraph::CachedTransformation, enum set @ref Magnum::SceneGraph::CachedTransformations */ #include @@ -39,9 +39,9 @@ namespace Magnum { namespace SceneGraph { /** @brief Which transformation to cache in given feature -@see @ref scenegraph-caching, CachedTransformations, - AbstractFeature::setCachedTransformations(), AbstractFeature::clean(), - AbstractFeature::cleanInverted() +@see @ref scenegraph-caching, @ref CachedTransformations, + @ref AbstractFeature::setCachedTransformations(), @ref AbstractFeature::clean(), + @ref AbstractFeature::cleanInverted() @todo Provide also simpler representations from which could benefit other transformation implementations, as they won't need to e.g. create transformation matrix from quaternion? @@ -50,14 +50,16 @@ enum class CachedTransformation: UnsignedByte { /** * Absolute transformation is cached. * - * If enabled, clean() is called when cleaning object. + * If enabled, @ref AbstractFeature::clean() is called when cleaning + * object. */ Absolute = 1 << 0, /** * Inverted absolute transformation is cached. * - * If enabled, cleanInverted() is called when cleaning object. + * If enabled, @ref AbstractFeature::cleanInverted() is called when + * cleaning object. */ InvertedAbsolute = 1 << 1 }; @@ -65,8 +67,8 @@ enum class CachedTransformation: UnsignedByte { /** @brief Which transformations to cache in this feature -@see @ref scenegraph-caching, AbstractFeature::setCachedTransformations(), - AbstractFeature::clean(), AbstractFeature::cleanInverted() +@see @ref scenegraph-caching, @ref AbstractFeature::setCachedTransformations(), + @ref AbstractFeature::clean(), @ref AbstractFeature::cleanInverted() */ typedef Containers::EnumSet CachedTransformations; @@ -75,11 +77,11 @@ CORRADE_ENUMSET_OPERATORS(CachedTransformations) /** @brief Base for object features -Contained in Object, takes care of transformation caching. See @ref scenegraph -for introduction. +Contained in @ref Object, takes care of transformation caching. See +@ref scenegraph for introduction. -Uses Corrade::Containers::LinkedList for accessing holder object and sibling -features. +Uses @ref Corrade::Containers::LinkedList for accessing holder object and +sibling features. @section AbstractFeature-subclassing Subclassing @@ -94,9 +96,9 @@ it from scratch every time to achieve better performance. See @ref scenegraph-caching for introduction. In order to have caching, you must enable it first, because by default the -caching is disabled. You can enable it using setCachedTransformations() and -then implement corresponding cleaning function(s) -- either clean(), -cleanInverted() or both. Example: +caching is disabled. You can enable it using @ref setCachedTransformations() +and then implement corresponding cleaning function(s) -- either @ref clean(), +@ref cleanInverted() or both. Example: @code class CachingFeature: public SceneGraph::AbstractFeature3D { public: @@ -119,16 +121,16 @@ Before using the cached value explicitly request object cleaning by calling @subsection AbstractFeature-subclassing-transformation Accessing object transformation -Features has by default access only to AbstractObject, which is base of Object -not depending on any particular transformation implementation. This has the -advantage that features doesn't have to be implemented for all possible +Features has by default access only to @ref AbstractObject, which is base of +@ref Object not depending on any particular transformation implementation. This +has the advantage that features doesn't have to be implemented for all possible transformation implementations, thus preventing code duplication. However it -is impossible to transform the object using only pointer to AbstractObject. +is impossible to transform the object using only pointer to @ref AbstractObject. The transformations have interfaces for common functionality, so the feature can use that interface instead of being specialized for all relevant transformation implementations. Using small trick we are able to get pointer -to both AbstractObject and needed transformation from one constructor +to both @ref AbstractObject and needed transformation from one constructor parameter: @code class TransformingFeature: public SceneGraph::AbstractFeature3D { @@ -231,7 +233,7 @@ template class AbstractFeature /** * @brief Which transformations are cached * - * @see @ref scenegraph-caching, clean(), cleanInverted() + * @see @ref scenegraph-caching, @ref clean(), @ref cleanInverted() */ CachedTransformations cachedTransformations() const { return _cachedTransformations; @@ -241,8 +243,8 @@ template class AbstractFeature /** * @brief Set transformations to be cached * - * Based on which transformation types are enabled, clean() or - * cleanInverted() is called when cleaning absolute object + * Based on which transformation types are enabled, @ref clean() or + * @ref cleanInverted() is called when cleaning absolute object * transformation. * * Nothing is enabled by default. @@ -257,7 +259,7 @@ template class AbstractFeature * * Reimplement only if you want to invalidate some external data when * object is marked as dirty. All expensive computations should be - * done in clean() and cleanInverted(). + * done in @ref clean() and @ref cleanInverted(). * * Default implementation does nothing. * @see @ref scenegraph-caching @@ -299,8 +301,8 @@ template class AbstractFeature /** @brief Base feature for two-dimensional scenes -Convenience alternative to %AbstractFeature<2, T>. See AbstractFeature -for more information. +Convenience alternative to %AbstractFeature<2, T>. See +@ref AbstractFeature for more information. @note Not available on GCC < 4.7. Use %AbstractFeature<2, T> instead. @see @ref AbstractFeature2D, @ref AbstractBasicFeature3D */ @@ -322,8 +324,8 @@ typedef AbstractFeature<2, Float> AbstractFeature2D; /** @brief Base feature for three-dimensional scenes -Convenience alternative to %AbstractFeature<3, T>. See AbstractFeature -for more information. +Convenience alternative to %AbstractFeature<3, T>. See +@ref AbstractFeature for more information. @note Not available on GCC < 4.7. Use %AbstractFeature<3, T> instead. @see AbstractFeature2D */ diff --git a/src/SceneGraph/AbstractGroupedFeature.h b/src/SceneGraph/AbstractGroupedFeature.h index 9f9126940..d274ec41a 100644 --- a/src/SceneGraph/AbstractGroupedFeature.h +++ b/src/SceneGraph/AbstractGroupedFeature.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::AbstractGroupedFeature, alias Magnum::SceneGraph::AbstractBasicGroupedFeature2D, Magnum::SceneGraph::AbstractBasicGroupedFeature3D, Magnum::SceneGraph::AbstractGroupedFeature2D, Magnum::SceneGraph::AbstractGroupedFeature3D + * @brief Class @ref Magnum::SceneGraph::AbstractGroupedFeature, alias @ref Magnum::SceneGraph::AbstractBasicGroupedFeature2D, @ref Magnum::SceneGraph::AbstractBasicGroupedFeature3D, @ref Magnum::SceneGraph::AbstractGroupedFeature2D, @ref Magnum::SceneGraph::AbstractGroupedFeature3D */ #include @@ -38,12 +38,12 @@ namespace Magnum { namespace SceneGraph { /** @brief Base for grouped features -Used together with FeatureGroup. +Used together with @ref FeatureGroup. @section AbstractGroupedFeature-subclassing Subclassing Usage is via subclassing the feature using [CRTP](http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern) -and typedef'ing FeatureGroup to accept only given type, e.g.: +and typedef'ing @ref FeatureGroup to accept only given type, e.g.: @code class Drawable: public SceneGraph::AbstractGroupedFeature3D { // ... @@ -76,7 +76,7 @@ template class AbstractGroupedFe * @param group Group this feature belongs to * * Adds the feature to the object and to group, if specified. - * @see FeatureGroup::add() + * @see @ref FeatureGroup::add() */ explicit AbstractGroupedFeature(AbstractObject& object, FeatureGroup* group = nullptr): AbstractFeature(object), _group(nullptr) { if(group) group->add(static_cast(*this)); @@ -111,7 +111,7 @@ template class AbstractGroupedFe @brief Base grouped feature for two-dimensional scenes Convenience alternative to %AbstractGroupedFeature<2, Derived, T>. See -AbstractGroupedFeature for more information. +@ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %AbstractGroupedFeature<2, Derived, T> instead. @see @ref AbstractGroupedFeature2D, @ref AbstractBasicGroupedFeature3D @@ -122,7 +122,7 @@ template using AbstractBasicGroupedFeature2D = AbstractG @brief Base grouped feature for two-dimensional float scenes Convenience alternative to %AbstractBasicGroupedFeature2D. -See AbstractGroupedFeature for more information. +See @ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %AbstractGroupedFeature<2, Derived, Float> instead. @see @ref AbstractGroupedFeature3D @@ -133,7 +133,7 @@ template using AbstractGroupedFeature2D = AbstractBasicGroupedFea @brief Base grouped feature for three-dimensional scenes Convenience alternative to %AbstractGroupedFeature<3, Derived, T>. See -AbstractGroupedFeature for more information. +@ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %AbstractGroupedFeature<3, Derived, T> instead. @see @ref AbstractGroupedFeature3D, @ref AbstractBasicGroupedFeature2D @@ -144,7 +144,7 @@ template using AbstractBasicGroupedFeature3D = AbstractG @brief Base grouped feature for three-dimensional float scenes Convenience alternative to %AbstractBasicGroupedFeature3D. -See AbstractGroupedFeature for more information. +See @ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %AbstractGroupedFeature<3, Derived, Float> instead. @see @ref AbstractGroupedFeature2D diff --git a/src/SceneGraph/Animable.h b/src/SceneGraph/Animable.h index 453d6def2..b1e9a5c09 100644 --- a/src/SceneGraph/Animable.h +++ b/src/SceneGraph/Animable.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::Animable, alias Magnum::SceneGraph::BasicAnimable2D, Magnum::SceneGraph::BasicAnimable3D, typedef Magnum::SceneGraph::Animable2D, Magnum::SceneGraph::Animable3D, enum Magnum::SceneGraph::AnimationState + * @brief Class @ref Magnum::SceneGraph::Animable, alias @ref Magnum::SceneGraph::BasicAnimable2D, @ref Magnum::SceneGraph::BasicAnimable3D, typedef @ref Magnum::SceneGraph::Animable2D, @ref Magnum::SceneGraph::Animable3D, enum @ref Magnum::SceneGraph::AnimationState */ #include "AbstractGroupedFeature.h" @@ -37,7 +37,7 @@ namespace Magnum { namespace SceneGraph { /** @brief Animation state -@see Animable::setState() +@see @ref Animable::setState() */ enum class AnimationState: UnsignedByte { /** @@ -62,14 +62,14 @@ Debug MAGNUM_SCENEGRAPH_EXPORT operator<<(Debug debug, AnimationState value); /** @brief %Animable -Adds animation feature to object. Each %Animable is part of some AnimableGroup, -which takes care of running the animations. +Adds animation feature to object. Each %Animable is part of some +@ref AnimableGroup, which takes care of running the animations. @section Animable-usage Usage -First thing is add Animable feature to some object and implement +First thing is to add @ref Animable feature to some object and implement animationStep(). You can do it conveniently using multiple inheritance (see -@ref scenegraph-features for introduction). Override animationStep() to +@ref scenegraph-features for introduction). Override @ref animationStep() to implement your animation, the function provides both absolute animation time and time delta. Example: @code @@ -90,9 +90,10 @@ class AnimableObject: public Object3D, SceneGraph::Animable3D { @endcode Then add the object to your scene and some animation group. You can also use -AnimableGroup::add() and AnimableGroup::remove() instead of passing the group -in the constructor. The animation is initially in stopped state and without -repeat, see setState(), setRepeated() and setRepeatCount() for more information. +@ref AnimableGroup::add() and @ref AnimableGroup::remove() instead of passing +the group in the constructor. The animation is initially in stopped state and +without repeat, see @ref setState(), @ref setRepeated() and @ref setRepeatCount() +for more information. @code Scene3D scene; SceneGraph::AnimableGroup3D animables; @@ -102,10 +103,10 @@ SceneGraph::AnimableGroup3D animables; // ... @endcode -Animation step is performed by calling AnimableGroup::step() in your draw event -implementation. The function expects absolute time from relative to some fixed -point in the past and time delta (i.e. duration of the frame). You can use -Timeline for that, see its documentation for more information. +Animation step is performed by calling @ref AnimableGroup::step() in your draw +event implementation. The function expects absolute time from relative to some +fixed point in the past and time delta (i.e. duration of the frame). You can +use @ref Timeline for that, see its documentation for more information. @code Timeline timeline; timeline.start(); @@ -121,15 +122,15 @@ void MyApplication::drawEvent() { @section Animable-performance Using animable groups to improve performance -AnimableGroup is optimized for case when no animation is running -- it just -puts itself to rest and waits until some animation changes its state to +@ref AnimableGroup is optimized for case when no animation is running -- it +just puts itself to rest and waits until some animation changes its state to @ref AnimationState::Running again. If you put animations which are not pernamently running to separate group, they will not be always traversed when calling @ref AnimableGroup::step(), saving precious frame time. @section Animable-explicit-specializations Explicit template specializations -The following specialization are explicitly compiled into @ref SceneGraph +The following specializations are explicitly compiled into @ref SceneGraph library. For other specializations (e.g. using @ref Double type) you have to use @ref Animable.hpp implementation file to avoid linker errors. See also @ref compilation-speedup-hpp for more information. @@ -151,7 +152,8 @@ template class Animable: public AbstractGrouped * * Creates stopped non-repeating animation with infinite duration, * adds the feature to the object and also to group, if specified. - * @see setDuration(), setState(), setRepeated(), AnimableGroup::add() + * @see @ref setDuration(), @ref setState(), @ref setRepeated(), + * @ref AnimableGroup::add() */ explicit Animable(AbstractObject& object, AnimableGroup* group = nullptr); @@ -179,7 +181,7 @@ template class Animable: public AbstractGrouped /** * @brief Whether the animation is repeated * - * @see repeatCount() + * @see @ref repeatCount() */ bool isRepeated() const { return _repeated; } @@ -188,7 +190,7 @@ template class Animable: public AbstractGrouped * @return Reference to self (for method chaining) * * Default is `false`. - * @see setRepeatCount() + * @see @ref setRepeatCount() */ Animable& setRepeated(bool repeated) { _repeated = repeated; @@ -198,7 +200,7 @@ template class Animable: public AbstractGrouped /** * @brief Repeat count * - * @see isRepeated() + * @see @ref isRepeated() */ UnsignedShort repeatCount() const { return _repeatCount; } @@ -208,7 +210,7 @@ template class Animable: public AbstractGrouped * * Has effect only if repeated animation is enabled. `0` means * infinitely repeated animation. Default is `0`. - * @see setRepeated() + * @see @ref setRepeated() */ Animable& setRepeatCount(UnsignedShort count) { _repeatCount = count; @@ -338,7 +340,7 @@ template class Animable: public AbstractGrouped /** @brief %Animable for two-dimensional scenes -Convenience alternative to %Animable<2, T>. See Animable for more +Convenience alternative to %Animable<2, T>. See @ref Animable for more information. @note Not available on GCC < 4.7. Use %Animable<2, T> instead. @see @ref Animable2D, @ref BasicAnimable3D @@ -361,7 +363,7 @@ typedef Animable<2, Float> Animable2D; /** @brief %Animable for three-dimensional scenes -Convenience alternative to %Animable<3, T>. See Animable for more +Convenience alternative to %Animable<3, T>. See @ref Animable for more information. @note Not available on GCC < 4.7. Use %Animable<3, T> instead. @see @ref Animable3D, @ref BasicAnimable2D diff --git a/src/SceneGraph/AnimableGroup.h b/src/SceneGraph/AnimableGroup.h index d88623fb9..e9da03a08 100644 --- a/src/SceneGraph/AnimableGroup.h +++ b/src/SceneGraph/AnimableGroup.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::AnimableGroup, alias Magnum::SceneGraph::BasicAnimableGroup2D, Magnum::SceneGraph::BasicAnimableGroup3D, typedef Magnum::SceneGraph::AnimableGroup2D, Magnum::SceneGraph::AnimableGroup3D + * @brief Class @ref Magnum::SceneGraph::AnimableGroup, alias @ref Magnum::SceneGraph::BasicAnimableGroup2D, @ref Magnum::SceneGraph::BasicAnimableGroup3D, typedef @ref Magnum::SceneGraph::AnimableGroup2D, @ref Magnum::SceneGraph::AnimableGroup3D */ #include "FeatureGroup.h" @@ -37,7 +37,7 @@ namespace Magnum { namespace SceneGraph { /** @brief Group of animables -See Animable for more information. +See @ref Animable for more information. @see @ref scenegraph, @ref BasicAnimableGroup2D, @ref BasicAnimableGroup3D, @ref AnimableGroup2D, @ref AnimableGroup3D */ @@ -53,19 +53,19 @@ template class AnimableGroup: public FeatureGro /** * @brief Count of running animations * - * @see step() + * @see @ref step() */ std::size_t runningCount() const { return _runningCount; } /** * @brief Perform animation step - * @param time Absolute time (e.g. Timeline::previousFrameTime()) - * @param delta Time delta for current frame (e.g. Timeline::previousFrameDuration()) + * @param time Absolute time (e.g. @ref Timeline::previousFrameTime()) + * @param delta Time delta for current frame (e.g. @ref Timeline::previousFrameDuration()) * * If there are no running animations the function does nothing. - * @see runningCount() + * @see @ref runningCount() */ - void step(const Float time, const Float delta); + void step(Float time, Float delta); private: std::size_t _runningCount; diff --git a/src/SceneGraph/Camera2D.h b/src/SceneGraph/Camera2D.h index 610af6419..c25b193bf 100644 --- a/src/SceneGraph/Camera2D.h +++ b/src/SceneGraph/Camera2D.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::BasicCamera2D, typedef Magnum::SceneGraph::Camera2D + * @brief Class @ref Magnum::SceneGraph::BasicCamera2D, typedef @ref Magnum::SceneGraph::Camera2D */ #include "AbstractCamera.h" @@ -64,7 +64,7 @@ template class BasicCamera2D: public AbstractCamera<2, T> { * @param object %Object holding this feature * * Sets orthographic projection to the default OpenGL cube (range @f$ [-1; 1] @f$ in all directions). - * @see setProjection() + * @see @ref setProjection() */ explicit BasicCamera2D(AbstractObject<2, T>& object); @@ -85,7 +85,7 @@ template class BasicCamera2D: public AbstractCamera<2, T> { * @param size Size of the view * @return Reference to self (for method chaining) * - * @see Matrix3::projection() + * @see @ref Matrix3::projection() */ BasicCamera2D& setProjection(const Math::Vector2& size); diff --git a/src/SceneGraph/Camera2D.hpp b/src/SceneGraph/Camera2D.hpp index 302d74e9b..ea85b5c76 100644 --- a/src/SceneGraph/Camera2D.hpp +++ b/src/SceneGraph/Camera2D.hpp @@ -25,7 +25,7 @@ */ /** @file - * @brief @ref compilation-speedup-hpp "Template implementation" for Camera2D.h + * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Camera2D.h */ #include "AbstractCamera.hpp" diff --git a/src/SceneGraph/Camera3D.h b/src/SceneGraph/Camera3D.h index d6744d953..0cc8c9694 100644 --- a/src/SceneGraph/Camera3D.h +++ b/src/SceneGraph/Camera3D.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::BasicCamera3D, typedef Magnum::SceneGraph::Camera3D + * @brief Class @ref Magnum::SceneGraph::BasicCamera3D, typedef @ref Magnum::SceneGraph::Camera3D */ #include "AbstractCamera.h" @@ -89,7 +89,7 @@ template class BasicCamera3D: public AbstractCamera<3, T> { * @param far Far clipping plane * @return Reference to self (for method chaining) * - * @see setPerspective(), Matrix4::orthographicProjection() + * @see @ref setPerspective(), @ref Matrix4::orthographicProjection() */ BasicCamera3D& setOrthographic(const Math::Vector2& size, T near, T far); @@ -100,7 +100,7 @@ template class BasicCamera3D: public AbstractCamera<3, T> { * @param far Far clipping plane * @return Reference to self (for method chaining) * - * @see setOrthographic(), Matrix4::perspectiveProjection() + * @see @ref setOrthographic(), @ref Matrix4::perspectiveProjection() */ BasicCamera3D& setPerspective(const Math::Vector2& size, T near, T far); @@ -112,7 +112,7 @@ template class BasicCamera3D: public AbstractCamera<3, T> { * @param far Far clipping plane * @return Reference to self (for method chaining) * - * @see setOrthographic(), Matrix4::perspectiveProjection() + * @see @ref setOrthographic(), @ref Matrix4::perspectiveProjection() */ BasicCamera3D& setPerspective(Math::Rad fov, T aspectRatio, T near, T far); diff --git a/src/SceneGraph/Camera3D.hpp b/src/SceneGraph/Camera3D.hpp index bef3b77e9..597f22fd0 100644 --- a/src/SceneGraph/Camera3D.hpp +++ b/src/SceneGraph/Camera3D.hpp @@ -25,7 +25,7 @@ */ /** @file - * @brief @ref compilation-speedup-hpp "Template implementation" for Camera3D.h + * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Camera3D.h */ #include "AbstractCamera.hpp" diff --git a/src/SceneGraph/Drawable.h b/src/SceneGraph/Drawable.h index 292907f57..d5023301c 100644 --- a/src/SceneGraph/Drawable.h +++ b/src/SceneGraph/Drawable.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::Drawable, Magnum::SceneGraph::DrawableGroup, alias Magnum::SceneGraph::BasicDrawable2D, Magnum::SceneGraph::BasicDrawable3D, Magnum::SceneGraph::BasicDrawableGroup2D, Magnum::SceneGraph::BasicDrawableGroup3D, typedef Magnum::SceneGraph::Drawable2D, Magnum::SceneGraph::Drawable3D, Magnum::SceneGraph::DrawableGroup2D, Magnum::SceneGraph::DrawableGroup3D + * @brief Class @ref Magnum::SceneGraph::Drawable, @ref Magnum::SceneGraph::DrawableGroup, alias @ref Magnum::SceneGraph::BasicDrawable2D, @ref Magnum::SceneGraph::BasicDrawable3D, @ref Magnum::SceneGraph::BasicDrawableGroup2D, @ref Magnum::SceneGraph::BasicDrawableGroup3D, typedef @ref Magnum::SceneGraph::Drawable2D, @ref Magnum::SceneGraph::Drawable3D, @ref Magnum::SceneGraph::DrawableGroup2D, @ref Magnum::SceneGraph::DrawableGroup3D */ #include "AbstractGroupedFeature.h" @@ -35,14 +35,15 @@ namespace Magnum { namespace SceneGraph { /** @brief %Drawable -Adds drawing function to the object. Each %Drawable is part of some DrawableGroup -and the whole group is drawn with particular camera using AbstractCamera::draw(). +Adds drawing function to the object. Each %Drawable is part of some +@ref DrawableGroup and the whole group is drawn with particular camera using +@ref AbstractCamera::draw(). @section Drawable-usage Usage -First thing is add Drawable feature to some object and implement draw(). You -can do it conveniently using multiple inheritance (see @ref scenegraph-features -for introduction). Example: +First thing is to add @ref Drawable feature to some object and implement +@ref draw(). You can do it conveniently using multiple inheritance (see +@ref scenegraph-features for introduction). Example: @code typedef SceneGraph::Object Object3D; typedef SceneGraph::Scene Scene3D; @@ -60,8 +61,8 @@ class DrawableObject: public Object3D, SceneGraph::Drawable3D { @endcode Then you add these objects to your scene and some drawable group and transform -them as you like. You can also use DrawableGroup::add() and -DrawableGroup::remove(). +them as you like. You can also use @ref DrawableGroup::add() and +@ref DrawableGroup::remove(). @code Scene3D scene; SceneGraph::DrawableGroup3D drawables; @@ -74,9 +75,10 @@ SceneGraph::DrawableGroup3D drawables; // ... @endcode -The last thing you need is Camera attached to some object (thus using its +The last thing you need is camera attached to some object (thus using its transformation) and with it you can perform drawing in your draw event -implementation. See Camera2D and Camera3D documentation for more information. +implementation. See @ref Camera2D and @ref Camera3D documentation for more +information. @code Camera3D camera(&cameraObject); @@ -91,10 +93,10 @@ void MyApplication::drawEvent() { @section Drawable-performance Using drawable groups to improve performance You can organize your drawables to multiple groups to minimize OpenGL state -changes - for example put all objects using the same shader, the same light +changes -- for example put all objects using the same shader, the same light setup etc into one group, then put all transparent into another and set common -parameters once for whole group instead of setting them again in each draw() -implementation. Example: +parameters once for whole group instead of setting them again in each +@ref draw() implementation. Example: @code Shaders::PhongShader shader; SceneGraph::DrawableGroup3D phongObjects, transparentObjects; @@ -135,7 +137,7 @@ template class Drawable: public AbstractGrouped * @param drawables Group this drawable belongs to * * Adds the feature to the object and also to the group, if specified. - * Otherwise you can use DrawableGroup::add(). + * Otherwise you can use @ref DrawableGroup::add(). */ explicit Drawable(AbstractObject& object, DrawableGroup* drawables = nullptr); @@ -159,7 +161,8 @@ template class Drawable: public AbstractGrouped * to camera * @param camera Camera * - * Projection matrix can be retrieved from AbstractCamera::projectionMatrix(). + * Projection matrix can be retrieved from + * @ref SceneGraph::AbstractCamera::projectionMatrix() "AbstractCamera::projectionMatrix()". */ virtual void draw(const typename DimensionTraits::MatrixType& transformationMatrix, AbstractCamera& camera) = 0; }; @@ -168,7 +171,7 @@ template class Drawable: public AbstractGrouped /** @brief %Drawable for two-dimensional scenes -Convenience alternative to %Drawable<2, T>. See Drawable for more +Convenience alternative to %Drawable<2, T>. See @ref Drawable for more information. @note Not available on GCC < 4.7. Use %Drawable<2, T> instead. @see @ref Drawable2D, @ref BasicDrawable3D @@ -191,7 +194,7 @@ typedef Drawable<2, Float> Drawable2D; /** @brief %Drawable for three-dimensional scenes -Convenience alternative to %Drawable<3, T>. See Drawable for more +Convenience alternative to %Drawable<3, T>. See @ref Drawable for more information. @note Not available on GCC < 4.7. Use %Drawable<3, T> instead. @see @ref Drawable3D, @ref BasicDrawable3D @@ -227,7 +230,7 @@ template class DrawableGroup: public FeatureGro /** @brief Group of drawables for two-dimensional scenes -Convenience alternative to %DrawableGroup<2, T>. See Drawable for +Convenience alternative to %DrawableGroup<2, T>. See @ref Drawable for more information. @note Not available on GCC < 4.7. Use %Drawable<2, T> instead. @see @ref DrawableGroup2D, @ref BasicDrawableGroup3D @@ -250,7 +253,7 @@ typedef DrawableGroup<2, Float> DrawableGroup2D; /** @brief Group of drawables for three-dimensional scenes -Convenience alternative to %DrawableGroup<3, T>. See Drawable for +Convenience alternative to %DrawableGroup<3, T>. See @ref Drawable for more information. @note Not available on GCC < 4.7. Use %Drawable<3, T> instead. @see @ref DrawableGroup3D, @ref BasicDrawableGroup2D diff --git a/src/SceneGraph/FeatureGroup.h b/src/SceneGraph/FeatureGroup.h index 5934020fc..efa7acb03 100644 --- a/src/SceneGraph/FeatureGroup.h +++ b/src/SceneGraph/FeatureGroup.h @@ -25,7 +25,7 @@ */ /** @file - * @brief Class Magnum::SceneGraph::AbstractFeatureGroup, Magnum::SceneGraph::FeatureGroup, alias Magnum::SceneGraph::BasicFeatureGroup2D, Magnum::SceneGraph::BasicFeatureGroup3D, Magnum::SceneGraph::FeatureGroup2D, Magnum::SceneGraph::FeatureGroup3D + * @brief Class @ref Magnum::SceneGraph::AbstractFeatureGroup, @ref Magnum::SceneGraph::FeatureGroup, alias @ref Magnum::SceneGraph::BasicFeatureGroup2D, @ref Magnum::SceneGraph::BasicFeatureGroup3D, @ref Magnum::SceneGraph::FeatureGroup2D, @ref Magnum::SceneGraph::FeatureGroup3D */ #include @@ -98,7 +98,7 @@ template class FeatureGroup: pub * @return Reference to self (for method chaining) * * If the features is part of another group, it is removed from it. - * @see remove(), AbstractGroupedFeature::AbstractGroupedFeature() + * @see @ref remove(), @ref AbstractGroupedFeature::AbstractGroupedFeature() */ FeatureGroup& add(Feature& feature); @@ -107,7 +107,7 @@ template class FeatureGroup: pub * @return Reference to self (for method chaining) * * The feature must be part of the group. - * @see add() + * @see @ref add() */ FeatureGroup& remove(Feature& feature); }; @@ -117,7 +117,7 @@ template class FeatureGroup: pub @brief Base feature group for two-dimensional scenes Convenience alternative to %FeatureGroup<2, Feature, T>. See -AbstractGroupedFeature for more information. +@ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %FeatureGroup<2, Feature, T> instead. @see @ref FeatureGroup2D, @ref BasicFeatureGroup3D @@ -128,7 +128,7 @@ template using BasicFeatureGroup2D = FeatureGroup<2, Fea @brief Base feature group for two-dimensional float scenes Convenience alternative to %BasicFeatureGroup2D. See -AbstractGroupedFeature for more information. +@ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %FeatureGroup<2, Feature, Float> instead. @see @ref FeatureGroup3D @@ -139,7 +139,7 @@ template using FeatureGroup2D = BasicFeatureGroup2D%FeatureGroup<3, Feature, T>. See -AbstractGroupedFeature for more information. +@ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %FeatureGroup<3, Feature, T> instead. @see @ref FeatureGroup3D, @ref BasicFeatureGroup2D @@ -150,7 +150,7 @@ template using BasicFeatureGroup3D = FeatureGroup<3, Fea @brief Base feature group for three-dimensional float scenes Convenience alternative to %BasicFeatureGroup3D. See -AbstractGroupedFeature for more information. +@ref AbstractGroupedFeature for more information. @note Not available on GCC < 4.7. Use %FeatureGroup<3, Feature, Float> instead. @see @ref FeatureGroup2D From 66ecc2ee48e6478691e9b85904f3b5629aad1a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:31:20 +0100 Subject: [PATCH 37/79] Documented texture formats disallowed in *Texture::setStorage(). --- src/TextureFormat.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/TextureFormat.h b/src/TextureFormat.h index 6bab5073f..0edb176f5 100644 --- a/src/TextureFormat.h +++ b/src/TextureFormat.h @@ -46,7 +46,9 @@ or WebGL. */ enum class TextureFormat: GLenum { /** - * Red component, normalized unsigned, size implementation-dependent. + * Red component, normalized unsigned, size implementation-dependent. Not + * allowed in unemulated @ref Texture::setStorage() "*Texture::setStorage()" + * calls. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref Magnum::TextureFormat::R8 "TextureFormat::R8". * @requires_gl30 %Extension @extension{ARB,texture_rg} @@ -70,7 +72,8 @@ enum class TextureFormat: GLenum { /** * Red and green component, normalized unsigned, size - * implementation-dependent. + * implementation-dependent. Not allowed in unemulated + * @ref Texture::setStorage() "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref Magnum::TextureFormat::RG8 "TextureFormat::RG8". * @requires_gl30 %Extension @extension{ARB,texture_rg} @@ -93,7 +96,8 @@ enum class TextureFormat: GLenum { #endif /** - * RGB, normalized unsigned, size implementation-dependent. + * RGB, normalized unsigned, size implementation-dependent. Not allowed in + * unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref Magnum::TextureFormat::RGB8 "TextureFormat::RGB8". */ @@ -110,7 +114,8 @@ enum class TextureFormat: GLenum { #endif /** - * RGBA, normalized unsigned, size implementation-dependent. + * RGBA, normalized unsigned, size implementation-dependent. Not allowed in + * unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref Magnum::TextureFormat::RGBA8 "TextureFormat::RGBA8". */ @@ -744,7 +749,8 @@ enum class TextureFormat: GLenum { #endif /** - * Depth component, size implementation-dependent. + * Depth component, size implementation-dependent. Not allowed in + * unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref Magnum::TextureFormat::DepthComponent16 "TextureFormat::DepthComponent16". * @requires_gles30 %Extension @es_extension{OES,depth_texture} or @@ -803,7 +809,8 @@ enum class TextureFormat: GLenum { #endif /** - * Depth and stencil component, size implementation-dependent. + * Depth and stencil component, size implementation-dependent. Not allowed + * in unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use exactly specified version of this format, * e.g. @ref Magnum::TextureFormat::Depth24Stencil8 "TextureFormat::Depth24Stencil8". * @requires_gles30 %Extension @es_extension{OES,packed_depth_stencil} From 89d9b475294b0041eb3cd6fd23ccffffb9e44dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:32:41 +0100 Subject: [PATCH 38/79] Removed forgotten call from Mesh test. No change in test results. --- src/Test/MeshGLTest.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Test/MeshGLTest.cpp b/src/Test/MeshGLTest.cpp index d23a69401..3b730d2fc 100644 --- a/src/Test/MeshGLTest.cpp +++ b/src/Test/MeshGLTest.cpp @@ -1150,7 +1150,6 @@ IndexChecker::IndexChecker(Mesh& mesh): framebuffer({{}, Vector2i(1)}) { shader.use(); mesh.setIndexCount(2) .setPrimitive(MeshPrimitive::Points); - mesh.draw(); /* Skip first vertex so we test also offsets */ MeshView(mesh).setIndexRange(1, 1).draw(); From 9418822d254ed5225471ad8113b249eed2686c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:33:39 +0100 Subject: [PATCH 39/79] Platform: don't store useless variable on Emscripten. --- src/Platform/Sdl2Application.cpp | 6 +++++- src/Platform/Sdl2Application.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Platform/Sdl2Application.cpp b/src/Platform/Sdl2Application.cpp index 969b852dc..8e3e871cd 100644 --- a/src/Platform/Sdl2Application.cpp +++ b/src/Platform/Sdl2Application.cpp @@ -328,7 +328,11 @@ Sdl2Application::Configuration::Configuration(): #ifndef CORRADE_TARGET_EMSCRIPTEN _title("Magnum SDL2 Application"), #endif - _size(800, 600), _windowFlags(WindowFlag::Resizable), _sampleCount(0), _version(Version::None) {} + _size(800, 600), _windowFlags(WindowFlag::Resizable), _sampleCount(0) + #ifndef CORRADE_TARGET_EMSCRIPTEN + , _version(Version::None) + #endif + {} Sdl2Application::Configuration::~Configuration() = default; diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index 253a63111..c7002f859 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -538,7 +538,9 @@ class Sdl2Application::Configuration { Vector2i _size; WindowFlags _windowFlags; Int _sampleCount; + #ifndef CORRADE_TARGET_EMSCRIPTEN Version _version; + #endif }; CORRADE_ENUMSET_OPERATORS(Sdl2Application::Configuration::WindowFlags) From c5b80e76d93223eaabcc899219be0b14b19948b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:34:08 +0100 Subject: [PATCH 40/79] Fix compilation on Emscripten. --- src/Mesh.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mesh.h b/src/Mesh.h index ed7a78b9f..068da10e6 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -683,7 +683,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { GLint(attribute.components()), GLenum(attribute.dataType()), bool(attribute.dataOptions() & AbstractShaderProgram::Attribute::DataOption::Normalized), - offset+i*attribute.vectorSize(), + GLintptr(offset+i*attribute.vectorSize()), stride }); } @@ -708,7 +708,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { location+i, GLint(attribute.components()), GLenum(attribute.dataType()), - offset+i*attribute.vectorSize(), + GLintptr(offset+i*attribute.vectorSize()), stride }); } From 6c2c020b892faf1600a368c14405a10979af5369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:35:03 +0100 Subject: [PATCH 41/79] Added some TODOs. --- src/AbstractFramebuffer.h | 1 + src/AbstractShaderProgram.h | 1 + src/Shader.h | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index 705c8b859..98af54200 100644 --- a/src/AbstractFramebuffer.h +++ b/src/AbstractFramebuffer.h @@ -62,6 +62,7 @@ typedef Containers::EnumSet Date: Thu, 9 Jan 2014 15:45:18 +0100 Subject: [PATCH 42/79] Documented internal formats unsupported in 3D textures. --- src/TextureFormat.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/TextureFormat.h b/src/TextureFormat.h index 0edb176f5..7d465f55f 100644 --- a/src/TextureFormat.h +++ b/src/TextureFormat.h @@ -749,8 +749,9 @@ enum class TextureFormat: GLenum { #endif /** - * Depth component, size implementation-dependent. Not allowed in - * unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls. + * Depth component, size implementation-dependent. Not supported in 3D + * textures, not allowed in unemulated @ref Texture::setStorage() + * "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref Magnum::TextureFormat::DepthComponent16 "TextureFormat::DepthComponent16". * @requires_gles30 %Extension @es_extension{OES,depth_texture} or @@ -759,7 +760,7 @@ enum class TextureFormat: GLenum { DepthComponent = GL_DEPTH_COMPONENT, /** - * Depth component, 16bit. + * Depth component, 16bit. Not supported in 3D textures. * @requires_gles30 %Extension (@es_extension{OES,required_internalformat} * and @es_extension{OES,depth_texture}) or (@es_extension{EXT,texture_storage} * and @es_extension{ANGLE,depth_texture}) @@ -767,7 +768,7 @@ enum class TextureFormat: GLenum { DepthComponent16 = GL_DEPTH_COMPONENT16, /** - * Depth component, 24bit. + * Depth component, 24bit. Not supported in 3D textures. * @requires_gles30 %Extension @es_extension{OES,required_internalformat}, * @es_extension{OES,depth_texture} and @es_extension{OES,depth24} */ @@ -778,7 +779,7 @@ enum class TextureFormat: GLenum { #endif /** - * Depth component, 32bit. + * Depth component, 32bit. Not supported in 3D textures. * @requires_es_extension %Extension (@es_extension{OES,required_internalformat}, * @es_extension{OES,depth_texture} and @es_extension{OES,depth32}) or * (@es_extension{EXT,texture_storage} and @es_extension{ANGLE,depth_texture}) @@ -791,7 +792,7 @@ enum class TextureFormat: GLenum { #ifndef MAGNUM_TARGET_GLES2 /** - * Depth component, 32bit float. + * Depth component, 32bit float. Not supported in 3D textures. * @requires_gl30 %Extension @extension{ARB,depth_buffer_float} * @requires_gles30 Only integral depth textures are available in OpenGL ES * 2.0. @@ -801,7 +802,7 @@ enum class TextureFormat: GLenum { #ifndef MAGNUM_TARGET_GLES /** - * Stencil index, 8bit. + * Stencil index, 8bit. Not supported in 3D textures. * @requires_gl44 %Extension @extension{ARB,texture_stencil8} * @requires_gl Only available as renderbuffer format in OpenGL ES. */ @@ -809,8 +810,9 @@ enum class TextureFormat: GLenum { #endif /** - * Depth and stencil component, size implementation-dependent. Not allowed - * in unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls. + * Depth and stencil component, size implementation-dependent. Not + * supported in 3D textures, not allowed in unemulated + * @ref Texture::setStorage() "*Texture::setStorage()" calls. * @deprecated_gl Prefer to use exactly specified version of this format, * e.g. @ref Magnum::TextureFormat::Depth24Stencil8 "TextureFormat::Depth24Stencil8". * @requires_gles30 %Extension @es_extension{OES,packed_depth_stencil} @@ -822,7 +824,7 @@ enum class TextureFormat: GLenum { #endif /** - * 24bit depth and 8bit stencil component. + * 24bit depth and 8bit stencil component. Not supported in 3D textures. * @requires_gl30 %Extension @extension{ARB,framebuffer_object} * @requires_gles30 %Extension @es_extension{OES,packed_depth_stencil} and * (@es_extension{OES,required_internalformat} or @@ -836,7 +838,8 @@ enum class TextureFormat: GLenum { #ifndef MAGNUM_TARGET_GLES2 /** - * 32bit float depth component and 8bit stencil component. + * 32bit float depth component and 8bit stencil component. Not supported in + * 3D textures. * @requires_gl30 %Extension @extension{ARB,depth_buffer_float} * @requires_gles30 Only integral depth textures are available in OpenGL ES * 2.0. From c84fa89281bb0cfd044ed5b2e6e4d3df785b53d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 15:46:58 +0100 Subject: [PATCH 43/79] Properly error out when using unsupported header. --- src/BufferImage.h | 2 ++ src/BufferTexture.h | 2 ++ src/CubeMapTextureArray.h | 2 ++ src/ImageFormat.h | 4 +++- src/Swizzle.h | 7 ++++--- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/BufferImage.h b/src/BufferImage.h index d60e0692b..aaab79b19 100644 --- a/src/BufferImage.h +++ b/src/BufferImage.h @@ -144,6 +144,8 @@ template inline BufferImage& BufferImage Date: Fri, 10 Jan 2014 00:37:36 +0100 Subject: [PATCH 44/79] Platform: forgot to initialize variable. Caused crash on startup for both GlutApplication and *XApplication. Sorry about that. --- src/Platform/AbstractXApplication.cpp | 7 +++---- src/Platform/GlutApplication.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Platform/AbstractXApplication.cpp b/src/Platform/AbstractXApplication.cpp index 3fb287433..38d5606f9 100644 --- a/src/Platform/AbstractXApplication.cpp +++ b/src/Platform/AbstractXApplication.cpp @@ -27,10 +27,9 @@ #include #include "Context.h" +#include "Version.h" #include "Platform/Implementation/AbstractContextHandler.h" -#define None 0L // redef Xlib nonsense - /* Mask for X events */ #define INPUT_MASK KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask @@ -80,7 +79,7 @@ bool AbstractXApplication::tryCreateContext(const Configuration& configuration) attr.event_mask = 0; unsigned long mask = CWBackPixel|CWBorderPixel|CWColormap|CWEventMask; window = XCreateWindow(display, root, 20, 20, configuration.size().x(), configuration.size().y(), 0, visInfo->depth, InputOutput, visInfo->visual, mask, &attr); - XSetStandardProperties(display, window, configuration.title().data(), nullptr, None, nullptr, 0, nullptr); + XSetStandardProperties(display, window, configuration.title().data(), nullptr, 0, nullptr, 0, nullptr); XFree(visInfo); /* Be notified about closing the window */ @@ -176,7 +175,7 @@ void AbstractXApplication::mousePressEvent(MouseEvent&) {} void AbstractXApplication::mouseReleaseEvent(MouseEvent&) {} void AbstractXApplication::mouseMoveEvent(MouseMoveEvent&) {} -AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600) {} +AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600), _version(Version::None) {} AbstractXApplication::Configuration::~Configuration() = default; }} diff --git a/src/Platform/GlutApplication.cpp b/src/Platform/GlutApplication.cpp index c425035a0..e02f8873f 100644 --- a/src/Platform/GlutApplication.cpp +++ b/src/Platform/GlutApplication.cpp @@ -133,7 +133,7 @@ void GlutApplication::mousePressEvent(MouseEvent&) {} void GlutApplication::mouseReleaseEvent(MouseEvent&) {} void GlutApplication::mouseMoveEvent(MouseMoveEvent&) {} -GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0) {} +GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0), _version(Version::None) {} GlutApplication::Configuration::~Configuration() = default; template class BasicScreen; From 9617646c417a055792b342865065044ae26f4222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 00:50:24 +0100 Subject: [PATCH 45/79] package: explicitly build also WindowlessGlxApplication in dev PKGBUILDs. --- package/archlinux/PKGBUILD | 1 + package/archlinux/PKGBUILD-clang | 1 + package/archlinux/PKGBUILD-clang-libc++ | 1 + package/archlinux/PKGBUILD-gcc46 | 1 + package/archlinux/PKGBUILD-gcc47 | 1 + package/archlinux/PKGBUILD-gcc49 | 1 + package/archlinux/PKGBUILD-release | 1 + 7 files changed, 7 insertions(+) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index b4812b88a..79a64b1a6 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -26,6 +26,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang index bcd3ed954..f98b4b14e 100644 --- a/package/archlinux/PKGBUILD-clang +++ b/package/archlinux/PKGBUILD-clang @@ -30,6 +30,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-clang-libc++ b/package/archlinux/PKGBUILD-clang-libc++ index e146e0129..e11965e27 100644 --- a/package/archlinux/PKGBUILD-clang-libc++ +++ b/package/archlinux/PKGBUILD-clang-libc++ @@ -32,6 +32,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-gcc46 b/package/archlinux/PKGBUILD-gcc46 index c8623c153..ba70ed497 100644 --- a/package/archlinux/PKGBUILD-gcc46 +++ b/package/archlinux/PKGBUILD-gcc46 @@ -30,6 +30,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-gcc47 b/package/archlinux/PKGBUILD-gcc47 index cacacf17c..5867486a8 100644 --- a/package/archlinux/PKGBUILD-gcc47 +++ b/package/archlinux/PKGBUILD-gcc47 @@ -30,6 +30,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-gcc49 b/package/archlinux/PKGBUILD-gcc49 index e20f7bb93..a8043f0f2 100644 --- a/package/archlinux/PKGBUILD-gcc49 +++ b/package/archlinux/PKGBUILD-gcc49 @@ -30,6 +30,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index 0bdee15b7..031abcd9d 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -21,6 +21,7 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ From 46df7734a90c7e98b3b3a26cf8710c55c0aba0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 16:54:48 +0100 Subject: [PATCH 46/79] Audio: reorder includes. --- src/Audio/Context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Audio/Context.h b/src/Audio/Context.h index 3969fb87b..4a2088687 100644 --- a/src/Audio/Context.h +++ b/src/Audio/Context.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Audio::Context */ -#include #include +#include #include "Audio/magnumAudioVisibility.h" From 6f12e2c741af2a3e7c380175f68d273203fba8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 19:57:57 +0100 Subject: [PATCH 47/79] Math: proper error when using deprecated header. --- src/Math/Geometry/Rectangle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Math/Geometry/Rectangle.h b/src/Math/Geometry/Rectangle.h index c3833fbf4..3a0d66462 100644 --- a/src/Math/Geometry/Rectangle.h +++ b/src/Math/Geometry/Rectangle.h @@ -68,7 +68,7 @@ namespace Corrade { namespace Utility { template struct ConfigurationValue>: public ConfigurationValue> {}; }} #else -#error +#error use Magnum/Math/Range.h instead #endif #endif From adfe95fb9ff86fd148846d4875e7bd7210175b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 18:02:32 +0100 Subject: [PATCH 48/79] modules: updated FindCorrade.cmake. --- modules/FindCorrade.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index 0c5c83f0f..efbfcebab 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -37,6 +37,10 @@ # Native Client with `glibc` toolchain # CORRADE_TARGET_EMSCRIPTEN - Defined if compiled for Emscripten # +# If CORRADE_BUILD_DEPRECATED is defined, the CORRADE_INCLUDE_DIR variable also +# contains path directly to Corrade directory (i.e. for includes without +# `Corrade/` prefix). +# # Corrade provides these macros and functions: # # @@ -126,8 +130,7 @@ find_program(CORRADE_RC_EXECUTABLE corrade-rc) # Include dir find_path(CORRADE_INCLUDE_DIR - NAMES PluginManager Utility - PATH_SUFFIXES Corrade) + NAMES Corrade/PluginManager Corrade/Utility) # CMake module dir find_path(_CORRADE_MODULE_DIR @@ -155,7 +158,7 @@ if(NOT CORRADE_FOUND) endif() # Configuration -file(READ ${CORRADE_INCLUDE_DIR}/corradeConfigure.h _corradeConfigure) +file(READ ${CORRADE_INCLUDE_DIR}/Corrade/corradeConfigure.h _corradeConfigure) # Compatibility? string(FIND "${_corradeConfigure}" "#define CORRADE_GCC47_COMPATIBILITY" _GCC47_COMPATIBILITY) @@ -215,6 +218,11 @@ mark_as_advanced(CORRADE_UTILITY_LIBRARY CORRADE_TESTSUITE_LIBRARY _CORRADE_MODULE_DIR) +# Add Corrade dir to include path if this is deprecated build +if(CORRADE_BUILD_DEPRECATED) + set(CORRADE_INCLUDE_DIR ${CORRADE_INCLUDE_DIR} ${CORRADE_INCLUDE_DIR}/Corrade) +endif() + # Include our module dir, if we have any if(NOT "${_CORRADE_MODULE_DIR}" STREQUAL "${CMAKE_ROOT}/Modules") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${_CORRADE_MODULE_DIR}") From 45a10cefdf4508801df4fdc6b78fc96b052af76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 17:01:00 +0100 Subject: [PATCH 49/79] Making includes absolute, part 1: moving files around. Everything what was in src/ is now in src/Corrade, everything from src/Plugins is now in src/MagnumPlugins, everything from external/ is in src/MagnumExternal. Added new CMakeLists.txt file and updated the other ones for the moves, no other change was made. If MAGNUM_BUILD_DEPRECATED is set, everything compiles and installs like previously except for the plugins, which are now in MagnumPlugins and not in Magnum/Plugins. --- src/{ => Magnum}/AbstractFramebuffer.cpp | 0 src/{ => Magnum}/AbstractFramebuffer.h | 0 src/{ => Magnum}/AbstractImage.cpp | 0 src/{ => Magnum}/AbstractImage.h | 0 src/{ => Magnum}/AbstractObject.cpp | 0 src/{ => Magnum}/AbstractObject.h | 0 src/{ => Magnum}/AbstractResourceLoader.h | 0 src/{ => Magnum}/AbstractShaderProgram.cpp | 0 src/{ => Magnum}/AbstractShaderProgram.h | 0 src/{ => Magnum}/AbstractTexture.cpp | 0 src/{ => Magnum}/AbstractTexture.h | 0 src/{ => Magnum}/Array.h | 0 src/{ => Magnum}/Audio/AbstractImporter.cpp | 0 src/{ => Magnum}/Audio/AbstractImporter.h | 0 src/{ => Magnum}/Audio/Audio.cpp | 0 src/{ => Magnum}/Audio/Audio.h | 0 src/{ => Magnum}/Audio/Buffer.cpp | 0 src/{ => Magnum}/Audio/Buffer.h | 0 src/{ => Magnum}/Audio/CMakeLists.txt | 0 src/{ => Magnum}/Audio/Context.cpp | 0 src/{ => Magnum}/Audio/Context.h | 0 src/{ => Magnum}/Audio/Renderer.cpp | 0 src/{ => Magnum}/Audio/Renderer.h | 0 src/{ => Magnum}/Audio/Source.cpp | 0 src/{ => Magnum}/Audio/Source.h | 0 .../Audio/Test/AbstractImporterTest.cpp | 0 src/{ => Magnum}/Audio/Test/BufferTest.cpp | 0 src/{ => Magnum}/Audio/Test/CMakeLists.txt | 0 src/{ => Magnum}/Audio/Test/RendererTest.cpp | 0 src/{ => Magnum}/Audio/Test/SourceTest.cpp | 0 src/{ => Magnum}/Audio/Test/file.bin | 0 src/{ => Magnum}/Audio/Test/testConfigure.h.cmake | 0 src/{ => Magnum}/Audio/magnumAudioVisibility.h | 0 src/{ => Magnum}/Buffer.cpp | 0 src/{ => Magnum}/Buffer.h | 0 src/{ => Magnum}/BufferImage.cpp | 0 src/{ => Magnum}/BufferImage.h | 0 src/{ => Magnum}/BufferTexture.cpp | 0 src/{ => Magnum}/BufferTexture.h | 0 src/{ => Magnum}/CMakeLists.txt | 0 src/{ => Magnum}/Color.h | 0 src/{ => Magnum}/ColorFormat.cpp | 0 src/{ => Magnum}/ColorFormat.h | 0 src/{ => Magnum}/Context.cpp | 0 src/{ => Magnum}/Context.h | 0 src/{ => Magnum}/CubeMapTexture.h | 0 src/{ => Magnum}/CubeMapTextureArray.h | 0 src/{ => Magnum}/DebugMarker.h | 0 src/{ => Magnum}/DebugMessage.cpp | 0 src/{ => Magnum}/DebugMessage.h | 0 src/{ => Magnum}/DebugTools/CMakeLists.txt | 0 src/{ => Magnum}/DebugTools/DebugTools.h | 0 src/{ => Magnum}/DebugTools/ForceRenderer.cpp | 0 src/{ => Magnum}/DebugTools/ForceRenderer.h | 0 .../Implementation/AbstractBoxRenderer.cpp | 0 .../DebugTools/Implementation/AbstractBoxRenderer.h | 0 .../Implementation/AbstractShapeRenderer.cpp | 0 .../Implementation/AbstractShapeRenderer.h | 0 .../Implementation/AxisAlignedBoxRenderer.cpp | 0 .../Implementation/AxisAlignedBoxRenderer.h | 0 .../DebugTools/Implementation/BoxRenderer.cpp | 0 .../DebugTools/Implementation/BoxRenderer.h | 0 .../DebugTools/Implementation/CapsuleRenderer.cpp | 0 .../DebugTools/Implementation/CapsuleRenderer.h | 0 .../Implementation/CapsuleRendererTransformation.h | 0 .../DebugTools/Implementation/CylinderRenderer.cpp | 0 .../DebugTools/Implementation/CylinderRenderer.h | 0 .../Implementation/CylinderRendererTransformation.h | 0 .../Implementation/ForceRendererTransformation.h | 0 .../Implementation/LineSegmentRenderer.cpp | 0 .../DebugTools/Implementation/LineSegmentRenderer.h | 0 .../LineSegmentRendererTransformation.h | 0 .../DebugTools/Implementation/PointRenderer.cpp | 0 .../DebugTools/Implementation/PointRenderer.h | 0 .../DebugTools/Implementation/SphereRenderer.cpp | 0 .../DebugTools/Implementation/SphereRenderer.h | 0 src/{ => Magnum}/DebugTools/ObjectRenderer.cpp | 0 src/{ => Magnum}/DebugTools/ObjectRenderer.h | 0 src/{ => Magnum}/DebugTools/Profiler.cpp | 0 src/{ => Magnum}/DebugTools/Profiler.h | 0 src/{ => Magnum}/DebugTools/ResourceManager.cpp | 0 src/{ => Magnum}/DebugTools/ResourceManager.h | 0 src/{ => Magnum}/DebugTools/ShapeRenderer.cpp | 0 src/{ => Magnum}/DebugTools/ShapeRenderer.h | 0 src/{ => Magnum}/DebugTools/Test/CMakeLists.txt | 0 .../DebugTools/Test/CapsuleRendererTest.cpp | 0 .../DebugTools/Test/CylinderRendererTest.cpp | 0 .../DebugTools/Test/ForceRendererTest.cpp | 0 .../DebugTools/Test/LineSegmentRendererTest.cpp | 0 .../DebugTools/magnumDebugToolsVisibility.h | 0 src/{ => Magnum}/DefaultFramebuffer.cpp | 0 src/{ => Magnum}/DefaultFramebuffer.h | 0 src/{ => Magnum}/DimensionTraits.h | 0 src/{ => Magnum}/Extensions.h | 0 src/{ => Magnum}/Framebuffer.cpp | 0 src/{ => Magnum}/Framebuffer.h | 0 src/{ => Magnum}/Image.cpp | 0 src/{ => Magnum}/Image.h | 0 src/{ => Magnum}/ImageFormat.h | 0 src/{ => Magnum}/ImageReference.h | 0 src/{ => Magnum}/Implementation/BufferState.cpp | 0 src/{ => Magnum}/Implementation/BufferState.h | 0 src/{ => Magnum}/Implementation/DebugState.cpp | 0 src/{ => Magnum}/Implementation/DebugState.h | 0 src/{ => Magnum}/Implementation/FramebufferState.h | 0 src/{ => Magnum}/Implementation/MeshState.h | 0 src/{ => Magnum}/Implementation/RendererState.h | 0 .../Implementation/ShaderProgramState.h | 0 src/{ => Magnum}/Implementation/ShaderState.h | 0 src/{ => Magnum}/Implementation/State.cpp | 0 src/{ => Magnum}/Implementation/State.h | 0 src/{ => Magnum}/Implementation/TextureState.cpp | 0 src/{ => Magnum}/Implementation/TextureState.h | 0 src/{ => Magnum}/Magnum.h | 0 src/{ => Magnum}/Math/Algorithms/CMakeLists.txt | 0 src/{ => Magnum}/Math/Algorithms/GaussJordan.h | 0 src/{ => Magnum}/Math/Algorithms/GramSchmidt.h | 0 src/{ => Magnum}/Math/Algorithms/Svd.h | 0 .../Math/Algorithms/Test/CMakeLists.txt | 0 .../Math/Algorithms/Test/GaussJordanTest.cpp | 0 .../Math/Algorithms/Test/GramSchmidtTest.cpp | 0 src/{ => Magnum}/Math/Algorithms/Test/SvdTest.cpp | 0 src/{ => Magnum}/Math/Angle.h | 0 src/{ => Magnum}/Math/BoolVector.h | 0 src/{ => Magnum}/Math/CMakeLists.txt | 0 src/{ => Magnum}/Math/Complex.h | 0 src/{ => Magnum}/Math/Constants.h | 0 src/{ => Magnum}/Math/Dual.h | 0 src/{ => Magnum}/Math/DualComplex.h | 0 src/{ => Magnum}/Math/DualQuaternion.h | 0 src/{ => Magnum}/Math/Functions.cpp | 0 src/{ => Magnum}/Math/Functions.h | 0 src/{ => Magnum}/Math/Geometry/CMakeLists.txt | 0 src/{ => Magnum}/Math/Geometry/Distance.h | 0 src/{ => Magnum}/Math/Geometry/Intersection.h | 0 src/{ => Magnum}/Math/Geometry/Rectangle.h | 0 src/{ => Magnum}/Math/Geometry/Test/CMakeLists.txt | 0 .../Math/Geometry/Test/DistanceTest.cpp | 0 .../Math/Geometry/Test/IntersectionTest.cpp | 0 src/{ => Magnum}/Math/Math.h | 0 src/{ => Magnum}/Math/Matrix.h | 0 src/{ => Magnum}/Math/Matrix3.h | 0 src/{ => Magnum}/Math/Matrix4.h | 0 src/{ => Magnum}/Math/Quaternion.h | 0 src/{ => Magnum}/Math/Range.h | 0 src/{ => Magnum}/Math/RectangularMatrix.h | 0 src/{ => Magnum}/Math/Swizzle.h | 0 src/{ => Magnum}/Math/Test/AngleTest.cpp | 0 src/{ => Magnum}/Math/Test/BoolVectorTest.cpp | 0 src/{ => Magnum}/Math/Test/CMakeLists.txt | 0 src/{ => Magnum}/Math/Test/ComplexTest.cpp | 0 src/{ => Magnum}/Math/Test/ConstantsTest.cpp | 0 src/{ => Magnum}/Math/Test/DualComplexTest.cpp | 0 src/{ => Magnum}/Math/Test/DualQuaternionTest.cpp | 0 src/{ => Magnum}/Math/Test/DualTest.cpp | 0 src/{ => Magnum}/Math/Test/FunctionsTest.cpp | 0 src/{ => Magnum}/Math/Test/Matrix3Test.cpp | 0 src/{ => Magnum}/Math/Test/Matrix4Test.cpp | 0 src/{ => Magnum}/Math/Test/MatrixTest.cpp | 0 src/{ => Magnum}/Math/Test/QuaternionTest.cpp | 0 src/{ => Magnum}/Math/Test/RangeTest.cpp | 0 .../Math/Test/RectangularMatrixTest.cpp | 0 src/{ => Magnum}/Math/Test/SwizzleTest.cpp | 0 src/{ => Magnum}/Math/Test/TypeTraitsTest.cpp | 0 src/{ => Magnum}/Math/Test/UnitTest.cpp | 0 src/{ => Magnum}/Math/Test/Vector2Test.cpp | 0 src/{ => Magnum}/Math/Test/Vector3Test.cpp | 0 src/{ => Magnum}/Math/Test/Vector4Test.cpp | 0 src/{ => Magnum}/Math/Test/VectorTest.cpp | 0 src/{ => Magnum}/Math/TypeTraits.h | 0 src/{ => Magnum}/Math/Unit.h | 0 src/{ => Magnum}/Math/Vector.h | 0 src/{ => Magnum}/Math/Vector2.h | 0 src/{ => Magnum}/Math/Vector3.h | 0 src/{ => Magnum}/Math/Vector4.h | 0 src/{ => Magnum}/Math/instantiation.cpp | 0 src/{ => Magnum}/Mesh.cpp | 0 src/{ => Magnum}/Mesh.h | 0 src/{ => Magnum}/MeshTools/CMakeLists.txt | 0 src/{ => Magnum}/MeshTools/CombineIndexedArrays.h | 0 src/{ => Magnum}/MeshTools/CompressIndices.cpp | 0 src/{ => Magnum}/MeshTools/CompressIndices.h | 0 src/{ => Magnum}/MeshTools/Duplicate.h | 0 src/{ => Magnum}/MeshTools/FlipNormals.cpp | 0 src/{ => Magnum}/MeshTools/FlipNormals.h | 0 src/{ => Magnum}/MeshTools/FullScreenTriangle.cpp | 0 src/{ => Magnum}/MeshTools/FullScreenTriangle.h | 0 src/{ => Magnum}/MeshTools/GenerateFlatNormals.cpp | 0 src/{ => Magnum}/MeshTools/GenerateFlatNormals.h | 0 src/{ => Magnum}/MeshTools/Interleave.h | 0 src/{ => Magnum}/MeshTools/RemoveDuplicates.h | 0 src/{ => Magnum}/MeshTools/Subdivide.h | 0 src/{ => Magnum}/MeshTools/Test/CMakeLists.txt | 0 .../MeshTools/Test/CombineIndexedArraysTest.cpp | 0 .../MeshTools/Test/CompressIndicesTest.cpp | 0 src/{ => Magnum}/MeshTools/Test/DuplicateTest.cpp | 0 src/{ => Magnum}/MeshTools/Test/FlipNormalsTest.cpp | 0 .../MeshTools/Test/GenerateFlatNormalsTest.cpp | 0 src/{ => Magnum}/MeshTools/Test/InterleaveTest.cpp | 0 .../MeshTools/Test/RemoveDuplicatesTest.cpp | 0 .../Test/SubdivideRemoveDuplicatesBenchmark.cpp | 0 .../Test/SubdivideRemoveDuplicatesBenchmark.h | 0 src/{ => Magnum}/MeshTools/Test/SubdivideTest.cpp | 0 src/{ => Magnum}/MeshTools/Test/TipsifyTest.cpp | 0 src/{ => Magnum}/MeshTools/Test/TransformTest.cpp | 0 src/{ => Magnum}/MeshTools/Tipsify.cpp | 0 src/{ => Magnum}/MeshTools/Tipsify.h | 0 src/{ => Magnum}/MeshTools/Transform.h | 0 .../MeshTools/magnumMeshToolsVisibility.h | 0 src/{ => Magnum}/MeshView.cpp | 0 src/{ => Magnum}/MeshView.h | 0 src/{ => Magnum}/OpenGL.cpp | 0 src/{ => Magnum}/OpenGL.h | 0 src/{ => Magnum}/Platform/AbstractXApplication.cpp | 0 src/{ => Magnum}/Platform/AbstractXApplication.h | 0 src/{ => Magnum}/Platform/CMakeLists.txt | 0 src/{ => Magnum}/Platform/EmscriptenApplication.js | 0 src/{ => Magnum}/Platform/GlutApplication.cpp | 0 src/{ => Magnum}/Platform/GlutApplication.h | 0 src/{ => Magnum}/Platform/GlxApplication.cpp | 0 src/{ => Magnum}/Platform/GlxApplication.h | 0 .../Implementation/AbstractContextHandler.h | 0 .../Platform/Implementation/EglContextHandler.cpp | 0 .../Platform/Implementation/EglContextHandler.h | 0 .../Platform/Implementation/GlxContextHandler.cpp | 0 .../Platform/Implementation/GlxContextHandler.h | 0 src/{ => Magnum}/Platform/NaClApplication.cpp | 0 src/{ => Magnum}/Platform/NaClApplication.h | 0 src/{ => Magnum}/Platform/NaClApplication.js | 0 src/{ => Magnum}/Platform/Platform.h | 0 src/{ => Magnum}/Platform/Screen.h | 0 src/{ => Magnum}/Platform/ScreenedApplication.h | 0 src/{ => Magnum}/Platform/ScreenedApplication.hpp | 0 src/{ => Magnum}/Platform/Sdl2Application.cpp | 0 src/{ => Magnum}/Platform/Sdl2Application.h | 0 src/{ => Magnum}/Platform/WebApplication.css | 0 .../Platform/WindowlessGlxApplication.cpp | 0 .../Platform/WindowlessGlxApplication.h | 0 .../Platform/WindowlessNaClApplication.cpp | 0 .../Platform/WindowlessNaClApplication.h | 0 src/{ => Magnum}/Platform/XEglApplication.cpp | 0 src/{ => Magnum}/Platform/XEglApplication.h | 0 src/{ => Magnum}/Platform/magnum-info-nacl.html | 0 src/{ => Magnum}/Platform/magnum-info-nacl.nmf | 0 src/{ => Magnum}/Platform/magnum-info.cpp | 0 src/{ => Magnum}/Primitives/CMakeLists.txt | 0 src/{ => Magnum}/Primitives/Capsule.cpp | 0 src/{ => Magnum}/Primitives/Capsule.h | 0 src/{ => Magnum}/Primitives/Circle.cpp | 0 src/{ => Magnum}/Primitives/Circle.h | 0 src/{ => Magnum}/Primitives/Crosshair.cpp | 0 src/{ => Magnum}/Primitives/Crosshair.h | 0 src/{ => Magnum}/Primitives/Cube.cpp | 0 src/{ => Magnum}/Primitives/Cube.h | 0 src/{ => Magnum}/Primitives/Cylinder.cpp | 0 src/{ => Magnum}/Primitives/Cylinder.h | 0 src/{ => Magnum}/Primitives/Icosphere.cpp | 0 src/{ => Magnum}/Primitives/Icosphere.h | 0 .../Primitives/Implementation/Spheroid.cpp | 0 .../Primitives/Implementation/Spheroid.h | 0 .../Primitives/Implementation/WireframeSpheroid.cpp | 0 .../Primitives/Implementation/WireframeSpheroid.h | 0 src/{ => Magnum}/Primitives/Line.cpp | 0 src/{ => Magnum}/Primitives/Line.h | 0 src/{ => Magnum}/Primitives/Plane.cpp | 0 src/{ => Magnum}/Primitives/Plane.h | 0 src/{ => Magnum}/Primitives/Square.cpp | 0 src/{ => Magnum}/Primitives/Square.h | 0 src/{ => Magnum}/Primitives/Test/CMakeLists.txt | 0 src/{ => Magnum}/Primitives/Test/CapsuleTest.cpp | 0 src/{ => Magnum}/Primitives/Test/CircleTest.cpp | 0 src/{ => Magnum}/Primitives/Test/CylinderTest.cpp | 0 src/{ => Magnum}/Primitives/Test/IcosphereTest.cpp | 0 src/{ => Magnum}/Primitives/Test/UVSphereTest.cpp | 0 src/{ => Magnum}/Primitives/UVSphere.cpp | 0 src/{ => Magnum}/Primitives/UVSphere.h | 0 .../Primitives/magnumPrimitivesVisibility.h | 0 src/{ => Magnum}/Query.cpp | 0 src/{ => Magnum}/Query.h | 0 src/{ => Magnum}/Renderbuffer.cpp | 0 src/{ => Magnum}/Renderbuffer.h | 0 src/{ => Magnum}/RenderbufferFormat.h | 0 src/{ => Magnum}/Renderer.cpp | 0 src/{ => Magnum}/Renderer.h | 0 src/{ => Magnum}/Resource.cpp | 0 src/{ => Magnum}/Resource.h | 0 src/{ => Magnum}/ResourceManager.h | 0 src/{ => Magnum}/Sampler.cpp | 0 src/{ => Magnum}/Sampler.h | 0 src/{ => Magnum}/SceneGraph/AbstractCamera.h | 0 src/{ => Magnum}/SceneGraph/AbstractCamera.hpp | 0 src/{ => Magnum}/SceneGraph/AbstractFeature.h | 0 src/{ => Magnum}/SceneGraph/AbstractFeature.hpp | 0 .../SceneGraph/AbstractGroupedFeature.h | 0 src/{ => Magnum}/SceneGraph/AbstractObject.h | 0 .../SceneGraph/AbstractTransformation.h | 0 src/{ => Magnum}/SceneGraph/AbstractTranslation.h | 0 .../SceneGraph/AbstractTranslationRotation2D.h | 0 .../SceneGraph/AbstractTranslationRotation3D.h | 0 .../AbstractTranslationRotationScaling2D.h | 0 .../AbstractTranslationRotationScaling3D.h | 0 src/{ => Magnum}/SceneGraph/Animable.cpp | 0 src/{ => Magnum}/SceneGraph/Animable.h | 0 src/{ => Magnum}/SceneGraph/Animable.hpp | 0 src/{ => Magnum}/SceneGraph/AnimableGroup.h | 0 src/{ => Magnum}/SceneGraph/CMakeLists.txt | 0 src/{ => Magnum}/SceneGraph/Camera2D.h | 0 src/{ => Magnum}/SceneGraph/Camera2D.hpp | 0 src/{ => Magnum}/SceneGraph/Camera3D.h | 0 src/{ => Magnum}/SceneGraph/Camera3D.hpp | 0 src/{ => Magnum}/SceneGraph/Drawable.h | 0 src/{ => Magnum}/SceneGraph/Drawable.hpp | 0 .../SceneGraph/DualComplexTransformation.h | 0 .../SceneGraph/DualQuaternionTransformation.h | 0 src/{ => Magnum}/SceneGraph/FeatureGroup.h | 0 src/{ => Magnum}/SceneGraph/FeatureGroup.hpp | 0 .../SceneGraph/MatrixTransformation2D.h | 0 .../SceneGraph/MatrixTransformation3D.h | 0 src/{ => Magnum}/SceneGraph/Object.h | 0 src/{ => Magnum}/SceneGraph/Object.hpp | 0 .../SceneGraph/RigidMatrixTransformation2D.h | 0 .../SceneGraph/RigidMatrixTransformation3D.h | 0 src/{ => Magnum}/SceneGraph/Scene.h | 0 src/{ => Magnum}/SceneGraph/SceneGraph.h | 0 src/{ => Magnum}/SceneGraph/Test/AnimableTest.cpp | 0 src/{ => Magnum}/SceneGraph/Test/CMakeLists.txt | 0 src/{ => Magnum}/SceneGraph/Test/CameraTest.cpp | 0 .../Test/DualComplexTransformationTest.cpp | 0 .../Test/DualQuaternionTransformationTest.cpp | 0 .../SceneGraph/Test/MatrixTransformation2DTest.cpp | 0 .../SceneGraph/Test/MatrixTransformation3DTest.cpp | 0 src/{ => Magnum}/SceneGraph/Test/ObjectTest.cpp | 0 .../Test/RigidMatrixTransformation2DTest.cpp | 0 .../Test/RigidMatrixTransformation3DTest.cpp | 0 src/{ => Magnum}/SceneGraph/Test/SceneTest.cpp | 0 .../Test/TranslationTransformationTest.cpp | 0 .../SceneGraph/TranslationTransformation.h | 0 src/{ => Magnum}/SceneGraph/instantiation.cpp | 0 .../SceneGraph/magnumSceneGraphVisibility.h | 0 src/{ => Magnum}/Shader.cpp | 0 src/{ => Magnum}/Shader.h | 0 src/{ => Magnum}/Shaders/AbstractVector.h | 0 src/{ => Magnum}/Shaders/AbstractVector2D.vert | 0 src/{ => Magnum}/Shaders/AbstractVector3D.vert | 0 src/{ => Magnum}/Shaders/CMakeLists.txt | 0 src/{ => Magnum}/Shaders/DistanceFieldVector.cpp | 0 src/{ => Magnum}/Shaders/DistanceFieldVector.frag | 0 src/{ => Magnum}/Shaders/DistanceFieldVector.h | 0 src/{ => Magnum}/Shaders/Flat.cpp | 0 src/{ => Magnum}/Shaders/Flat.frag | 0 src/{ => Magnum}/Shaders/Flat.h | 0 src/{ => Magnum}/Shaders/Flat2D.vert | 0 src/{ => Magnum}/Shaders/Flat3D.vert | 0 src/{ => Magnum}/Shaders/FullScreenTriangle.glsl | 0 src/{ => Magnum}/Shaders/Generic.h | 0 src/{ => Magnum}/Shaders/MeshVisualizer.cpp | 0 src/{ => Magnum}/Shaders/MeshVisualizer.frag | 0 src/{ => Magnum}/Shaders/MeshVisualizer.geom | 0 src/{ => Magnum}/Shaders/MeshVisualizer.h | 0 src/{ => Magnum}/Shaders/MeshVisualizer.vert | 0 src/{ => Magnum}/Shaders/Phong.cpp | 0 src/{ => Magnum}/Shaders/Phong.frag | 0 src/{ => Magnum}/Shaders/Phong.h | 0 src/{ => Magnum}/Shaders/Phong.vert | 0 src/{ => Magnum}/Shaders/Shaders.h | 0 src/{ => Magnum}/Shaders/Test/CMakeLists.txt | 0 .../Shaders/Test/DistanceFieldVectorGLTest.cpp | 0 src/{ => Magnum}/Shaders/Test/FlatGLTest.cpp | 0 .../Shaders/Test/MeshVisualizerGLTest.cpp | 0 src/{ => Magnum}/Shaders/Test/PhongGLTest.cpp | 0 src/{ => Magnum}/Shaders/Test/VectorGLTest.cpp | 0 src/{ => Magnum}/Shaders/Test/VertexColorGLTest.cpp | 0 src/{ => Magnum}/Shaders/Vector.cpp | 0 src/{ => Magnum}/Shaders/Vector.frag | 0 src/{ => Magnum}/Shaders/Vector.h | 0 src/{ => Magnum}/Shaders/VertexColor.cpp | 0 src/{ => Magnum}/Shaders/VertexColor.frag | 0 src/{ => Magnum}/Shaders/VertexColor.h | 0 src/{ => Magnum}/Shaders/VertexColor2D.vert | 0 src/{ => Magnum}/Shaders/VertexColor3D.vert | 0 src/{ => Magnum}/Shaders/compatibility.glsl | 0 src/{ => Magnum}/Shaders/generic.glsl | 0 .../Shaders/magnumShadersResourceImport.hpp | 0 src/{ => Magnum}/Shaders/magnumShadersVisibility.h | 0 src/{ => Magnum}/Shaders/resources.conf | 0 src/{ => Magnum}/Shapes/AbstractShape.cpp | 0 src/{ => Magnum}/Shapes/AbstractShape.h | 0 src/{ => Magnum}/Shapes/AxisAlignedBox.cpp | 0 src/{ => Magnum}/Shapes/AxisAlignedBox.h | 0 src/{ => Magnum}/Shapes/Box.cpp | 0 src/{ => Magnum}/Shapes/Box.h | 0 src/{ => Magnum}/Shapes/CMakeLists.txt | 0 src/{ => Magnum}/Shapes/Capsule.cpp | 0 src/{ => Magnum}/Shapes/Capsule.h | 0 src/{ => Magnum}/Shapes/Collision.h | 0 src/{ => Magnum}/Shapes/Composition.cpp | 0 src/{ => Magnum}/Shapes/Composition.h | 0 src/{ => Magnum}/Shapes/Cylinder.cpp | 0 src/{ => Magnum}/Shapes/Cylinder.h | 0 .../Shapes/Implementation/CollisionDispatch.cpp | 0 .../Shapes/Implementation/CollisionDispatch.h | 0 src/{ => Magnum}/Shapes/Line.cpp | 0 src/{ => Magnum}/Shapes/Line.h | 0 src/{ => Magnum}/Shapes/LineSegment.h | 0 src/{ => Magnum}/Shapes/Plane.cpp | 0 src/{ => Magnum}/Shapes/Plane.h | 0 src/{ => Magnum}/Shapes/Point.cpp | 0 src/{ => Magnum}/Shapes/Point.h | 0 src/{ => Magnum}/Shapes/Shape.cpp | 0 src/{ => Magnum}/Shapes/Shape.h | 0 src/{ => Magnum}/Shapes/ShapeGroup.cpp | 0 src/{ => Magnum}/Shapes/ShapeGroup.h | 0 src/{ => Magnum}/Shapes/Shapes.h | 0 src/{ => Magnum}/Shapes/Sphere.cpp | 0 src/{ => Magnum}/Shapes/Sphere.h | 0 src/{ => Magnum}/Shapes/Test/AxisAlignedBoxTest.cpp | 0 src/{ => Magnum}/Shapes/Test/BoxTest.cpp | 0 src/{ => Magnum}/Shapes/Test/CMakeLists.txt | 0 src/{ => Magnum}/Shapes/Test/CapsuleTest.cpp | 0 src/{ => Magnum}/Shapes/Test/CollisionTest.cpp | 0 src/{ => Magnum}/Shapes/Test/CompositionTest.cpp | 0 src/{ => Magnum}/Shapes/Test/CylinderTest.cpp | 0 src/{ => Magnum}/Shapes/Test/LineTest.cpp | 0 src/{ => Magnum}/Shapes/Test/PlaneTest.cpp | 0 src/{ => Magnum}/Shapes/Test/PointTest.cpp | 0 .../Shapes/Test/ShapeImplementationTest.cpp | 0 src/{ => Magnum}/Shapes/Test/ShapeTest.cpp | 0 src/{ => Magnum}/Shapes/Test/ShapeTestBase.h | 0 src/{ => Magnum}/Shapes/Test/SphereTest.cpp | 0 src/{ => Magnum}/Shapes/magnumShapesVisibility.h | 0 src/{ => Magnum}/Shapes/shapeImplementation.cpp | 0 src/{ => Magnum}/Shapes/shapeImplementation.h | 0 src/{ => Magnum}/Swizzle.h | 0 src/{ => Magnum}/Test/AbstractImageTest.cpp | 0 src/{ => Magnum}/Test/AbstractObjectGLTest.cpp | 0 src/{ => Magnum}/Test/AbstractOpenGLTester.h | 0 src/{ => Magnum}/Test/AbstractQueryGLTest.cpp | 0 .../Test/AbstractShaderProgramGLTest.cpp | 0 .../AbstractShaderProgramGLTestFiles/MyShader.frag | 0 .../AbstractShaderProgramGLTestFiles/MyShader.vert | 0 .../MyShaderFragmentOutputs.frag | 0 .../AbstractShaderProgramGLTestFiles/resources.conf | 0 src/{ => Magnum}/Test/AbstractShaderProgramTest.cpp | 0 src/{ => Magnum}/Test/AbstractTextureGLTest.cpp | 0 src/{ => Magnum}/Test/ArrayTest.cpp | 0 src/{ => Magnum}/Test/BufferGLTest.cpp | 0 src/{ => Magnum}/Test/BufferImageGLTest.cpp | 0 src/{ => Magnum}/Test/BufferTextureGLTest.cpp | 0 src/{ => Magnum}/Test/CMakeLists.txt | 0 src/{ => Magnum}/Test/ColorTest.cpp | 0 src/{ => Magnum}/Test/ContextGLTest.cpp | 0 src/{ => Magnum}/Test/CubeMapTextureArrayGLTest.cpp | 0 src/{ => Magnum}/Test/CubeMapTextureGLTest.cpp | 0 src/{ => Magnum}/Test/DebugGLTest.cpp | 0 src/{ => Magnum}/Test/DebugMessageTest.cpp | 0 src/{ => Magnum}/Test/DefaultFramebufferTest.cpp | 0 src/{ => Magnum}/Test/FramebufferGLTest.cpp | 0 src/{ => Magnum}/Test/FramebufferTest.cpp | 0 src/{ => Magnum}/Test/ImageReferenceTest.cpp | 0 src/{ => Magnum}/Test/ImageTest.cpp | 0 src/{ => Magnum}/Test/MeshGLTest.cpp | 0 src/{ => Magnum}/Test/MeshTest.cpp | 0 src/{ => Magnum}/Test/PrimitiveQueryGLTest.cpp | 0 .../Test/QueryGLTestFiles/MyShader.frag | 0 .../Test/QueryGLTestFiles/MyShader.vert | 0 .../Test/QueryGLTestFiles/resources.conf | 0 src/{ => Magnum}/Test/RenderbufferGLTest.cpp | 0 src/{ => Magnum}/Test/RendererTest.cpp | 0 src/{ => Magnum}/Test/ResourceManagerTest.cpp | 0 src/{ => Magnum}/Test/SampleQueryGLTest.cpp | 0 src/{ => Magnum}/Test/SamplerTest.cpp | 0 src/{ => Magnum}/Test/ShaderGLTest.cpp | 0 src/{ => Magnum}/Test/ShaderGLTestConfigure.h.cmake | 0 src/{ => Magnum}/Test/ShaderGLTestFiles/shader.glsl | 0 src/{ => Magnum}/Test/ShaderTest.cpp | 0 src/{ => Magnum}/Test/TextureGLTest.cpp | 0 src/{ => Magnum}/Test/TimeQueryGLTest.cpp | 0 src/{ => Magnum}/Test/VersionTest.cpp | 0 src/{ => Magnum}/Text/AbstractFont.cpp | 0 src/{ => Magnum}/Text/AbstractFont.h | 0 src/{ => Magnum}/Text/AbstractFontConverter.cpp | 0 src/{ => Magnum}/Text/AbstractFontConverter.h | 0 src/{ => Magnum}/Text/Alignment.h | 0 src/{ => Magnum}/Text/CMakeLists.txt | 0 src/{ => Magnum}/Text/DistanceFieldGlyphCache.cpp | 0 src/{ => Magnum}/Text/DistanceFieldGlyphCache.h | 0 src/{ => Magnum}/Text/GlyphCache.cpp | 0 src/{ => Magnum}/Text/GlyphCache.h | 0 src/{ => Magnum}/Text/Renderer.cpp | 0 src/{ => Magnum}/Text/Renderer.h | 0 .../Text/Test/AbstractFontConverterTest.cpp | 0 src/{ => Magnum}/Text/Test/AbstractFontTest.cpp | 0 src/{ => Magnum}/Text/Test/AbstractLayouterTest.cpp | 0 src/{ => Magnum}/Text/Test/CMakeLists.txt | 0 src/{ => Magnum}/Text/Test/GlyphCacheGLTest.cpp | 0 src/{ => Magnum}/Text/Test/RendererGLTest.cpp | 0 src/{ => Magnum}/Text/Test/data.bin | 0 src/{ => Magnum}/Text/Test/testConfigure.h.cmake | 0 src/{ => Magnum}/Text/Text.h | 0 src/{ => Magnum}/Text/TextRenderer.h | 0 src/{ => Magnum}/Text/configure.h.cmake | 0 src/{ => Magnum}/Text/fontconverter.cpp | 0 src/{ => Magnum}/Text/magnumTextVisibility.h | 0 src/{ => Magnum}/Texture.h | 0 src/{ => Magnum}/TextureFormat.h | 0 src/{ => Magnum}/TextureTools/Atlas.cpp | 0 src/{ => Magnum}/TextureTools/Atlas.h | 0 src/{ => Magnum}/TextureTools/CMakeLists.txt | 0 src/{ => Magnum}/TextureTools/DistanceField.cpp | 0 src/{ => Magnum}/TextureTools/DistanceField.h | 0 .../TextureTools/DistanceFieldShader.frag | 0 .../TextureTools/DistanceFieldShader.vert | 0 src/{ => Magnum}/TextureTools/Test/AtlasTest.cpp | 0 src/{ => Magnum}/TextureTools/Test/CMakeLists.txt | 0 src/{ => Magnum}/TextureTools/configure.h.cmake | 0 .../TextureTools/distancefieldconverter.cpp | 0 .../magnumTextureToolsResourceImport.hpp | 0 .../TextureTools/magnumTextureToolsVisibility.h | 0 src/{ => Magnum}/TextureTools/resources.conf | 0 src/{ => Magnum}/Timeline.cpp | 0 src/{ => Magnum}/Timeline.h | 0 src/{ => Magnum}/Trade/AbstractImageConverter.cpp | 0 src/{ => Magnum}/Trade/AbstractImageConverter.h | 0 src/{ => Magnum}/Trade/AbstractImporter.cpp | 0 src/{ => Magnum}/Trade/AbstractImporter.h | 0 src/{ => Magnum}/Trade/AbstractMaterialData.cpp | 0 src/{ => Magnum}/Trade/AbstractMaterialData.h | 0 src/{ => Magnum}/Trade/CMakeLists.txt | 0 src/{ => Magnum}/Trade/CameraData.h | 0 src/{ => Magnum}/Trade/ImageData.h | 0 src/{ => Magnum}/Trade/LightData.h | 0 src/{ => Magnum}/Trade/MeshData2D.cpp | 0 src/{ => Magnum}/Trade/MeshData2D.h | 0 src/{ => Magnum}/Trade/MeshData3D.cpp | 0 src/{ => Magnum}/Trade/MeshData3D.h | 0 src/{ => Magnum}/Trade/MeshObjectData2D.cpp | 0 src/{ => Magnum}/Trade/MeshObjectData2D.h | 0 src/{ => Magnum}/Trade/MeshObjectData3D.cpp | 0 src/{ => Magnum}/Trade/MeshObjectData3D.h | 0 src/{ => Magnum}/Trade/ObjectData2D.cpp | 0 src/{ => Magnum}/Trade/ObjectData2D.h | 0 src/{ => Magnum}/Trade/ObjectData3D.cpp | 0 src/{ => Magnum}/Trade/ObjectData3D.h | 0 src/{ => Magnum}/Trade/PhongMaterialData.cpp | 0 src/{ => Magnum}/Trade/PhongMaterialData.h | 0 src/{ => Magnum}/Trade/SceneData.cpp | 0 src/{ => Magnum}/Trade/SceneData.h | 0 .../Trade/Test/AbstractImageConverterTest.cpp | 0 .../Trade/Test/AbstractImporterTest.cpp | 0 .../Trade/Test/AbstractMaterialDataTest.cpp | 0 src/{ => Magnum}/Trade/Test/CMakeLists.txt | 0 src/{ => Magnum}/Trade/Test/ImageDataTest.cpp | 0 src/{ => Magnum}/Trade/Test/ObjectData2DTest.cpp | 0 src/{ => Magnum}/Trade/Test/ObjectData3DTest.cpp | 0 src/{ => Magnum}/Trade/Test/TextureDataTest.cpp | 0 src/{ => Magnum}/Trade/Test/file.bin | 0 src/{ => Magnum}/Trade/Test/testConfigure.h.cmake | 0 src/{ => Magnum}/Trade/TextureData.cpp | 0 src/{ => Magnum}/Trade/TextureData.h | 0 src/{ => Magnum}/Trade/Trade.h | 0 src/{ => Magnum}/Types.h | 0 src/{ => Magnum}/Version.cpp | 0 src/{ => Magnum}/Version.h | 0 src/{ => Magnum}/magnumConfigure.h.cmake | 0 src/{ => Magnum}/magnumVisibility.h | 0 {external => src/MagnumExternal}/CMakeLists.txt | 0 .../MagnumExternal}/OpenGL/CMakeLists.txt | 0 .../MagnumExternal}/OpenGL/GL/CMakeLists.txt | 0 .../MagnumExternal}/OpenGL/GL/README.md | 0 .../MagnumExternal}/OpenGL/GL/extensions.txt | 0 .../MagnumExternal}/OpenGL/GL/gl_magnum.c | 0 .../MagnumExternal}/OpenGL/GL/gl_magnum.h | 0 .../MagnumExternal}/OpenGL/GLES2/CMakeLists.txt | 0 {external => src/MagnumExternal}/OpenGL/GLES2/gl2.h | 0 .../MagnumExternal}/OpenGL/GLES2/gl2ext.h | 0 .../MagnumExternal}/OpenGL/GLES2/gl2platform.h | 0 .../MagnumExternal}/OpenGL/GLES3/CMakeLists.txt | 0 {external => src/MagnumExternal}/OpenGL/GLES3/gl3.h | 0 .../MagnumExternal}/OpenGL/GLES3/gl3platform.h | 0 .../MagnumExternal}/OpenGL/KHR/CMakeLists.txt | 0 .../MagnumExternal}/OpenGL/KHR/khrplatform.h | 0 .../MagnumExternal}/Optional/CMakeLists.txt | 0 .../MagnumExternal}/Optional/LICENSE_1_0.txt | 0 .../MagnumExternal}/Optional/optional.hpp | 0 src/{Plugins => MagnumPlugins}/CMakeLists.txt | 0 .../MagnumFont/CMakeLists.txt | 0 .../MagnumFont/MagnumFont.conf | 0 .../MagnumFont/MagnumFont.cpp | 0 .../MagnumFont/MagnumFont.h | 0 .../MagnumFont/Test/CMakeLists.txt | 0 .../MagnumFont/Test/MagnumFontGLTest.cpp | 0 .../MagnumFont/Test/font.conf | 0 .../MagnumFont/Test/font.tga | Bin .../MagnumFont/Test/magnumFontTestConfigure.h.cmake | 0 .../MagnumFont/pluginRegistrationMagnumFont.cpp | 0 .../MagnumFontConverter/CMakeLists.txt | 0 .../MagnumFontConverter/MagnumFontConverter.conf | 0 .../MagnumFontConverter/MagnumFontConverter.cpp | 0 .../MagnumFontConverter/MagnumFontConverter.h | 0 .../MagnumFontConverter/Test/CMakeLists.txt | 0 .../Test/MagnumFontConverterGLTest.cpp | 0 .../Test/magnumFontConverterTestConfigure.h.cmake | 0 .../pluginRegistrationMagnumFontConverter.cpp | 0 .../TgaImageConverter/CMakeLists.txt | 0 .../TgaImageConverter/Test/CMakeLists.txt | 0 .../Test/TgaImageConverterTest.cpp | 0 .../TgaImageConverter/Test/configure.h.cmake | 0 .../TgaImageConverter/TgaImageConverter.conf | 0 .../TgaImageConverter/TgaImageConverter.cpp | 0 .../TgaImageConverter/TgaImageConverter.h | 0 .../pluginRegistrationTgaImageConverter.cpp | 0 .../TgaImporter/CMakeLists.txt | 0 .../TgaImporter/Test/CMakeLists.txt | 0 .../TgaImporter/Test/TgaImporterTest.cpp | 0 .../TgaImporter/Test/configure.h.cmake | 0 .../TgaImporter/Test/file.tga | Bin .../TgaImporter/TgaHeader.h | 0 .../TgaImporter/TgaImporter.conf | 0 .../TgaImporter/TgaImporter.cpp | 0 .../TgaImporter/TgaImporter.h | 0 .../TgaImporter/pluginRegistrationTgaImporter.cpp | 0 .../WavAudioImporter/CMakeLists.txt | 0 .../WavAudioImporter/Test/CMakeLists.txt | 0 .../WavAudioImporter/Test/WavImporterTest.cpp | 0 .../WavAudioImporter/Test/configure.h.cmake | 0 .../WavAudioImporter/Test/mono16.wav | Bin .../WavAudioImporter/Test/stereo8.wav | Bin .../Test/unsupportedChannelCount.wav | Bin .../WavAudioImporter/Test/unsupportedFormat.wav | Bin .../WavAudioImporter/Test/wrongSignature.wav | Bin .../WavAudioImporter/WavAudioImporter.conf | 0 .../WavAudioImporter/WavHeader.h | 0 .../WavAudioImporter/WavImporter.cpp | 0 .../WavAudioImporter/WavImporter.h | 0 .../pluginRegistrationWavAudioImporter.cpp | 0 635 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => Magnum}/AbstractFramebuffer.cpp (100%) rename src/{ => Magnum}/AbstractFramebuffer.h (100%) rename src/{ => Magnum}/AbstractImage.cpp (100%) rename src/{ => Magnum}/AbstractImage.h (100%) rename src/{ => Magnum}/AbstractObject.cpp (100%) rename src/{ => Magnum}/AbstractObject.h (100%) rename src/{ => Magnum}/AbstractResourceLoader.h (100%) rename src/{ => Magnum}/AbstractShaderProgram.cpp (100%) rename src/{ => Magnum}/AbstractShaderProgram.h (100%) rename src/{ => Magnum}/AbstractTexture.cpp (100%) rename src/{ => Magnum}/AbstractTexture.h (100%) rename src/{ => Magnum}/Array.h (100%) rename src/{ => Magnum}/Audio/AbstractImporter.cpp (100%) rename src/{ => Magnum}/Audio/AbstractImporter.h (100%) rename src/{ => Magnum}/Audio/Audio.cpp (100%) rename src/{ => Magnum}/Audio/Audio.h (100%) rename src/{ => Magnum}/Audio/Buffer.cpp (100%) rename src/{ => Magnum}/Audio/Buffer.h (100%) rename src/{ => Magnum}/Audio/CMakeLists.txt (100%) rename src/{ => Magnum}/Audio/Context.cpp (100%) rename src/{ => Magnum}/Audio/Context.h (100%) rename src/{ => Magnum}/Audio/Renderer.cpp (100%) rename src/{ => Magnum}/Audio/Renderer.h (100%) rename src/{ => Magnum}/Audio/Source.cpp (100%) rename src/{ => Magnum}/Audio/Source.h (100%) rename src/{ => Magnum}/Audio/Test/AbstractImporterTest.cpp (100%) rename src/{ => Magnum}/Audio/Test/BufferTest.cpp (100%) rename src/{ => Magnum}/Audio/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Audio/Test/RendererTest.cpp (100%) rename src/{ => Magnum}/Audio/Test/SourceTest.cpp (100%) rename src/{ => Magnum}/Audio/Test/file.bin (100%) rename src/{ => Magnum}/Audio/Test/testConfigure.h.cmake (100%) rename src/{ => Magnum}/Audio/magnumAudioVisibility.h (100%) rename src/{ => Magnum}/Buffer.cpp (100%) rename src/{ => Magnum}/Buffer.h (100%) rename src/{ => Magnum}/BufferImage.cpp (100%) rename src/{ => Magnum}/BufferImage.h (100%) rename src/{ => Magnum}/BufferTexture.cpp (100%) rename src/{ => Magnum}/BufferTexture.h (100%) rename src/{ => Magnum}/CMakeLists.txt (100%) rename src/{ => Magnum}/Color.h (100%) rename src/{ => Magnum}/ColorFormat.cpp (100%) rename src/{ => Magnum}/ColorFormat.h (100%) rename src/{ => Magnum}/Context.cpp (100%) rename src/{ => Magnum}/Context.h (100%) rename src/{ => Magnum}/CubeMapTexture.h (100%) rename src/{ => Magnum}/CubeMapTextureArray.h (100%) rename src/{ => Magnum}/DebugMarker.h (100%) rename src/{ => Magnum}/DebugMessage.cpp (100%) rename src/{ => Magnum}/DebugMessage.h (100%) rename src/{ => Magnum}/DebugTools/CMakeLists.txt (100%) rename src/{ => Magnum}/DebugTools/DebugTools.h (100%) rename src/{ => Magnum}/DebugTools/ForceRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/ForceRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/AbstractBoxRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/AbstractBoxRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/AbstractShapeRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/AbstractShapeRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/AxisAlignedBoxRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/BoxRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/BoxRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/CapsuleRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/CapsuleRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/CapsuleRendererTransformation.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/CylinderRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/CylinderRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/CylinderRendererTransformation.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/ForceRendererTransformation.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/LineSegmentRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/LineSegmentRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/LineSegmentRendererTransformation.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/PointRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/PointRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Implementation/SphereRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/Implementation/SphereRenderer.h (100%) rename src/{ => Magnum}/DebugTools/ObjectRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/ObjectRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Profiler.cpp (100%) rename src/{ => Magnum}/DebugTools/Profiler.h (100%) rename src/{ => Magnum}/DebugTools/ResourceManager.cpp (100%) rename src/{ => Magnum}/DebugTools/ResourceManager.h (100%) rename src/{ => Magnum}/DebugTools/ShapeRenderer.cpp (100%) rename src/{ => Magnum}/DebugTools/ShapeRenderer.h (100%) rename src/{ => Magnum}/DebugTools/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/DebugTools/Test/CapsuleRendererTest.cpp (100%) rename src/{ => Magnum}/DebugTools/Test/CylinderRendererTest.cpp (100%) rename src/{ => Magnum}/DebugTools/Test/ForceRendererTest.cpp (100%) rename src/{ => Magnum}/DebugTools/Test/LineSegmentRendererTest.cpp (100%) rename src/{ => Magnum}/DebugTools/magnumDebugToolsVisibility.h (100%) rename src/{ => Magnum}/DefaultFramebuffer.cpp (100%) rename src/{ => Magnum}/DefaultFramebuffer.h (100%) rename src/{ => Magnum}/DimensionTraits.h (100%) rename src/{ => Magnum}/Extensions.h (100%) rename src/{ => Magnum}/Framebuffer.cpp (100%) rename src/{ => Magnum}/Framebuffer.h (100%) rename src/{ => Magnum}/Image.cpp (100%) rename src/{ => Magnum}/Image.h (100%) rename src/{ => Magnum}/ImageFormat.h (100%) rename src/{ => Magnum}/ImageReference.h (100%) rename src/{ => Magnum}/Implementation/BufferState.cpp (100%) rename src/{ => Magnum}/Implementation/BufferState.h (100%) rename src/{ => Magnum}/Implementation/DebugState.cpp (100%) rename src/{ => Magnum}/Implementation/DebugState.h (100%) rename src/{ => Magnum}/Implementation/FramebufferState.h (100%) rename src/{ => Magnum}/Implementation/MeshState.h (100%) rename src/{ => Magnum}/Implementation/RendererState.h (100%) rename src/{ => Magnum}/Implementation/ShaderProgramState.h (100%) rename src/{ => Magnum}/Implementation/ShaderState.h (100%) rename src/{ => Magnum}/Implementation/State.cpp (100%) rename src/{ => Magnum}/Implementation/State.h (100%) rename src/{ => Magnum}/Implementation/TextureState.cpp (100%) rename src/{ => Magnum}/Implementation/TextureState.h (100%) rename src/{ => Magnum}/Magnum.h (100%) rename src/{ => Magnum}/Math/Algorithms/CMakeLists.txt (100%) rename src/{ => Magnum}/Math/Algorithms/GaussJordan.h (100%) rename src/{ => Magnum}/Math/Algorithms/GramSchmidt.h (100%) rename src/{ => Magnum}/Math/Algorithms/Svd.h (100%) rename src/{ => Magnum}/Math/Algorithms/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Math/Algorithms/Test/GaussJordanTest.cpp (100%) rename src/{ => Magnum}/Math/Algorithms/Test/GramSchmidtTest.cpp (100%) rename src/{ => Magnum}/Math/Algorithms/Test/SvdTest.cpp (100%) rename src/{ => Magnum}/Math/Angle.h (100%) rename src/{ => Magnum}/Math/BoolVector.h (100%) rename src/{ => Magnum}/Math/CMakeLists.txt (100%) rename src/{ => Magnum}/Math/Complex.h (100%) rename src/{ => Magnum}/Math/Constants.h (100%) rename src/{ => Magnum}/Math/Dual.h (100%) rename src/{ => Magnum}/Math/DualComplex.h (100%) rename src/{ => Magnum}/Math/DualQuaternion.h (100%) rename src/{ => Magnum}/Math/Functions.cpp (100%) rename src/{ => Magnum}/Math/Functions.h (100%) rename src/{ => Magnum}/Math/Geometry/CMakeLists.txt (100%) rename src/{ => Magnum}/Math/Geometry/Distance.h (100%) rename src/{ => Magnum}/Math/Geometry/Intersection.h (100%) rename src/{ => Magnum}/Math/Geometry/Rectangle.h (100%) rename src/{ => Magnum}/Math/Geometry/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Math/Geometry/Test/DistanceTest.cpp (100%) rename src/{ => Magnum}/Math/Geometry/Test/IntersectionTest.cpp (100%) rename src/{ => Magnum}/Math/Math.h (100%) rename src/{ => Magnum}/Math/Matrix.h (100%) rename src/{ => Magnum}/Math/Matrix3.h (100%) rename src/{ => Magnum}/Math/Matrix4.h (100%) rename src/{ => Magnum}/Math/Quaternion.h (100%) rename src/{ => Magnum}/Math/Range.h (100%) rename src/{ => Magnum}/Math/RectangularMatrix.h (100%) rename src/{ => Magnum}/Math/Swizzle.h (100%) rename src/{ => Magnum}/Math/Test/AngleTest.cpp (100%) rename src/{ => Magnum}/Math/Test/BoolVectorTest.cpp (100%) rename src/{ => Magnum}/Math/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Math/Test/ComplexTest.cpp (100%) rename src/{ => Magnum}/Math/Test/ConstantsTest.cpp (100%) rename src/{ => Magnum}/Math/Test/DualComplexTest.cpp (100%) rename src/{ => Magnum}/Math/Test/DualQuaternionTest.cpp (100%) rename src/{ => Magnum}/Math/Test/DualTest.cpp (100%) rename src/{ => Magnum}/Math/Test/FunctionsTest.cpp (100%) rename src/{ => Magnum}/Math/Test/Matrix3Test.cpp (100%) rename src/{ => Magnum}/Math/Test/Matrix4Test.cpp (100%) rename src/{ => Magnum}/Math/Test/MatrixTest.cpp (100%) rename src/{ => Magnum}/Math/Test/QuaternionTest.cpp (100%) rename src/{ => Magnum}/Math/Test/RangeTest.cpp (100%) rename src/{ => Magnum}/Math/Test/RectangularMatrixTest.cpp (100%) rename src/{ => Magnum}/Math/Test/SwizzleTest.cpp (100%) rename src/{ => Magnum}/Math/Test/TypeTraitsTest.cpp (100%) rename src/{ => Magnum}/Math/Test/UnitTest.cpp (100%) rename src/{ => Magnum}/Math/Test/Vector2Test.cpp (100%) rename src/{ => Magnum}/Math/Test/Vector3Test.cpp (100%) rename src/{ => Magnum}/Math/Test/Vector4Test.cpp (100%) rename src/{ => Magnum}/Math/Test/VectorTest.cpp (100%) rename src/{ => Magnum}/Math/TypeTraits.h (100%) rename src/{ => Magnum}/Math/Unit.h (100%) rename src/{ => Magnum}/Math/Vector.h (100%) rename src/{ => Magnum}/Math/Vector2.h (100%) rename src/{ => Magnum}/Math/Vector3.h (100%) rename src/{ => Magnum}/Math/Vector4.h (100%) rename src/{ => Magnum}/Math/instantiation.cpp (100%) rename src/{ => Magnum}/Mesh.cpp (100%) rename src/{ => Magnum}/Mesh.h (100%) rename src/{ => Magnum}/MeshTools/CMakeLists.txt (100%) rename src/{ => Magnum}/MeshTools/CombineIndexedArrays.h (100%) rename src/{ => Magnum}/MeshTools/CompressIndices.cpp (100%) rename src/{ => Magnum}/MeshTools/CompressIndices.h (100%) rename src/{ => Magnum}/MeshTools/Duplicate.h (100%) rename src/{ => Magnum}/MeshTools/FlipNormals.cpp (100%) rename src/{ => Magnum}/MeshTools/FlipNormals.h (100%) rename src/{ => Magnum}/MeshTools/FullScreenTriangle.cpp (100%) rename src/{ => Magnum}/MeshTools/FullScreenTriangle.h (100%) rename src/{ => Magnum}/MeshTools/GenerateFlatNormals.cpp (100%) rename src/{ => Magnum}/MeshTools/GenerateFlatNormals.h (100%) rename src/{ => Magnum}/MeshTools/Interleave.h (100%) rename src/{ => Magnum}/MeshTools/RemoveDuplicates.h (100%) rename src/{ => Magnum}/MeshTools/Subdivide.h (100%) rename src/{ => Magnum}/MeshTools/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/MeshTools/Test/CombineIndexedArraysTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/CompressIndicesTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/DuplicateTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/FlipNormalsTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/GenerateFlatNormalsTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/InterleaveTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/RemoveDuplicatesTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h (100%) rename src/{ => Magnum}/MeshTools/Test/SubdivideTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/TipsifyTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Test/TransformTest.cpp (100%) rename src/{ => Magnum}/MeshTools/Tipsify.cpp (100%) rename src/{ => Magnum}/MeshTools/Tipsify.h (100%) rename src/{ => Magnum}/MeshTools/Transform.h (100%) rename src/{ => Magnum}/MeshTools/magnumMeshToolsVisibility.h (100%) rename src/{ => Magnum}/MeshView.cpp (100%) rename src/{ => Magnum}/MeshView.h (100%) rename src/{ => Magnum}/OpenGL.cpp (100%) rename src/{ => Magnum}/OpenGL.h (100%) rename src/{ => Magnum}/Platform/AbstractXApplication.cpp (100%) rename src/{ => Magnum}/Platform/AbstractXApplication.h (100%) rename src/{ => Magnum}/Platform/CMakeLists.txt (100%) rename src/{ => Magnum}/Platform/EmscriptenApplication.js (100%) rename src/{ => Magnum}/Platform/GlutApplication.cpp (100%) rename src/{ => Magnum}/Platform/GlutApplication.h (100%) rename src/{ => Magnum}/Platform/GlxApplication.cpp (100%) rename src/{ => Magnum}/Platform/GlxApplication.h (100%) rename src/{ => Magnum}/Platform/Implementation/AbstractContextHandler.h (100%) rename src/{ => Magnum}/Platform/Implementation/EglContextHandler.cpp (100%) rename src/{ => Magnum}/Platform/Implementation/EglContextHandler.h (100%) rename src/{ => Magnum}/Platform/Implementation/GlxContextHandler.cpp (100%) rename src/{ => Magnum}/Platform/Implementation/GlxContextHandler.h (100%) rename src/{ => Magnum}/Platform/NaClApplication.cpp (100%) rename src/{ => Magnum}/Platform/NaClApplication.h (100%) rename src/{ => Magnum}/Platform/NaClApplication.js (100%) rename src/{ => Magnum}/Platform/Platform.h (100%) rename src/{ => Magnum}/Platform/Screen.h (100%) rename src/{ => Magnum}/Platform/ScreenedApplication.h (100%) rename src/{ => Magnum}/Platform/ScreenedApplication.hpp (100%) rename src/{ => Magnum}/Platform/Sdl2Application.cpp (100%) rename src/{ => Magnum}/Platform/Sdl2Application.h (100%) rename src/{ => Magnum}/Platform/WebApplication.css (100%) rename src/{ => Magnum}/Platform/WindowlessGlxApplication.cpp (100%) rename src/{ => Magnum}/Platform/WindowlessGlxApplication.h (100%) rename src/{ => Magnum}/Platform/WindowlessNaClApplication.cpp (100%) rename src/{ => Magnum}/Platform/WindowlessNaClApplication.h (100%) rename src/{ => Magnum}/Platform/XEglApplication.cpp (100%) rename src/{ => Magnum}/Platform/XEglApplication.h (100%) rename src/{ => Magnum}/Platform/magnum-info-nacl.html (100%) rename src/{ => Magnum}/Platform/magnum-info-nacl.nmf (100%) rename src/{ => Magnum}/Platform/magnum-info.cpp (100%) rename src/{ => Magnum}/Primitives/CMakeLists.txt (100%) rename src/{ => Magnum}/Primitives/Capsule.cpp (100%) rename src/{ => Magnum}/Primitives/Capsule.h (100%) rename src/{ => Magnum}/Primitives/Circle.cpp (100%) rename src/{ => Magnum}/Primitives/Circle.h (100%) rename src/{ => Magnum}/Primitives/Crosshair.cpp (100%) rename src/{ => Magnum}/Primitives/Crosshair.h (100%) rename src/{ => Magnum}/Primitives/Cube.cpp (100%) rename src/{ => Magnum}/Primitives/Cube.h (100%) rename src/{ => Magnum}/Primitives/Cylinder.cpp (100%) rename src/{ => Magnum}/Primitives/Cylinder.h (100%) rename src/{ => Magnum}/Primitives/Icosphere.cpp (100%) rename src/{ => Magnum}/Primitives/Icosphere.h (100%) rename src/{ => Magnum}/Primitives/Implementation/Spheroid.cpp (100%) rename src/{ => Magnum}/Primitives/Implementation/Spheroid.h (100%) rename src/{ => Magnum}/Primitives/Implementation/WireframeSpheroid.cpp (100%) rename src/{ => Magnum}/Primitives/Implementation/WireframeSpheroid.h (100%) rename src/{ => Magnum}/Primitives/Line.cpp (100%) rename src/{ => Magnum}/Primitives/Line.h (100%) rename src/{ => Magnum}/Primitives/Plane.cpp (100%) rename src/{ => Magnum}/Primitives/Plane.h (100%) rename src/{ => Magnum}/Primitives/Square.cpp (100%) rename src/{ => Magnum}/Primitives/Square.h (100%) rename src/{ => Magnum}/Primitives/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Primitives/Test/CapsuleTest.cpp (100%) rename src/{ => Magnum}/Primitives/Test/CircleTest.cpp (100%) rename src/{ => Magnum}/Primitives/Test/CylinderTest.cpp (100%) rename src/{ => Magnum}/Primitives/Test/IcosphereTest.cpp (100%) rename src/{ => Magnum}/Primitives/Test/UVSphereTest.cpp (100%) rename src/{ => Magnum}/Primitives/UVSphere.cpp (100%) rename src/{ => Magnum}/Primitives/UVSphere.h (100%) rename src/{ => Magnum}/Primitives/magnumPrimitivesVisibility.h (100%) rename src/{ => Magnum}/Query.cpp (100%) rename src/{ => Magnum}/Query.h (100%) rename src/{ => Magnum}/Renderbuffer.cpp (100%) rename src/{ => Magnum}/Renderbuffer.h (100%) rename src/{ => Magnum}/RenderbufferFormat.h (100%) rename src/{ => Magnum}/Renderer.cpp (100%) rename src/{ => Magnum}/Renderer.h (100%) rename src/{ => Magnum}/Resource.cpp (100%) rename src/{ => Magnum}/Resource.h (100%) rename src/{ => Magnum}/ResourceManager.h (100%) rename src/{ => Magnum}/Sampler.cpp (100%) rename src/{ => Magnum}/Sampler.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractCamera.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractCamera.hpp (100%) rename src/{ => Magnum}/SceneGraph/AbstractFeature.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractFeature.hpp (100%) rename src/{ => Magnum}/SceneGraph/AbstractGroupedFeature.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractObject.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractTransformation.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractTranslation.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractTranslationRotation2D.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractTranslationRotation3D.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractTranslationRotationScaling2D.h (100%) rename src/{ => Magnum}/SceneGraph/AbstractTranslationRotationScaling3D.h (100%) rename src/{ => Magnum}/SceneGraph/Animable.cpp (100%) rename src/{ => Magnum}/SceneGraph/Animable.h (100%) rename src/{ => Magnum}/SceneGraph/Animable.hpp (100%) rename src/{ => Magnum}/SceneGraph/AnimableGroup.h (100%) rename src/{ => Magnum}/SceneGraph/CMakeLists.txt (100%) rename src/{ => Magnum}/SceneGraph/Camera2D.h (100%) rename src/{ => Magnum}/SceneGraph/Camera2D.hpp (100%) rename src/{ => Magnum}/SceneGraph/Camera3D.h (100%) rename src/{ => Magnum}/SceneGraph/Camera3D.hpp (100%) rename src/{ => Magnum}/SceneGraph/Drawable.h (100%) rename src/{ => Magnum}/SceneGraph/Drawable.hpp (100%) rename src/{ => Magnum}/SceneGraph/DualComplexTransformation.h (100%) rename src/{ => Magnum}/SceneGraph/DualQuaternionTransformation.h (100%) rename src/{ => Magnum}/SceneGraph/FeatureGroup.h (100%) rename src/{ => Magnum}/SceneGraph/FeatureGroup.hpp (100%) rename src/{ => Magnum}/SceneGraph/MatrixTransformation2D.h (100%) rename src/{ => Magnum}/SceneGraph/MatrixTransformation3D.h (100%) rename src/{ => Magnum}/SceneGraph/Object.h (100%) rename src/{ => Magnum}/SceneGraph/Object.hpp (100%) rename src/{ => Magnum}/SceneGraph/RigidMatrixTransformation2D.h (100%) rename src/{ => Magnum}/SceneGraph/RigidMatrixTransformation3D.h (100%) rename src/{ => Magnum}/SceneGraph/Scene.h (100%) rename src/{ => Magnum}/SceneGraph/SceneGraph.h (100%) rename src/{ => Magnum}/SceneGraph/Test/AnimableTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/SceneGraph/Test/CameraTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/DualComplexTransformationTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/DualQuaternionTransformationTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/MatrixTransformation2DTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/MatrixTransformation3DTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/ObjectTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/SceneTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/Test/TranslationTransformationTest.cpp (100%) rename src/{ => Magnum}/SceneGraph/TranslationTransformation.h (100%) rename src/{ => Magnum}/SceneGraph/instantiation.cpp (100%) rename src/{ => Magnum}/SceneGraph/magnumSceneGraphVisibility.h (100%) rename src/{ => Magnum}/Shader.cpp (100%) rename src/{ => Magnum}/Shader.h (100%) rename src/{ => Magnum}/Shaders/AbstractVector.h (100%) rename src/{ => Magnum}/Shaders/AbstractVector2D.vert (100%) rename src/{ => Magnum}/Shaders/AbstractVector3D.vert (100%) rename src/{ => Magnum}/Shaders/CMakeLists.txt (100%) rename src/{ => Magnum}/Shaders/DistanceFieldVector.cpp (100%) rename src/{ => Magnum}/Shaders/DistanceFieldVector.frag (100%) rename src/{ => Magnum}/Shaders/DistanceFieldVector.h (100%) rename src/{ => Magnum}/Shaders/Flat.cpp (100%) rename src/{ => Magnum}/Shaders/Flat.frag (100%) rename src/{ => Magnum}/Shaders/Flat.h (100%) rename src/{ => Magnum}/Shaders/Flat2D.vert (100%) rename src/{ => Magnum}/Shaders/Flat3D.vert (100%) rename src/{ => Magnum}/Shaders/FullScreenTriangle.glsl (100%) rename src/{ => Magnum}/Shaders/Generic.h (100%) rename src/{ => Magnum}/Shaders/MeshVisualizer.cpp (100%) rename src/{ => Magnum}/Shaders/MeshVisualizer.frag (100%) rename src/{ => Magnum}/Shaders/MeshVisualizer.geom (100%) rename src/{ => Magnum}/Shaders/MeshVisualizer.h (100%) rename src/{ => Magnum}/Shaders/MeshVisualizer.vert (100%) rename src/{ => Magnum}/Shaders/Phong.cpp (100%) rename src/{ => Magnum}/Shaders/Phong.frag (100%) rename src/{ => Magnum}/Shaders/Phong.h (100%) rename src/{ => Magnum}/Shaders/Phong.vert (100%) rename src/{ => Magnum}/Shaders/Shaders.h (100%) rename src/{ => Magnum}/Shaders/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Shaders/Test/DistanceFieldVectorGLTest.cpp (100%) rename src/{ => Magnum}/Shaders/Test/FlatGLTest.cpp (100%) rename src/{ => Magnum}/Shaders/Test/MeshVisualizerGLTest.cpp (100%) rename src/{ => Magnum}/Shaders/Test/PhongGLTest.cpp (100%) rename src/{ => Magnum}/Shaders/Test/VectorGLTest.cpp (100%) rename src/{ => Magnum}/Shaders/Test/VertexColorGLTest.cpp (100%) rename src/{ => Magnum}/Shaders/Vector.cpp (100%) rename src/{ => Magnum}/Shaders/Vector.frag (100%) rename src/{ => Magnum}/Shaders/Vector.h (100%) rename src/{ => Magnum}/Shaders/VertexColor.cpp (100%) rename src/{ => Magnum}/Shaders/VertexColor.frag (100%) rename src/{ => Magnum}/Shaders/VertexColor.h (100%) rename src/{ => Magnum}/Shaders/VertexColor2D.vert (100%) rename src/{ => Magnum}/Shaders/VertexColor3D.vert (100%) rename src/{ => Magnum}/Shaders/compatibility.glsl (100%) rename src/{ => Magnum}/Shaders/generic.glsl (100%) rename src/{ => Magnum}/Shaders/magnumShadersResourceImport.hpp (100%) rename src/{ => Magnum}/Shaders/magnumShadersVisibility.h (100%) rename src/{ => Magnum}/Shaders/resources.conf (100%) rename src/{ => Magnum}/Shapes/AbstractShape.cpp (100%) rename src/{ => Magnum}/Shapes/AbstractShape.h (100%) rename src/{ => Magnum}/Shapes/AxisAlignedBox.cpp (100%) rename src/{ => Magnum}/Shapes/AxisAlignedBox.h (100%) rename src/{ => Magnum}/Shapes/Box.cpp (100%) rename src/{ => Magnum}/Shapes/Box.h (100%) rename src/{ => Magnum}/Shapes/CMakeLists.txt (100%) rename src/{ => Magnum}/Shapes/Capsule.cpp (100%) rename src/{ => Magnum}/Shapes/Capsule.h (100%) rename src/{ => Magnum}/Shapes/Collision.h (100%) rename src/{ => Magnum}/Shapes/Composition.cpp (100%) rename src/{ => Magnum}/Shapes/Composition.h (100%) rename src/{ => Magnum}/Shapes/Cylinder.cpp (100%) rename src/{ => Magnum}/Shapes/Cylinder.h (100%) rename src/{ => Magnum}/Shapes/Implementation/CollisionDispatch.cpp (100%) rename src/{ => Magnum}/Shapes/Implementation/CollisionDispatch.h (100%) rename src/{ => Magnum}/Shapes/Line.cpp (100%) rename src/{ => Magnum}/Shapes/Line.h (100%) rename src/{ => Magnum}/Shapes/LineSegment.h (100%) rename src/{ => Magnum}/Shapes/Plane.cpp (100%) rename src/{ => Magnum}/Shapes/Plane.h (100%) rename src/{ => Magnum}/Shapes/Point.cpp (100%) rename src/{ => Magnum}/Shapes/Point.h (100%) rename src/{ => Magnum}/Shapes/Shape.cpp (100%) rename src/{ => Magnum}/Shapes/Shape.h (100%) rename src/{ => Magnum}/Shapes/ShapeGroup.cpp (100%) rename src/{ => Magnum}/Shapes/ShapeGroup.h (100%) rename src/{ => Magnum}/Shapes/Shapes.h (100%) rename src/{ => Magnum}/Shapes/Sphere.cpp (100%) rename src/{ => Magnum}/Shapes/Sphere.h (100%) rename src/{ => Magnum}/Shapes/Test/AxisAlignedBoxTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/BoxTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Shapes/Test/CapsuleTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/CollisionTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/CompositionTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/CylinderTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/LineTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/PlaneTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/PointTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/ShapeImplementationTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/ShapeTest.cpp (100%) rename src/{ => Magnum}/Shapes/Test/ShapeTestBase.h (100%) rename src/{ => Magnum}/Shapes/Test/SphereTest.cpp (100%) rename src/{ => Magnum}/Shapes/magnumShapesVisibility.h (100%) rename src/{ => Magnum}/Shapes/shapeImplementation.cpp (100%) rename src/{ => Magnum}/Shapes/shapeImplementation.h (100%) rename src/{ => Magnum}/Swizzle.h (100%) rename src/{ => Magnum}/Test/AbstractImageTest.cpp (100%) rename src/{ => Magnum}/Test/AbstractObjectGLTest.cpp (100%) rename src/{ => Magnum}/Test/AbstractOpenGLTester.h (100%) rename src/{ => Magnum}/Test/AbstractQueryGLTest.cpp (100%) rename src/{ => Magnum}/Test/AbstractShaderProgramGLTest.cpp (100%) rename src/{ => Magnum}/Test/AbstractShaderProgramGLTestFiles/MyShader.frag (100%) rename src/{ => Magnum}/Test/AbstractShaderProgramGLTestFiles/MyShader.vert (100%) rename src/{ => Magnum}/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag (100%) rename src/{ => Magnum}/Test/AbstractShaderProgramGLTestFiles/resources.conf (100%) rename src/{ => Magnum}/Test/AbstractShaderProgramTest.cpp (100%) rename src/{ => Magnum}/Test/AbstractTextureGLTest.cpp (100%) rename src/{ => Magnum}/Test/ArrayTest.cpp (100%) rename src/{ => Magnum}/Test/BufferGLTest.cpp (100%) rename src/{ => Magnum}/Test/BufferImageGLTest.cpp (100%) rename src/{ => Magnum}/Test/BufferTextureGLTest.cpp (100%) rename src/{ => Magnum}/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Test/ColorTest.cpp (100%) rename src/{ => Magnum}/Test/ContextGLTest.cpp (100%) rename src/{ => Magnum}/Test/CubeMapTextureArrayGLTest.cpp (100%) rename src/{ => Magnum}/Test/CubeMapTextureGLTest.cpp (100%) rename src/{ => Magnum}/Test/DebugGLTest.cpp (100%) rename src/{ => Magnum}/Test/DebugMessageTest.cpp (100%) rename src/{ => Magnum}/Test/DefaultFramebufferTest.cpp (100%) rename src/{ => Magnum}/Test/FramebufferGLTest.cpp (100%) rename src/{ => Magnum}/Test/FramebufferTest.cpp (100%) rename src/{ => Magnum}/Test/ImageReferenceTest.cpp (100%) rename src/{ => Magnum}/Test/ImageTest.cpp (100%) rename src/{ => Magnum}/Test/MeshGLTest.cpp (100%) rename src/{ => Magnum}/Test/MeshTest.cpp (100%) rename src/{ => Magnum}/Test/PrimitiveQueryGLTest.cpp (100%) rename src/{ => Magnum}/Test/QueryGLTestFiles/MyShader.frag (100%) rename src/{ => Magnum}/Test/QueryGLTestFiles/MyShader.vert (100%) rename src/{ => Magnum}/Test/QueryGLTestFiles/resources.conf (100%) rename src/{ => Magnum}/Test/RenderbufferGLTest.cpp (100%) rename src/{ => Magnum}/Test/RendererTest.cpp (100%) rename src/{ => Magnum}/Test/ResourceManagerTest.cpp (100%) rename src/{ => Magnum}/Test/SampleQueryGLTest.cpp (100%) rename src/{ => Magnum}/Test/SamplerTest.cpp (100%) rename src/{ => Magnum}/Test/ShaderGLTest.cpp (100%) rename src/{ => Magnum}/Test/ShaderGLTestConfigure.h.cmake (100%) rename src/{ => Magnum}/Test/ShaderGLTestFiles/shader.glsl (100%) rename src/{ => Magnum}/Test/ShaderTest.cpp (100%) rename src/{ => Magnum}/Test/TextureGLTest.cpp (100%) rename src/{ => Magnum}/Test/TimeQueryGLTest.cpp (100%) rename src/{ => Magnum}/Test/VersionTest.cpp (100%) rename src/{ => Magnum}/Text/AbstractFont.cpp (100%) rename src/{ => Magnum}/Text/AbstractFont.h (100%) rename src/{ => Magnum}/Text/AbstractFontConverter.cpp (100%) rename src/{ => Magnum}/Text/AbstractFontConverter.h (100%) rename src/{ => Magnum}/Text/Alignment.h (100%) rename src/{ => Magnum}/Text/CMakeLists.txt (100%) rename src/{ => Magnum}/Text/DistanceFieldGlyphCache.cpp (100%) rename src/{ => Magnum}/Text/DistanceFieldGlyphCache.h (100%) rename src/{ => Magnum}/Text/GlyphCache.cpp (100%) rename src/{ => Magnum}/Text/GlyphCache.h (100%) rename src/{ => Magnum}/Text/Renderer.cpp (100%) rename src/{ => Magnum}/Text/Renderer.h (100%) rename src/{ => Magnum}/Text/Test/AbstractFontConverterTest.cpp (100%) rename src/{ => Magnum}/Text/Test/AbstractFontTest.cpp (100%) rename src/{ => Magnum}/Text/Test/AbstractLayouterTest.cpp (100%) rename src/{ => Magnum}/Text/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Text/Test/GlyphCacheGLTest.cpp (100%) rename src/{ => Magnum}/Text/Test/RendererGLTest.cpp (100%) rename src/{ => Magnum}/Text/Test/data.bin (100%) rename src/{ => Magnum}/Text/Test/testConfigure.h.cmake (100%) rename src/{ => Magnum}/Text/Text.h (100%) rename src/{ => Magnum}/Text/TextRenderer.h (100%) rename src/{ => Magnum}/Text/configure.h.cmake (100%) rename src/{ => Magnum}/Text/fontconverter.cpp (100%) rename src/{ => Magnum}/Text/magnumTextVisibility.h (100%) rename src/{ => Magnum}/Texture.h (100%) rename src/{ => Magnum}/TextureFormat.h (100%) rename src/{ => Magnum}/TextureTools/Atlas.cpp (100%) rename src/{ => Magnum}/TextureTools/Atlas.h (100%) rename src/{ => Magnum}/TextureTools/CMakeLists.txt (100%) rename src/{ => Magnum}/TextureTools/DistanceField.cpp (100%) rename src/{ => Magnum}/TextureTools/DistanceField.h (100%) rename src/{ => Magnum}/TextureTools/DistanceFieldShader.frag (100%) rename src/{ => Magnum}/TextureTools/DistanceFieldShader.vert (100%) rename src/{ => Magnum}/TextureTools/Test/AtlasTest.cpp (100%) rename src/{ => Magnum}/TextureTools/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/TextureTools/configure.h.cmake (100%) rename src/{ => Magnum}/TextureTools/distancefieldconverter.cpp (100%) rename src/{ => Magnum}/TextureTools/magnumTextureToolsResourceImport.hpp (100%) rename src/{ => Magnum}/TextureTools/magnumTextureToolsVisibility.h (100%) rename src/{ => Magnum}/TextureTools/resources.conf (100%) rename src/{ => Magnum}/Timeline.cpp (100%) rename src/{ => Magnum}/Timeline.h (100%) rename src/{ => Magnum}/Trade/AbstractImageConverter.cpp (100%) rename src/{ => Magnum}/Trade/AbstractImageConverter.h (100%) rename src/{ => Magnum}/Trade/AbstractImporter.cpp (100%) rename src/{ => Magnum}/Trade/AbstractImporter.h (100%) rename src/{ => Magnum}/Trade/AbstractMaterialData.cpp (100%) rename src/{ => Magnum}/Trade/AbstractMaterialData.h (100%) rename src/{ => Magnum}/Trade/CMakeLists.txt (100%) rename src/{ => Magnum}/Trade/CameraData.h (100%) rename src/{ => Magnum}/Trade/ImageData.h (100%) rename src/{ => Magnum}/Trade/LightData.h (100%) rename src/{ => Magnum}/Trade/MeshData2D.cpp (100%) rename src/{ => Magnum}/Trade/MeshData2D.h (100%) rename src/{ => Magnum}/Trade/MeshData3D.cpp (100%) rename src/{ => Magnum}/Trade/MeshData3D.h (100%) rename src/{ => Magnum}/Trade/MeshObjectData2D.cpp (100%) rename src/{ => Magnum}/Trade/MeshObjectData2D.h (100%) rename src/{ => Magnum}/Trade/MeshObjectData3D.cpp (100%) rename src/{ => Magnum}/Trade/MeshObjectData3D.h (100%) rename src/{ => Magnum}/Trade/ObjectData2D.cpp (100%) rename src/{ => Magnum}/Trade/ObjectData2D.h (100%) rename src/{ => Magnum}/Trade/ObjectData3D.cpp (100%) rename src/{ => Magnum}/Trade/ObjectData3D.h (100%) rename src/{ => Magnum}/Trade/PhongMaterialData.cpp (100%) rename src/{ => Magnum}/Trade/PhongMaterialData.h (100%) rename src/{ => Magnum}/Trade/SceneData.cpp (100%) rename src/{ => Magnum}/Trade/SceneData.h (100%) rename src/{ => Magnum}/Trade/Test/AbstractImageConverterTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/AbstractImporterTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/AbstractMaterialDataTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/CMakeLists.txt (100%) rename src/{ => Magnum}/Trade/Test/ImageDataTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/ObjectData2DTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/ObjectData3DTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/TextureDataTest.cpp (100%) rename src/{ => Magnum}/Trade/Test/file.bin (100%) rename src/{ => Magnum}/Trade/Test/testConfigure.h.cmake (100%) rename src/{ => Magnum}/Trade/TextureData.cpp (100%) rename src/{ => Magnum}/Trade/TextureData.h (100%) rename src/{ => Magnum}/Trade/Trade.h (100%) rename src/{ => Magnum}/Types.h (100%) rename src/{ => Magnum}/Version.cpp (100%) rename src/{ => Magnum}/Version.h (100%) rename src/{ => Magnum}/magnumConfigure.h.cmake (100%) rename src/{ => Magnum}/magnumVisibility.h (100%) rename {external => src/MagnumExternal}/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/OpenGL/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/OpenGL/GL/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/OpenGL/GL/README.md (100%) rename {external => src/MagnumExternal}/OpenGL/GL/extensions.txt (100%) rename {external => src/MagnumExternal}/OpenGL/GL/gl_magnum.c (100%) rename {external => src/MagnumExternal}/OpenGL/GL/gl_magnum.h (100%) rename {external => src/MagnumExternal}/OpenGL/GLES2/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/OpenGL/GLES2/gl2.h (100%) rename {external => src/MagnumExternal}/OpenGL/GLES2/gl2ext.h (100%) rename {external => src/MagnumExternal}/OpenGL/GLES2/gl2platform.h (100%) rename {external => src/MagnumExternal}/OpenGL/GLES3/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/OpenGL/GLES3/gl3.h (100%) rename {external => src/MagnumExternal}/OpenGL/GLES3/gl3platform.h (100%) rename {external => src/MagnumExternal}/OpenGL/KHR/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/OpenGL/KHR/khrplatform.h (100%) rename {external => src/MagnumExternal}/Optional/CMakeLists.txt (100%) rename {external => src/MagnumExternal}/Optional/LICENSE_1_0.txt (100%) rename {external => src/MagnumExternal}/Optional/optional.hpp (100%) rename src/{Plugins => MagnumPlugins}/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/MagnumFont.conf (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/MagnumFont.cpp (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/MagnumFont.h (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/Test/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/Test/MagnumFontGLTest.cpp (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/Test/font.conf (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/Test/font.tga (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/Test/magnumFontTestConfigure.h.cmake (100%) rename src/{Plugins => MagnumPlugins}/MagnumFont/pluginRegistrationMagnumFont.cpp (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/MagnumFontConverter.conf (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/MagnumFontConverter.cpp (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/MagnumFontConverter.h (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/Test/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake (100%) rename src/{Plugins => MagnumPlugins}/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/Test/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/Test/TgaImageConverterTest.cpp (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/Test/configure.h.cmake (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/TgaImageConverter.conf (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/TgaImageConverter.cpp (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/TgaImageConverter.h (100%) rename src/{Plugins => MagnumPlugins}/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/Test/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/Test/TgaImporterTest.cpp (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/Test/configure.h.cmake (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/Test/file.tga (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/TgaHeader.h (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/TgaImporter.conf (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/TgaImporter.cpp (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/TgaImporter.h (100%) rename src/{Plugins => MagnumPlugins}/TgaImporter/pluginRegistrationTgaImporter.cpp (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/CMakeLists.txt (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/WavImporterTest.cpp (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/configure.h.cmake (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/mono16.wav (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/stereo8.wav (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/unsupportedChannelCount.wav (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/unsupportedFormat.wav (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/Test/wrongSignature.wav (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/WavAudioImporter.conf (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/WavHeader.h (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/WavImporter.cpp (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/WavImporter.h (100%) rename src/{Plugins => MagnumPlugins}/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp (100%) diff --git a/src/AbstractFramebuffer.cpp b/src/Magnum/AbstractFramebuffer.cpp similarity index 100% rename from src/AbstractFramebuffer.cpp rename to src/Magnum/AbstractFramebuffer.cpp diff --git a/src/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h similarity index 100% rename from src/AbstractFramebuffer.h rename to src/Magnum/AbstractFramebuffer.h diff --git a/src/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp similarity index 100% rename from src/AbstractImage.cpp rename to src/Magnum/AbstractImage.cpp diff --git a/src/AbstractImage.h b/src/Magnum/AbstractImage.h similarity index 100% rename from src/AbstractImage.h rename to src/Magnum/AbstractImage.h diff --git a/src/AbstractObject.cpp b/src/Magnum/AbstractObject.cpp similarity index 100% rename from src/AbstractObject.cpp rename to src/Magnum/AbstractObject.cpp diff --git a/src/AbstractObject.h b/src/Magnum/AbstractObject.h similarity index 100% rename from src/AbstractObject.h rename to src/Magnum/AbstractObject.h diff --git a/src/AbstractResourceLoader.h b/src/Magnum/AbstractResourceLoader.h similarity index 100% rename from src/AbstractResourceLoader.h rename to src/Magnum/AbstractResourceLoader.h diff --git a/src/AbstractShaderProgram.cpp b/src/Magnum/AbstractShaderProgram.cpp similarity index 100% rename from src/AbstractShaderProgram.cpp rename to src/Magnum/AbstractShaderProgram.cpp diff --git a/src/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h similarity index 100% rename from src/AbstractShaderProgram.h rename to src/Magnum/AbstractShaderProgram.h diff --git a/src/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp similarity index 100% rename from src/AbstractTexture.cpp rename to src/Magnum/AbstractTexture.cpp diff --git a/src/AbstractTexture.h b/src/Magnum/AbstractTexture.h similarity index 100% rename from src/AbstractTexture.h rename to src/Magnum/AbstractTexture.h diff --git a/src/Array.h b/src/Magnum/Array.h similarity index 100% rename from src/Array.h rename to src/Magnum/Array.h diff --git a/src/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp similarity index 100% rename from src/Audio/AbstractImporter.cpp rename to src/Magnum/Audio/AbstractImporter.cpp diff --git a/src/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h similarity index 100% rename from src/Audio/AbstractImporter.h rename to src/Magnum/Audio/AbstractImporter.h diff --git a/src/Audio/Audio.cpp b/src/Magnum/Audio/Audio.cpp similarity index 100% rename from src/Audio/Audio.cpp rename to src/Magnum/Audio/Audio.cpp diff --git a/src/Audio/Audio.h b/src/Magnum/Audio/Audio.h similarity index 100% rename from src/Audio/Audio.h rename to src/Magnum/Audio/Audio.h diff --git a/src/Audio/Buffer.cpp b/src/Magnum/Audio/Buffer.cpp similarity index 100% rename from src/Audio/Buffer.cpp rename to src/Magnum/Audio/Buffer.cpp diff --git a/src/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h similarity index 100% rename from src/Audio/Buffer.h rename to src/Magnum/Audio/Buffer.h diff --git a/src/Audio/CMakeLists.txt b/src/Magnum/Audio/CMakeLists.txt similarity index 100% rename from src/Audio/CMakeLists.txt rename to src/Magnum/Audio/CMakeLists.txt diff --git a/src/Audio/Context.cpp b/src/Magnum/Audio/Context.cpp similarity index 100% rename from src/Audio/Context.cpp rename to src/Magnum/Audio/Context.cpp diff --git a/src/Audio/Context.h b/src/Magnum/Audio/Context.h similarity index 100% rename from src/Audio/Context.h rename to src/Magnum/Audio/Context.h diff --git a/src/Audio/Renderer.cpp b/src/Magnum/Audio/Renderer.cpp similarity index 100% rename from src/Audio/Renderer.cpp rename to src/Magnum/Audio/Renderer.cpp diff --git a/src/Audio/Renderer.h b/src/Magnum/Audio/Renderer.h similarity index 100% rename from src/Audio/Renderer.h rename to src/Magnum/Audio/Renderer.h diff --git a/src/Audio/Source.cpp b/src/Magnum/Audio/Source.cpp similarity index 100% rename from src/Audio/Source.cpp rename to src/Magnum/Audio/Source.cpp diff --git a/src/Audio/Source.h b/src/Magnum/Audio/Source.h similarity index 100% rename from src/Audio/Source.h rename to src/Magnum/Audio/Source.h diff --git a/src/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp similarity index 100% rename from src/Audio/Test/AbstractImporterTest.cpp rename to src/Magnum/Audio/Test/AbstractImporterTest.cpp diff --git a/src/Audio/Test/BufferTest.cpp b/src/Magnum/Audio/Test/BufferTest.cpp similarity index 100% rename from src/Audio/Test/BufferTest.cpp rename to src/Magnum/Audio/Test/BufferTest.cpp diff --git a/src/Audio/Test/CMakeLists.txt b/src/Magnum/Audio/Test/CMakeLists.txt similarity index 100% rename from src/Audio/Test/CMakeLists.txt rename to src/Magnum/Audio/Test/CMakeLists.txt diff --git a/src/Audio/Test/RendererTest.cpp b/src/Magnum/Audio/Test/RendererTest.cpp similarity index 100% rename from src/Audio/Test/RendererTest.cpp rename to src/Magnum/Audio/Test/RendererTest.cpp diff --git a/src/Audio/Test/SourceTest.cpp b/src/Magnum/Audio/Test/SourceTest.cpp similarity index 100% rename from src/Audio/Test/SourceTest.cpp rename to src/Magnum/Audio/Test/SourceTest.cpp diff --git a/src/Audio/Test/file.bin b/src/Magnum/Audio/Test/file.bin similarity index 100% rename from src/Audio/Test/file.bin rename to src/Magnum/Audio/Test/file.bin diff --git a/src/Audio/Test/testConfigure.h.cmake b/src/Magnum/Audio/Test/testConfigure.h.cmake similarity index 100% rename from src/Audio/Test/testConfigure.h.cmake rename to src/Magnum/Audio/Test/testConfigure.h.cmake diff --git a/src/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/magnumAudioVisibility.h similarity index 100% rename from src/Audio/magnumAudioVisibility.h rename to src/Magnum/Audio/magnumAudioVisibility.h diff --git a/src/Buffer.cpp b/src/Magnum/Buffer.cpp similarity index 100% rename from src/Buffer.cpp rename to src/Magnum/Buffer.cpp diff --git a/src/Buffer.h b/src/Magnum/Buffer.h similarity index 100% rename from src/Buffer.h rename to src/Magnum/Buffer.h diff --git a/src/BufferImage.cpp b/src/Magnum/BufferImage.cpp similarity index 100% rename from src/BufferImage.cpp rename to src/Magnum/BufferImage.cpp diff --git a/src/BufferImage.h b/src/Magnum/BufferImage.h similarity index 100% rename from src/BufferImage.h rename to src/Magnum/BufferImage.h diff --git a/src/BufferTexture.cpp b/src/Magnum/BufferTexture.cpp similarity index 100% rename from src/BufferTexture.cpp rename to src/Magnum/BufferTexture.cpp diff --git a/src/BufferTexture.h b/src/Magnum/BufferTexture.h similarity index 100% rename from src/BufferTexture.h rename to src/Magnum/BufferTexture.h diff --git a/src/CMakeLists.txt b/src/Magnum/CMakeLists.txt similarity index 100% rename from src/CMakeLists.txt rename to src/Magnum/CMakeLists.txt diff --git a/src/Color.h b/src/Magnum/Color.h similarity index 100% rename from src/Color.h rename to src/Magnum/Color.h diff --git a/src/ColorFormat.cpp b/src/Magnum/ColorFormat.cpp similarity index 100% rename from src/ColorFormat.cpp rename to src/Magnum/ColorFormat.cpp diff --git a/src/ColorFormat.h b/src/Magnum/ColorFormat.h similarity index 100% rename from src/ColorFormat.h rename to src/Magnum/ColorFormat.h diff --git a/src/Context.cpp b/src/Magnum/Context.cpp similarity index 100% rename from src/Context.cpp rename to src/Magnum/Context.cpp diff --git a/src/Context.h b/src/Magnum/Context.h similarity index 100% rename from src/Context.h rename to src/Magnum/Context.h diff --git a/src/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h similarity index 100% rename from src/CubeMapTexture.h rename to src/Magnum/CubeMapTexture.h diff --git a/src/CubeMapTextureArray.h b/src/Magnum/CubeMapTextureArray.h similarity index 100% rename from src/CubeMapTextureArray.h rename to src/Magnum/CubeMapTextureArray.h diff --git a/src/DebugMarker.h b/src/Magnum/DebugMarker.h similarity index 100% rename from src/DebugMarker.h rename to src/Magnum/DebugMarker.h diff --git a/src/DebugMessage.cpp b/src/Magnum/DebugMessage.cpp similarity index 100% rename from src/DebugMessage.cpp rename to src/Magnum/DebugMessage.cpp diff --git a/src/DebugMessage.h b/src/Magnum/DebugMessage.h similarity index 100% rename from src/DebugMessage.h rename to src/Magnum/DebugMessage.h diff --git a/src/DebugTools/CMakeLists.txt b/src/Magnum/DebugTools/CMakeLists.txt similarity index 100% rename from src/DebugTools/CMakeLists.txt rename to src/Magnum/DebugTools/CMakeLists.txt diff --git a/src/DebugTools/DebugTools.h b/src/Magnum/DebugTools/DebugTools.h similarity index 100% rename from src/DebugTools/DebugTools.h rename to src/Magnum/DebugTools/DebugTools.h diff --git a/src/DebugTools/ForceRenderer.cpp b/src/Magnum/DebugTools/ForceRenderer.cpp similarity index 100% rename from src/DebugTools/ForceRenderer.cpp rename to src/Magnum/DebugTools/ForceRenderer.cpp diff --git a/src/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h similarity index 100% rename from src/DebugTools/ForceRenderer.h rename to src/Magnum/DebugTools/ForceRenderer.h diff --git a/src/DebugTools/Implementation/AbstractBoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/AbstractBoxRenderer.cpp rename to src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp diff --git a/src/DebugTools/Implementation/AbstractBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h similarity index 100% rename from src/DebugTools/Implementation/AbstractBoxRenderer.h rename to src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h diff --git a/src/DebugTools/Implementation/AbstractShapeRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/AbstractShapeRenderer.cpp rename to src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp diff --git a/src/DebugTools/Implementation/AbstractShapeRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h similarity index 100% rename from src/DebugTools/Implementation/AbstractShapeRenderer.h rename to src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h diff --git a/src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp rename to src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp diff --git a/src/DebugTools/Implementation/AxisAlignedBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h similarity index 100% rename from src/DebugTools/Implementation/AxisAlignedBoxRenderer.h rename to src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h diff --git a/src/DebugTools/Implementation/BoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/BoxRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/BoxRenderer.cpp rename to src/Magnum/DebugTools/Implementation/BoxRenderer.cpp diff --git a/src/DebugTools/Implementation/BoxRenderer.h b/src/Magnum/DebugTools/Implementation/BoxRenderer.h similarity index 100% rename from src/DebugTools/Implementation/BoxRenderer.h rename to src/Magnum/DebugTools/Implementation/BoxRenderer.h diff --git a/src/DebugTools/Implementation/CapsuleRenderer.cpp b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/CapsuleRenderer.cpp rename to src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp diff --git a/src/DebugTools/Implementation/CapsuleRenderer.h b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h similarity index 100% rename from src/DebugTools/Implementation/CapsuleRenderer.h rename to src/Magnum/DebugTools/Implementation/CapsuleRenderer.h diff --git a/src/DebugTools/Implementation/CapsuleRendererTransformation.h b/src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h similarity index 100% rename from src/DebugTools/Implementation/CapsuleRendererTransformation.h rename to src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h diff --git a/src/DebugTools/Implementation/CylinderRenderer.cpp b/src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/CylinderRenderer.cpp rename to src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp diff --git a/src/DebugTools/Implementation/CylinderRenderer.h b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h similarity index 100% rename from src/DebugTools/Implementation/CylinderRenderer.h rename to src/Magnum/DebugTools/Implementation/CylinderRenderer.h diff --git a/src/DebugTools/Implementation/CylinderRendererTransformation.h b/src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h similarity index 100% rename from src/DebugTools/Implementation/CylinderRendererTransformation.h rename to src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h diff --git a/src/DebugTools/Implementation/ForceRendererTransformation.h b/src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h similarity index 100% rename from src/DebugTools/Implementation/ForceRendererTransformation.h rename to src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h diff --git a/src/DebugTools/Implementation/LineSegmentRenderer.cpp b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/LineSegmentRenderer.cpp rename to src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp diff --git a/src/DebugTools/Implementation/LineSegmentRenderer.h b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h similarity index 100% rename from src/DebugTools/Implementation/LineSegmentRenderer.h rename to src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h diff --git a/src/DebugTools/Implementation/LineSegmentRendererTransformation.h b/src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h similarity index 100% rename from src/DebugTools/Implementation/LineSegmentRendererTransformation.h rename to src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h diff --git a/src/DebugTools/Implementation/PointRenderer.cpp b/src/Magnum/DebugTools/Implementation/PointRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/PointRenderer.cpp rename to src/Magnum/DebugTools/Implementation/PointRenderer.cpp diff --git a/src/DebugTools/Implementation/PointRenderer.h b/src/Magnum/DebugTools/Implementation/PointRenderer.h similarity index 100% rename from src/DebugTools/Implementation/PointRenderer.h rename to src/Magnum/DebugTools/Implementation/PointRenderer.h diff --git a/src/DebugTools/Implementation/SphereRenderer.cpp b/src/Magnum/DebugTools/Implementation/SphereRenderer.cpp similarity index 100% rename from src/DebugTools/Implementation/SphereRenderer.cpp rename to src/Magnum/DebugTools/Implementation/SphereRenderer.cpp diff --git a/src/DebugTools/Implementation/SphereRenderer.h b/src/Magnum/DebugTools/Implementation/SphereRenderer.h similarity index 100% rename from src/DebugTools/Implementation/SphereRenderer.h rename to src/Magnum/DebugTools/Implementation/SphereRenderer.h diff --git a/src/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp similarity index 100% rename from src/DebugTools/ObjectRenderer.cpp rename to src/Magnum/DebugTools/ObjectRenderer.cpp diff --git a/src/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h similarity index 100% rename from src/DebugTools/ObjectRenderer.h rename to src/Magnum/DebugTools/ObjectRenderer.h diff --git a/src/DebugTools/Profiler.cpp b/src/Magnum/DebugTools/Profiler.cpp similarity index 100% rename from src/DebugTools/Profiler.cpp rename to src/Magnum/DebugTools/Profiler.cpp diff --git a/src/DebugTools/Profiler.h b/src/Magnum/DebugTools/Profiler.h similarity index 100% rename from src/DebugTools/Profiler.h rename to src/Magnum/DebugTools/Profiler.h diff --git a/src/DebugTools/ResourceManager.cpp b/src/Magnum/DebugTools/ResourceManager.cpp similarity index 100% rename from src/DebugTools/ResourceManager.cpp rename to src/Magnum/DebugTools/ResourceManager.cpp diff --git a/src/DebugTools/ResourceManager.h b/src/Magnum/DebugTools/ResourceManager.h similarity index 100% rename from src/DebugTools/ResourceManager.h rename to src/Magnum/DebugTools/ResourceManager.h diff --git a/src/DebugTools/ShapeRenderer.cpp b/src/Magnum/DebugTools/ShapeRenderer.cpp similarity index 100% rename from src/DebugTools/ShapeRenderer.cpp rename to src/Magnum/DebugTools/ShapeRenderer.cpp diff --git a/src/DebugTools/ShapeRenderer.h b/src/Magnum/DebugTools/ShapeRenderer.h similarity index 100% rename from src/DebugTools/ShapeRenderer.h rename to src/Magnum/DebugTools/ShapeRenderer.h diff --git a/src/DebugTools/Test/CMakeLists.txt b/src/Magnum/DebugTools/Test/CMakeLists.txt similarity index 100% rename from src/DebugTools/Test/CMakeLists.txt rename to src/Magnum/DebugTools/Test/CMakeLists.txt diff --git a/src/DebugTools/Test/CapsuleRendererTest.cpp b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp similarity index 100% rename from src/DebugTools/Test/CapsuleRendererTest.cpp rename to src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp diff --git a/src/DebugTools/Test/CylinderRendererTest.cpp b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp similarity index 100% rename from src/DebugTools/Test/CylinderRendererTest.cpp rename to src/Magnum/DebugTools/Test/CylinderRendererTest.cpp diff --git a/src/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp similarity index 100% rename from src/DebugTools/Test/ForceRendererTest.cpp rename to src/Magnum/DebugTools/Test/ForceRendererTest.cpp diff --git a/src/DebugTools/Test/LineSegmentRendererTest.cpp b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp similarity index 100% rename from src/DebugTools/Test/LineSegmentRendererTest.cpp rename to src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp diff --git a/src/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h similarity index 100% rename from src/DebugTools/magnumDebugToolsVisibility.h rename to src/Magnum/DebugTools/magnumDebugToolsVisibility.h diff --git a/src/DefaultFramebuffer.cpp b/src/Magnum/DefaultFramebuffer.cpp similarity index 100% rename from src/DefaultFramebuffer.cpp rename to src/Magnum/DefaultFramebuffer.cpp diff --git a/src/DefaultFramebuffer.h b/src/Magnum/DefaultFramebuffer.h similarity index 100% rename from src/DefaultFramebuffer.h rename to src/Magnum/DefaultFramebuffer.h diff --git a/src/DimensionTraits.h b/src/Magnum/DimensionTraits.h similarity index 100% rename from src/DimensionTraits.h rename to src/Magnum/DimensionTraits.h diff --git a/src/Extensions.h b/src/Magnum/Extensions.h similarity index 100% rename from src/Extensions.h rename to src/Magnum/Extensions.h diff --git a/src/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp similarity index 100% rename from src/Framebuffer.cpp rename to src/Magnum/Framebuffer.cpp diff --git a/src/Framebuffer.h b/src/Magnum/Framebuffer.h similarity index 100% rename from src/Framebuffer.h rename to src/Magnum/Framebuffer.h diff --git a/src/Image.cpp b/src/Magnum/Image.cpp similarity index 100% rename from src/Image.cpp rename to src/Magnum/Image.cpp diff --git a/src/Image.h b/src/Magnum/Image.h similarity index 100% rename from src/Image.h rename to src/Magnum/Image.h diff --git a/src/ImageFormat.h b/src/Magnum/ImageFormat.h similarity index 100% rename from src/ImageFormat.h rename to src/Magnum/ImageFormat.h diff --git a/src/ImageReference.h b/src/Magnum/ImageReference.h similarity index 100% rename from src/ImageReference.h rename to src/Magnum/ImageReference.h diff --git a/src/Implementation/BufferState.cpp b/src/Magnum/Implementation/BufferState.cpp similarity index 100% rename from src/Implementation/BufferState.cpp rename to src/Magnum/Implementation/BufferState.cpp diff --git a/src/Implementation/BufferState.h b/src/Magnum/Implementation/BufferState.h similarity index 100% rename from src/Implementation/BufferState.h rename to src/Magnum/Implementation/BufferState.h diff --git a/src/Implementation/DebugState.cpp b/src/Magnum/Implementation/DebugState.cpp similarity index 100% rename from src/Implementation/DebugState.cpp rename to src/Magnum/Implementation/DebugState.cpp diff --git a/src/Implementation/DebugState.h b/src/Magnum/Implementation/DebugState.h similarity index 100% rename from src/Implementation/DebugState.h rename to src/Magnum/Implementation/DebugState.h diff --git a/src/Implementation/FramebufferState.h b/src/Magnum/Implementation/FramebufferState.h similarity index 100% rename from src/Implementation/FramebufferState.h rename to src/Magnum/Implementation/FramebufferState.h diff --git a/src/Implementation/MeshState.h b/src/Magnum/Implementation/MeshState.h similarity index 100% rename from src/Implementation/MeshState.h rename to src/Magnum/Implementation/MeshState.h diff --git a/src/Implementation/RendererState.h b/src/Magnum/Implementation/RendererState.h similarity index 100% rename from src/Implementation/RendererState.h rename to src/Magnum/Implementation/RendererState.h diff --git a/src/Implementation/ShaderProgramState.h b/src/Magnum/Implementation/ShaderProgramState.h similarity index 100% rename from src/Implementation/ShaderProgramState.h rename to src/Magnum/Implementation/ShaderProgramState.h diff --git a/src/Implementation/ShaderState.h b/src/Magnum/Implementation/ShaderState.h similarity index 100% rename from src/Implementation/ShaderState.h rename to src/Magnum/Implementation/ShaderState.h diff --git a/src/Implementation/State.cpp b/src/Magnum/Implementation/State.cpp similarity index 100% rename from src/Implementation/State.cpp rename to src/Magnum/Implementation/State.cpp diff --git a/src/Implementation/State.h b/src/Magnum/Implementation/State.h similarity index 100% rename from src/Implementation/State.h rename to src/Magnum/Implementation/State.h diff --git a/src/Implementation/TextureState.cpp b/src/Magnum/Implementation/TextureState.cpp similarity index 100% rename from src/Implementation/TextureState.cpp rename to src/Magnum/Implementation/TextureState.cpp diff --git a/src/Implementation/TextureState.h b/src/Magnum/Implementation/TextureState.h similarity index 100% rename from src/Implementation/TextureState.h rename to src/Magnum/Implementation/TextureState.h diff --git a/src/Magnum.h b/src/Magnum/Magnum.h similarity index 100% rename from src/Magnum.h rename to src/Magnum/Magnum.h diff --git a/src/Math/Algorithms/CMakeLists.txt b/src/Magnum/Math/Algorithms/CMakeLists.txt similarity index 100% rename from src/Math/Algorithms/CMakeLists.txt rename to src/Magnum/Math/Algorithms/CMakeLists.txt diff --git a/src/Math/Algorithms/GaussJordan.h b/src/Magnum/Math/Algorithms/GaussJordan.h similarity index 100% rename from src/Math/Algorithms/GaussJordan.h rename to src/Magnum/Math/Algorithms/GaussJordan.h diff --git a/src/Math/Algorithms/GramSchmidt.h b/src/Magnum/Math/Algorithms/GramSchmidt.h similarity index 100% rename from src/Math/Algorithms/GramSchmidt.h rename to src/Magnum/Math/Algorithms/GramSchmidt.h diff --git a/src/Math/Algorithms/Svd.h b/src/Magnum/Math/Algorithms/Svd.h similarity index 100% rename from src/Math/Algorithms/Svd.h rename to src/Magnum/Math/Algorithms/Svd.h diff --git a/src/Math/Algorithms/Test/CMakeLists.txt b/src/Magnum/Math/Algorithms/Test/CMakeLists.txt similarity index 100% rename from src/Math/Algorithms/Test/CMakeLists.txt rename to src/Magnum/Math/Algorithms/Test/CMakeLists.txt diff --git a/src/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp similarity index 100% rename from src/Math/Algorithms/Test/GaussJordanTest.cpp rename to src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp diff --git a/src/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp similarity index 100% rename from src/Math/Algorithms/Test/GramSchmidtTest.cpp rename to src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp diff --git a/src/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp similarity index 100% rename from src/Math/Algorithms/Test/SvdTest.cpp rename to src/Magnum/Math/Algorithms/Test/SvdTest.cpp diff --git a/src/Math/Angle.h b/src/Magnum/Math/Angle.h similarity index 100% rename from src/Math/Angle.h rename to src/Magnum/Math/Angle.h diff --git a/src/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h similarity index 100% rename from src/Math/BoolVector.h rename to src/Magnum/Math/BoolVector.h diff --git a/src/Math/CMakeLists.txt b/src/Magnum/Math/CMakeLists.txt similarity index 100% rename from src/Math/CMakeLists.txt rename to src/Magnum/Math/CMakeLists.txt diff --git a/src/Math/Complex.h b/src/Magnum/Math/Complex.h similarity index 100% rename from src/Math/Complex.h rename to src/Magnum/Math/Complex.h diff --git a/src/Math/Constants.h b/src/Magnum/Math/Constants.h similarity index 100% rename from src/Math/Constants.h rename to src/Magnum/Math/Constants.h diff --git a/src/Math/Dual.h b/src/Magnum/Math/Dual.h similarity index 100% rename from src/Math/Dual.h rename to src/Magnum/Math/Dual.h diff --git a/src/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h similarity index 100% rename from src/Math/DualComplex.h rename to src/Magnum/Math/DualComplex.h diff --git a/src/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h similarity index 100% rename from src/Math/DualQuaternion.h rename to src/Magnum/Math/DualQuaternion.h diff --git a/src/Math/Functions.cpp b/src/Magnum/Math/Functions.cpp similarity index 100% rename from src/Math/Functions.cpp rename to src/Magnum/Math/Functions.cpp diff --git a/src/Math/Functions.h b/src/Magnum/Math/Functions.h similarity index 100% rename from src/Math/Functions.h rename to src/Magnum/Math/Functions.h diff --git a/src/Math/Geometry/CMakeLists.txt b/src/Magnum/Math/Geometry/CMakeLists.txt similarity index 100% rename from src/Math/Geometry/CMakeLists.txt rename to src/Magnum/Math/Geometry/CMakeLists.txt diff --git a/src/Math/Geometry/Distance.h b/src/Magnum/Math/Geometry/Distance.h similarity index 100% rename from src/Math/Geometry/Distance.h rename to src/Magnum/Math/Geometry/Distance.h diff --git a/src/Math/Geometry/Intersection.h b/src/Magnum/Math/Geometry/Intersection.h similarity index 100% rename from src/Math/Geometry/Intersection.h rename to src/Magnum/Math/Geometry/Intersection.h diff --git a/src/Math/Geometry/Rectangle.h b/src/Magnum/Math/Geometry/Rectangle.h similarity index 100% rename from src/Math/Geometry/Rectangle.h rename to src/Magnum/Math/Geometry/Rectangle.h diff --git a/src/Math/Geometry/Test/CMakeLists.txt b/src/Magnum/Math/Geometry/Test/CMakeLists.txt similarity index 100% rename from src/Math/Geometry/Test/CMakeLists.txt rename to src/Magnum/Math/Geometry/Test/CMakeLists.txt diff --git a/src/Math/Geometry/Test/DistanceTest.cpp b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp similarity index 100% rename from src/Math/Geometry/Test/DistanceTest.cpp rename to src/Magnum/Math/Geometry/Test/DistanceTest.cpp diff --git a/src/Math/Geometry/Test/IntersectionTest.cpp b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp similarity index 100% rename from src/Math/Geometry/Test/IntersectionTest.cpp rename to src/Magnum/Math/Geometry/Test/IntersectionTest.cpp diff --git a/src/Math/Math.h b/src/Magnum/Math/Math.h similarity index 100% rename from src/Math/Math.h rename to src/Magnum/Math/Math.h diff --git a/src/Math/Matrix.h b/src/Magnum/Math/Matrix.h similarity index 100% rename from src/Math/Matrix.h rename to src/Magnum/Math/Matrix.h diff --git a/src/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h similarity index 100% rename from src/Math/Matrix3.h rename to src/Magnum/Math/Matrix3.h diff --git a/src/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h similarity index 100% rename from src/Math/Matrix4.h rename to src/Magnum/Math/Matrix4.h diff --git a/src/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h similarity index 100% rename from src/Math/Quaternion.h rename to src/Magnum/Math/Quaternion.h diff --git a/src/Math/Range.h b/src/Magnum/Math/Range.h similarity index 100% rename from src/Math/Range.h rename to src/Magnum/Math/Range.h diff --git a/src/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h similarity index 100% rename from src/Math/RectangularMatrix.h rename to src/Magnum/Math/RectangularMatrix.h diff --git a/src/Math/Swizzle.h b/src/Magnum/Math/Swizzle.h similarity index 100% rename from src/Math/Swizzle.h rename to src/Magnum/Math/Swizzle.h diff --git a/src/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp similarity index 100% rename from src/Math/Test/AngleTest.cpp rename to src/Magnum/Math/Test/AngleTest.cpp diff --git a/src/Math/Test/BoolVectorTest.cpp b/src/Magnum/Math/Test/BoolVectorTest.cpp similarity index 100% rename from src/Math/Test/BoolVectorTest.cpp rename to src/Magnum/Math/Test/BoolVectorTest.cpp diff --git a/src/Math/Test/CMakeLists.txt b/src/Magnum/Math/Test/CMakeLists.txt similarity index 100% rename from src/Math/Test/CMakeLists.txt rename to src/Magnum/Math/Test/CMakeLists.txt diff --git a/src/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp similarity index 100% rename from src/Math/Test/ComplexTest.cpp rename to src/Magnum/Math/Test/ComplexTest.cpp diff --git a/src/Math/Test/ConstantsTest.cpp b/src/Magnum/Math/Test/ConstantsTest.cpp similarity index 100% rename from src/Math/Test/ConstantsTest.cpp rename to src/Magnum/Math/Test/ConstantsTest.cpp diff --git a/src/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp similarity index 100% rename from src/Math/Test/DualComplexTest.cpp rename to src/Magnum/Math/Test/DualComplexTest.cpp diff --git a/src/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp similarity index 100% rename from src/Math/Test/DualQuaternionTest.cpp rename to src/Magnum/Math/Test/DualQuaternionTest.cpp diff --git a/src/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp similarity index 100% rename from src/Math/Test/DualTest.cpp rename to src/Magnum/Math/Test/DualTest.cpp diff --git a/src/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp similarity index 100% rename from src/Math/Test/FunctionsTest.cpp rename to src/Magnum/Math/Test/FunctionsTest.cpp diff --git a/src/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp similarity index 100% rename from src/Math/Test/Matrix3Test.cpp rename to src/Magnum/Math/Test/Matrix3Test.cpp diff --git a/src/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp similarity index 100% rename from src/Math/Test/Matrix4Test.cpp rename to src/Magnum/Math/Test/Matrix4Test.cpp diff --git a/src/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp similarity index 100% rename from src/Math/Test/MatrixTest.cpp rename to src/Magnum/Math/Test/MatrixTest.cpp diff --git a/src/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp similarity index 100% rename from src/Math/Test/QuaternionTest.cpp rename to src/Magnum/Math/Test/QuaternionTest.cpp diff --git a/src/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp similarity index 100% rename from src/Math/Test/RangeTest.cpp rename to src/Magnum/Math/Test/RangeTest.cpp diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp similarity index 100% rename from src/Math/Test/RectangularMatrixTest.cpp rename to src/Magnum/Math/Test/RectangularMatrixTest.cpp diff --git a/src/Math/Test/SwizzleTest.cpp b/src/Magnum/Math/Test/SwizzleTest.cpp similarity index 100% rename from src/Math/Test/SwizzleTest.cpp rename to src/Magnum/Math/Test/SwizzleTest.cpp diff --git a/src/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp similarity index 100% rename from src/Math/Test/TypeTraitsTest.cpp rename to src/Magnum/Math/Test/TypeTraitsTest.cpp diff --git a/src/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp similarity index 100% rename from src/Math/Test/UnitTest.cpp rename to src/Magnum/Math/Test/UnitTest.cpp diff --git a/src/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp similarity index 100% rename from src/Math/Test/Vector2Test.cpp rename to src/Magnum/Math/Test/Vector2Test.cpp diff --git a/src/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp similarity index 100% rename from src/Math/Test/Vector3Test.cpp rename to src/Magnum/Math/Test/Vector3Test.cpp diff --git a/src/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp similarity index 100% rename from src/Math/Test/Vector4Test.cpp rename to src/Magnum/Math/Test/Vector4Test.cpp diff --git a/src/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp similarity index 100% rename from src/Math/Test/VectorTest.cpp rename to src/Magnum/Math/Test/VectorTest.cpp diff --git a/src/Math/TypeTraits.h b/src/Magnum/Math/TypeTraits.h similarity index 100% rename from src/Math/TypeTraits.h rename to src/Magnum/Math/TypeTraits.h diff --git a/src/Math/Unit.h b/src/Magnum/Math/Unit.h similarity index 100% rename from src/Math/Unit.h rename to src/Magnum/Math/Unit.h diff --git a/src/Math/Vector.h b/src/Magnum/Math/Vector.h similarity index 100% rename from src/Math/Vector.h rename to src/Magnum/Math/Vector.h diff --git a/src/Math/Vector2.h b/src/Magnum/Math/Vector2.h similarity index 100% rename from src/Math/Vector2.h rename to src/Magnum/Math/Vector2.h diff --git a/src/Math/Vector3.h b/src/Magnum/Math/Vector3.h similarity index 100% rename from src/Math/Vector3.h rename to src/Magnum/Math/Vector3.h diff --git a/src/Math/Vector4.h b/src/Magnum/Math/Vector4.h similarity index 100% rename from src/Math/Vector4.h rename to src/Magnum/Math/Vector4.h diff --git a/src/Math/instantiation.cpp b/src/Magnum/Math/instantiation.cpp similarity index 100% rename from src/Math/instantiation.cpp rename to src/Magnum/Math/instantiation.cpp diff --git a/src/Mesh.cpp b/src/Magnum/Mesh.cpp similarity index 100% rename from src/Mesh.cpp rename to src/Magnum/Mesh.cpp diff --git a/src/Mesh.h b/src/Magnum/Mesh.h similarity index 100% rename from src/Mesh.h rename to src/Magnum/Mesh.h diff --git a/src/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt similarity index 100% rename from src/MeshTools/CMakeLists.txt rename to src/Magnum/MeshTools/CMakeLists.txt diff --git a/src/MeshTools/CombineIndexedArrays.h b/src/Magnum/MeshTools/CombineIndexedArrays.h similarity index 100% rename from src/MeshTools/CombineIndexedArrays.h rename to src/Magnum/MeshTools/CombineIndexedArrays.h diff --git a/src/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp similarity index 100% rename from src/MeshTools/CompressIndices.cpp rename to src/Magnum/MeshTools/CompressIndices.cpp diff --git a/src/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h similarity index 100% rename from src/MeshTools/CompressIndices.h rename to src/Magnum/MeshTools/CompressIndices.h diff --git a/src/MeshTools/Duplicate.h b/src/Magnum/MeshTools/Duplicate.h similarity index 100% rename from src/MeshTools/Duplicate.h rename to src/Magnum/MeshTools/Duplicate.h diff --git a/src/MeshTools/FlipNormals.cpp b/src/Magnum/MeshTools/FlipNormals.cpp similarity index 100% rename from src/MeshTools/FlipNormals.cpp rename to src/Magnum/MeshTools/FlipNormals.cpp diff --git a/src/MeshTools/FlipNormals.h b/src/Magnum/MeshTools/FlipNormals.h similarity index 100% rename from src/MeshTools/FlipNormals.h rename to src/Magnum/MeshTools/FlipNormals.h diff --git a/src/MeshTools/FullScreenTriangle.cpp b/src/Magnum/MeshTools/FullScreenTriangle.cpp similarity index 100% rename from src/MeshTools/FullScreenTriangle.cpp rename to src/Magnum/MeshTools/FullScreenTriangle.cpp diff --git a/src/MeshTools/FullScreenTriangle.h b/src/Magnum/MeshTools/FullScreenTriangle.h similarity index 100% rename from src/MeshTools/FullScreenTriangle.h rename to src/Magnum/MeshTools/FullScreenTriangle.h diff --git a/src/MeshTools/GenerateFlatNormals.cpp b/src/Magnum/MeshTools/GenerateFlatNormals.cpp similarity index 100% rename from src/MeshTools/GenerateFlatNormals.cpp rename to src/Magnum/MeshTools/GenerateFlatNormals.cpp diff --git a/src/MeshTools/GenerateFlatNormals.h b/src/Magnum/MeshTools/GenerateFlatNormals.h similarity index 100% rename from src/MeshTools/GenerateFlatNormals.h rename to src/Magnum/MeshTools/GenerateFlatNormals.h diff --git a/src/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h similarity index 100% rename from src/MeshTools/Interleave.h rename to src/Magnum/MeshTools/Interleave.h diff --git a/src/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h similarity index 100% rename from src/MeshTools/RemoveDuplicates.h rename to src/Magnum/MeshTools/RemoveDuplicates.h diff --git a/src/MeshTools/Subdivide.h b/src/Magnum/MeshTools/Subdivide.h similarity index 100% rename from src/MeshTools/Subdivide.h rename to src/Magnum/MeshTools/Subdivide.h diff --git a/src/MeshTools/Test/CMakeLists.txt b/src/Magnum/MeshTools/Test/CMakeLists.txt similarity index 100% rename from src/MeshTools/Test/CMakeLists.txt rename to src/Magnum/MeshTools/Test/CMakeLists.txt diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp similarity index 100% rename from src/MeshTools/Test/CombineIndexedArraysTest.cpp rename to src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp diff --git a/src/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp similarity index 100% rename from src/MeshTools/Test/CompressIndicesTest.cpp rename to src/Magnum/MeshTools/Test/CompressIndicesTest.cpp diff --git a/src/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp similarity index 100% rename from src/MeshTools/Test/DuplicateTest.cpp rename to src/Magnum/MeshTools/Test/DuplicateTest.cpp diff --git a/src/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp similarity index 100% rename from src/MeshTools/Test/FlipNormalsTest.cpp rename to src/Magnum/MeshTools/Test/FlipNormalsTest.cpp diff --git a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp similarity index 100% rename from src/MeshTools/Test/GenerateFlatNormalsTest.cpp rename to src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp diff --git a/src/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp similarity index 100% rename from src/MeshTools/Test/InterleaveTest.cpp rename to src/Magnum/MeshTools/Test/InterleaveTest.cpp diff --git a/src/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp similarity index 100% rename from src/MeshTools/Test/RemoveDuplicatesTest.cpp rename to src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp diff --git a/src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp similarity index 100% rename from src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp rename to src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp diff --git a/src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h similarity index 100% rename from src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h rename to src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h diff --git a/src/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp similarity index 100% rename from src/MeshTools/Test/SubdivideTest.cpp rename to src/Magnum/MeshTools/Test/SubdivideTest.cpp diff --git a/src/MeshTools/Test/TipsifyTest.cpp b/src/Magnum/MeshTools/Test/TipsifyTest.cpp similarity index 100% rename from src/MeshTools/Test/TipsifyTest.cpp rename to src/Magnum/MeshTools/Test/TipsifyTest.cpp diff --git a/src/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp similarity index 100% rename from src/MeshTools/Test/TransformTest.cpp rename to src/Magnum/MeshTools/Test/TransformTest.cpp diff --git a/src/MeshTools/Tipsify.cpp b/src/Magnum/MeshTools/Tipsify.cpp similarity index 100% rename from src/MeshTools/Tipsify.cpp rename to src/Magnum/MeshTools/Tipsify.cpp diff --git a/src/MeshTools/Tipsify.h b/src/Magnum/MeshTools/Tipsify.h similarity index 100% rename from src/MeshTools/Tipsify.h rename to src/Magnum/MeshTools/Tipsify.h diff --git a/src/MeshTools/Transform.h b/src/Magnum/MeshTools/Transform.h similarity index 100% rename from src/MeshTools/Transform.h rename to src/Magnum/MeshTools/Transform.h diff --git a/src/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h similarity index 100% rename from src/MeshTools/magnumMeshToolsVisibility.h rename to src/Magnum/MeshTools/magnumMeshToolsVisibility.h diff --git a/src/MeshView.cpp b/src/Magnum/MeshView.cpp similarity index 100% rename from src/MeshView.cpp rename to src/Magnum/MeshView.cpp diff --git a/src/MeshView.h b/src/Magnum/MeshView.h similarity index 100% rename from src/MeshView.h rename to src/Magnum/MeshView.h diff --git a/src/OpenGL.cpp b/src/Magnum/OpenGL.cpp similarity index 100% rename from src/OpenGL.cpp rename to src/Magnum/OpenGL.cpp diff --git a/src/OpenGL.h b/src/Magnum/OpenGL.h similarity index 100% rename from src/OpenGL.h rename to src/Magnum/OpenGL.h diff --git a/src/Platform/AbstractXApplication.cpp b/src/Magnum/Platform/AbstractXApplication.cpp similarity index 100% rename from src/Platform/AbstractXApplication.cpp rename to src/Magnum/Platform/AbstractXApplication.cpp diff --git a/src/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h similarity index 100% rename from src/Platform/AbstractXApplication.h rename to src/Magnum/Platform/AbstractXApplication.h diff --git a/src/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt similarity index 100% rename from src/Platform/CMakeLists.txt rename to src/Magnum/Platform/CMakeLists.txt diff --git a/src/Platform/EmscriptenApplication.js b/src/Magnum/Platform/EmscriptenApplication.js similarity index 100% rename from src/Platform/EmscriptenApplication.js rename to src/Magnum/Platform/EmscriptenApplication.js diff --git a/src/Platform/GlutApplication.cpp b/src/Magnum/Platform/GlutApplication.cpp similarity index 100% rename from src/Platform/GlutApplication.cpp rename to src/Magnum/Platform/GlutApplication.cpp diff --git a/src/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h similarity index 100% rename from src/Platform/GlutApplication.h rename to src/Magnum/Platform/GlutApplication.h diff --git a/src/Platform/GlxApplication.cpp b/src/Magnum/Platform/GlxApplication.cpp similarity index 100% rename from src/Platform/GlxApplication.cpp rename to src/Magnum/Platform/GlxApplication.cpp diff --git a/src/Platform/GlxApplication.h b/src/Magnum/Platform/GlxApplication.h similarity index 100% rename from src/Platform/GlxApplication.h rename to src/Magnum/Platform/GlxApplication.h diff --git a/src/Platform/Implementation/AbstractContextHandler.h b/src/Magnum/Platform/Implementation/AbstractContextHandler.h similarity index 100% rename from src/Platform/Implementation/AbstractContextHandler.h rename to src/Magnum/Platform/Implementation/AbstractContextHandler.h diff --git a/src/Platform/Implementation/EglContextHandler.cpp b/src/Magnum/Platform/Implementation/EglContextHandler.cpp similarity index 100% rename from src/Platform/Implementation/EglContextHandler.cpp rename to src/Magnum/Platform/Implementation/EglContextHandler.cpp diff --git a/src/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h similarity index 100% rename from src/Platform/Implementation/EglContextHandler.h rename to src/Magnum/Platform/Implementation/EglContextHandler.h diff --git a/src/Platform/Implementation/GlxContextHandler.cpp b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp similarity index 100% rename from src/Platform/Implementation/GlxContextHandler.cpp rename to src/Magnum/Platform/Implementation/GlxContextHandler.cpp diff --git a/src/Platform/Implementation/GlxContextHandler.h b/src/Magnum/Platform/Implementation/GlxContextHandler.h similarity index 100% rename from src/Platform/Implementation/GlxContextHandler.h rename to src/Magnum/Platform/Implementation/GlxContextHandler.h diff --git a/src/Platform/NaClApplication.cpp b/src/Magnum/Platform/NaClApplication.cpp similarity index 100% rename from src/Platform/NaClApplication.cpp rename to src/Magnum/Platform/NaClApplication.cpp diff --git a/src/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h similarity index 100% rename from src/Platform/NaClApplication.h rename to src/Magnum/Platform/NaClApplication.h diff --git a/src/Platform/NaClApplication.js b/src/Magnum/Platform/NaClApplication.js similarity index 100% rename from src/Platform/NaClApplication.js rename to src/Magnum/Platform/NaClApplication.js diff --git a/src/Platform/Platform.h b/src/Magnum/Platform/Platform.h similarity index 100% rename from src/Platform/Platform.h rename to src/Magnum/Platform/Platform.h diff --git a/src/Platform/Screen.h b/src/Magnum/Platform/Screen.h similarity index 100% rename from src/Platform/Screen.h rename to src/Magnum/Platform/Screen.h diff --git a/src/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h similarity index 100% rename from src/Platform/ScreenedApplication.h rename to src/Magnum/Platform/ScreenedApplication.h diff --git a/src/Platform/ScreenedApplication.hpp b/src/Magnum/Platform/ScreenedApplication.hpp similarity index 100% rename from src/Platform/ScreenedApplication.hpp rename to src/Magnum/Platform/ScreenedApplication.hpp diff --git a/src/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp similarity index 100% rename from src/Platform/Sdl2Application.cpp rename to src/Magnum/Platform/Sdl2Application.cpp diff --git a/src/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h similarity index 100% rename from src/Platform/Sdl2Application.h rename to src/Magnum/Platform/Sdl2Application.h diff --git a/src/Platform/WebApplication.css b/src/Magnum/Platform/WebApplication.css similarity index 100% rename from src/Platform/WebApplication.css rename to src/Magnum/Platform/WebApplication.css diff --git a/src/Platform/WindowlessGlxApplication.cpp b/src/Magnum/Platform/WindowlessGlxApplication.cpp similarity index 100% rename from src/Platform/WindowlessGlxApplication.cpp rename to src/Magnum/Platform/WindowlessGlxApplication.cpp diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h similarity index 100% rename from src/Platform/WindowlessGlxApplication.h rename to src/Magnum/Platform/WindowlessGlxApplication.h diff --git a/src/Platform/WindowlessNaClApplication.cpp b/src/Magnum/Platform/WindowlessNaClApplication.cpp similarity index 100% rename from src/Platform/WindowlessNaClApplication.cpp rename to src/Magnum/Platform/WindowlessNaClApplication.cpp diff --git a/src/Platform/WindowlessNaClApplication.h b/src/Magnum/Platform/WindowlessNaClApplication.h similarity index 100% rename from src/Platform/WindowlessNaClApplication.h rename to src/Magnum/Platform/WindowlessNaClApplication.h diff --git a/src/Platform/XEglApplication.cpp b/src/Magnum/Platform/XEglApplication.cpp similarity index 100% rename from src/Platform/XEglApplication.cpp rename to src/Magnum/Platform/XEglApplication.cpp diff --git a/src/Platform/XEglApplication.h b/src/Magnum/Platform/XEglApplication.h similarity index 100% rename from src/Platform/XEglApplication.h rename to src/Magnum/Platform/XEglApplication.h diff --git a/src/Platform/magnum-info-nacl.html b/src/Magnum/Platform/magnum-info-nacl.html similarity index 100% rename from src/Platform/magnum-info-nacl.html rename to src/Magnum/Platform/magnum-info-nacl.html diff --git a/src/Platform/magnum-info-nacl.nmf b/src/Magnum/Platform/magnum-info-nacl.nmf similarity index 100% rename from src/Platform/magnum-info-nacl.nmf rename to src/Magnum/Platform/magnum-info-nacl.nmf diff --git a/src/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp similarity index 100% rename from src/Platform/magnum-info.cpp rename to src/Magnum/Platform/magnum-info.cpp diff --git a/src/Primitives/CMakeLists.txt b/src/Magnum/Primitives/CMakeLists.txt similarity index 100% rename from src/Primitives/CMakeLists.txt rename to src/Magnum/Primitives/CMakeLists.txt diff --git a/src/Primitives/Capsule.cpp b/src/Magnum/Primitives/Capsule.cpp similarity index 100% rename from src/Primitives/Capsule.cpp rename to src/Magnum/Primitives/Capsule.cpp diff --git a/src/Primitives/Capsule.h b/src/Magnum/Primitives/Capsule.h similarity index 100% rename from src/Primitives/Capsule.h rename to src/Magnum/Primitives/Capsule.h diff --git a/src/Primitives/Circle.cpp b/src/Magnum/Primitives/Circle.cpp similarity index 100% rename from src/Primitives/Circle.cpp rename to src/Magnum/Primitives/Circle.cpp diff --git a/src/Primitives/Circle.h b/src/Magnum/Primitives/Circle.h similarity index 100% rename from src/Primitives/Circle.h rename to src/Magnum/Primitives/Circle.h diff --git a/src/Primitives/Crosshair.cpp b/src/Magnum/Primitives/Crosshair.cpp similarity index 100% rename from src/Primitives/Crosshair.cpp rename to src/Magnum/Primitives/Crosshair.cpp diff --git a/src/Primitives/Crosshair.h b/src/Magnum/Primitives/Crosshair.h similarity index 100% rename from src/Primitives/Crosshair.h rename to src/Magnum/Primitives/Crosshair.h diff --git a/src/Primitives/Cube.cpp b/src/Magnum/Primitives/Cube.cpp similarity index 100% rename from src/Primitives/Cube.cpp rename to src/Magnum/Primitives/Cube.cpp diff --git a/src/Primitives/Cube.h b/src/Magnum/Primitives/Cube.h similarity index 100% rename from src/Primitives/Cube.h rename to src/Magnum/Primitives/Cube.h diff --git a/src/Primitives/Cylinder.cpp b/src/Magnum/Primitives/Cylinder.cpp similarity index 100% rename from src/Primitives/Cylinder.cpp rename to src/Magnum/Primitives/Cylinder.cpp diff --git a/src/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h similarity index 100% rename from src/Primitives/Cylinder.h rename to src/Magnum/Primitives/Cylinder.h diff --git a/src/Primitives/Icosphere.cpp b/src/Magnum/Primitives/Icosphere.cpp similarity index 100% rename from src/Primitives/Icosphere.cpp rename to src/Magnum/Primitives/Icosphere.cpp diff --git a/src/Primitives/Icosphere.h b/src/Magnum/Primitives/Icosphere.h similarity index 100% rename from src/Primitives/Icosphere.h rename to src/Magnum/Primitives/Icosphere.h diff --git a/src/Primitives/Implementation/Spheroid.cpp b/src/Magnum/Primitives/Implementation/Spheroid.cpp similarity index 100% rename from src/Primitives/Implementation/Spheroid.cpp rename to src/Magnum/Primitives/Implementation/Spheroid.cpp diff --git a/src/Primitives/Implementation/Spheroid.h b/src/Magnum/Primitives/Implementation/Spheroid.h similarity index 100% rename from src/Primitives/Implementation/Spheroid.h rename to src/Magnum/Primitives/Implementation/Spheroid.h diff --git a/src/Primitives/Implementation/WireframeSpheroid.cpp b/src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp similarity index 100% rename from src/Primitives/Implementation/WireframeSpheroid.cpp rename to src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp diff --git a/src/Primitives/Implementation/WireframeSpheroid.h b/src/Magnum/Primitives/Implementation/WireframeSpheroid.h similarity index 100% rename from src/Primitives/Implementation/WireframeSpheroid.h rename to src/Magnum/Primitives/Implementation/WireframeSpheroid.h diff --git a/src/Primitives/Line.cpp b/src/Magnum/Primitives/Line.cpp similarity index 100% rename from src/Primitives/Line.cpp rename to src/Magnum/Primitives/Line.cpp diff --git a/src/Primitives/Line.h b/src/Magnum/Primitives/Line.h similarity index 100% rename from src/Primitives/Line.h rename to src/Magnum/Primitives/Line.h diff --git a/src/Primitives/Plane.cpp b/src/Magnum/Primitives/Plane.cpp similarity index 100% rename from src/Primitives/Plane.cpp rename to src/Magnum/Primitives/Plane.cpp diff --git a/src/Primitives/Plane.h b/src/Magnum/Primitives/Plane.h similarity index 100% rename from src/Primitives/Plane.h rename to src/Magnum/Primitives/Plane.h diff --git a/src/Primitives/Square.cpp b/src/Magnum/Primitives/Square.cpp similarity index 100% rename from src/Primitives/Square.cpp rename to src/Magnum/Primitives/Square.cpp diff --git a/src/Primitives/Square.h b/src/Magnum/Primitives/Square.h similarity index 100% rename from src/Primitives/Square.h rename to src/Magnum/Primitives/Square.h diff --git a/src/Primitives/Test/CMakeLists.txt b/src/Magnum/Primitives/Test/CMakeLists.txt similarity index 100% rename from src/Primitives/Test/CMakeLists.txt rename to src/Magnum/Primitives/Test/CMakeLists.txt diff --git a/src/Primitives/Test/CapsuleTest.cpp b/src/Magnum/Primitives/Test/CapsuleTest.cpp similarity index 100% rename from src/Primitives/Test/CapsuleTest.cpp rename to src/Magnum/Primitives/Test/CapsuleTest.cpp diff --git a/src/Primitives/Test/CircleTest.cpp b/src/Magnum/Primitives/Test/CircleTest.cpp similarity index 100% rename from src/Primitives/Test/CircleTest.cpp rename to src/Magnum/Primitives/Test/CircleTest.cpp diff --git a/src/Primitives/Test/CylinderTest.cpp b/src/Magnum/Primitives/Test/CylinderTest.cpp similarity index 100% rename from src/Primitives/Test/CylinderTest.cpp rename to src/Magnum/Primitives/Test/CylinderTest.cpp diff --git a/src/Primitives/Test/IcosphereTest.cpp b/src/Magnum/Primitives/Test/IcosphereTest.cpp similarity index 100% rename from src/Primitives/Test/IcosphereTest.cpp rename to src/Magnum/Primitives/Test/IcosphereTest.cpp diff --git a/src/Primitives/Test/UVSphereTest.cpp b/src/Magnum/Primitives/Test/UVSphereTest.cpp similarity index 100% rename from src/Primitives/Test/UVSphereTest.cpp rename to src/Magnum/Primitives/Test/UVSphereTest.cpp diff --git a/src/Primitives/UVSphere.cpp b/src/Magnum/Primitives/UVSphere.cpp similarity index 100% rename from src/Primitives/UVSphere.cpp rename to src/Magnum/Primitives/UVSphere.cpp diff --git a/src/Primitives/UVSphere.h b/src/Magnum/Primitives/UVSphere.h similarity index 100% rename from src/Primitives/UVSphere.h rename to src/Magnum/Primitives/UVSphere.h diff --git a/src/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/magnumPrimitivesVisibility.h similarity index 100% rename from src/Primitives/magnumPrimitivesVisibility.h rename to src/Magnum/Primitives/magnumPrimitivesVisibility.h diff --git a/src/Query.cpp b/src/Magnum/Query.cpp similarity index 100% rename from src/Query.cpp rename to src/Magnum/Query.cpp diff --git a/src/Query.h b/src/Magnum/Query.h similarity index 100% rename from src/Query.h rename to src/Magnum/Query.h diff --git a/src/Renderbuffer.cpp b/src/Magnum/Renderbuffer.cpp similarity index 100% rename from src/Renderbuffer.cpp rename to src/Magnum/Renderbuffer.cpp diff --git a/src/Renderbuffer.h b/src/Magnum/Renderbuffer.h similarity index 100% rename from src/Renderbuffer.h rename to src/Magnum/Renderbuffer.h diff --git a/src/RenderbufferFormat.h b/src/Magnum/RenderbufferFormat.h similarity index 100% rename from src/RenderbufferFormat.h rename to src/Magnum/RenderbufferFormat.h diff --git a/src/Renderer.cpp b/src/Magnum/Renderer.cpp similarity index 100% rename from src/Renderer.cpp rename to src/Magnum/Renderer.cpp diff --git a/src/Renderer.h b/src/Magnum/Renderer.h similarity index 100% rename from src/Renderer.h rename to src/Magnum/Renderer.h diff --git a/src/Resource.cpp b/src/Magnum/Resource.cpp similarity index 100% rename from src/Resource.cpp rename to src/Magnum/Resource.cpp diff --git a/src/Resource.h b/src/Magnum/Resource.h similarity index 100% rename from src/Resource.h rename to src/Magnum/Resource.h diff --git a/src/ResourceManager.h b/src/Magnum/ResourceManager.h similarity index 100% rename from src/ResourceManager.h rename to src/Magnum/ResourceManager.h diff --git a/src/Sampler.cpp b/src/Magnum/Sampler.cpp similarity index 100% rename from src/Sampler.cpp rename to src/Magnum/Sampler.cpp diff --git a/src/Sampler.h b/src/Magnum/Sampler.h similarity index 100% rename from src/Sampler.h rename to src/Magnum/Sampler.h diff --git a/src/SceneGraph/AbstractCamera.h b/src/Magnum/SceneGraph/AbstractCamera.h similarity index 100% rename from src/SceneGraph/AbstractCamera.h rename to src/Magnum/SceneGraph/AbstractCamera.h diff --git a/src/SceneGraph/AbstractCamera.hpp b/src/Magnum/SceneGraph/AbstractCamera.hpp similarity index 100% rename from src/SceneGraph/AbstractCamera.hpp rename to src/Magnum/SceneGraph/AbstractCamera.hpp diff --git a/src/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h similarity index 100% rename from src/SceneGraph/AbstractFeature.h rename to src/Magnum/SceneGraph/AbstractFeature.h diff --git a/src/SceneGraph/AbstractFeature.hpp b/src/Magnum/SceneGraph/AbstractFeature.hpp similarity index 100% rename from src/SceneGraph/AbstractFeature.hpp rename to src/Magnum/SceneGraph/AbstractFeature.hpp diff --git a/src/SceneGraph/AbstractGroupedFeature.h b/src/Magnum/SceneGraph/AbstractGroupedFeature.h similarity index 100% rename from src/SceneGraph/AbstractGroupedFeature.h rename to src/Magnum/SceneGraph/AbstractGroupedFeature.h diff --git a/src/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h similarity index 100% rename from src/SceneGraph/AbstractObject.h rename to src/Magnum/SceneGraph/AbstractObject.h diff --git a/src/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h similarity index 100% rename from src/SceneGraph/AbstractTransformation.h rename to src/Magnum/SceneGraph/AbstractTransformation.h diff --git a/src/SceneGraph/AbstractTranslation.h b/src/Magnum/SceneGraph/AbstractTranslation.h similarity index 100% rename from src/SceneGraph/AbstractTranslation.h rename to src/Magnum/SceneGraph/AbstractTranslation.h diff --git a/src/SceneGraph/AbstractTranslationRotation2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h similarity index 100% rename from src/SceneGraph/AbstractTranslationRotation2D.h rename to src/Magnum/SceneGraph/AbstractTranslationRotation2D.h diff --git a/src/SceneGraph/AbstractTranslationRotation3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h similarity index 100% rename from src/SceneGraph/AbstractTranslationRotation3D.h rename to src/Magnum/SceneGraph/AbstractTranslationRotation3D.h diff --git a/src/SceneGraph/AbstractTranslationRotationScaling2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h similarity index 100% rename from src/SceneGraph/AbstractTranslationRotationScaling2D.h rename to src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h diff --git a/src/SceneGraph/AbstractTranslationRotationScaling3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h similarity index 100% rename from src/SceneGraph/AbstractTranslationRotationScaling3D.h rename to src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h diff --git a/src/SceneGraph/Animable.cpp b/src/Magnum/SceneGraph/Animable.cpp similarity index 100% rename from src/SceneGraph/Animable.cpp rename to src/Magnum/SceneGraph/Animable.cpp diff --git a/src/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h similarity index 100% rename from src/SceneGraph/Animable.h rename to src/Magnum/SceneGraph/Animable.h diff --git a/src/SceneGraph/Animable.hpp b/src/Magnum/SceneGraph/Animable.hpp similarity index 100% rename from src/SceneGraph/Animable.hpp rename to src/Magnum/SceneGraph/Animable.hpp diff --git a/src/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h similarity index 100% rename from src/SceneGraph/AnimableGroup.h rename to src/Magnum/SceneGraph/AnimableGroup.h diff --git a/src/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt similarity index 100% rename from src/SceneGraph/CMakeLists.txt rename to src/Magnum/SceneGraph/CMakeLists.txt diff --git a/src/SceneGraph/Camera2D.h b/src/Magnum/SceneGraph/Camera2D.h similarity index 100% rename from src/SceneGraph/Camera2D.h rename to src/Magnum/SceneGraph/Camera2D.h diff --git a/src/SceneGraph/Camera2D.hpp b/src/Magnum/SceneGraph/Camera2D.hpp similarity index 100% rename from src/SceneGraph/Camera2D.hpp rename to src/Magnum/SceneGraph/Camera2D.hpp diff --git a/src/SceneGraph/Camera3D.h b/src/Magnum/SceneGraph/Camera3D.h similarity index 100% rename from src/SceneGraph/Camera3D.h rename to src/Magnum/SceneGraph/Camera3D.h diff --git a/src/SceneGraph/Camera3D.hpp b/src/Magnum/SceneGraph/Camera3D.hpp similarity index 100% rename from src/SceneGraph/Camera3D.hpp rename to src/Magnum/SceneGraph/Camera3D.hpp diff --git a/src/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h similarity index 100% rename from src/SceneGraph/Drawable.h rename to src/Magnum/SceneGraph/Drawable.h diff --git a/src/SceneGraph/Drawable.hpp b/src/Magnum/SceneGraph/Drawable.hpp similarity index 100% rename from src/SceneGraph/Drawable.hpp rename to src/Magnum/SceneGraph/Drawable.hpp diff --git a/src/SceneGraph/DualComplexTransformation.h b/src/Magnum/SceneGraph/DualComplexTransformation.h similarity index 100% rename from src/SceneGraph/DualComplexTransformation.h rename to src/Magnum/SceneGraph/DualComplexTransformation.h diff --git a/src/SceneGraph/DualQuaternionTransformation.h b/src/Magnum/SceneGraph/DualQuaternionTransformation.h similarity index 100% rename from src/SceneGraph/DualQuaternionTransformation.h rename to src/Magnum/SceneGraph/DualQuaternionTransformation.h diff --git a/src/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h similarity index 100% rename from src/SceneGraph/FeatureGroup.h rename to src/Magnum/SceneGraph/FeatureGroup.h diff --git a/src/SceneGraph/FeatureGroup.hpp b/src/Magnum/SceneGraph/FeatureGroup.hpp similarity index 100% rename from src/SceneGraph/FeatureGroup.hpp rename to src/Magnum/SceneGraph/FeatureGroup.hpp diff --git a/src/SceneGraph/MatrixTransformation2D.h b/src/Magnum/SceneGraph/MatrixTransformation2D.h similarity index 100% rename from src/SceneGraph/MatrixTransformation2D.h rename to src/Magnum/SceneGraph/MatrixTransformation2D.h diff --git a/src/SceneGraph/MatrixTransformation3D.h b/src/Magnum/SceneGraph/MatrixTransformation3D.h similarity index 100% rename from src/SceneGraph/MatrixTransformation3D.h rename to src/Magnum/SceneGraph/MatrixTransformation3D.h diff --git a/src/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h similarity index 100% rename from src/SceneGraph/Object.h rename to src/Magnum/SceneGraph/Object.h diff --git a/src/SceneGraph/Object.hpp b/src/Magnum/SceneGraph/Object.hpp similarity index 100% rename from src/SceneGraph/Object.hpp rename to src/Magnum/SceneGraph/Object.hpp diff --git a/src/SceneGraph/RigidMatrixTransformation2D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h similarity index 100% rename from src/SceneGraph/RigidMatrixTransformation2D.h rename to src/Magnum/SceneGraph/RigidMatrixTransformation2D.h diff --git a/src/SceneGraph/RigidMatrixTransformation3D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h similarity index 100% rename from src/SceneGraph/RigidMatrixTransformation3D.h rename to src/Magnum/SceneGraph/RigidMatrixTransformation3D.h diff --git a/src/SceneGraph/Scene.h b/src/Magnum/SceneGraph/Scene.h similarity index 100% rename from src/SceneGraph/Scene.h rename to src/Magnum/SceneGraph/Scene.h diff --git a/src/SceneGraph/SceneGraph.h b/src/Magnum/SceneGraph/SceneGraph.h similarity index 100% rename from src/SceneGraph/SceneGraph.h rename to src/Magnum/SceneGraph/SceneGraph.h diff --git a/src/SceneGraph/Test/AnimableTest.cpp b/src/Magnum/SceneGraph/Test/AnimableTest.cpp similarity index 100% rename from src/SceneGraph/Test/AnimableTest.cpp rename to src/Magnum/SceneGraph/Test/AnimableTest.cpp diff --git a/src/SceneGraph/Test/CMakeLists.txt b/src/Magnum/SceneGraph/Test/CMakeLists.txt similarity index 100% rename from src/SceneGraph/Test/CMakeLists.txt rename to src/Magnum/SceneGraph/Test/CMakeLists.txt diff --git a/src/SceneGraph/Test/CameraTest.cpp b/src/Magnum/SceneGraph/Test/CameraTest.cpp similarity index 100% rename from src/SceneGraph/Test/CameraTest.cpp rename to src/Magnum/SceneGraph/Test/CameraTest.cpp diff --git a/src/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp similarity index 100% rename from src/SceneGraph/Test/DualComplexTransformationTest.cpp rename to src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp diff --git a/src/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp similarity index 100% rename from src/SceneGraph/Test/DualQuaternionTransformationTest.cpp rename to src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp diff --git a/src/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp similarity index 100% rename from src/SceneGraph/Test/MatrixTransformation2DTest.cpp rename to src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp diff --git a/src/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp similarity index 100% rename from src/SceneGraph/Test/MatrixTransformation3DTest.cpp rename to src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp diff --git a/src/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp similarity index 100% rename from src/SceneGraph/Test/ObjectTest.cpp rename to src/Magnum/SceneGraph/Test/ObjectTest.cpp diff --git a/src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp similarity index 100% rename from src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp rename to src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp diff --git a/src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp similarity index 100% rename from src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp rename to src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp diff --git a/src/SceneGraph/Test/SceneTest.cpp b/src/Magnum/SceneGraph/Test/SceneTest.cpp similarity index 100% rename from src/SceneGraph/Test/SceneTest.cpp rename to src/Magnum/SceneGraph/Test/SceneTest.cpp diff --git a/src/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp similarity index 100% rename from src/SceneGraph/Test/TranslationTransformationTest.cpp rename to src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp diff --git a/src/SceneGraph/TranslationTransformation.h b/src/Magnum/SceneGraph/TranslationTransformation.h similarity index 100% rename from src/SceneGraph/TranslationTransformation.h rename to src/Magnum/SceneGraph/TranslationTransformation.h diff --git a/src/SceneGraph/instantiation.cpp b/src/Magnum/SceneGraph/instantiation.cpp similarity index 100% rename from src/SceneGraph/instantiation.cpp rename to src/Magnum/SceneGraph/instantiation.cpp diff --git a/src/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h similarity index 100% rename from src/SceneGraph/magnumSceneGraphVisibility.h rename to src/Magnum/SceneGraph/magnumSceneGraphVisibility.h diff --git a/src/Shader.cpp b/src/Magnum/Shader.cpp similarity index 100% rename from src/Shader.cpp rename to src/Magnum/Shader.cpp diff --git a/src/Shader.h b/src/Magnum/Shader.h similarity index 100% rename from src/Shader.h rename to src/Magnum/Shader.h diff --git a/src/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h similarity index 100% rename from src/Shaders/AbstractVector.h rename to src/Magnum/Shaders/AbstractVector.h diff --git a/src/Shaders/AbstractVector2D.vert b/src/Magnum/Shaders/AbstractVector2D.vert similarity index 100% rename from src/Shaders/AbstractVector2D.vert rename to src/Magnum/Shaders/AbstractVector2D.vert diff --git a/src/Shaders/AbstractVector3D.vert b/src/Magnum/Shaders/AbstractVector3D.vert similarity index 100% rename from src/Shaders/AbstractVector3D.vert rename to src/Magnum/Shaders/AbstractVector3D.vert diff --git a/src/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt similarity index 100% rename from src/Shaders/CMakeLists.txt rename to src/Magnum/Shaders/CMakeLists.txt diff --git a/src/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp similarity index 100% rename from src/Shaders/DistanceFieldVector.cpp rename to src/Magnum/Shaders/DistanceFieldVector.cpp diff --git a/src/Shaders/DistanceFieldVector.frag b/src/Magnum/Shaders/DistanceFieldVector.frag similarity index 100% rename from src/Shaders/DistanceFieldVector.frag rename to src/Magnum/Shaders/DistanceFieldVector.frag diff --git a/src/Shaders/DistanceFieldVector.h b/src/Magnum/Shaders/DistanceFieldVector.h similarity index 100% rename from src/Shaders/DistanceFieldVector.h rename to src/Magnum/Shaders/DistanceFieldVector.h diff --git a/src/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp similarity index 100% rename from src/Shaders/Flat.cpp rename to src/Magnum/Shaders/Flat.cpp diff --git a/src/Shaders/Flat.frag b/src/Magnum/Shaders/Flat.frag similarity index 100% rename from src/Shaders/Flat.frag rename to src/Magnum/Shaders/Flat.frag diff --git a/src/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h similarity index 100% rename from src/Shaders/Flat.h rename to src/Magnum/Shaders/Flat.h diff --git a/src/Shaders/Flat2D.vert b/src/Magnum/Shaders/Flat2D.vert similarity index 100% rename from src/Shaders/Flat2D.vert rename to src/Magnum/Shaders/Flat2D.vert diff --git a/src/Shaders/Flat3D.vert b/src/Magnum/Shaders/Flat3D.vert similarity index 100% rename from src/Shaders/Flat3D.vert rename to src/Magnum/Shaders/Flat3D.vert diff --git a/src/Shaders/FullScreenTriangle.glsl b/src/Magnum/Shaders/FullScreenTriangle.glsl similarity index 100% rename from src/Shaders/FullScreenTriangle.glsl rename to src/Magnum/Shaders/FullScreenTriangle.glsl diff --git a/src/Shaders/Generic.h b/src/Magnum/Shaders/Generic.h similarity index 100% rename from src/Shaders/Generic.h rename to src/Magnum/Shaders/Generic.h diff --git a/src/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp similarity index 100% rename from src/Shaders/MeshVisualizer.cpp rename to src/Magnum/Shaders/MeshVisualizer.cpp diff --git a/src/Shaders/MeshVisualizer.frag b/src/Magnum/Shaders/MeshVisualizer.frag similarity index 100% rename from src/Shaders/MeshVisualizer.frag rename to src/Magnum/Shaders/MeshVisualizer.frag diff --git a/src/Shaders/MeshVisualizer.geom b/src/Magnum/Shaders/MeshVisualizer.geom similarity index 100% rename from src/Shaders/MeshVisualizer.geom rename to src/Magnum/Shaders/MeshVisualizer.geom diff --git a/src/Shaders/MeshVisualizer.h b/src/Magnum/Shaders/MeshVisualizer.h similarity index 100% rename from src/Shaders/MeshVisualizer.h rename to src/Magnum/Shaders/MeshVisualizer.h diff --git a/src/Shaders/MeshVisualizer.vert b/src/Magnum/Shaders/MeshVisualizer.vert similarity index 100% rename from src/Shaders/MeshVisualizer.vert rename to src/Magnum/Shaders/MeshVisualizer.vert diff --git a/src/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp similarity index 100% rename from src/Shaders/Phong.cpp rename to src/Magnum/Shaders/Phong.cpp diff --git a/src/Shaders/Phong.frag b/src/Magnum/Shaders/Phong.frag similarity index 100% rename from src/Shaders/Phong.frag rename to src/Magnum/Shaders/Phong.frag diff --git a/src/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h similarity index 100% rename from src/Shaders/Phong.h rename to src/Magnum/Shaders/Phong.h diff --git a/src/Shaders/Phong.vert b/src/Magnum/Shaders/Phong.vert similarity index 100% rename from src/Shaders/Phong.vert rename to src/Magnum/Shaders/Phong.vert diff --git a/src/Shaders/Shaders.h b/src/Magnum/Shaders/Shaders.h similarity index 100% rename from src/Shaders/Shaders.h rename to src/Magnum/Shaders/Shaders.h diff --git a/src/Shaders/Test/CMakeLists.txt b/src/Magnum/Shaders/Test/CMakeLists.txt similarity index 100% rename from src/Shaders/Test/CMakeLists.txt rename to src/Magnum/Shaders/Test/CMakeLists.txt diff --git a/src/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp similarity index 100% rename from src/Shaders/Test/DistanceFieldVectorGLTest.cpp rename to src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp diff --git a/src/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp similarity index 100% rename from src/Shaders/Test/FlatGLTest.cpp rename to src/Magnum/Shaders/Test/FlatGLTest.cpp diff --git a/src/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp similarity index 100% rename from src/Shaders/Test/MeshVisualizerGLTest.cpp rename to src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp diff --git a/src/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp similarity index 100% rename from src/Shaders/Test/PhongGLTest.cpp rename to src/Magnum/Shaders/Test/PhongGLTest.cpp diff --git a/src/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp similarity index 100% rename from src/Shaders/Test/VectorGLTest.cpp rename to src/Magnum/Shaders/Test/VectorGLTest.cpp diff --git a/src/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp similarity index 100% rename from src/Shaders/Test/VertexColorGLTest.cpp rename to src/Magnum/Shaders/Test/VertexColorGLTest.cpp diff --git a/src/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp similarity index 100% rename from src/Shaders/Vector.cpp rename to src/Magnum/Shaders/Vector.cpp diff --git a/src/Shaders/Vector.frag b/src/Magnum/Shaders/Vector.frag similarity index 100% rename from src/Shaders/Vector.frag rename to src/Magnum/Shaders/Vector.frag diff --git a/src/Shaders/Vector.h b/src/Magnum/Shaders/Vector.h similarity index 100% rename from src/Shaders/Vector.h rename to src/Magnum/Shaders/Vector.h diff --git a/src/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp similarity index 100% rename from src/Shaders/VertexColor.cpp rename to src/Magnum/Shaders/VertexColor.cpp diff --git a/src/Shaders/VertexColor.frag b/src/Magnum/Shaders/VertexColor.frag similarity index 100% rename from src/Shaders/VertexColor.frag rename to src/Magnum/Shaders/VertexColor.frag diff --git a/src/Shaders/VertexColor.h b/src/Magnum/Shaders/VertexColor.h similarity index 100% rename from src/Shaders/VertexColor.h rename to src/Magnum/Shaders/VertexColor.h diff --git a/src/Shaders/VertexColor2D.vert b/src/Magnum/Shaders/VertexColor2D.vert similarity index 100% rename from src/Shaders/VertexColor2D.vert rename to src/Magnum/Shaders/VertexColor2D.vert diff --git a/src/Shaders/VertexColor3D.vert b/src/Magnum/Shaders/VertexColor3D.vert similarity index 100% rename from src/Shaders/VertexColor3D.vert rename to src/Magnum/Shaders/VertexColor3D.vert diff --git a/src/Shaders/compatibility.glsl b/src/Magnum/Shaders/compatibility.glsl similarity index 100% rename from src/Shaders/compatibility.glsl rename to src/Magnum/Shaders/compatibility.glsl diff --git a/src/Shaders/generic.glsl b/src/Magnum/Shaders/generic.glsl similarity index 100% rename from src/Shaders/generic.glsl rename to src/Magnum/Shaders/generic.glsl diff --git a/src/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp similarity index 100% rename from src/Shaders/magnumShadersResourceImport.hpp rename to src/Magnum/Shaders/magnumShadersResourceImport.hpp diff --git a/src/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/magnumShadersVisibility.h similarity index 100% rename from src/Shaders/magnumShadersVisibility.h rename to src/Magnum/Shaders/magnumShadersVisibility.h diff --git a/src/Shaders/resources.conf b/src/Magnum/Shaders/resources.conf similarity index 100% rename from src/Shaders/resources.conf rename to src/Magnum/Shaders/resources.conf diff --git a/src/Shapes/AbstractShape.cpp b/src/Magnum/Shapes/AbstractShape.cpp similarity index 100% rename from src/Shapes/AbstractShape.cpp rename to src/Magnum/Shapes/AbstractShape.cpp diff --git a/src/Shapes/AbstractShape.h b/src/Magnum/Shapes/AbstractShape.h similarity index 100% rename from src/Shapes/AbstractShape.h rename to src/Magnum/Shapes/AbstractShape.h diff --git a/src/Shapes/AxisAlignedBox.cpp b/src/Magnum/Shapes/AxisAlignedBox.cpp similarity index 100% rename from src/Shapes/AxisAlignedBox.cpp rename to src/Magnum/Shapes/AxisAlignedBox.cpp diff --git a/src/Shapes/AxisAlignedBox.h b/src/Magnum/Shapes/AxisAlignedBox.h similarity index 100% rename from src/Shapes/AxisAlignedBox.h rename to src/Magnum/Shapes/AxisAlignedBox.h diff --git a/src/Shapes/Box.cpp b/src/Magnum/Shapes/Box.cpp similarity index 100% rename from src/Shapes/Box.cpp rename to src/Magnum/Shapes/Box.cpp diff --git a/src/Shapes/Box.h b/src/Magnum/Shapes/Box.h similarity index 100% rename from src/Shapes/Box.h rename to src/Magnum/Shapes/Box.h diff --git a/src/Shapes/CMakeLists.txt b/src/Magnum/Shapes/CMakeLists.txt similarity index 100% rename from src/Shapes/CMakeLists.txt rename to src/Magnum/Shapes/CMakeLists.txt diff --git a/src/Shapes/Capsule.cpp b/src/Magnum/Shapes/Capsule.cpp similarity index 100% rename from src/Shapes/Capsule.cpp rename to src/Magnum/Shapes/Capsule.cpp diff --git a/src/Shapes/Capsule.h b/src/Magnum/Shapes/Capsule.h similarity index 100% rename from src/Shapes/Capsule.h rename to src/Magnum/Shapes/Capsule.h diff --git a/src/Shapes/Collision.h b/src/Magnum/Shapes/Collision.h similarity index 100% rename from src/Shapes/Collision.h rename to src/Magnum/Shapes/Collision.h diff --git a/src/Shapes/Composition.cpp b/src/Magnum/Shapes/Composition.cpp similarity index 100% rename from src/Shapes/Composition.cpp rename to src/Magnum/Shapes/Composition.cpp diff --git a/src/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h similarity index 100% rename from src/Shapes/Composition.h rename to src/Magnum/Shapes/Composition.h diff --git a/src/Shapes/Cylinder.cpp b/src/Magnum/Shapes/Cylinder.cpp similarity index 100% rename from src/Shapes/Cylinder.cpp rename to src/Magnum/Shapes/Cylinder.cpp diff --git a/src/Shapes/Cylinder.h b/src/Magnum/Shapes/Cylinder.h similarity index 100% rename from src/Shapes/Cylinder.h rename to src/Magnum/Shapes/Cylinder.h diff --git a/src/Shapes/Implementation/CollisionDispatch.cpp b/src/Magnum/Shapes/Implementation/CollisionDispatch.cpp similarity index 100% rename from src/Shapes/Implementation/CollisionDispatch.cpp rename to src/Magnum/Shapes/Implementation/CollisionDispatch.cpp diff --git a/src/Shapes/Implementation/CollisionDispatch.h b/src/Magnum/Shapes/Implementation/CollisionDispatch.h similarity index 100% rename from src/Shapes/Implementation/CollisionDispatch.h rename to src/Magnum/Shapes/Implementation/CollisionDispatch.h diff --git a/src/Shapes/Line.cpp b/src/Magnum/Shapes/Line.cpp similarity index 100% rename from src/Shapes/Line.cpp rename to src/Magnum/Shapes/Line.cpp diff --git a/src/Shapes/Line.h b/src/Magnum/Shapes/Line.h similarity index 100% rename from src/Shapes/Line.h rename to src/Magnum/Shapes/Line.h diff --git a/src/Shapes/LineSegment.h b/src/Magnum/Shapes/LineSegment.h similarity index 100% rename from src/Shapes/LineSegment.h rename to src/Magnum/Shapes/LineSegment.h diff --git a/src/Shapes/Plane.cpp b/src/Magnum/Shapes/Plane.cpp similarity index 100% rename from src/Shapes/Plane.cpp rename to src/Magnum/Shapes/Plane.cpp diff --git a/src/Shapes/Plane.h b/src/Magnum/Shapes/Plane.h similarity index 100% rename from src/Shapes/Plane.h rename to src/Magnum/Shapes/Plane.h diff --git a/src/Shapes/Point.cpp b/src/Magnum/Shapes/Point.cpp similarity index 100% rename from src/Shapes/Point.cpp rename to src/Magnum/Shapes/Point.cpp diff --git a/src/Shapes/Point.h b/src/Magnum/Shapes/Point.h similarity index 100% rename from src/Shapes/Point.h rename to src/Magnum/Shapes/Point.h diff --git a/src/Shapes/Shape.cpp b/src/Magnum/Shapes/Shape.cpp similarity index 100% rename from src/Shapes/Shape.cpp rename to src/Magnum/Shapes/Shape.cpp diff --git a/src/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h similarity index 100% rename from src/Shapes/Shape.h rename to src/Magnum/Shapes/Shape.h diff --git a/src/Shapes/ShapeGroup.cpp b/src/Magnum/Shapes/ShapeGroup.cpp similarity index 100% rename from src/Shapes/ShapeGroup.cpp rename to src/Magnum/Shapes/ShapeGroup.cpp diff --git a/src/Shapes/ShapeGroup.h b/src/Magnum/Shapes/ShapeGroup.h similarity index 100% rename from src/Shapes/ShapeGroup.h rename to src/Magnum/Shapes/ShapeGroup.h diff --git a/src/Shapes/Shapes.h b/src/Magnum/Shapes/Shapes.h similarity index 100% rename from src/Shapes/Shapes.h rename to src/Magnum/Shapes/Shapes.h diff --git a/src/Shapes/Sphere.cpp b/src/Magnum/Shapes/Sphere.cpp similarity index 100% rename from src/Shapes/Sphere.cpp rename to src/Magnum/Shapes/Sphere.cpp diff --git a/src/Shapes/Sphere.h b/src/Magnum/Shapes/Sphere.h similarity index 100% rename from src/Shapes/Sphere.h rename to src/Magnum/Shapes/Sphere.h diff --git a/src/Shapes/Test/AxisAlignedBoxTest.cpp b/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp similarity index 100% rename from src/Shapes/Test/AxisAlignedBoxTest.cpp rename to src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp diff --git a/src/Shapes/Test/BoxTest.cpp b/src/Magnum/Shapes/Test/BoxTest.cpp similarity index 100% rename from src/Shapes/Test/BoxTest.cpp rename to src/Magnum/Shapes/Test/BoxTest.cpp diff --git a/src/Shapes/Test/CMakeLists.txt b/src/Magnum/Shapes/Test/CMakeLists.txt similarity index 100% rename from src/Shapes/Test/CMakeLists.txt rename to src/Magnum/Shapes/Test/CMakeLists.txt diff --git a/src/Shapes/Test/CapsuleTest.cpp b/src/Magnum/Shapes/Test/CapsuleTest.cpp similarity index 100% rename from src/Shapes/Test/CapsuleTest.cpp rename to src/Magnum/Shapes/Test/CapsuleTest.cpp diff --git a/src/Shapes/Test/CollisionTest.cpp b/src/Magnum/Shapes/Test/CollisionTest.cpp similarity index 100% rename from src/Shapes/Test/CollisionTest.cpp rename to src/Magnum/Shapes/Test/CollisionTest.cpp diff --git a/src/Shapes/Test/CompositionTest.cpp b/src/Magnum/Shapes/Test/CompositionTest.cpp similarity index 100% rename from src/Shapes/Test/CompositionTest.cpp rename to src/Magnum/Shapes/Test/CompositionTest.cpp diff --git a/src/Shapes/Test/CylinderTest.cpp b/src/Magnum/Shapes/Test/CylinderTest.cpp similarity index 100% rename from src/Shapes/Test/CylinderTest.cpp rename to src/Magnum/Shapes/Test/CylinderTest.cpp diff --git a/src/Shapes/Test/LineTest.cpp b/src/Magnum/Shapes/Test/LineTest.cpp similarity index 100% rename from src/Shapes/Test/LineTest.cpp rename to src/Magnum/Shapes/Test/LineTest.cpp diff --git a/src/Shapes/Test/PlaneTest.cpp b/src/Magnum/Shapes/Test/PlaneTest.cpp similarity index 100% rename from src/Shapes/Test/PlaneTest.cpp rename to src/Magnum/Shapes/Test/PlaneTest.cpp diff --git a/src/Shapes/Test/PointTest.cpp b/src/Magnum/Shapes/Test/PointTest.cpp similarity index 100% rename from src/Shapes/Test/PointTest.cpp rename to src/Magnum/Shapes/Test/PointTest.cpp diff --git a/src/Shapes/Test/ShapeImplementationTest.cpp b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp similarity index 100% rename from src/Shapes/Test/ShapeImplementationTest.cpp rename to src/Magnum/Shapes/Test/ShapeImplementationTest.cpp diff --git a/src/Shapes/Test/ShapeTest.cpp b/src/Magnum/Shapes/Test/ShapeTest.cpp similarity index 100% rename from src/Shapes/Test/ShapeTest.cpp rename to src/Magnum/Shapes/Test/ShapeTest.cpp diff --git a/src/Shapes/Test/ShapeTestBase.h b/src/Magnum/Shapes/Test/ShapeTestBase.h similarity index 100% rename from src/Shapes/Test/ShapeTestBase.h rename to src/Magnum/Shapes/Test/ShapeTestBase.h diff --git a/src/Shapes/Test/SphereTest.cpp b/src/Magnum/Shapes/Test/SphereTest.cpp similarity index 100% rename from src/Shapes/Test/SphereTest.cpp rename to src/Magnum/Shapes/Test/SphereTest.cpp diff --git a/src/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/magnumShapesVisibility.h similarity index 100% rename from src/Shapes/magnumShapesVisibility.h rename to src/Magnum/Shapes/magnumShapesVisibility.h diff --git a/src/Shapes/shapeImplementation.cpp b/src/Magnum/Shapes/shapeImplementation.cpp similarity index 100% rename from src/Shapes/shapeImplementation.cpp rename to src/Magnum/Shapes/shapeImplementation.cpp diff --git a/src/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h similarity index 100% rename from src/Shapes/shapeImplementation.h rename to src/Magnum/Shapes/shapeImplementation.h diff --git a/src/Swizzle.h b/src/Magnum/Swizzle.h similarity index 100% rename from src/Swizzle.h rename to src/Magnum/Swizzle.h diff --git a/src/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp similarity index 100% rename from src/Test/AbstractImageTest.cpp rename to src/Magnum/Test/AbstractImageTest.cpp diff --git a/src/Test/AbstractObjectGLTest.cpp b/src/Magnum/Test/AbstractObjectGLTest.cpp similarity index 100% rename from src/Test/AbstractObjectGLTest.cpp rename to src/Magnum/Test/AbstractObjectGLTest.cpp diff --git a/src/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h similarity index 100% rename from src/Test/AbstractOpenGLTester.h rename to src/Magnum/Test/AbstractOpenGLTester.h diff --git a/src/Test/AbstractQueryGLTest.cpp b/src/Magnum/Test/AbstractQueryGLTest.cpp similarity index 100% rename from src/Test/AbstractQueryGLTest.cpp rename to src/Magnum/Test/AbstractQueryGLTest.cpp diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp similarity index 100% rename from src/Test/AbstractShaderProgramGLTest.cpp rename to src/Magnum/Test/AbstractShaderProgramGLTest.cpp diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.frag similarity index 100% rename from src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.frag diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.vert similarity index 100% rename from src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.vert diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag similarity index 100% rename from src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag diff --git a/src/Test/AbstractShaderProgramGLTestFiles/resources.conf b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/resources.conf similarity index 100% rename from src/Test/AbstractShaderProgramGLTestFiles/resources.conf rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/resources.conf diff --git a/src/Test/AbstractShaderProgramTest.cpp b/src/Magnum/Test/AbstractShaderProgramTest.cpp similarity index 100% rename from src/Test/AbstractShaderProgramTest.cpp rename to src/Magnum/Test/AbstractShaderProgramTest.cpp diff --git a/src/Test/AbstractTextureGLTest.cpp b/src/Magnum/Test/AbstractTextureGLTest.cpp similarity index 100% rename from src/Test/AbstractTextureGLTest.cpp rename to src/Magnum/Test/AbstractTextureGLTest.cpp diff --git a/src/Test/ArrayTest.cpp b/src/Magnum/Test/ArrayTest.cpp similarity index 100% rename from src/Test/ArrayTest.cpp rename to src/Magnum/Test/ArrayTest.cpp diff --git a/src/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp similarity index 100% rename from src/Test/BufferGLTest.cpp rename to src/Magnum/Test/BufferGLTest.cpp diff --git a/src/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp similarity index 100% rename from src/Test/BufferImageGLTest.cpp rename to src/Magnum/Test/BufferImageGLTest.cpp diff --git a/src/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp similarity index 100% rename from src/Test/BufferTextureGLTest.cpp rename to src/Magnum/Test/BufferTextureGLTest.cpp diff --git a/src/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt similarity index 100% rename from src/Test/CMakeLists.txt rename to src/Magnum/Test/CMakeLists.txt diff --git a/src/Test/ColorTest.cpp b/src/Magnum/Test/ColorTest.cpp similarity index 100% rename from src/Test/ColorTest.cpp rename to src/Magnum/Test/ColorTest.cpp diff --git a/src/Test/ContextGLTest.cpp b/src/Magnum/Test/ContextGLTest.cpp similarity index 100% rename from src/Test/ContextGLTest.cpp rename to src/Magnum/Test/ContextGLTest.cpp diff --git a/src/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp similarity index 100% rename from src/Test/CubeMapTextureArrayGLTest.cpp rename to src/Magnum/Test/CubeMapTextureArrayGLTest.cpp diff --git a/src/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp similarity index 100% rename from src/Test/CubeMapTextureGLTest.cpp rename to src/Magnum/Test/CubeMapTextureGLTest.cpp diff --git a/src/Test/DebugGLTest.cpp b/src/Magnum/Test/DebugGLTest.cpp similarity index 100% rename from src/Test/DebugGLTest.cpp rename to src/Magnum/Test/DebugGLTest.cpp diff --git a/src/Test/DebugMessageTest.cpp b/src/Magnum/Test/DebugMessageTest.cpp similarity index 100% rename from src/Test/DebugMessageTest.cpp rename to src/Magnum/Test/DebugMessageTest.cpp diff --git a/src/Test/DefaultFramebufferTest.cpp b/src/Magnum/Test/DefaultFramebufferTest.cpp similarity index 100% rename from src/Test/DefaultFramebufferTest.cpp rename to src/Magnum/Test/DefaultFramebufferTest.cpp diff --git a/src/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp similarity index 100% rename from src/Test/FramebufferGLTest.cpp rename to src/Magnum/Test/FramebufferGLTest.cpp diff --git a/src/Test/FramebufferTest.cpp b/src/Magnum/Test/FramebufferTest.cpp similarity index 100% rename from src/Test/FramebufferTest.cpp rename to src/Magnum/Test/FramebufferTest.cpp diff --git a/src/Test/ImageReferenceTest.cpp b/src/Magnum/Test/ImageReferenceTest.cpp similarity index 100% rename from src/Test/ImageReferenceTest.cpp rename to src/Magnum/Test/ImageReferenceTest.cpp diff --git a/src/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp similarity index 100% rename from src/Test/ImageTest.cpp rename to src/Magnum/Test/ImageTest.cpp diff --git a/src/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp similarity index 100% rename from src/Test/MeshGLTest.cpp rename to src/Magnum/Test/MeshGLTest.cpp diff --git a/src/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp similarity index 100% rename from src/Test/MeshTest.cpp rename to src/Magnum/Test/MeshTest.cpp diff --git a/src/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp similarity index 100% rename from src/Test/PrimitiveQueryGLTest.cpp rename to src/Magnum/Test/PrimitiveQueryGLTest.cpp diff --git a/src/Test/QueryGLTestFiles/MyShader.frag b/src/Magnum/Test/QueryGLTestFiles/MyShader.frag similarity index 100% rename from src/Test/QueryGLTestFiles/MyShader.frag rename to src/Magnum/Test/QueryGLTestFiles/MyShader.frag diff --git a/src/Test/QueryGLTestFiles/MyShader.vert b/src/Magnum/Test/QueryGLTestFiles/MyShader.vert similarity index 100% rename from src/Test/QueryGLTestFiles/MyShader.vert rename to src/Magnum/Test/QueryGLTestFiles/MyShader.vert diff --git a/src/Test/QueryGLTestFiles/resources.conf b/src/Magnum/Test/QueryGLTestFiles/resources.conf similarity index 100% rename from src/Test/QueryGLTestFiles/resources.conf rename to src/Magnum/Test/QueryGLTestFiles/resources.conf diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Magnum/Test/RenderbufferGLTest.cpp similarity index 100% rename from src/Test/RenderbufferGLTest.cpp rename to src/Magnum/Test/RenderbufferGLTest.cpp diff --git a/src/Test/RendererTest.cpp b/src/Magnum/Test/RendererTest.cpp similarity index 100% rename from src/Test/RendererTest.cpp rename to src/Magnum/Test/RendererTest.cpp diff --git a/src/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp similarity index 100% rename from src/Test/ResourceManagerTest.cpp rename to src/Magnum/Test/ResourceManagerTest.cpp diff --git a/src/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp similarity index 100% rename from src/Test/SampleQueryGLTest.cpp rename to src/Magnum/Test/SampleQueryGLTest.cpp diff --git a/src/Test/SamplerTest.cpp b/src/Magnum/Test/SamplerTest.cpp similarity index 100% rename from src/Test/SamplerTest.cpp rename to src/Magnum/Test/SamplerTest.cpp diff --git a/src/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp similarity index 100% rename from src/Test/ShaderGLTest.cpp rename to src/Magnum/Test/ShaderGLTest.cpp diff --git a/src/Test/ShaderGLTestConfigure.h.cmake b/src/Magnum/Test/ShaderGLTestConfigure.h.cmake similarity index 100% rename from src/Test/ShaderGLTestConfigure.h.cmake rename to src/Magnum/Test/ShaderGLTestConfigure.h.cmake diff --git a/src/Test/ShaderGLTestFiles/shader.glsl b/src/Magnum/Test/ShaderGLTestFiles/shader.glsl similarity index 100% rename from src/Test/ShaderGLTestFiles/shader.glsl rename to src/Magnum/Test/ShaderGLTestFiles/shader.glsl diff --git a/src/Test/ShaderTest.cpp b/src/Magnum/Test/ShaderTest.cpp similarity index 100% rename from src/Test/ShaderTest.cpp rename to src/Magnum/Test/ShaderTest.cpp diff --git a/src/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp similarity index 100% rename from src/Test/TextureGLTest.cpp rename to src/Magnum/Test/TextureGLTest.cpp diff --git a/src/Test/TimeQueryGLTest.cpp b/src/Magnum/Test/TimeQueryGLTest.cpp similarity index 100% rename from src/Test/TimeQueryGLTest.cpp rename to src/Magnum/Test/TimeQueryGLTest.cpp diff --git a/src/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp similarity index 100% rename from src/Test/VersionTest.cpp rename to src/Magnum/Test/VersionTest.cpp diff --git a/src/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp similarity index 100% rename from src/Text/AbstractFont.cpp rename to src/Magnum/Text/AbstractFont.cpp diff --git a/src/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h similarity index 100% rename from src/Text/AbstractFont.h rename to src/Magnum/Text/AbstractFont.h diff --git a/src/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp similarity index 100% rename from src/Text/AbstractFontConverter.cpp rename to src/Magnum/Text/AbstractFontConverter.cpp diff --git a/src/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h similarity index 100% rename from src/Text/AbstractFontConverter.h rename to src/Magnum/Text/AbstractFontConverter.h diff --git a/src/Text/Alignment.h b/src/Magnum/Text/Alignment.h similarity index 100% rename from src/Text/Alignment.h rename to src/Magnum/Text/Alignment.h diff --git a/src/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt similarity index 100% rename from src/Text/CMakeLists.txt rename to src/Magnum/Text/CMakeLists.txt diff --git a/src/Text/DistanceFieldGlyphCache.cpp b/src/Magnum/Text/DistanceFieldGlyphCache.cpp similarity index 100% rename from src/Text/DistanceFieldGlyphCache.cpp rename to src/Magnum/Text/DistanceFieldGlyphCache.cpp diff --git a/src/Text/DistanceFieldGlyphCache.h b/src/Magnum/Text/DistanceFieldGlyphCache.h similarity index 100% rename from src/Text/DistanceFieldGlyphCache.h rename to src/Magnum/Text/DistanceFieldGlyphCache.h diff --git a/src/Text/GlyphCache.cpp b/src/Magnum/Text/GlyphCache.cpp similarity index 100% rename from src/Text/GlyphCache.cpp rename to src/Magnum/Text/GlyphCache.cpp diff --git a/src/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h similarity index 100% rename from src/Text/GlyphCache.h rename to src/Magnum/Text/GlyphCache.h diff --git a/src/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp similarity index 100% rename from src/Text/Renderer.cpp rename to src/Magnum/Text/Renderer.cpp diff --git a/src/Text/Renderer.h b/src/Magnum/Text/Renderer.h similarity index 100% rename from src/Text/Renderer.h rename to src/Magnum/Text/Renderer.h diff --git a/src/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp similarity index 100% rename from src/Text/Test/AbstractFontConverterTest.cpp rename to src/Magnum/Text/Test/AbstractFontConverterTest.cpp diff --git a/src/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp similarity index 100% rename from src/Text/Test/AbstractFontTest.cpp rename to src/Magnum/Text/Test/AbstractFontTest.cpp diff --git a/src/Text/Test/AbstractLayouterTest.cpp b/src/Magnum/Text/Test/AbstractLayouterTest.cpp similarity index 100% rename from src/Text/Test/AbstractLayouterTest.cpp rename to src/Magnum/Text/Test/AbstractLayouterTest.cpp diff --git a/src/Text/Test/CMakeLists.txt b/src/Magnum/Text/Test/CMakeLists.txt similarity index 100% rename from src/Text/Test/CMakeLists.txt rename to src/Magnum/Text/Test/CMakeLists.txt diff --git a/src/Text/Test/GlyphCacheGLTest.cpp b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp similarity index 100% rename from src/Text/Test/GlyphCacheGLTest.cpp rename to src/Magnum/Text/Test/GlyphCacheGLTest.cpp diff --git a/src/Text/Test/RendererGLTest.cpp b/src/Magnum/Text/Test/RendererGLTest.cpp similarity index 100% rename from src/Text/Test/RendererGLTest.cpp rename to src/Magnum/Text/Test/RendererGLTest.cpp diff --git a/src/Text/Test/data.bin b/src/Magnum/Text/Test/data.bin similarity index 100% rename from src/Text/Test/data.bin rename to src/Magnum/Text/Test/data.bin diff --git a/src/Text/Test/testConfigure.h.cmake b/src/Magnum/Text/Test/testConfigure.h.cmake similarity index 100% rename from src/Text/Test/testConfigure.h.cmake rename to src/Magnum/Text/Test/testConfigure.h.cmake diff --git a/src/Text/Text.h b/src/Magnum/Text/Text.h similarity index 100% rename from src/Text/Text.h rename to src/Magnum/Text/Text.h diff --git a/src/Text/TextRenderer.h b/src/Magnum/Text/TextRenderer.h similarity index 100% rename from src/Text/TextRenderer.h rename to src/Magnum/Text/TextRenderer.h diff --git a/src/Text/configure.h.cmake b/src/Magnum/Text/configure.h.cmake similarity index 100% rename from src/Text/configure.h.cmake rename to src/Magnum/Text/configure.h.cmake diff --git a/src/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp similarity index 100% rename from src/Text/fontconverter.cpp rename to src/Magnum/Text/fontconverter.cpp diff --git a/src/Text/magnumTextVisibility.h b/src/Magnum/Text/magnumTextVisibility.h similarity index 100% rename from src/Text/magnumTextVisibility.h rename to src/Magnum/Text/magnumTextVisibility.h diff --git a/src/Texture.h b/src/Magnum/Texture.h similarity index 100% rename from src/Texture.h rename to src/Magnum/Texture.h diff --git a/src/TextureFormat.h b/src/Magnum/TextureFormat.h similarity index 100% rename from src/TextureFormat.h rename to src/Magnum/TextureFormat.h diff --git a/src/TextureTools/Atlas.cpp b/src/Magnum/TextureTools/Atlas.cpp similarity index 100% rename from src/TextureTools/Atlas.cpp rename to src/Magnum/TextureTools/Atlas.cpp diff --git a/src/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h similarity index 100% rename from src/TextureTools/Atlas.h rename to src/Magnum/TextureTools/Atlas.h diff --git a/src/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt similarity index 100% rename from src/TextureTools/CMakeLists.txt rename to src/Magnum/TextureTools/CMakeLists.txt diff --git a/src/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp similarity index 100% rename from src/TextureTools/DistanceField.cpp rename to src/Magnum/TextureTools/DistanceField.cpp diff --git a/src/TextureTools/DistanceField.h b/src/Magnum/TextureTools/DistanceField.h similarity index 100% rename from src/TextureTools/DistanceField.h rename to src/Magnum/TextureTools/DistanceField.h diff --git a/src/TextureTools/DistanceFieldShader.frag b/src/Magnum/TextureTools/DistanceFieldShader.frag similarity index 100% rename from src/TextureTools/DistanceFieldShader.frag rename to src/Magnum/TextureTools/DistanceFieldShader.frag diff --git a/src/TextureTools/DistanceFieldShader.vert b/src/Magnum/TextureTools/DistanceFieldShader.vert similarity index 100% rename from src/TextureTools/DistanceFieldShader.vert rename to src/Magnum/TextureTools/DistanceFieldShader.vert diff --git a/src/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp similarity index 100% rename from src/TextureTools/Test/AtlasTest.cpp rename to src/Magnum/TextureTools/Test/AtlasTest.cpp diff --git a/src/TextureTools/Test/CMakeLists.txt b/src/Magnum/TextureTools/Test/CMakeLists.txt similarity index 100% rename from src/TextureTools/Test/CMakeLists.txt rename to src/Magnum/TextureTools/Test/CMakeLists.txt diff --git a/src/TextureTools/configure.h.cmake b/src/Magnum/TextureTools/configure.h.cmake similarity index 100% rename from src/TextureTools/configure.h.cmake rename to src/Magnum/TextureTools/configure.h.cmake diff --git a/src/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp similarity index 100% rename from src/TextureTools/distancefieldconverter.cpp rename to src/Magnum/TextureTools/distancefieldconverter.cpp diff --git a/src/TextureTools/magnumTextureToolsResourceImport.hpp b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp similarity index 100% rename from src/TextureTools/magnumTextureToolsResourceImport.hpp rename to src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp diff --git a/src/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h similarity index 100% rename from src/TextureTools/magnumTextureToolsVisibility.h rename to src/Magnum/TextureTools/magnumTextureToolsVisibility.h diff --git a/src/TextureTools/resources.conf b/src/Magnum/TextureTools/resources.conf similarity index 100% rename from src/TextureTools/resources.conf rename to src/Magnum/TextureTools/resources.conf diff --git a/src/Timeline.cpp b/src/Magnum/Timeline.cpp similarity index 100% rename from src/Timeline.cpp rename to src/Magnum/Timeline.cpp diff --git a/src/Timeline.h b/src/Magnum/Timeline.h similarity index 100% rename from src/Timeline.h rename to src/Magnum/Timeline.h diff --git a/src/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp similarity index 100% rename from src/Trade/AbstractImageConverter.cpp rename to src/Magnum/Trade/AbstractImageConverter.cpp diff --git a/src/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h similarity index 100% rename from src/Trade/AbstractImageConverter.h rename to src/Magnum/Trade/AbstractImageConverter.h diff --git a/src/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp similarity index 100% rename from src/Trade/AbstractImporter.cpp rename to src/Magnum/Trade/AbstractImporter.cpp diff --git a/src/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h similarity index 100% rename from src/Trade/AbstractImporter.h rename to src/Magnum/Trade/AbstractImporter.h diff --git a/src/Trade/AbstractMaterialData.cpp b/src/Magnum/Trade/AbstractMaterialData.cpp similarity index 100% rename from src/Trade/AbstractMaterialData.cpp rename to src/Magnum/Trade/AbstractMaterialData.cpp diff --git a/src/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h similarity index 100% rename from src/Trade/AbstractMaterialData.h rename to src/Magnum/Trade/AbstractMaterialData.h diff --git a/src/Trade/CMakeLists.txt b/src/Magnum/Trade/CMakeLists.txt similarity index 100% rename from src/Trade/CMakeLists.txt rename to src/Magnum/Trade/CMakeLists.txt diff --git a/src/Trade/CameraData.h b/src/Magnum/Trade/CameraData.h similarity index 100% rename from src/Trade/CameraData.h rename to src/Magnum/Trade/CameraData.h diff --git a/src/Trade/ImageData.h b/src/Magnum/Trade/ImageData.h similarity index 100% rename from src/Trade/ImageData.h rename to src/Magnum/Trade/ImageData.h diff --git a/src/Trade/LightData.h b/src/Magnum/Trade/LightData.h similarity index 100% rename from src/Trade/LightData.h rename to src/Magnum/Trade/LightData.h diff --git a/src/Trade/MeshData2D.cpp b/src/Magnum/Trade/MeshData2D.cpp similarity index 100% rename from src/Trade/MeshData2D.cpp rename to src/Magnum/Trade/MeshData2D.cpp diff --git a/src/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h similarity index 100% rename from src/Trade/MeshData2D.h rename to src/Magnum/Trade/MeshData2D.h diff --git a/src/Trade/MeshData3D.cpp b/src/Magnum/Trade/MeshData3D.cpp similarity index 100% rename from src/Trade/MeshData3D.cpp rename to src/Magnum/Trade/MeshData3D.cpp diff --git a/src/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h similarity index 100% rename from src/Trade/MeshData3D.h rename to src/Magnum/Trade/MeshData3D.h diff --git a/src/Trade/MeshObjectData2D.cpp b/src/Magnum/Trade/MeshObjectData2D.cpp similarity index 100% rename from src/Trade/MeshObjectData2D.cpp rename to src/Magnum/Trade/MeshObjectData2D.cpp diff --git a/src/Trade/MeshObjectData2D.h b/src/Magnum/Trade/MeshObjectData2D.h similarity index 100% rename from src/Trade/MeshObjectData2D.h rename to src/Magnum/Trade/MeshObjectData2D.h diff --git a/src/Trade/MeshObjectData3D.cpp b/src/Magnum/Trade/MeshObjectData3D.cpp similarity index 100% rename from src/Trade/MeshObjectData3D.cpp rename to src/Magnum/Trade/MeshObjectData3D.cpp diff --git a/src/Trade/MeshObjectData3D.h b/src/Magnum/Trade/MeshObjectData3D.h similarity index 100% rename from src/Trade/MeshObjectData3D.h rename to src/Magnum/Trade/MeshObjectData3D.h diff --git a/src/Trade/ObjectData2D.cpp b/src/Magnum/Trade/ObjectData2D.cpp similarity index 100% rename from src/Trade/ObjectData2D.cpp rename to src/Magnum/Trade/ObjectData2D.cpp diff --git a/src/Trade/ObjectData2D.h b/src/Magnum/Trade/ObjectData2D.h similarity index 100% rename from src/Trade/ObjectData2D.h rename to src/Magnum/Trade/ObjectData2D.h diff --git a/src/Trade/ObjectData3D.cpp b/src/Magnum/Trade/ObjectData3D.cpp similarity index 100% rename from src/Trade/ObjectData3D.cpp rename to src/Magnum/Trade/ObjectData3D.cpp diff --git a/src/Trade/ObjectData3D.h b/src/Magnum/Trade/ObjectData3D.h similarity index 100% rename from src/Trade/ObjectData3D.h rename to src/Magnum/Trade/ObjectData3D.h diff --git a/src/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp similarity index 100% rename from src/Trade/PhongMaterialData.cpp rename to src/Magnum/Trade/PhongMaterialData.cpp diff --git a/src/Trade/PhongMaterialData.h b/src/Magnum/Trade/PhongMaterialData.h similarity index 100% rename from src/Trade/PhongMaterialData.h rename to src/Magnum/Trade/PhongMaterialData.h diff --git a/src/Trade/SceneData.cpp b/src/Magnum/Trade/SceneData.cpp similarity index 100% rename from src/Trade/SceneData.cpp rename to src/Magnum/Trade/SceneData.cpp diff --git a/src/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h similarity index 100% rename from src/Trade/SceneData.h rename to src/Magnum/Trade/SceneData.h diff --git a/src/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp similarity index 100% rename from src/Trade/Test/AbstractImageConverterTest.cpp rename to src/Magnum/Trade/Test/AbstractImageConverterTest.cpp diff --git a/src/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp similarity index 100% rename from src/Trade/Test/AbstractImporterTest.cpp rename to src/Magnum/Trade/Test/AbstractImporterTest.cpp diff --git a/src/Trade/Test/AbstractMaterialDataTest.cpp b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp similarity index 100% rename from src/Trade/Test/AbstractMaterialDataTest.cpp rename to src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp diff --git a/src/Trade/Test/CMakeLists.txt b/src/Magnum/Trade/Test/CMakeLists.txt similarity index 100% rename from src/Trade/Test/CMakeLists.txt rename to src/Magnum/Trade/Test/CMakeLists.txt diff --git a/src/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp similarity index 100% rename from src/Trade/Test/ImageDataTest.cpp rename to src/Magnum/Trade/Test/ImageDataTest.cpp diff --git a/src/Trade/Test/ObjectData2DTest.cpp b/src/Magnum/Trade/Test/ObjectData2DTest.cpp similarity index 100% rename from src/Trade/Test/ObjectData2DTest.cpp rename to src/Magnum/Trade/Test/ObjectData2DTest.cpp diff --git a/src/Trade/Test/ObjectData3DTest.cpp b/src/Magnum/Trade/Test/ObjectData3DTest.cpp similarity index 100% rename from src/Trade/Test/ObjectData3DTest.cpp rename to src/Magnum/Trade/Test/ObjectData3DTest.cpp diff --git a/src/Trade/Test/TextureDataTest.cpp b/src/Magnum/Trade/Test/TextureDataTest.cpp similarity index 100% rename from src/Trade/Test/TextureDataTest.cpp rename to src/Magnum/Trade/Test/TextureDataTest.cpp diff --git a/src/Trade/Test/file.bin b/src/Magnum/Trade/Test/file.bin similarity index 100% rename from src/Trade/Test/file.bin rename to src/Magnum/Trade/Test/file.bin diff --git a/src/Trade/Test/testConfigure.h.cmake b/src/Magnum/Trade/Test/testConfigure.h.cmake similarity index 100% rename from src/Trade/Test/testConfigure.h.cmake rename to src/Magnum/Trade/Test/testConfigure.h.cmake diff --git a/src/Trade/TextureData.cpp b/src/Magnum/Trade/TextureData.cpp similarity index 100% rename from src/Trade/TextureData.cpp rename to src/Magnum/Trade/TextureData.cpp diff --git a/src/Trade/TextureData.h b/src/Magnum/Trade/TextureData.h similarity index 100% rename from src/Trade/TextureData.h rename to src/Magnum/Trade/TextureData.h diff --git a/src/Trade/Trade.h b/src/Magnum/Trade/Trade.h similarity index 100% rename from src/Trade/Trade.h rename to src/Magnum/Trade/Trade.h diff --git a/src/Types.h b/src/Magnum/Types.h similarity index 100% rename from src/Types.h rename to src/Magnum/Types.h diff --git a/src/Version.cpp b/src/Magnum/Version.cpp similarity index 100% rename from src/Version.cpp rename to src/Magnum/Version.cpp diff --git a/src/Version.h b/src/Magnum/Version.h similarity index 100% rename from src/Version.h rename to src/Magnum/Version.h diff --git a/src/magnumConfigure.h.cmake b/src/Magnum/magnumConfigure.h.cmake similarity index 100% rename from src/magnumConfigure.h.cmake rename to src/Magnum/magnumConfigure.h.cmake diff --git a/src/magnumVisibility.h b/src/Magnum/magnumVisibility.h similarity index 100% rename from src/magnumVisibility.h rename to src/Magnum/magnumVisibility.h diff --git a/external/CMakeLists.txt b/src/MagnumExternal/CMakeLists.txt similarity index 100% rename from external/CMakeLists.txt rename to src/MagnumExternal/CMakeLists.txt diff --git a/external/OpenGL/CMakeLists.txt b/src/MagnumExternal/OpenGL/CMakeLists.txt similarity index 100% rename from external/OpenGL/CMakeLists.txt rename to src/MagnumExternal/OpenGL/CMakeLists.txt diff --git a/external/OpenGL/GL/CMakeLists.txt b/src/MagnumExternal/OpenGL/GL/CMakeLists.txt similarity index 100% rename from external/OpenGL/GL/CMakeLists.txt rename to src/MagnumExternal/OpenGL/GL/CMakeLists.txt diff --git a/external/OpenGL/GL/README.md b/src/MagnumExternal/OpenGL/GL/README.md similarity index 100% rename from external/OpenGL/GL/README.md rename to src/MagnumExternal/OpenGL/GL/README.md diff --git a/external/OpenGL/GL/extensions.txt b/src/MagnumExternal/OpenGL/GL/extensions.txt similarity index 100% rename from external/OpenGL/GL/extensions.txt rename to src/MagnumExternal/OpenGL/GL/extensions.txt diff --git a/external/OpenGL/GL/gl_magnum.c b/src/MagnumExternal/OpenGL/GL/gl_magnum.c similarity index 100% rename from external/OpenGL/GL/gl_magnum.c rename to src/MagnumExternal/OpenGL/GL/gl_magnum.c diff --git a/external/OpenGL/GL/gl_magnum.h b/src/MagnumExternal/OpenGL/GL/gl_magnum.h similarity index 100% rename from external/OpenGL/GL/gl_magnum.h rename to src/MagnumExternal/OpenGL/GL/gl_magnum.h diff --git a/external/OpenGL/GLES2/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt similarity index 100% rename from external/OpenGL/GLES2/CMakeLists.txt rename to src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt diff --git a/external/OpenGL/GLES2/gl2.h b/src/MagnumExternal/OpenGL/GLES2/gl2.h similarity index 100% rename from external/OpenGL/GLES2/gl2.h rename to src/MagnumExternal/OpenGL/GLES2/gl2.h diff --git a/external/OpenGL/GLES2/gl2ext.h b/src/MagnumExternal/OpenGL/GLES2/gl2ext.h similarity index 100% rename from external/OpenGL/GLES2/gl2ext.h rename to src/MagnumExternal/OpenGL/GLES2/gl2ext.h diff --git a/external/OpenGL/GLES2/gl2platform.h b/src/MagnumExternal/OpenGL/GLES2/gl2platform.h similarity index 100% rename from external/OpenGL/GLES2/gl2platform.h rename to src/MagnumExternal/OpenGL/GLES2/gl2platform.h diff --git a/external/OpenGL/GLES3/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt similarity index 100% rename from external/OpenGL/GLES3/CMakeLists.txt rename to src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt diff --git a/external/OpenGL/GLES3/gl3.h b/src/MagnumExternal/OpenGL/GLES3/gl3.h similarity index 100% rename from external/OpenGL/GLES3/gl3.h rename to src/MagnumExternal/OpenGL/GLES3/gl3.h diff --git a/external/OpenGL/GLES3/gl3platform.h b/src/MagnumExternal/OpenGL/GLES3/gl3platform.h similarity index 100% rename from external/OpenGL/GLES3/gl3platform.h rename to src/MagnumExternal/OpenGL/GLES3/gl3platform.h diff --git a/external/OpenGL/KHR/CMakeLists.txt b/src/MagnumExternal/OpenGL/KHR/CMakeLists.txt similarity index 100% rename from external/OpenGL/KHR/CMakeLists.txt rename to src/MagnumExternal/OpenGL/KHR/CMakeLists.txt diff --git a/external/OpenGL/KHR/khrplatform.h b/src/MagnumExternal/OpenGL/KHR/khrplatform.h similarity index 100% rename from external/OpenGL/KHR/khrplatform.h rename to src/MagnumExternal/OpenGL/KHR/khrplatform.h diff --git a/external/Optional/CMakeLists.txt b/src/MagnumExternal/Optional/CMakeLists.txt similarity index 100% rename from external/Optional/CMakeLists.txt rename to src/MagnumExternal/Optional/CMakeLists.txt diff --git a/external/Optional/LICENSE_1_0.txt b/src/MagnumExternal/Optional/LICENSE_1_0.txt similarity index 100% rename from external/Optional/LICENSE_1_0.txt rename to src/MagnumExternal/Optional/LICENSE_1_0.txt diff --git a/external/Optional/optional.hpp b/src/MagnumExternal/Optional/optional.hpp similarity index 100% rename from external/Optional/optional.hpp rename to src/MagnumExternal/Optional/optional.hpp diff --git a/src/Plugins/CMakeLists.txt b/src/MagnumPlugins/CMakeLists.txt similarity index 100% rename from src/Plugins/CMakeLists.txt rename to src/MagnumPlugins/CMakeLists.txt diff --git a/src/Plugins/MagnumFont/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/CMakeLists.txt similarity index 100% rename from src/Plugins/MagnumFont/CMakeLists.txt rename to src/MagnumPlugins/MagnumFont/CMakeLists.txt diff --git a/src/Plugins/MagnumFont/MagnumFont.conf b/src/MagnumPlugins/MagnumFont/MagnumFont.conf similarity index 100% rename from src/Plugins/MagnumFont/MagnumFont.conf rename to src/MagnumPlugins/MagnumFont/MagnumFont.conf diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp similarity index 100% rename from src/Plugins/MagnumFont/MagnumFont.cpp rename to src/MagnumPlugins/MagnumFont/MagnumFont.cpp diff --git a/src/Plugins/MagnumFont/MagnumFont.h b/src/MagnumPlugins/MagnumFont/MagnumFont.h similarity index 100% rename from src/Plugins/MagnumFont/MagnumFont.h rename to src/MagnumPlugins/MagnumFont/MagnumFont.h diff --git a/src/Plugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt similarity index 100% rename from src/Plugins/MagnumFont/Test/CMakeLists.txt rename to src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt diff --git a/src/Plugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp similarity index 100% rename from src/Plugins/MagnumFont/Test/MagnumFontGLTest.cpp rename to src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp diff --git a/src/Plugins/MagnumFont/Test/font.conf b/src/MagnumPlugins/MagnumFont/Test/font.conf similarity index 100% rename from src/Plugins/MagnumFont/Test/font.conf rename to src/MagnumPlugins/MagnumFont/Test/font.conf diff --git a/src/Plugins/MagnumFont/Test/font.tga b/src/MagnumPlugins/MagnumFont/Test/font.tga similarity index 100% rename from src/Plugins/MagnumFont/Test/font.tga rename to src/MagnumPlugins/MagnumFont/Test/font.tga diff --git a/src/Plugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake similarity index 100% rename from src/Plugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake rename to src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake diff --git a/src/Plugins/MagnumFont/pluginRegistrationMagnumFont.cpp b/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp similarity index 100% rename from src/Plugins/MagnumFont/pluginRegistrationMagnumFont.cpp rename to src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp diff --git a/src/Plugins/MagnumFontConverter/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt similarity index 100% rename from src/Plugins/MagnumFontConverter/CMakeLists.txt rename to src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.conf b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.conf similarity index 100% rename from src/Plugins/MagnumFontConverter/MagnumFontConverter.conf rename to src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.conf diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp similarity index 100% rename from src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp rename to src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.h b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h similarity index 100% rename from src/Plugins/MagnumFontConverter/MagnumFontConverter.h rename to src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h diff --git a/src/Plugins/MagnumFontConverter/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt similarity index 100% rename from src/Plugins/MagnumFontConverter/Test/CMakeLists.txt rename to src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt diff --git a/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp similarity index 100% rename from src/Plugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp rename to src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp diff --git a/src/Plugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake similarity index 100% rename from src/Plugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake rename to src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake diff --git a/src/Plugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp similarity index 100% rename from src/Plugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp rename to src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp diff --git a/src/Plugins/TgaImageConverter/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt similarity index 100% rename from src/Plugins/TgaImageConverter/CMakeLists.txt rename to src/MagnumPlugins/TgaImageConverter/CMakeLists.txt diff --git a/src/Plugins/TgaImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt similarity index 100% rename from src/Plugins/TgaImageConverter/Test/CMakeLists.txt rename to src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt diff --git a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp similarity index 100% rename from src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp rename to src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp diff --git a/src/Plugins/TgaImageConverter/Test/configure.h.cmake b/src/MagnumPlugins/TgaImageConverter/Test/configure.h.cmake similarity index 100% rename from src/Plugins/TgaImageConverter/Test/configure.h.cmake rename to src/MagnumPlugins/TgaImageConverter/Test/configure.h.cmake diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.conf b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.conf similarity index 100% rename from src/Plugins/TgaImageConverter/TgaImageConverter.conf rename to src/MagnumPlugins/TgaImageConverter/TgaImageConverter.conf diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp similarity index 100% rename from src/Plugins/TgaImageConverter/TgaImageConverter.cpp rename to src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.h b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h similarity index 100% rename from src/Plugins/TgaImageConverter/TgaImageConverter.h rename to src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h diff --git a/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp similarity index 100% rename from src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp rename to src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp diff --git a/src/Plugins/TgaImporter/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/CMakeLists.txt similarity index 100% rename from src/Plugins/TgaImporter/CMakeLists.txt rename to src/MagnumPlugins/TgaImporter/CMakeLists.txt diff --git a/src/Plugins/TgaImporter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt similarity index 100% rename from src/Plugins/TgaImporter/Test/CMakeLists.txt rename to src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp similarity index 100% rename from src/Plugins/TgaImporter/Test/TgaImporterTest.cpp rename to src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp diff --git a/src/Plugins/TgaImporter/Test/configure.h.cmake b/src/MagnumPlugins/TgaImporter/Test/configure.h.cmake similarity index 100% rename from src/Plugins/TgaImporter/Test/configure.h.cmake rename to src/MagnumPlugins/TgaImporter/Test/configure.h.cmake diff --git a/src/Plugins/TgaImporter/Test/file.tga b/src/MagnumPlugins/TgaImporter/Test/file.tga similarity index 100% rename from src/Plugins/TgaImporter/Test/file.tga rename to src/MagnumPlugins/TgaImporter/Test/file.tga diff --git a/src/Plugins/TgaImporter/TgaHeader.h b/src/MagnumPlugins/TgaImporter/TgaHeader.h similarity index 100% rename from src/Plugins/TgaImporter/TgaHeader.h rename to src/MagnumPlugins/TgaImporter/TgaHeader.h diff --git a/src/Plugins/TgaImporter/TgaImporter.conf b/src/MagnumPlugins/TgaImporter/TgaImporter.conf similarity index 100% rename from src/Plugins/TgaImporter/TgaImporter.conf rename to src/MagnumPlugins/TgaImporter/TgaImporter.conf diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp similarity index 100% rename from src/Plugins/TgaImporter/TgaImporter.cpp rename to src/MagnumPlugins/TgaImporter/TgaImporter.cpp diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h similarity index 100% rename from src/Plugins/TgaImporter/TgaImporter.h rename to src/MagnumPlugins/TgaImporter/TgaImporter.h diff --git a/src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp b/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp similarity index 100% rename from src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp rename to src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp diff --git a/src/Plugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt similarity index 100% rename from src/Plugins/WavAudioImporter/CMakeLists.txt rename to src/MagnumPlugins/WavAudioImporter/CMakeLists.txt diff --git a/src/Plugins/WavAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt similarity index 100% rename from src/Plugins/WavAudioImporter/Test/CMakeLists.txt rename to src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt diff --git a/src/Plugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp similarity index 100% rename from src/Plugins/WavAudioImporter/Test/WavImporterTest.cpp rename to src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp diff --git a/src/Plugins/WavAudioImporter/Test/configure.h.cmake b/src/MagnumPlugins/WavAudioImporter/Test/configure.h.cmake similarity index 100% rename from src/Plugins/WavAudioImporter/Test/configure.h.cmake rename to src/MagnumPlugins/WavAudioImporter/Test/configure.h.cmake diff --git a/src/Plugins/WavAudioImporter/Test/mono16.wav b/src/MagnumPlugins/WavAudioImporter/Test/mono16.wav similarity index 100% rename from src/Plugins/WavAudioImporter/Test/mono16.wav rename to src/MagnumPlugins/WavAudioImporter/Test/mono16.wav diff --git a/src/Plugins/WavAudioImporter/Test/stereo8.wav b/src/MagnumPlugins/WavAudioImporter/Test/stereo8.wav similarity index 100% rename from src/Plugins/WavAudioImporter/Test/stereo8.wav rename to src/MagnumPlugins/WavAudioImporter/Test/stereo8.wav diff --git a/src/Plugins/WavAudioImporter/Test/unsupportedChannelCount.wav b/src/MagnumPlugins/WavAudioImporter/Test/unsupportedChannelCount.wav similarity index 100% rename from src/Plugins/WavAudioImporter/Test/unsupportedChannelCount.wav rename to src/MagnumPlugins/WavAudioImporter/Test/unsupportedChannelCount.wav diff --git a/src/Plugins/WavAudioImporter/Test/unsupportedFormat.wav b/src/MagnumPlugins/WavAudioImporter/Test/unsupportedFormat.wav similarity index 100% rename from src/Plugins/WavAudioImporter/Test/unsupportedFormat.wav rename to src/MagnumPlugins/WavAudioImporter/Test/unsupportedFormat.wav diff --git a/src/Plugins/WavAudioImporter/Test/wrongSignature.wav b/src/MagnumPlugins/WavAudioImporter/Test/wrongSignature.wav similarity index 100% rename from src/Plugins/WavAudioImporter/Test/wrongSignature.wav rename to src/MagnumPlugins/WavAudioImporter/Test/wrongSignature.wav diff --git a/src/Plugins/WavAudioImporter/WavAudioImporter.conf b/src/MagnumPlugins/WavAudioImporter/WavAudioImporter.conf similarity index 100% rename from src/Plugins/WavAudioImporter/WavAudioImporter.conf rename to src/MagnumPlugins/WavAudioImporter/WavAudioImporter.conf diff --git a/src/Plugins/WavAudioImporter/WavHeader.h b/src/MagnumPlugins/WavAudioImporter/WavHeader.h similarity index 100% rename from src/Plugins/WavAudioImporter/WavHeader.h rename to src/MagnumPlugins/WavAudioImporter/WavHeader.h diff --git a/src/Plugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp similarity index 100% rename from src/Plugins/WavAudioImporter/WavImporter.cpp rename to src/MagnumPlugins/WavAudioImporter/WavImporter.cpp diff --git a/src/Plugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h similarity index 100% rename from src/Plugins/WavAudioImporter/WavImporter.h rename to src/MagnumPlugins/WavAudioImporter/WavImporter.h diff --git a/src/Plugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp b/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp similarity index 100% rename from src/Plugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp rename to src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp From 05b620dd090c42e6134ebdccf8de649271f2f923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 18:05:54 +0100 Subject: [PATCH 50/79] Making includes absolute, part 2: make it compile again. Added new root CMakeLists.txt file, the old include paths are used only if MAGNUM_BUILD_DEPRECATED is set, thus it can now compile and install only if deprecated build is enabled. --- CMakeLists.txt | 4 +- src/CMakeLists.txt | 58 +++++++++++++++++++ src/Magnum/CMakeLists.txt | 27 --------- src/MagnumExternal/OpenGL/GL/CMakeLists.txt | 2 +- .../OpenGL/GLES2/CMakeLists.txt | 2 +- .../OpenGL/GLES3/CMakeLists.txt | 2 +- src/MagnumExternal/OpenGL/KHR/CMakeLists.txt | 2 +- src/MagnumExternal/Optional/CMakeLists.txt | 2 +- src/MagnumPlugins/CMakeLists.txt | 2 - 9 files changed, 65 insertions(+), 36 deletions(-) create mode 100644 src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index bc0db64a9..32cd0218a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,8 +156,8 @@ set(MAGNUM_PLUGINS_AUDIOIMPORTER_INSTALL_DIR ${MAGNUM_PLUGINS_INSTALL_DIR}/audio set(MAGNUM_DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/magnum) set(MAGNUM_CMAKE_FIND_MODULE_INSTALL_DIR ${CMAKE_ROOT}/Modules) set(MAGNUM_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/Magnum) -set(MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/Magnum/Plugins) +set(MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/MagnumExternal) +set(MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/MagnumPlugins) -add_subdirectory(external) add_subdirectory(modules) add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..3f51b4a48 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,58 @@ +# +# This file is part of Magnum. +# +# Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +# Disable `-pedantic` for GCC 4.6, as the compiler doesn't like +# list-initialization of array of classes (RectangularMatrix constructors). It +# is perfectly legal C++11 and both GCC 4.7 and Clang accept it without notice. +if(CORRADE_GCC46_COMPATIBILITY) + string(REPLACE "-pedantic" "" CORRADE_CXX_FLAGS "${CORRADE_CXX_FLAGS}") +endif() + +# On 4.8.2 strict aliasing causes failure of DebugToolsCylinderRendererTest +# without any warning, only in release build, any attempt to add debug print +# results in issue disappearing. Not an issue on Clang or GCC < 4.8. +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.8.0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +endif() + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CORRADE_CXX_FLAGS}") + +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CORRADE_INCLUDE_DIR}) + +# We can use both implicit include path (GLES2/gl2.h) where our headers can +# be overriden with system ones or explicit (MagnumExternal/OpenGL/GLES2/gl2ext.h) +# where only our headers will be used +include_directories(${CMAKE_SOURCE_DIR}/src/MagnumExternal/OpenGL) + +if(MAGNUM_BUILD_DEPRECATED) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/Magnum + ${CMAKE_CURRENT_BINARY_DIR}/Magnum + ${CMAKE_CURRENT_SOURCE_DIR}/MagnumPlugins + ${CMAKE_CURRENT_SOURCE_DIR}/MagnumExternal) +endif() + +add_subdirectory(MagnumExternal) +add_subdirectory(Magnum) +add_subdirectory(MagnumPlugins) diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index 1e41aaa82..fdb6d5d5d 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -22,32 +22,6 @@ # DEALINGS IN THE SOFTWARE. # -# Disable `-pedantic` for GCC 4.6, as the compiler doesn't like -# list-initialization of array of classes (RectangularMatrix constructors). It -# is perfectly legal C++11 and both GCC 4.7 and Clang accept it without notice. -if(CORRADE_GCC46_COMPATIBILITY) - string(REPLACE "-pedantic" "" CORRADE_CXX_FLAGS "${CORRADE_CXX_FLAGS}") -endif() - -# On 4.8.2 strict aliasing causes failure of DebugToolsCylinderRendererTest -# without any warning, only in release build, any attempt to add debug print -# results in issue disappearing. Not an issue on Clang or GCC < 4.8. -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.8.0") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") -endif() - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CORRADE_CXX_FLAGS}") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CORRADE_INCLUDE_DIR} - - # We can use both implicit include path (GLES2/gl2.h) where our headers can - # be overriden with system ones or explicit (OpenGL/GLES2/gl2ext.h) where - # only our headers will be used - ${CMAKE_SOURCE_DIR}/external - ${CMAKE_SOURCE_DIR}/external/OpenGL) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumConfigure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h) @@ -212,7 +186,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h DESTINATION ${MAGNUM add_subdirectory(Math) add_subdirectory(Platform) -add_subdirectory(Plugins) add_subdirectory(Trade) if(WITH_AUDIO) diff --git a/src/MagnumExternal/OpenGL/GL/CMakeLists.txt b/src/MagnumExternal/OpenGL/GL/CMakeLists.txt index c8048349e..33f3113a3 100644 --- a/src/MagnumExternal/OpenGL/GL/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/GL/CMakeLists.txt @@ -30,4 +30,4 @@ else() set_target_properties(MagnumGLLoadGenObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -DGLLoadGen_EXPORTS") endif() -install(FILES gl_magnum.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/OpenGL/GL) +install(FILES gl_magnum.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GL) diff --git a/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt index 2a1a501ca..adfe3f038 100644 --- a/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt @@ -33,4 +33,4 @@ if(TARGET_GLES2 AND NOT CORRADE_TARGET_NACL) gl2.h) endif() -install(FILES ${MagnumOpenGL_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/OpenGL/GLES2) +install(FILES ${MagnumOpenGL_HEADERS} DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES2) diff --git a/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt index 6699d72ba..14e62289b 100644 --- a/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt @@ -22,4 +22,4 @@ # DEALINGS IN THE SOFTWARE. # -install(FILES gl3.h gl3platform.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/OpenGL/GLES3) +install(FILES gl3.h gl3platform.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES3) diff --git a/src/MagnumExternal/OpenGL/KHR/CMakeLists.txt b/src/MagnumExternal/OpenGL/KHR/CMakeLists.txt index e8e737ceb..ba8222611 100644 --- a/src/MagnumExternal/OpenGL/KHR/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/KHR/CMakeLists.txt @@ -24,5 +24,5 @@ # NaCl has its own gl2.h, this one causes linker issues if(NOT CORRADE_TARGET_NACL) - install(FILES khrplatform.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/OpenGL/KHR) + install(FILES khrplatform.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/KHR) endif() diff --git a/src/MagnumExternal/Optional/CMakeLists.txt b/src/MagnumExternal/Optional/CMakeLists.txt index 46923f333..9a0576e57 100644 --- a/src/MagnumExternal/Optional/CMakeLists.txt +++ b/src/MagnumExternal/Optional/CMakeLists.txt @@ -22,4 +22,4 @@ # DEALINGS IN THE SOFTWARE. # -install(FILES optional.hpp DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Optional) +install(FILES optional.hpp DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/Optional) diff --git a/src/MagnumPlugins/CMakeLists.txt b/src/MagnumPlugins/CMakeLists.txt index f7324492d..dd4f4b9fa 100644 --- a/src/MagnumPlugins/CMakeLists.txt +++ b/src/MagnumPlugins/CMakeLists.txt @@ -22,8 +22,6 @@ # DEALINGS IN THE SOFTWARE. # -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - # Wrapper for creating given plugin type macro(add_plugin) if(NOT BUILD_STATIC) From 2b2ad572807d9b8a0e337983a30dedaac2b97968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jan 2014 18:07:54 +0100 Subject: [PATCH 51/79] Making includes absolute, part 3: updated FindMagnum.cmake. If MAGNUM_BUILD_DEPRECATED is defined, it behaves the same as previously, although you may need to recreate your build dir. --- doc/cmake.dox | 6 +++++- modules/FindMagnum.cmake | 31 +++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/doc/cmake.dox b/doc/cmake.dox index 7ce68f46e..0624e07d2 100644 --- a/doc/cmake.dox +++ b/doc/cmake.dox @@ -47,7 +47,6 @@ variables: (e.g. set it to `.` when deploying on Windows with plugins stored relatively to the executable), the following `MAGNUM_PLUGINS_*_DIR` variables depend on it. -- `MAGNUM_PLUGINS_INCLUDE_DIR` -- Include dir with plugins - `MAGNUM_PLUGINS_FONT_DIR` -- Directory with font plugins - `MAGNUM_PLUGINS_FONTCONVERTER_DIR` -- Directory with font converter plugins - `MAGNUM_PLUGINS_IMAGECONVERTER_DIR` -- Directory with image converter @@ -135,6 +134,11 @@ are also available as preprocessor variables if including Magnum.h: - `MAGNUM_TARGET_DESKTOP_GLES` -- Defined if compiled with OpenGL ES emulation on desktop OpenGL +If `MAGNUM_BUILD_DEPRECATED` is defined, the `MAGNUM_INCLUDE_DIR` variable also +contains path directly to Magnum directory (i.e. for includes without `Magnum/` +prefix) and `MAGNUM_PLUGINS_INCLUDE_DIR` contains include dir for plugins (i.e. +instead of `MagnumPlugins/` prefix). + %Corrade library provides also its own set of CMake macros and variables, see @ref corrade-cmake "its documentation" for more information. @ref cmake-plugins "Plugins repository" and @ref cmake-integration "Integration library" diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 4991b5758..63e62714c 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -7,7 +7,6 @@ # MAGNUM_LIBRARIES - Magnum library and dependent libraries # MAGNUM_INCLUDE_DIRS - Root include dir and include dirs of # dependencies -# MAGNUM_PLUGINS_INCLUDE_DIR - Include dir with plugins # MAGNUM_PLUGINS_DIR - Base directory with plugins. You can modify # it (e.g. set it to `.` when deploying on Windows with plugins stored # relatively to the executable), the following MAGNUM_PLUGINS_*_DIR @@ -68,6 +67,11 @@ # MAGNUM_TARGET_DESKTOP_GLES - Defined if compiled with OpenGL ES # emulation on desktop OpenGL # +# If `MAGNUM_BUILD_DEPRECATED` is defined, the `MAGNUM_INCLUDE_DIR` variable +# also contains path directly to Magnum directory (i.e. for includes without +# `Magnum/` prefix) and `MAGNUM_PLUGINS_INCLUDE_DIR` contains include dir for +# plugins (i.e. instead of `MagnumPlugins/` prefix). +# # Additionally these variables are defined for internal usage: # MAGNUM_INCLUDE_DIR - Root include dir (w/o # dependencies) @@ -126,11 +130,10 @@ find_library(MAGNUM_LIBRARY Magnum) # Root include dir find_path(MAGNUM_INCLUDE_DIR - NAMES Magnum.h - PATH_SUFFIXES Magnum) + NAMES Magnum/Magnum.h) # Configuration -file(READ ${MAGNUM_INCLUDE_DIR}/magnumConfigure.h _magnumConfigure) +file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/magnumConfigure.h _magnumConfigure) string(FIND "${_magnumConfigure}" "#define MAGNUM_BUILD_DEPRECATED" _BUILD_DEPRECATED) if(NOT _BUILD_DEPRECATED EQUAL -1) @@ -208,7 +211,7 @@ foreach(component ${Magnum_FIND_COMPONENTS}) # Set plugin defaults, find the plugin if(_MAGNUM_${_COMPONENT}_IS_PLUGIN) - set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX Plugins/${component}) + set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX MagnumPlugins/${component}) # Don't override the one for *AudioImporter plugins if(NOT _MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES) @@ -226,7 +229,7 @@ foreach(component ${Magnum_FIND_COMPONENTS}) # Set library defaults, find the library else() - set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX ${component}) + set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX Magnum/${component}) set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES ${component}.h) find_library(MAGNUM_${_COMPONENT}_LIBRARY Magnum${component}) @@ -234,7 +237,7 @@ foreach(component ${Magnum_FIND_COMPONENTS}) # Applications if(${component} MATCHES .+Application) - set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX Platform) + set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX Magnum/Platform) # GLUT application dependencies if(${component} STREQUAL GlutApplication) @@ -354,7 +357,7 @@ find_package_handle_standard_args(Magnum # Dependent libraries and includes set(MAGNUM_INCLUDE_DIRS ${MAGNUM_INCLUDE_DIR} - ${MAGNUM_INCLUDE_DIR}/OpenGL + ${MAGNUM_INCLUDE_DIR}/MagnumExternal/OpenGL ${CORRADE_INCLUDE_DIR}) set(MAGNUM_LIBRARIES ${MAGNUM_LIBRARY} ${CORRADE_UTILITY_LIBRARIES} @@ -376,7 +379,7 @@ set(MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR ${MAGNUM_PLUGINS_INSTALL_DIR}/importers) set(MAGNUM_PLUGINS_AUDIOIMPORTER_INSTALL_DIR ${MAGNUM_PLUGINS_INSTALL_DIR}/audioimporters) set(MAGNUM_CMAKE_FIND_MODULE_INSTALL_DIR ${CMAKE_ROOT}/Modules) set(MAGNUM_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/Magnum) -set(MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/Magnum/Plugins) +set(MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/MagnumPlugins) mark_as_advanced(FORCE MAGNUM_LIBRARY MAGNUM_INCLUDE_DIR @@ -391,11 +394,19 @@ mark_as_advanced(FORCE MAGNUM_INCLUDE_INSTALL_DIR MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR) +# Add Magnum dir to include path and create MAGNUM_PLUGINS_INCLUDE_DIR if this +# is deprecated build +if(MAGNUM_BUILD_DEPRECATED) + set(MAGNUM_INCLUDE_DIRS ${MAGNUM_INCLUDE_DIRS} + ${MAGNUM_INCLUDE_DIR}/Magnum + ${MAGNUM_INCLUDE_DIR}/MagnumExternal) + set(MAGNUM_PLUGINS_INCLUDE_DIR ${MAGNUM_INCLUDE_DIR}/MagnumPlugins) +endif() + set(MAGNUM_PLUGINS_DIR ${MAGNUM_PLUGINS_INSTALL_DIR} CACHE PATH "Base directory where to look for Magnum plugins") # Plugin directories -set(MAGNUM_PLUGINS_INCLUDE_DIR ${MAGNUM_INCLUDE_DIR}/Plugins) set(MAGNUM_PLUGINS_FONT_DIR ${MAGNUM_PLUGINS_DIR}/fonts) set(MAGNUM_PLUGINS_FONTCONVERTER_DIR ${MAGNUM_PLUGINS_DIR}/fontconverters) set(MAGNUM_PLUGINS_IMAGECONVERTER_DIR ${MAGNUM_PLUGINS_DIR}/imageconverters) From be3f3664febb6fb7ef5c976c0c8c8af06242c33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 16:48:36 +0100 Subject: [PATCH 52/79] modules: updated FindCorrade.cmake. --- modules/FindCorrade.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index efbfcebab..9b102d8da 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -158,7 +158,7 @@ if(NOT CORRADE_FOUND) endif() # Configuration -file(READ ${CORRADE_INCLUDE_DIR}/Corrade/corradeConfigure.h _corradeConfigure) +file(READ ${CORRADE_INCLUDE_DIR}/Corrade/configure.h _corradeConfigure) # Compatibility? string(FIND "${_corradeConfigure}" "#define CORRADE_GCC47_COMPATIBILITY" _GCC47_COMPATIBILITY) From 8c2291aa496a3e8e7e73bd14da5dc6951cc186b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 16:51:45 +0100 Subject: [PATCH 53/79] Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames. --- src/Magnum/AbstractFramebuffer.h | 2 +- src/Magnum/AbstractImage.cpp | 2 +- src/Magnum/AbstractObject.cpp | 2 +- src/Magnum/AbstractShaderProgram.h | 2 +- src/Magnum/Audio/AbstractImporter.cpp | 6 +++--- src/Magnum/Audio/AbstractImporter.h | 2 +- src/Magnum/Audio/Buffer.cpp | 2 +- src/Magnum/Audio/Buffer.h | 2 +- src/Magnum/Audio/Context.cpp | 4 ++-- src/Magnum/Audio/Renderer.cpp | 2 +- src/Magnum/Audio/Source.cpp | 2 +- src/Magnum/Audio/Test/AbstractImporterTest.cpp | 6 +++--- src/Magnum/Audio/Test/BufferTest.cpp | 2 +- src/Magnum/Audio/Test/RendererTest.cpp | 2 +- src/Magnum/Audio/Test/SourceTest.cpp | 2 +- src/Magnum/Audio/magnumAudioVisibility.h | 2 +- src/Magnum/Buffer.cpp | 2 +- src/Magnum/Buffer.h | 6 +++--- src/Magnum/ColorFormat.cpp | 2 +- src/Magnum/Context.cpp | 4 ++-- src/Magnum/Context.h | 2 +- src/Magnum/DebugMessage.cpp | 2 +- .../DebugTools/Implementation/AbstractBoxRenderer.h | 2 -- .../DebugTools/Implementation/AxisAlignedBoxRenderer.h | 5 ++--- src/Magnum/DebugTools/Implementation/BoxRenderer.h | 5 ++--- src/Magnum/DebugTools/Implementation/CapsuleRenderer.h | 5 ++--- src/Magnum/DebugTools/Implementation/CylinderRenderer.h | 5 ++--- .../DebugTools/Implementation/LineSegmentRenderer.h | 5 ++--- src/Magnum/DebugTools/Implementation/PointRenderer.h | 5 ++--- src/Magnum/DebugTools/Implementation/SphereRenderer.h | 5 ++--- src/Magnum/DebugTools/Profiler.cpp | 2 +- src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp | 2 +- src/Magnum/DebugTools/Test/CylinderRendererTest.cpp | 2 +- src/Magnum/DebugTools/Test/ForceRendererTest.cpp | 2 +- src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp | 2 +- src/Magnum/DebugTools/magnumDebugToolsVisibility.h | 2 +- src/Magnum/DefaultFramebuffer.cpp | 2 +- src/Magnum/Implementation/BufferState.cpp | 2 +- src/Magnum/Magnum.h | 4 ++-- src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp | 2 +- src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp | 2 +- src/Magnum/Math/Algorithms/Test/SvdTest.cpp | 2 +- src/Magnum/Math/Angle.h | 4 ++-- src/Magnum/Math/BoolVector.h | 4 ++-- src/Magnum/Math/Complex.h | 4 ++-- src/Magnum/Math/Dual.h | 2 +- src/Magnum/Math/Geometry/Rectangle.h | 2 +- src/Magnum/Math/Geometry/Test/DistanceTest.cpp | 2 +- src/Magnum/Math/Geometry/Test/IntersectionTest.cpp | 2 +- src/Magnum/Math/Math.h | 2 +- src/Magnum/Math/Quaternion.h | 4 ++-- src/Magnum/Math/Test/AngleTest.cpp | 2 +- src/Magnum/Math/Test/BoolVectorTest.cpp | 2 +- src/Magnum/Math/Test/ComplexTest.cpp | 2 +- src/Magnum/Math/Test/ConstantsTest.cpp | 2 +- src/Magnum/Math/Test/DualComplexTest.cpp | 2 +- src/Magnum/Math/Test/DualQuaternionTest.cpp | 2 +- src/Magnum/Math/Test/DualTest.cpp | 2 +- src/Magnum/Math/Test/FunctionsTest.cpp | 2 +- src/Magnum/Math/Test/Matrix3Test.cpp | 4 ++-- src/Magnum/Math/Test/Matrix4Test.cpp | 4 ++-- src/Magnum/Math/Test/MatrixTest.cpp | 4 ++-- src/Magnum/Math/Test/QuaternionTest.cpp | 2 +- src/Magnum/Math/Test/RangeTest.cpp | 4 ++-- src/Magnum/Math/Test/RectangularMatrixTest.cpp | 4 ++-- src/Magnum/Math/Test/SwizzleTest.cpp | 2 +- src/Magnum/Math/Test/TypeTraitsTest.cpp | 2 +- src/Magnum/Math/Test/UnitTest.cpp | 2 +- src/Magnum/Math/Test/Vector2Test.cpp | 4 ++-- src/Magnum/Math/Test/Vector3Test.cpp | 4 ++-- src/Magnum/Math/Test/Vector4Test.cpp | 4 ++-- src/Magnum/Math/Test/VectorTest.cpp | 4 ++-- src/Magnum/Math/Vector.h | 6 +++--- src/Magnum/Mesh.cpp | 2 +- src/Magnum/Mesh.h | 2 +- src/Magnum/MeshTools/CompressIndices.cpp | 2 +- src/Magnum/MeshTools/RemoveDuplicates.h | 2 +- src/Magnum/MeshTools/Subdivide.h | 2 +- src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp | 2 +- src/Magnum/MeshTools/Test/CompressIndicesTest.cpp | 6 +++--- src/Magnum/MeshTools/Test/DuplicateTest.cpp | 2 +- src/Magnum/MeshTools/Test/FlipNormalsTest.cpp | 2 +- src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp | 2 +- src/Magnum/MeshTools/Test/InterleaveTest.cpp | 6 +++--- src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp | 2 +- src/Magnum/MeshTools/Test/SubdivideTest.cpp | 2 +- src/Magnum/MeshTools/Test/TipsifyTest.cpp | 2 +- src/Magnum/MeshTools/Test/TransformTest.cpp | 2 +- src/Magnum/MeshTools/magnumMeshToolsVisibility.h | 2 +- src/Magnum/OpenGL.h | 3 ++- src/Magnum/Platform/AbstractXApplication.cpp | 2 +- src/Magnum/Platform/AbstractXApplication.h | 5 ++--- src/Magnum/Platform/Implementation/EglContextHandler.cpp | 2 +- src/Magnum/Platform/Implementation/EglContextHandler.h | 5 ++--- src/Magnum/Platform/Implementation/GlxContextHandler.cpp | 2 +- src/Magnum/Platform/Implementation/GlxContextHandler.h | 4 ++-- src/Magnum/Platform/NaClApplication.cpp | 2 +- src/Magnum/Platform/NaClApplication.h | 5 ++--- src/Magnum/Platform/Screen.h | 2 +- src/Magnum/Platform/ScreenedApplication.h | 4 ++-- src/Magnum/Platform/Sdl2Application.h | 6 +++--- src/Magnum/Platform/WindowlessGlxApplication.cpp | 4 ++-- src/Magnum/Platform/WindowlessNaClApplication.cpp | 4 ++-- src/Magnum/Platform/WindowlessNaClApplication.h | 5 ++--- src/Magnum/Platform/magnum-info.cpp | 8 ++++---- src/Magnum/Primitives/Cylinder.h | 2 +- src/Magnum/Primitives/Test/CapsuleTest.cpp | 4 ++-- src/Magnum/Primitives/Test/CircleTest.cpp | 2 +- src/Magnum/Primitives/Test/CylinderTest.cpp | 4 ++-- src/Magnum/Primitives/Test/IcosphereTest.cpp | 2 +- src/Magnum/Primitives/Test/UVSphereTest.cpp | 4 ++-- src/Magnum/Primitives/magnumPrimitivesVisibility.h | 2 +- src/Magnum/Query.cpp | 2 +- src/Magnum/Query.h | 2 +- src/Magnum/Renderer.h | 2 +- src/Magnum/Resource.h | 4 ++-- src/Magnum/Sampler.cpp | 2 +- src/Magnum/SceneGraph/AbstractFeature.h | 4 ++-- src/Magnum/SceneGraph/AbstractObject.h | 2 +- src/Magnum/SceneGraph/FeatureGroup.h | 2 +- src/Magnum/SceneGraph/Object.h | 2 +- src/Magnum/SceneGraph/SceneGraph.h | 4 ++-- src/Magnum/SceneGraph/Test/AnimableTest.cpp | 2 +- src/Magnum/SceneGraph/Test/CameraTest.cpp | 2 +- .../SceneGraph/Test/DualComplexTransformationTest.cpp | 2 +- .../SceneGraph/Test/DualQuaternionTransformationTest.cpp | 2 +- src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp | 2 +- src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp | 2 +- src/Magnum/SceneGraph/Test/ObjectTest.cpp | 2 +- .../SceneGraph/Test/RigidMatrixTransformation2DTest.cpp | 2 +- .../SceneGraph/Test/RigidMatrixTransformation3DTest.cpp | 2 +- src/Magnum/SceneGraph/Test/SceneTest.cpp | 2 +- .../SceneGraph/Test/TranslationTransformationTest.cpp | 2 +- src/Magnum/SceneGraph/magnumSceneGraphVisibility.h | 2 +- src/Magnum/Shader.cpp | 6 +++--- src/Magnum/Shaders/DistanceFieldVector.cpp | 2 +- src/Magnum/Shaders/Flat.cpp | 2 +- src/Magnum/Shaders/MeshVisualizer.cpp | 2 +- src/Magnum/Shaders/Phong.cpp | 2 +- src/Magnum/Shaders/Vector.cpp | 2 +- src/Magnum/Shaders/VertexColor.cpp | 2 +- src/Magnum/Shaders/magnumShadersResourceImport.hpp | 4 ++-- src/Magnum/Shaders/magnumShadersVisibility.h | 2 +- src/Magnum/Shapes/AbstractShape.cpp | 2 +- src/Magnum/Shapes/Composition.cpp | 2 +- src/Magnum/Shapes/Composition.h | 4 ++-- src/Magnum/Shapes/Test/BoxTest.cpp | 2 +- src/Magnum/Shapes/Test/CollisionTest.cpp | 2 +- src/Magnum/Shapes/Test/CompositionTest.cpp | 2 -- src/Magnum/Shapes/Test/LineTest.cpp | 2 +- src/Magnum/Shapes/Test/PointTest.cpp | 2 +- src/Magnum/Shapes/Test/ShapeImplementationTest.cpp | 2 +- src/Magnum/Shapes/Test/ShapeTest.cpp | 2 +- src/Magnum/Shapes/Test/ShapeTestBase.h | 2 +- src/Magnum/Shapes/magnumShapesVisibility.h | 2 +- src/Magnum/Shapes/shapeImplementation.cpp | 2 +- src/Magnum/Shapes/shapeImplementation.h | 4 ++-- src/Magnum/Test/AbstractImageTest.cpp | 2 +- src/Magnum/Test/AbstractOpenGLTester.h | 4 ++-- src/Magnum/Test/AbstractShaderProgramGLTest.cpp | 2 +- src/Magnum/Test/AbstractShaderProgramTest.cpp | 2 +- src/Magnum/Test/ArrayTest.cpp | 2 +- src/Magnum/Test/BufferGLTest.cpp | 2 +- src/Magnum/Test/BufferImageGLTest.cpp | 2 +- src/Magnum/Test/BufferTextureGLTest.cpp | 2 +- src/Magnum/Test/ColorTest.cpp | 4 ++-- src/Magnum/Test/CubeMapTextureArrayGLTest.cpp | 2 +- src/Magnum/Test/CubeMapTextureGLTest.cpp | 2 +- src/Magnum/Test/DebugMessageTest.cpp | 2 +- src/Magnum/Test/DefaultFramebufferTest.cpp | 2 +- src/Magnum/Test/FramebufferTest.cpp | 2 +- src/Magnum/Test/ImageReferenceTest.cpp | 2 +- src/Magnum/Test/ImageTest.cpp | 2 +- src/Magnum/Test/MeshTest.cpp | 4 ++-- src/Magnum/Test/PrimitiveQueryGLTest.cpp | 4 ++-- src/Magnum/Test/RendererTest.cpp | 2 +- src/Magnum/Test/ResourceManagerTest.cpp | 5 ++--- src/Magnum/Test/SampleQueryGLTest.cpp | 4 ++-- src/Magnum/Test/SamplerTest.cpp | 2 +- src/Magnum/Test/ShaderGLTest.cpp | 2 +- src/Magnum/Test/ShaderTest.cpp | 2 +- src/Magnum/Test/TextureGLTest.cpp | 2 +- src/Magnum/Test/VersionTest.cpp | 2 +- src/Magnum/Text/AbstractFont.cpp | 6 +++--- src/Magnum/Text/AbstractFont.h | 2 +- src/Magnum/Text/AbstractFontConverter.cpp | 8 ++++---- src/Magnum/Text/AbstractFontConverter.h | 2 +- src/Magnum/Text/Test/AbstractFontConverterTest.cpp | 8 ++++---- src/Magnum/Text/Test/AbstractFontTest.cpp | 6 +++--- src/Magnum/Text/Test/AbstractLayouterTest.cpp | 2 +- src/Magnum/Text/fontconverter.cpp | 6 +++--- src/Magnum/Text/magnumTextVisibility.h | 2 +- src/Magnum/TextureTools/DistanceField.cpp | 2 +- src/Magnum/TextureTools/Test/AtlasTest.cpp | 2 +- src/Magnum/TextureTools/distancefieldconverter.cpp | 4 ++-- .../TextureTools/magnumTextureToolsResourceImport.hpp | 4 ++-- src/Magnum/TextureTools/magnumTextureToolsVisibility.h | 2 +- src/Magnum/Timeline.cpp | 4 ++-- src/Magnum/Trade/AbstractImageConverter.cpp | 6 +++--- src/Magnum/Trade/AbstractImageConverter.h | 2 +- src/Magnum/Trade/AbstractImporter.cpp | 6 +++--- src/Magnum/Trade/AbstractImporter.h | 4 ++-- src/Magnum/Trade/AbstractMaterialData.cpp | 2 +- src/Magnum/Trade/Test/AbstractImageConverterTest.cpp | 8 ++++---- src/Magnum/Trade/Test/AbstractImporterTest.cpp | 6 +++--- src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp | 2 +- src/Magnum/Trade/Test/ImageDataTest.cpp | 2 +- src/Magnum/Trade/Test/ObjectData2DTest.cpp | 2 +- src/Magnum/Trade/Test/ObjectData3DTest.cpp | 2 +- src/Magnum/Trade/Test/TextureDataTest.cpp | 2 +- src/Magnum/Version.cpp | 2 +- src/Magnum/magnumVisibility.h | 2 +- src/MagnumPlugins/MagnumFont/MagnumFont.cpp | 6 +++--- src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp | 2 +- .../MagnumFontConverter/MagnumFontConverter.cpp | 4 ++-- .../Test/MagnumFontConverterGLTest.cpp | 4 ++-- .../TgaImageConverter/Test/TgaImageConverterTest.cpp | 6 +++--- src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp | 4 ++-- src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp | 6 +++--- src/MagnumPlugins/TgaImporter/TgaImporter.cpp | 4 ++-- src/MagnumPlugins/TgaImporter/TgaImporter.h | 2 +- .../WavAudioImporter/Test/WavImporterTest.cpp | 6 +++--- src/MagnumPlugins/WavAudioImporter/WavImporter.cpp | 6 +++--- src/MagnumPlugins/WavAudioImporter/WavImporter.h | 3 +-- 224 files changed, 327 insertions(+), 343 deletions(-) diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h index 98af54200..4167a3aa0 100644 --- a/src/Magnum/AbstractFramebuffer.h +++ b/src/Magnum/AbstractFramebuffer.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::AbstractFramebuffer, enum @ref Magnum::FramebufferClear, @ref Magnum::FramebufferBlit, @ref Magnum::FramebufferBlitFilter, @ref Magnum::FramebufferTarget, enum set @ref Magnum::FramebufferClearMask */ -#include +#include #include "Math/Range.h" #include "Magnum.h" diff --git a/src/Magnum/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp index fa6f7d599..c6c3adf29 100644 --- a/src/Magnum/AbstractImage.cpp +++ b/src/Magnum/AbstractImage.cpp @@ -24,7 +24,7 @@ #include "AbstractImage.h" -#include +#include #include "Math/Vector.h" #include "ColorFormat.h" diff --git a/src/Magnum/AbstractObject.cpp b/src/Magnum/AbstractObject.cpp index 74b2df9ba..10eb46795 100644 --- a/src/Magnum/AbstractObject.cpp +++ b/src/Magnum/AbstractObject.cpp @@ -24,7 +24,7 @@ #include "AbstractObject.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index c43710692..62c3092a1 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "AbstractObject.h" #include "Magnum.h" diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp index 8ea19b564..88f1a665d 100644 --- a/src/Magnum/Audio/AbstractImporter.cpp +++ b/src/Magnum/Audio/AbstractImporter.cpp @@ -24,9 +24,9 @@ #include "AbstractImporter.h" -#include -#include -#include +#include +#include +#include namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h index f4ba8b15b..ce02c4f9a 100644 --- a/src/Magnum/Audio/AbstractImporter.h +++ b/src/Magnum/Audio/AbstractImporter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Audio::AbstractImporter */ -#include +#include #include "Magnum.h" #include "Audio/Buffer.h" diff --git a/src/Magnum/Audio/Buffer.cpp b/src/Magnum/Audio/Buffer.cpp index 1a28d95c1..36de21bd9 100644 --- a/src/Magnum/Audio/Buffer.cpp +++ b/src/Magnum/Audio/Buffer.cpp @@ -24,7 +24,7 @@ #include "Buffer.h" -#include +#include namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h index 31774c9e5..1122f561c 100644 --- a/src/Magnum/Audio/Buffer.h +++ b/src/Magnum/Audio/Buffer.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include "Magnum.h" #include "Audio/magnumAudioVisibility.h" diff --git a/src/Magnum/Audio/Context.cpp b/src/Magnum/Audio/Context.cpp index 86af094de..9fdf451cb 100644 --- a/src/Magnum/Audio/Context.cpp +++ b/src/Magnum/Audio/Context.cpp @@ -25,8 +25,8 @@ #include "Context.h" #include -#include -#include +#include +#include #include "Magnum.h" diff --git a/src/Magnum/Audio/Renderer.cpp b/src/Magnum/Audio/Renderer.cpp index 4dbeae53f..5dd492c2c 100644 --- a/src/Magnum/Audio/Renderer.cpp +++ b/src/Magnum/Audio/Renderer.cpp @@ -24,7 +24,7 @@ #include "Renderer.h" -#include +#include namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Source.cpp b/src/Magnum/Audio/Source.cpp index aaa0ab9d4..e5a25acae 100644 --- a/src/Magnum/Audio/Source.cpp +++ b/src/Magnum/Audio/Source.cpp @@ -24,7 +24,7 @@ #include "Source.h" -#include +#include #include "Audio/Buffer.h" diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp index ff479d654..7bd92b9a1 100644 --- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include "Audio/AbstractImporter.h" diff --git a/src/Magnum/Audio/Test/BufferTest.cpp b/src/Magnum/Audio/Test/BufferTest.cpp index 56c6f2ba9..5e4bd63c9 100644 --- a/src/Magnum/Audio/Test/BufferTest.cpp +++ b/src/Magnum/Audio/Test/BufferTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Audio/Buffer.h" diff --git a/src/Magnum/Audio/Test/RendererTest.cpp b/src/Magnum/Audio/Test/RendererTest.cpp index 9be69593d..7751c67ea 100644 --- a/src/Magnum/Audio/Test/RendererTest.cpp +++ b/src/Magnum/Audio/Test/RendererTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Audio/Renderer.h" diff --git a/src/Magnum/Audio/Test/SourceTest.cpp b/src/Magnum/Audio/Test/SourceTest.cpp index 90424ce29..35f658683 100644 --- a/src/Magnum/Audio/Test/SourceTest.cpp +++ b/src/Magnum/Audio/Test/SourceTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Audio/Source.h" diff --git a/src/Magnum/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/magnumAudioVisibility.h index cc4600394..f99a51c24 100644 --- a/src/Magnum/Audio/magnumAudioVisibility.h +++ b/src/Magnum/Audio/magnumAudioVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/Buffer.cpp b/src/Magnum/Buffer.cpp index aaf53b5ca..a453a9e5c 100644 --- a/src/Magnum/Buffer.cpp +++ b/src/Magnum/Buffer.cpp @@ -24,7 +24,7 @@ #include "Buffer.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index 5b0f5dd8a..b03df8373 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -31,9 +31,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "AbstractObject.h" #include "Magnum.h" diff --git a/src/Magnum/ColorFormat.cpp b/src/Magnum/ColorFormat.cpp index 7b3403ec2..d4b493297 100644 --- a/src/Magnum/ColorFormat.cpp +++ b/src/Magnum/ColorFormat.cpp @@ -24,7 +24,7 @@ #include "ColorFormat.h" -#include +#include namespace Magnum { diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index 1306cb5c5..6896c47fb 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "AbstractFramebuffer.h" #include "AbstractShaderProgram.h" diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index e6837c6bb..300f465a6 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "Magnum.h" #include "OpenGL.h" diff --git a/src/Magnum/DebugMessage.cpp b/src/Magnum/DebugMessage.cpp index 763c322de..76ef91f6c 100644 --- a/src/Magnum/DebugMessage.cpp +++ b/src/Magnum/DebugMessage.cpp @@ -24,7 +24,7 @@ #include "DebugMessage.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h index 0996a20f7..d0375677f 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h +++ b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h @@ -29,8 +29,6 @@ #include "Resource.h" #include "Shaders/Shaders.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class AbstractBoxRenderer; diff --git a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h index 999cc4bf1..f1eb9a990 100644 --- a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h +++ b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractBoxRenderer.h" +#include +#include "AbstractBoxRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class AxisAlignedBoxRenderer: public AbstractBoxRenderer { diff --git a/src/Magnum/DebugTools/Implementation/BoxRenderer.h b/src/Magnum/DebugTools/Implementation/BoxRenderer.h index 54b00cfd2..f1a361b6d 100644 --- a/src/Magnum/DebugTools/Implementation/BoxRenderer.h +++ b/src/Magnum/DebugTools/Implementation/BoxRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractBoxRenderer.h" +#include +#include "AbstractBoxRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class BoxRenderer: public AbstractBoxRenderer { diff --git a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h index 5a2553470..a448e821e 100644 --- a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h +++ b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractShapeRenderer.h" +#include +#include "AbstractShapeRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class AbstractCapsuleRenderer; diff --git a/src/Magnum/DebugTools/Implementation/CylinderRenderer.h b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h index d5a511254..c98aa5f51 100644 --- a/src/Magnum/DebugTools/Implementation/CylinderRenderer.h +++ b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractShapeRenderer.h" +#include +#include "AbstractShapeRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class AbstractCylinderRenderer; diff --git a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h index 556db46ec..9e17c0a00 100644 --- a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h +++ b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractShapeRenderer.h" +#include +#include "AbstractShapeRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class LineSegmentRenderer: public AbstractShapeRenderer { diff --git a/src/Magnum/DebugTools/Implementation/PointRenderer.h b/src/Magnum/DebugTools/Implementation/PointRenderer.h index adb88415b..a3adc9f47 100644 --- a/src/Magnum/DebugTools/Implementation/PointRenderer.h +++ b/src/Magnum/DebugTools/Implementation/PointRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractShapeRenderer.h" +#include +#include "AbstractShapeRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class PointRenderer: public AbstractShapeRenderer { diff --git a/src/Magnum/DebugTools/Implementation/SphereRenderer.h b/src/Magnum/DebugTools/Implementation/SphereRenderer.h index 14687a6ee..62f892e10 100644 --- a/src/Magnum/DebugTools/Implementation/SphereRenderer.h +++ b/src/Magnum/DebugTools/Implementation/SphereRenderer.h @@ -24,12 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "AbstractShapeRenderer.h" +#include +#include "AbstractShapeRenderer.h" #include "Shapes/Shapes.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace DebugTools { namespace Implementation { template class AbstractSphereRenderer; diff --git a/src/Magnum/DebugTools/Profiler.cpp b/src/Magnum/DebugTools/Profiler.cpp index 465833b96..2528ee29d 100644 --- a/src/Magnum/DebugTools/Profiler.cpp +++ b/src/Magnum/DebugTools/Profiler.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "Magnum.h" diff --git a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp index 0ec537c9c..65a28d4e3 100644 --- a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "DebugTools/Implementation/CapsuleRendererTransformation.h" diff --git a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp index 9c18c51fa..2b4d94c63 100644 --- a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "DebugTools/Implementation/CylinderRendererTransformation.h" diff --git a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp index d560e8e38..2c440ac49 100644 --- a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "DebugTools/Implementation/ForceRendererTransformation.h" diff --git a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp index c87f992d3..835e4b30f 100644 --- a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Matrix3.h" #include "Math/Matrix4.h" diff --git a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h index 2499c5d24..d3405f72a 100644 --- a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h +++ b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/DefaultFramebuffer.cpp b/src/Magnum/DefaultFramebuffer.cpp index 51193daff..c4b81e1bc 100644 --- a/src/Magnum/DefaultFramebuffer.cpp +++ b/src/Magnum/DefaultFramebuffer.cpp @@ -24,7 +24,7 @@ #include "DefaultFramebuffer.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Implementation/BufferState.cpp b/src/Magnum/Implementation/BufferState.cpp index e844f8991..d34618806 100644 --- a/src/Magnum/Implementation/BufferState.cpp +++ b/src/Magnum/Implementation/BufferState.cpp @@ -24,7 +24,7 @@ #include "BufferState.h" -#include +#include namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 96d5f8e70..611d4dffd 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -28,14 +28,14 @@ * @brief Forward declarations for Magnum namespace */ -#include +#include #include "Math/Math.h" #include "Types.h" #include "magnumConfigure.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp index b20652c18..8148b9608 100644 --- a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Algorithms/GaussJordan.h" diff --git a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp index 494615329..57c070d45 100644 --- a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Algorithms/GramSchmidt.h" diff --git a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp index c46448fc4..b8b995f2b 100644 --- a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Algorithms/Svd.h" diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index 9fa9a4617..e76a02c69 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Math::Deg, Magnum::Math::Rad and related operators. */ -#include -#include +#include +#include #include "Math/Constants.h" #include "Math/Math.h" diff --git a/src/Magnum/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h index 9866ee114..dca661894 100644 --- a/src/Magnum/Math/BoolVector.h +++ b/src/Magnum/Math/BoolVector.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Math::BoolVector */ -#include -#include +#include +#include #include "Types.h" diff --git a/src/Magnum/Math/Complex.h b/src/Magnum/Math/Complex.h index 88f2338f7..6c992a677 100644 --- a/src/Magnum/Math/Complex.h +++ b/src/Magnum/Math/Complex.h @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include #include "Math/Matrix.h" #include "Math/Vector2.h" diff --git a/src/Magnum/Math/Dual.h b/src/Magnum/Math/Dual.h index 5d5e4948a..9cb42afa6 100644 --- a/src/Magnum/Math/Dual.h +++ b/src/Magnum/Math/Dual.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "Math/TypeTraits.h" diff --git a/src/Magnum/Math/Geometry/Rectangle.h b/src/Magnum/Math/Geometry/Rectangle.h index 3a0d66462..bf44dfd7e 100644 --- a/src/Magnum/Math/Geometry/Rectangle.h +++ b/src/Magnum/Math/Geometry/Rectangle.h @@ -32,7 +32,7 @@ #include "Math/Range.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include namespace Magnum { namespace Math { namespace Geometry { diff --git a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp index f60c94931..5d658d4d2 100644 --- a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp +++ b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Constants.h" #include "Math/Geometry/Distance.h" diff --git a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp index db23f96f8..551a5a5f6 100644 --- a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp +++ b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Geometry/Intersection.h" diff --git a/src/Magnum/Math/Math.h b/src/Magnum/Math/Math.h index 27edab373..762af5290 100644 --- a/src/Magnum/Math/Math.h +++ b/src/Magnum/Math/Math.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "Types.h" diff --git a/src/Magnum/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h index 65c3f9408..cfa6454a6 100644 --- a/src/Magnum/Math/Quaternion.h +++ b/src/Magnum/Math/Quaternion.h @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include #include "Math/TypeTraits.h" #include "Math/Matrix.h" diff --git a/src/Magnum/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp index cdc3b3eba..72120aa85 100644 --- a/src/Magnum/Math/Test/AngleTest.cpp +++ b/src/Magnum/Math/Test/AngleTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Angle.h" diff --git a/src/Magnum/Math/Test/BoolVectorTest.cpp b/src/Magnum/Math/Test/BoolVectorTest.cpp index 06b7a42e3..72c2e134d 100644 --- a/src/Magnum/Math/Test/BoolVectorTest.cpp +++ b/src/Magnum/Math/Test/BoolVectorTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/BoolVector.h" diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp index 181f3a780..ff5d176e0 100644 --- a/src/Magnum/Math/Test/ComplexTest.cpp +++ b/src/Magnum/Math/Test/ComplexTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Complex.h" #include "Math/Matrix3.h" diff --git a/src/Magnum/Math/Test/ConstantsTest.cpp b/src/Magnum/Math/Test/ConstantsTest.cpp index 9242453b7..c443b14dc 100644 --- a/src/Magnum/Math/Test/ConstantsTest.cpp +++ b/src/Magnum/Math/Test/ConstantsTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Constants.h" #include "Math/Functions.h" diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp index 6e6c5d554..a01374061 100644 --- a/src/Magnum/Math/Test/DualComplexTest.cpp +++ b/src/Magnum/Math/Test/DualComplexTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/DualComplex.h" #include "Math/DualQuaternion.h" diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp index db7a7e653..27d337256 100644 --- a/src/Magnum/Math/Test/DualQuaternionTest.cpp +++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/DualQuaternion.h" diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index 1bf0c2da7..d5bf78614 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Dual.h" diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp index b2dd56187..a72f897f3 100644 --- a/src/Magnum/Math/Test/FunctionsTest.cpp +++ b/src/Magnum/Math/Test/FunctionsTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Functions.h" #include "Math/Vector3.h" diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp index 255927bfe..39bf78ae1 100644 --- a/src/Magnum/Math/Test/Matrix3Test.cpp +++ b/src/Magnum/Math/Test/Matrix3Test.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Matrix3.h" diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp index d363351fd..0f5eba0b8 100644 --- a/src/Magnum/Math/Test/Matrix4Test.cpp +++ b/src/Magnum/Math/Test/Matrix4Test.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Matrix4.h" diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index d0940bc9a..6e28cb699 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Matrix.h" diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index 1d4413861..8130ccf2f 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Matrix4.h" #include "Math/Quaternion.h" diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index 341d3f8e2..ae54276e8 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Range.h" diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index 689ea1fee..445b4573d 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/RectangularMatrix.h" diff --git a/src/Magnum/Math/Test/SwizzleTest.cpp b/src/Magnum/Math/Test/SwizzleTest.cpp index 19968ca72..476c12dd6 100644 --- a/src/Magnum/Math/Test/SwizzleTest.cpp +++ b/src/Magnum/Math/Test/SwizzleTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Swizzle.h" diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp index dd5d0edad..cc2d1ae4d 100644 --- a/src/Magnum/Math/Test/TypeTraitsTest.cpp +++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/TypeTraits.h" diff --git a/src/Magnum/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp index d1ce67d48..ec8420b0c 100644 --- a/src/Magnum/Math/Test/UnitTest.cpp +++ b/src/Magnum/Math/Test/UnitTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Unit.h" diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp index 69c67c879..6e782bb6d 100644 --- a/src/Magnum/Math/Test/Vector2Test.cpp +++ b/src/Magnum/Math/Test/Vector2Test.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Vector3.h" /* Vector3 used in Vector2::cross() */ diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp index 2611283e4..34c37a4ac 100644 --- a/src/Magnum/Math/Test/Vector3Test.cpp +++ b/src/Magnum/Math/Test/Vector3Test.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Vector3.h" diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp index e5480f870..91b32f8f9 100644 --- a/src/Magnum/Math/Test/Vector4Test.cpp +++ b/src/Magnum/Math/Test/Vector4Test.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Vector4.h" diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index a09684da3..1d8bc01fe 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Math/Vector.h" diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index a8ec1e645..42a00a239 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -30,9 +30,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "Math/Angle.h" #include "Math/BoolVector.h" diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index f8da0e95e..9ea11a1d8 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -24,7 +24,7 @@ #include "Mesh.h" -#include +#include #include "Buffer.h" #include "Context.h" diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 068da10e6..738c52b8b 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "AbstractShaderProgram.h" diff --git a/src/Magnum/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp index ed2886d36..7c726c42f 100644 --- a/src/Magnum/MeshTools/CompressIndices.cpp +++ b/src/Magnum/MeshTools/CompressIndices.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "Math/Functions.h" #include "Buffer.h" diff --git a/src/Magnum/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h index 8b1ac58f2..e1403fd6e 100644 --- a/src/Magnum/MeshTools/RemoveDuplicates.h +++ b/src/Magnum/MeshTools/RemoveDuplicates.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "Math/Functions.h" #include "Magnum.h" diff --git a/src/Magnum/MeshTools/Subdivide.h b/src/Magnum/MeshTools/Subdivide.h index 33b8f8517..a4c78fd15 100644 --- a/src/Magnum/MeshTools/Subdivide.h +++ b/src/Magnum/MeshTools/Subdivide.h @@ -29,7 +29,7 @@ */ #include -#include +#include namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp index cf9cd103b..de139add4 100644 --- a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp +++ b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include "Types.h" #include "MeshTools/CombineIndexedArrays.h" diff --git a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp index 47e4b03cd..49be7308d 100644 --- a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp +++ b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include "MeshTools/CompressIndices.h" diff --git a/src/Magnum/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp index 9fe06065f..14736b9f1 100644 --- a/src/Magnum/MeshTools/Test/DuplicateTest.cpp +++ b/src/Magnum/MeshTools/Test/DuplicateTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "MeshTools/Duplicate.h" #include "Magnum.h" diff --git a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp index fb6106f47..140388963 100644 --- a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Vector3.h" #include "MeshTools/FlipNormals.h" diff --git a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp index 9e3f747d9..4dbd95b94 100644 --- a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Vector3.h" #include "MeshTools/GenerateFlatNormals.h" diff --git a/src/Magnum/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp index 036fe2e8e..4ab6712c9 100644 --- a/src/Magnum/MeshTools/Test/InterleaveTest.cpp +++ b/src/Magnum/MeshTools/Test/InterleaveTest.cpp @@ -23,10 +23,10 @@ */ #include -#include +#include +#include +#include -#include "Utility/Endianness.h" -#include "Utility/Debug.h" #include "MeshTools/Interleave.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp index 2f40c9038..9966be31a 100644 --- a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp +++ b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "MeshTools/RemoveDuplicates.h" diff --git a/src/Magnum/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp index 2114b70c6..bd6afe8fd 100644 --- a/src/Magnum/MeshTools/Test/SubdivideTest.cpp +++ b/src/Magnum/MeshTools/Test/SubdivideTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "MeshTools/RemoveDuplicates.h" #include "MeshTools/Subdivide.h" diff --git a/src/Magnum/MeshTools/Test/TipsifyTest.cpp b/src/Magnum/MeshTools/Test/TipsifyTest.cpp index 61da9fd17..8c0f5b35a 100644 --- a/src/Magnum/MeshTools/Test/TipsifyTest.cpp +++ b/src/Magnum/MeshTools/Test/TipsifyTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Magnum.h" #include "MeshTools/Tipsify.h" diff --git a/src/Magnum/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp index ab0d46a68..5bbc0b8bc 100644 --- a/src/Magnum/MeshTools/Test/TransformTest.cpp +++ b/src/Magnum/MeshTools/Test/TransformTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Matrix3.h" #include "Magnum.h" diff --git a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h index 476d8f3a5..988c8a90e 100644 --- a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h +++ b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/OpenGL.h b/src/Magnum/OpenGL.h index b40af2f11..a2ca1416f 100644 --- a/src/Magnum/OpenGL.h +++ b/src/Magnum/OpenGL.h @@ -28,7 +28,8 @@ * @brief OpenGL headers */ -#include +#include + #include "magnumConfigure.h" /** @todo Remove NaCl workaround when not needed */ diff --git a/src/Magnum/Platform/AbstractXApplication.cpp b/src/Magnum/Platform/AbstractXApplication.cpp index 38d5606f9..26a2c553a 100644 --- a/src/Magnum/Platform/AbstractXApplication.cpp +++ b/src/Magnum/Platform/AbstractXApplication.cpp @@ -24,7 +24,7 @@ #include "AbstractXApplication.h" -#include +#include #include "Context.h" #include "Version.h" diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index 62a4407d8..81bca66ef 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -28,9 +28,7 @@ * @brief Class @ref Magnum::Platform::AbstractXApplication */ -#include - -#include "Magnum.h" +#include #include #include @@ -40,6 +38,7 @@ #undef None #undef Status +#include "Magnum.h" #include "Math/Vector2.h" namespace Magnum { diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.cpp b/src/Magnum/Platform/Implementation/EglContextHandler.cpp index 121af16f8..b17233341 100644 --- a/src/Magnum/Platform/Implementation/EglContextHandler.cpp +++ b/src/Magnum/Platform/Implementation/EglContextHandler.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "Context.h" #include "Version.h" diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h index 94724da66..1b5640c19 100644 --- a/src/Magnum/Platform/Implementation/EglContextHandler.h +++ b/src/Magnum/Platform/Implementation/EglContextHandler.h @@ -30,15 +30,14 @@ #define SUPPORT_X11 // OpenGL ES on BeagleBoard needs this (?) #endif #include - /* undef Xlib nonsense to avoid conflicts */ #undef None +#include + #include "Platform/AbstractXApplication.h" #include "Platform/Implementation/AbstractContextHandler.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace Platform { namespace Implementation { #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.cpp b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp index bc90befc3..08ed88616 100644 --- a/src/Magnum/Platform/Implementation/GlxContextHandler.cpp +++ b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "Context.h" #include "Version.h" diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.h b/src/Magnum/Platform/Implementation/GlxContextHandler.h index a1e99f90e..a4f9ff66b 100644 --- a/src/Magnum/Platform/Implementation/GlxContextHandler.h +++ b/src/Magnum/Platform/Implementation/GlxContextHandler.h @@ -33,11 +33,11 @@ #undef None #undef Status +#include + #include "Platform/AbstractXApplication.h" #include "Platform/Implementation/AbstractContextHandler.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace Platform { namespace Implementation { /** diff --git a/src/Magnum/Platform/NaClApplication.cpp b/src/Magnum/Platform/NaClApplication.cpp index 9272fc581..f31bfd688 100644 --- a/src/Magnum/Platform/NaClApplication.cpp +++ b/src/Magnum/Platform/NaClApplication.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "Context.h" #include "Platform/ScreenedApplication.hpp" diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h index 4dc6088a3..3aa022531 100644 --- a/src/Magnum/Platform/NaClApplication.h +++ b/src/Magnum/Platform/NaClApplication.h @@ -29,7 +29,8 @@ */ #include -#include +#include +#include #include #include #include @@ -41,8 +42,6 @@ #include "Math/Vector2.h" #include "Magnum.h" -#include "corradeCompatibility.h" - namespace pp { class Graphics3D; class Fullscreen; diff --git a/src/Magnum/Platform/Screen.h b/src/Magnum/Platform/Screen.h index 805fbd2f2..330920eff 100644 --- a/src/Magnum/Platform/Screen.h +++ b/src/Magnum/Platform/Screen.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::Platform::BasicScreen */ -#include +#include #include "Platform/ScreenedApplication.h" diff --git a/src/Magnum/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h index fc7e0a468..43db79d4a 100644 --- a/src/Magnum/Platform/ScreenedApplication.h +++ b/src/Magnum/Platform/ScreenedApplication.h @@ -28,9 +28,9 @@ * @brief Class @ref Magnum::Platform::BasicScreenedApplication */ -#include -#include +#include +#include "Magnum.h" #include "Platform/Platform.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index c7002f859..76934c8fa 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::Platform::Sdl2Application */ -#include -#include +#include +#include #include "Platform/Platform.h" #include "Math/Vector2.h" @@ -42,7 +42,7 @@ #include #ifdef MAGNUM_BUILD_DEPRECATED -#include +#include #endif namespace Magnum { diff --git a/src/Magnum/Platform/WindowlessGlxApplication.cpp b/src/Magnum/Platform/WindowlessGlxApplication.cpp index a84592ad1..ee2ddd6c7 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.cpp +++ b/src/Magnum/Platform/WindowlessGlxApplication.cpp @@ -24,8 +24,8 @@ #include "WindowlessGlxApplication.h" -#include -#include +#include +#include #include "Context.h" diff --git a/src/Magnum/Platform/WindowlessNaClApplication.cpp b/src/Magnum/Platform/WindowlessNaClApplication.cpp index 22e9eb1d6..3e9ca18ed 100644 --- a/src/Magnum/Platform/WindowlessNaClApplication.cpp +++ b/src/Magnum/Platform/WindowlessNaClApplication.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "Context.h" diff --git a/src/Magnum/Platform/WindowlessNaClApplication.h b/src/Magnum/Platform/WindowlessNaClApplication.h index a6f2a55ef..b2552b8a3 100644 --- a/src/Magnum/Platform/WindowlessNaClApplication.h +++ b/src/Magnum/Platform/WindowlessNaClApplication.h @@ -29,7 +29,8 @@ */ #include -#include +#include +#include #include #include #include @@ -37,8 +38,6 @@ #include "Magnum.h" -#include "corradeCompatibility.h" - namespace pp { class Graphics3D; class Fullscreen; diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp index adac9c2fb..891b9e5e3 100644 --- a/src/Magnum/Platform/magnum-info.cpp +++ b/src/Magnum/Platform/magnum-info.cpp @@ -22,11 +22,11 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include #ifdef CORRADE_TARGET_NACL -#include +#include #endif #include "AbstractShaderProgram.h" diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h index bc95ad19a..bfe3ba5c7 100644 --- a/src/Magnum/Primitives/Cylinder.h +++ b/src/Magnum/Primitives/Cylinder.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Cylinder */ -#include +#include #include "Magnum.h" #include "Primitives/magnumPrimitivesVisibility.h" diff --git a/src/Magnum/Primitives/Test/CapsuleTest.cpp b/src/Magnum/Primitives/Test/CapsuleTest.cpp index 23efaba1e..9fe344b35 100644 --- a/src/Magnum/Primitives/Test/CapsuleTest.cpp +++ b/src/Magnum/Primitives/Test/CapsuleTest.cpp @@ -25,8 +25,8 @@ /* Less precision */ #define FLOAT_EQUALITY_PRECISION 1.0e-5 -#include -#include +#include +#include #include "Math/Vector3.h" #include "Trade/MeshData2D.h" diff --git a/src/Magnum/Primitives/Test/CircleTest.cpp b/src/Magnum/Primitives/Test/CircleTest.cpp index 4395086f3..b1a77618a 100644 --- a/src/Magnum/Primitives/Test/CircleTest.cpp +++ b/src/Magnum/Primitives/Test/CircleTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Vector2.h" #include "Primitives/Circle.h" diff --git a/src/Magnum/Primitives/Test/CylinderTest.cpp b/src/Magnum/Primitives/Test/CylinderTest.cpp index 10bc34add..03e5a64f3 100644 --- a/src/Magnum/Primitives/Test/CylinderTest.cpp +++ b/src/Magnum/Primitives/Test/CylinderTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "Math/Vector3.h" #include "Primitives/Cylinder.h" diff --git a/src/Magnum/Primitives/Test/IcosphereTest.cpp b/src/Magnum/Primitives/Test/IcosphereTest.cpp index e6f6d13db..59ed877f9 100644 --- a/src/Magnum/Primitives/Test/IcosphereTest.cpp +++ b/src/Magnum/Primitives/Test/IcosphereTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Vector3.h" #include "Primitives/Icosphere.h" diff --git a/src/Magnum/Primitives/Test/UVSphereTest.cpp b/src/Magnum/Primitives/Test/UVSphereTest.cpp index f4df1a54e..7be1c2cca 100644 --- a/src/Magnum/Primitives/Test/UVSphereTest.cpp +++ b/src/Magnum/Primitives/Test/UVSphereTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "Math/Vector3.h" #include "Primitives/UVSphere.h" diff --git a/src/Magnum/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/magnumPrimitivesVisibility.h index 770730353..a3a60ec46 100644 --- a/src/Magnum/Primitives/magnumPrimitivesVisibility.h +++ b/src/Magnum/Primitives/magnumPrimitivesVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/Query.cpp b/src/Magnum/Query.cpp index d847bb635..da4460996 100644 --- a/src/Magnum/Query.cpp +++ b/src/Magnum/Query.cpp @@ -24,7 +24,7 @@ #include "Query.h" -#include +#include #include "Context.h" #include "Implementation/DebugState.h" diff --git a/src/Magnum/Query.h b/src/Magnum/Query.h index 1d1b4bf52..9237efc32 100644 --- a/src/Magnum/Query.h +++ b/src/Magnum/Query.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::AbstractQuery, @ref Magnum::PrimitiveQuery, @ref Magnum::SampleQuery, @ref Magnum::TimeQuery */ -#include +#include #include "AbstractObject.h" #include "magnumConfigure.h" diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index f9254b114..e95dae180 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Renderer */ -#include +#include #include "Magnum.h" #include "OpenGL.h" diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index 591fb7014..cf33afe1c 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -28,8 +28,8 @@ * @brief Class Magnum::ResourceKey, Magnum::Resource, enum Magnum::ResourceState */ -#include -#include +#include +#include #include "Magnum.h" diff --git a/src/Magnum/Sampler.cpp b/src/Magnum/Sampler.cpp index 9e6a9311e..6b0452f33 100644 --- a/src/Magnum/Sampler.cpp +++ b/src/Magnum/Sampler.cpp @@ -24,7 +24,7 @@ #include "Sampler.h" -#include +#include #include "Context.h" #include "Implementation/State.h" diff --git a/src/Magnum/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h index 8f2a585c5..58e63433e 100644 --- a/src/Magnum/SceneGraph/AbstractFeature.h +++ b/src/Magnum/SceneGraph/AbstractFeature.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::SceneGraph::AbstractFeature, alias @ref Magnum::SceneGraph::AbstractBasicFeature2D, @ref Magnum::SceneGraph::AbstractBasicFeature3D, typedef @ref Magnum::SceneGraph::AbstractFeature2D, @ref Magnum::SceneGraph::AbstractFeature3D, enum @ref Magnum::SceneGraph::CachedTransformation, enum set @ref Magnum::SceneGraph::CachedTransformations */ -#include -#include +#include +#include #include "Magnum.h" #include "SceneGraph/AbstractObject.h" diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index ffe781a70..24a0273c8 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "DimensionTraits.h" #include "SceneGraph.h" diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index efa7acb03..34359ac05 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "SceneGraph/SceneGraph.h" #include "SceneGraph/magnumSceneGraphVisibility.h" diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h index 903101e64..6832cee2e 100644 --- a/src/Magnum/SceneGraph/Object.h +++ b/src/Magnum/SceneGraph/Object.h @@ -28,7 +28,7 @@ * @brief Class Magnum::SceneGraph::Object */ -#include +#include #include "AbstractFeature.h" #include "AbstractObject.h" diff --git a/src/Magnum/SceneGraph/SceneGraph.h b/src/Magnum/SceneGraph/SceneGraph.h index e8f657935..0370b6b5f 100644 --- a/src/Magnum/SceneGraph/SceneGraph.h +++ b/src/Magnum/SceneGraph/SceneGraph.h @@ -28,9 +28,9 @@ * @brief Forward declarations for Magnum::SceneGraph namespace */ -#include "Types.h" +#include -#include "corradeCompatibility.h" +#include "Types.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Test/AnimableTest.cpp b/src/Magnum/SceneGraph/Test/AnimableTest.cpp index eb9c9eb7d..3dafc0ead 100644 --- a/src/Magnum/SceneGraph/Test/AnimableTest.cpp +++ b/src/Magnum/SceneGraph/Test/AnimableTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/Animable.h" #include "SceneGraph/AnimableGroup.h" diff --git a/src/Magnum/SceneGraph/Test/CameraTest.cpp b/src/Magnum/SceneGraph/Test/CameraTest.cpp index 14ed3c555..d21dec3d2 100644 --- a/src/Magnum/SceneGraph/Test/CameraTest.cpp +++ b/src/Magnum/SceneGraph/Test/CameraTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "SceneGraph/AbstractCamera.hpp" /* only for aspectRatioFix(), so it doesn't have to be exported */ #include "SceneGraph/Camera2D.h" diff --git a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp index 5d7417065..4acfc2aba 100644 --- a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/DualComplexTransformation.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp index 72d5d0f41..6cc743870 100644 --- a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/DualQuaternionTransformation.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp index b1408956e..607f0ed3c 100644 --- a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp +++ b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "SceneGraph/MatrixTransformation2D.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp index 66240a318..44fe948a4 100644 --- a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp +++ b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "SceneGraph/MatrixTransformation3D.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp index 0dbbefe7a..82375a07a 100644 --- a/src/Magnum/SceneGraph/Test/ObjectTest.cpp +++ b/src/Magnum/SceneGraph/Test/ObjectTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/MatrixTransformation3D.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp index f33537c2f..8aaa7ba1b 100644 --- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp +++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/RigidMatrixTransformation2D.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp index d6cf466a7..f0ce9f7a9 100644 --- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp +++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/RigidMatrixTransformation3D.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/SceneTest.cpp b/src/Magnum/SceneGraph/Test/SceneTest.cpp index 65f8dcb60..ccb6676e7 100644 --- a/src/Magnum/SceneGraph/Test/SceneTest.cpp +++ b/src/Magnum/SceneGraph/Test/SceneTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "SceneGraph/MatrixTransformation3D.h" #include "SceneGraph/Scene.h" diff --git a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp index de012ff81..e3ca42edf 100644 --- a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "SceneGraph/Object.hpp" #include "SceneGraph/TranslationTransformation.h" diff --git a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h index 9ffc7422c..4f6d10dd0 100644 --- a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp index 22a204b49..842c5d663 100644 --- a/src/Magnum/Shader.cpp +++ b/src/Magnum/Shader.cpp @@ -24,9 +24,9 @@ #include "Shader.h" -#include -#include -#include +#include +#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp index fac5a9b88..fe846b59c 100644 --- a/src/Magnum/Shaders/DistanceFieldVector.cpp +++ b/src/Magnum/Shaders/DistanceFieldVector.cpp @@ -24,7 +24,7 @@ #include "DistanceFieldVector.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp index 97ef51c2f..058b7260e 100644 --- a/src/Magnum/Shaders/Flat.cpp +++ b/src/Magnum/Shaders/Flat.cpp @@ -24,7 +24,7 @@ #include "Flat.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp index bc7dcbbac..4a557d1a3 100644 --- a/src/Magnum/Shaders/MeshVisualizer.cpp +++ b/src/Magnum/Shaders/MeshVisualizer.cpp @@ -24,7 +24,7 @@ #include "MeshVisualizer.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp index 78f0f844f..e33cfe27e 100644 --- a/src/Magnum/Shaders/Phong.cpp +++ b/src/Magnum/Shaders/Phong.cpp @@ -24,7 +24,7 @@ #include "Phong.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp index c2895bdc6..2069e3671 100644 --- a/src/Magnum/Shaders/Vector.cpp +++ b/src/Magnum/Shaders/Vector.cpp @@ -24,7 +24,7 @@ #include "Vector.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp index ce36675d6..443b5841d 100644 --- a/src/Magnum/Shaders/VertexColor.cpp +++ b/src/Magnum/Shaders/VertexColor.cpp @@ -24,7 +24,7 @@ #include "VertexColor.h" -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp index 419601905..2235ca5f0 100644 --- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp +++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp @@ -27,8 +27,8 @@ #include "magnumConfigure.h" #ifdef MAGNUM_BUILD_STATIC -#include -#include +#include +#include static int magnumShadersResourceImport() { CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS) diff --git a/src/Magnum/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/magnumShadersVisibility.h index a42810511..202006b11 100644 --- a/src/Magnum/Shaders/magnumShadersVisibility.h +++ b/src/Magnum/Shaders/magnumShadersVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/Shapes/AbstractShape.cpp b/src/Magnum/Shapes/AbstractShape.cpp index f6cee4d27..a6e25edc8 100644 --- a/src/Magnum/Shapes/AbstractShape.cpp +++ b/src/Magnum/Shapes/AbstractShape.cpp @@ -24,7 +24,7 @@ #include "AbstractShape.h" -#include +#include #include "Shapes/ShapeGroup.h" #include "Shapes/Implementation/CollisionDispatch.h" diff --git a/src/Magnum/Shapes/Composition.cpp b/src/Magnum/Shapes/Composition.cpp index 456071772..141937eb7 100644 --- a/src/Magnum/Shapes/Composition.cpp +++ b/src/Magnum/Shapes/Composition.cpp @@ -25,7 +25,7 @@ #include "Composition.h" #include -#include +#include #include "Shapes/Implementation/CollisionDispatch.h" diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h index c07768397..727b24ad4 100644 --- a/src/Magnum/Shapes/Composition.h +++ b/src/Magnum/Shapes/Composition.h @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include "DimensionTraits.h" #include "Shapes/Shapes.h" diff --git a/src/Magnum/Shapes/Test/BoxTest.cpp b/src/Magnum/Shapes/Test/BoxTest.cpp index 1be8e1c71..53140f695 100644 --- a/src/Magnum/Shapes/Test/BoxTest.cpp +++ b/src/Magnum/Shapes/Test/BoxTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Matrix4.h" #include "Magnum.h" diff --git a/src/Magnum/Shapes/Test/CollisionTest.cpp b/src/Magnum/Shapes/Test/CollisionTest.cpp index 545d13f35..8501bb80d 100644 --- a/src/Magnum/Shapes/Test/CollisionTest.cpp +++ b/src/Magnum/Shapes/Test/CollisionTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Shapes/Collision.h" #include "Magnum.h" diff --git a/src/Magnum/Shapes/Test/CompositionTest.cpp b/src/Magnum/Shapes/Test/CompositionTest.cpp index da9a4d08e..cb6f3f76c 100644 --- a/src/Magnum/Shapes/Test/CompositionTest.cpp +++ b/src/Magnum/Shapes/Test/CompositionTest.cpp @@ -22,8 +22,6 @@ DEALINGS IN THE SOFTWARE. */ -#include - #include "Math/Matrix3.h" #include "Math/Matrix4.h" #include "Shapes/Point.h" diff --git a/src/Magnum/Shapes/Test/LineTest.cpp b/src/Magnum/Shapes/Test/LineTest.cpp index bb8ce701d..73e2681bc 100644 --- a/src/Magnum/Shapes/Test/LineTest.cpp +++ b/src/Magnum/Shapes/Test/LineTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Matrix4.h" #include "Magnum.h" diff --git a/src/Magnum/Shapes/Test/PointTest.cpp b/src/Magnum/Shapes/Test/PointTest.cpp index 38d344edc..3a6f02be7 100644 --- a/src/Magnum/Shapes/Test/PointTest.cpp +++ b/src/Magnum/Shapes/Test/PointTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Matrix4.h" #include "Magnum.h" diff --git a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp index eced1884a..27c58566f 100644 --- a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp +++ b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Shapes/shapeImplementation.h" diff --git a/src/Magnum/Shapes/Test/ShapeTest.cpp b/src/Magnum/Shapes/Test/ShapeTest.cpp index 432c55a9d..2f86d4949 100644 --- a/src/Magnum/Shapes/Test/ShapeTest.cpp +++ b/src/Magnum/Shapes/Test/ShapeTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Shapes/ShapeGroup.h" #include "Shapes/Shape.h" diff --git a/src/Magnum/Shapes/Test/ShapeTestBase.h b/src/Magnum/Shapes/Test/ShapeTestBase.h index 348cc3ee7..bb5cff964 100644 --- a/src/Magnum/Shapes/Test/ShapeTestBase.h +++ b/src/Magnum/Shapes/Test/ShapeTestBase.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/magnumShapesVisibility.h index 2af59f9b8..008ae8a88 100644 --- a/src/Magnum/Shapes/magnumShapesVisibility.h +++ b/src/Magnum/Shapes/magnumShapesVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/Shapes/shapeImplementation.cpp b/src/Magnum/Shapes/shapeImplementation.cpp index 3a783de32..b89560d60 100644 --- a/src/Magnum/Shapes/shapeImplementation.cpp +++ b/src/Magnum/Shapes/shapeImplementation.cpp @@ -24,7 +24,7 @@ #include "shapeImplementation.h" -#include +#include namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h index 8febd6a8a..fc6301a53 100644 --- a/src/Magnum/Shapes/shapeImplementation.h +++ b/src/Magnum/Shapes/shapeImplementation.h @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include "DimensionTraits.h" #include "Magnum.h" diff --git a/src/Magnum/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp index 864a9e601..9e386f235 100644 --- a/src/Magnum/Test/AbstractImageTest.cpp +++ b/src/Magnum/Test/AbstractImageTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "AbstractImage.h" #include "Image.h" diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h index ef1c7c0be..f2743b7ae 100644 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ b/src/Magnum/Test/AbstractOpenGLTester.h @@ -24,8 +24,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp index 0fd679c97..858c7cd2e 100644 --- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Matrix.h" #include "Math/Vector4.h" diff --git a/src/Magnum/Test/AbstractShaderProgramTest.cpp b/src/Magnum/Test/AbstractShaderProgramTest.cpp index 4df6e4eb9..c09832c9d 100644 --- a/src/Magnum/Test/AbstractShaderProgramTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "AbstractShaderProgram.h" diff --git a/src/Magnum/Test/ArrayTest.cpp b/src/Magnum/Test/ArrayTest.cpp index 1a677aa33..84bca1274 100644 --- a/src/Magnum/Test/ArrayTest.cpp +++ b/src/Magnum/Test/ArrayTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Array.h" diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp index 92b8a0c34..e565797d2 100644 --- a/src/Magnum/Test/BufferGLTest.cpp +++ b/src/Magnum/Test/BufferGLTest.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include "Buffer.h" #include "Context.h" diff --git a/src/Magnum/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp index 815aeb1c4..72d257f50 100644 --- a/src/Magnum/Test/BufferImageGLTest.cpp +++ b/src/Magnum/Test/BufferImageGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "BufferImage.h" #include "ColorFormat.h" diff --git a/src/Magnum/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp index e7029f69f..1ea39e425 100644 --- a/src/Magnum/Test/BufferTextureGLTest.cpp +++ b/src/Magnum/Test/BufferTextureGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Buffer.h" #include "BufferTexture.h" diff --git a/src/Magnum/Test/ColorTest.cpp b/src/Magnum/Test/ColorTest.cpp index dfb1ac2c5..0762c00cd 100644 --- a/src/Magnum/Test/ColorTest.cpp +++ b/src/Magnum/Test/ColorTest.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Color.h" diff --git a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp index 455f24cfe..c71aae2e9 100644 --- a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "BufferImage.h" #include "ColorFormat.h" diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp index d72978e72..2276be95b 100644 --- a/src/Magnum/Test/CubeMapTextureGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "BufferImage.h" #include "ColorFormat.h" diff --git a/src/Magnum/Test/DebugMessageTest.cpp b/src/Magnum/Test/DebugMessageTest.cpp index 868c6178d..5fb963e18 100644 --- a/src/Magnum/Test/DebugMessageTest.cpp +++ b/src/Magnum/Test/DebugMessageTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "DebugMessage.h" diff --git a/src/Magnum/Test/DefaultFramebufferTest.cpp b/src/Magnum/Test/DefaultFramebufferTest.cpp index a0dceffbd..1a09256bc 100644 --- a/src/Magnum/Test/DefaultFramebufferTest.cpp +++ b/src/Magnum/Test/DefaultFramebufferTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "DefaultFramebuffer.h" diff --git a/src/Magnum/Test/FramebufferTest.cpp b/src/Magnum/Test/FramebufferTest.cpp index a3b43be21..2879c4722 100644 --- a/src/Magnum/Test/FramebufferTest.cpp +++ b/src/Magnum/Test/FramebufferTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Framebuffer.h" diff --git a/src/Magnum/Test/ImageReferenceTest.cpp b/src/Magnum/Test/ImageReferenceTest.cpp index eeb80a59f..4be244c97 100644 --- a/src/Magnum/Test/ImageReferenceTest.cpp +++ b/src/Magnum/Test/ImageReferenceTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "ColorFormat.h" #include "ImageReference.h" diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp index 2a464cf55..db8d69a46 100644 --- a/src/Magnum/Test/ImageTest.cpp +++ b/src/Magnum/Test/ImageTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "ColorFormat.h" #include "Image.h" diff --git a/src/Magnum/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp index b3b4fe283..bc942adab 100644 --- a/src/Magnum/Test/MeshTest.cpp +++ b/src/Magnum/Test/MeshTest.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include "Mesh.h" diff --git a/src/Magnum/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp index 7e6691454..fe09a43ed 100644 --- a/src/Magnum/Test/PrimitiveQueryGLTest.cpp +++ b/src/Magnum/Test/PrimitiveQueryGLTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "AbstractShaderProgram.h" #include "Buffer.h" diff --git a/src/Magnum/Test/RendererTest.cpp b/src/Magnum/Test/RendererTest.cpp index 7e784dc11..07d6493f1 100644 --- a/src/Magnum/Test/RendererTest.cpp +++ b/src/Magnum/Test/RendererTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Renderer.h" diff --git a/src/Magnum/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp index 7718c1906..e6cb366e1 100644 --- a/src/Magnum/Test/ResourceManagerTest.cpp +++ b/src/Magnum/Test/ResourceManagerTest.cpp @@ -23,13 +23,12 @@ */ #include -#include +#include +#include #include "AbstractResourceLoader.h" #include "ResourceManager.h" -#include "corradeCompatibility.h" - namespace Magnum { namespace Test { class ResourceManagerTest: public TestSuite::Tester { diff --git a/src/Magnum/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp index 3fae6a0f7..bc6a1d91b 100644 --- a/src/Magnum/Test/SampleQueryGLTest.cpp +++ b/src/Magnum/Test/SampleQueryGLTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "AbstractShaderProgram.h" #include "Buffer.h" diff --git a/src/Magnum/Test/SamplerTest.cpp b/src/Magnum/Test/SamplerTest.cpp index 961b16f1c..a4fcfeb73 100644 --- a/src/Magnum/Test/SamplerTest.cpp +++ b/src/Magnum/Test/SamplerTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Sampler.h" diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp index 37bba4647..e8de60201 100644 --- a/src/Magnum/Test/ShaderGLTest.cpp +++ b/src/Magnum/Test/ShaderGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Context.h" #include "Extensions.h" diff --git a/src/Magnum/Test/ShaderTest.cpp b/src/Magnum/Test/ShaderTest.cpp index 451be692a..3301e17cc 100644 --- a/src/Magnum/Test/ShaderTest.cpp +++ b/src/Magnum/Test/ShaderTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Shader.h" diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp index f3582b65a..3650af957 100644 --- a/src/Magnum/Test/TextureGLTest.cpp +++ b/src/Magnum/Test/TextureGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "BufferImage.h" #include "ColorFormat.h" diff --git a/src/Magnum/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp index d3d6d9693..406398841 100644 --- a/src/Magnum/Test/VersionTest.cpp +++ b/src/Magnum/Test/VersionTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Version.h" diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp index ccb1c3ef5..176ec02e0 100644 --- a/src/Magnum/Text/AbstractFont.cpp +++ b/src/Magnum/Text/AbstractFont.cpp @@ -24,9 +24,9 @@ #include "AbstractFont.h" -#include -#include -#include +#include +#include +#include #include "Text/GlyphCache.h" diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h index 6c6851e04..1dbfa864e 100644 --- a/src/Magnum/Text/AbstractFont.h +++ b/src/Magnum/Text/AbstractFont.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "Magnum.h" #include "Texture.h" diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp index 0c1711598..3f543d507 100644 --- a/src/Magnum/Text/AbstractFontConverter.cpp +++ b/src/Magnum/Text/AbstractFontConverter.cpp @@ -25,10 +25,10 @@ #include "AbstractFontConverter.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Text/GlyphCache.h" diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h index b000f8572..b9cf01e4b 100644 --- a/src/Magnum/Text/AbstractFontConverter.h +++ b/src/Magnum/Text/AbstractFontConverter.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "Magnum.h" #include "Text/Text.h" diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index fc38f8b8b..c22cd8e2d 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include "Text/AbstractFontConverter.h" #include "Text/GlyphCache.h" diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp index afb577ecd..3c5e3eb8d 100644 --- a/src/Magnum/Text/Test/AbstractFontTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontTest.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include "Text/AbstractFont.h" diff --git a/src/Magnum/Text/Test/AbstractLayouterTest.cpp b/src/Magnum/Text/Test/AbstractLayouterTest.cpp index 18d5feb8e..53e9a109c 100644 --- a/src/Magnum/Text/Test/AbstractLayouterTest.cpp +++ b/src/Magnum/Text/Test/AbstractLayouterTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Math/Range.h" #include "Text/AbstractFont.h" diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp index 5189b056d..8ea4d40e0 100644 --- a/src/Magnum/Text/fontconverter.cpp +++ b/src/Magnum/Text/fontconverter.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include "Platform/WindowlessGlxApplication.h" #include "Text/AbstractFont.h" diff --git a/src/Magnum/Text/magnumTextVisibility.h b/src/Magnum/Text/magnumTextVisibility.h index c15adef5a..ab2fe21ae 100644 --- a/src/Magnum/Text/magnumTextVisibility.h +++ b/src/Magnum/Text/magnumTextVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp index 107d7d033..0d1a1561d 100644 --- a/src/Magnum/TextureTools/DistanceField.cpp +++ b/src/Magnum/TextureTools/DistanceField.cpp @@ -24,7 +24,7 @@ #include "TextureTools/DistanceField.h" -#include +#include #include "Math/Range.h" #include "AbstractShaderProgram.h" diff --git a/src/Magnum/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp index 11d8a4c32..2ef4fea7a 100644 --- a/src/Magnum/TextureTools/Test/AtlasTest.cpp +++ b/src/Magnum/TextureTools/Test/AtlasTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Math/Range.h" #include "TextureTools/Atlas.h" diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index 8fd096224..0174eaddb 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "Math/Range.h" #include "ColorFormat.h" diff --git a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp index 9ac0777df..d6d00ea1f 100644 --- a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp +++ b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp @@ -27,8 +27,8 @@ #include "magnumConfigure.h" #ifdef MAGNUM_BUILD_STATIC -#include -#include +#include +#include static int magnumTextureToolsResourceImport() { CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS) diff --git a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h index c552e907d..93de7e8cf 100644 --- a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h +++ b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/Magnum/Timeline.cpp b/src/Magnum/Timeline.cpp index 6d6c2b65e..020ecf7c0 100644 --- a/src/Magnum/Timeline.cpp +++ b/src/Magnum/Timeline.cpp @@ -24,8 +24,8 @@ #include "Timeline.h" -#include -#include +#include +#include #include "Magnum.h" diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp index 4e22d6f60..b0040f81a 100644 --- a/src/Magnum/Trade/AbstractImageConverter.cpp +++ b/src/Magnum/Trade/AbstractImageConverter.cpp @@ -24,9 +24,9 @@ #include "AbstractImageConverter.h" -#include -#include -#include +#include +#include +#include namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index d3f46e1d9..e9712c654 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Trade::AbstractImageConverter */ -#include +#include #include "Magnum.h" #include "Text/Text.h" diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index d6bc760c3..fc443f4c0 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -24,9 +24,9 @@ #include "AbstractImporter.h" -#include -#include -#include +#include +#include +#include #include "Trade/AbstractMaterialData.h" #include "Trade/CameraData.h" diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index ef427065c..edab4f813 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include #include "Optional/optional.hpp" diff --git a/src/Magnum/Trade/AbstractMaterialData.cpp b/src/Magnum/Trade/AbstractMaterialData.cpp index 4ee1fb912..1ddf31593 100644 --- a/src/Magnum/Trade/AbstractMaterialData.cpp +++ b/src/Magnum/Trade/AbstractMaterialData.cpp @@ -24,7 +24,7 @@ #include "AbstractMaterialData.h" -#include +#include namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 78cb19876..72a352445 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include "ColorFormat.h" #include "ImageReference.h" diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp index 3dacf06dd..62372489d 100644 --- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include "Trade/AbstractImporter.h" diff --git a/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp index a85f6308f..1ebc7c94d 100644 --- a/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Trade/AbstractMaterialData.h" diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp index a2310158b..95728d240 100644 --- a/src/Magnum/Trade/Test/ImageDataTest.cpp +++ b/src/Magnum/Trade/Test/ImageDataTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "ColorFormat.h" #include "Trade/ImageData.h" diff --git a/src/Magnum/Trade/Test/ObjectData2DTest.cpp b/src/Magnum/Trade/Test/ObjectData2DTest.cpp index 4806c02fa..38ab97478 100644 --- a/src/Magnum/Trade/Test/ObjectData2DTest.cpp +++ b/src/Magnum/Trade/Test/ObjectData2DTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Trade/ObjectData2D.h" diff --git a/src/Magnum/Trade/Test/ObjectData3DTest.cpp b/src/Magnum/Trade/Test/ObjectData3DTest.cpp index ec08578ae..0170384a2 100644 --- a/src/Magnum/Trade/Test/ObjectData3DTest.cpp +++ b/src/Magnum/Trade/Test/ObjectData3DTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Trade/ObjectData3D.h" diff --git a/src/Magnum/Trade/Test/TextureDataTest.cpp b/src/Magnum/Trade/Test/TextureDataTest.cpp index 3fb83bd70..408f887e3 100644 --- a/src/Magnum/Trade/Test/TextureDataTest.cpp +++ b/src/Magnum/Trade/Test/TextureDataTest.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "Trade/TextureData.h" diff --git a/src/Magnum/Version.cpp b/src/Magnum/Version.cpp index 57cdd543b..1be0559df 100644 --- a/src/Magnum/Version.cpp +++ b/src/Magnum/Version.cpp @@ -24,7 +24,7 @@ #include "Version.h" -#include +#include namespace Magnum { diff --git a/src/Magnum/magnumVisibility.h b/src/Magnum/magnumVisibility.h index 3916257c3..2d5b0f886 100644 --- a/src/Magnum/magnumVisibility.h +++ b/src/Magnum/magnumVisibility.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "magnumConfigure.h" diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp index 89a18202c..9bab28e1f 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp @@ -25,9 +25,9 @@ #include "MagnumFont.h" #include -#include -#include -#include +#include +#include +#include #include "Text/GlyphCache.h" #include "Trade/ImageData.h" diff --git a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp index f0d3b69e3..1d453c2c7 100644 --- a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp +++ b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include +#include #include "Test/AbstractOpenGLTester.h" #include "Text/GlyphCache.h" diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp index 64ca48c35..721bf7860 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -25,8 +25,8 @@ #include "MagnumFontConverter.h" #include -#include -#include +#include +#include #include "ColorFormat.h" #include "Image.h" diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp index a104604ad..05d54cea3 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include "ColorFormat.h" #include "Extensions.h" diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index cc9365fa2..b86cc4184 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "ColorFormat.h" #include "Image.h" diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp index 7f2b2d663..c212ae7f2 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "ColorFormat.h" #include "Image.h" diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp index 241d71f04..3ce181d5a 100644 --- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp @@ -23,9 +23,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "ColorFormat.h" #include "Trade/ImageData.h" diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp index 1e8d7d769..aa8e2267c 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "ColorFormat.h" #include "Trade/ImageData.h" diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h index ff0bc78a1..c3eace385 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.h +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Trade::TgaImporter */ -#include +#include #include "Trade/AbstractImporter.h" diff --git a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp index 1a9593379..a5dfba801 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp +++ b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp @@ -23,9 +23,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "WavAudioImporter/WavImporter.h" diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp index 882112c36..5c1bd54ce 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp @@ -24,9 +24,9 @@ #include "WavImporter.h" -#include -#include -#include +#include +#include +#include #include "WavHeader.h" diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h index 58c8d2c84..73595b00e 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.h +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.h @@ -28,8 +28,7 @@ * @brief Class Magnum::Audio::WavImporter */ -#include -#include +#include #include "Audio/AbstractImporter.h" From 0616f24f34f3c8d94661116f12e43d058ebb054a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 18:16:34 +0100 Subject: [PATCH 54/79] Making includes absolute, part 5: absolute includes everywhere. The only places where they aren't absolute are: - when header is included from corresponding source file - when including headers which are not part of final installation (e.g. test-specific configuration, headers from Implementation/) --- src/CMakeLists.txt | 8 ------ src/Magnum/AbstractFramebuffer.cpp | 8 +++--- src/Magnum/AbstractFramebuffer.h | 6 ++-- src/Magnum/AbstractImage.cpp | 4 +-- src/Magnum/AbstractImage.h | 4 +-- src/Magnum/AbstractObject.cpp | 5 ++-- src/Magnum/AbstractObject.h | 6 ++-- src/Magnum/AbstractResourceLoader.h | 2 +- src/Magnum/AbstractShaderProgram.cpp | 9 +++--- src/Magnum/AbstractShaderProgram.h | 6 ++-- src/Magnum/AbstractTexture.cpp | 15 +++++----- src/Magnum/AbstractTexture.h | 8 +++--- src/Magnum/Array.h | 4 +-- src/Magnum/Audio/AbstractImporter.h | 4 +-- src/Magnum/Audio/Audio.cpp | 2 +- src/Magnum/Audio/Buffer.h | 4 +-- src/Magnum/Audio/Context.cpp | 2 +- src/Magnum/Audio/Context.h | 2 +- src/Magnum/Audio/Renderer.h | 6 ++-- src/Magnum/Audio/Source.cpp | 2 +- src/Magnum/Audio/Source.h | 8 +++--- .../Audio/Test/AbstractImporterTest.cpp | 2 +- src/Magnum/Audio/Test/BufferTest.cpp | 2 +- src/Magnum/Audio/Test/RendererTest.cpp | 2 +- src/Magnum/Audio/Test/SourceTest.cpp | 2 +- src/Magnum/Audio/magnumAudioVisibility.h | 2 +- src/Magnum/Buffer.cpp | 5 ++-- src/Magnum/Buffer.h | 4 +-- src/Magnum/BufferImage.h | 8 +++--- src/Magnum/BufferTexture.cpp | 6 ++-- src/Magnum/BufferTexture.h | 2 +- src/Magnum/Color.h | 6 ++-- src/Magnum/ColorFormat.h | 6 ++-- src/Magnum/Context.cpp | 22 +++++++-------- src/Magnum/Context.h | 6 ++-- src/Magnum/CubeMapTexture.h | 2 +- src/Magnum/CubeMapTextureArray.h | 2 +- src/Magnum/DebugMarker.h | 2 +- src/Magnum/DebugMessage.cpp | 8 +++--- src/Magnum/DebugMessage.h | 6 ++-- src/Magnum/DebugTools/DebugTools.h | 2 +- src/Magnum/DebugTools/ForceRenderer.cpp | 12 ++++---- src/Magnum/DebugTools/ForceRenderer.h | 11 ++++---- .../Implementation/AbstractBoxRenderer.cpp | 10 +++---- .../Implementation/AbstractBoxRenderer.h | 4 +-- .../Implementation/AbstractShapeRenderer.cpp | 16 +++++------ .../Implementation/AbstractShapeRenderer.h | 12 ++++---- .../Implementation/AxisAlignedBoxRenderer.cpp | 8 +++--- .../Implementation/AxisAlignedBoxRenderer.h | 3 +- .../DebugTools/Implementation/BoxRenderer.cpp | 8 +++--- .../DebugTools/Implementation/BoxRenderer.h | 3 +- .../Implementation/CapsuleRenderer.cpp | 22 +++++++-------- .../Implementation/CapsuleRenderer.h | 3 +- .../CapsuleRendererTransformation.h | 10 +++---- .../Implementation/CylinderRenderer.cpp | 20 ++++++------- .../Implementation/CylinderRenderer.h | 3 +- .../CylinderRendererTransformation.h | 10 +++---- .../ForceRendererTransformation.h | 10 +++---- .../Implementation/LineSegmentRenderer.cpp | 16 +++++------ .../Implementation/LineSegmentRenderer.h | 3 +- .../LineSegmentRendererTransformation.h | 2 +- .../Implementation/PointRenderer.cpp | 14 +++++----- .../DebugTools/Implementation/PointRenderer.h | 3 +- .../Implementation/SphereRenderer.cpp | 16 +++++------ .../Implementation/SphereRenderer.h | 3 +- src/Magnum/DebugTools/ObjectRenderer.cpp | 10 +++---- src/Magnum/DebugTools/ObjectRenderer.h | 9 +++--- src/Magnum/DebugTools/Profiler.cpp | 2 +- src/Magnum/DebugTools/Profiler.h | 4 +-- src/Magnum/DebugTools/ResourceManager.cpp | 12 ++++---- src/Magnum/DebugTools/ResourceManager.h | 14 ++++------ src/Magnum/DebugTools/ShapeRenderer.cpp | 8 +++--- src/Magnum/DebugTools/ShapeRenderer.h | 13 ++++----- .../DebugTools/Test/CapsuleRendererTest.cpp | 2 +- .../DebugTools/Test/CylinderRendererTest.cpp | 2 +- .../DebugTools/Test/ForceRendererTest.cpp | 2 +- .../Test/LineSegmentRendererTest.cpp | 9 +++--- .../DebugTools/magnumDebugToolsVisibility.h | 2 +- src/Magnum/DefaultFramebuffer.cpp | 8 +++--- src/Magnum/DefaultFramebuffer.h | 2 +- src/Magnum/DimensionTraits.h | 4 +-- src/Magnum/Extensions.h | 2 +- src/Magnum/Framebuffer.cpp | 12 ++++---- src/Magnum/Framebuffer.h | 4 +-- src/Magnum/Image.h | 2 +- src/Magnum/ImageFormat.h | 2 +- src/Magnum/ImageReference.h | 6 ++-- src/Magnum/Implementation/BufferState.h | 2 +- src/Magnum/Implementation/DebugState.cpp | 6 ++-- src/Magnum/Implementation/DebugState.h | 2 +- src/Magnum/Implementation/FramebufferState.h | 6 ++-- src/Magnum/Implementation/MeshState.h | 2 +- src/Magnum/Implementation/RendererState.h | 2 +- .../Implementation/ShaderProgramState.h | 2 +- src/Magnum/Implementation/ShaderState.h | 6 ++-- src/Magnum/Implementation/State.cpp | 21 +++++++------- src/Magnum/Implementation/State.h | 2 +- src/Magnum/Implementation/TextureState.h | 2 +- src/Magnum/Magnum.h | 6 ++-- src/Magnum/Math/Algorithms/GaussJordan.h | 2 +- src/Magnum/Math/Algorithms/GramSchmidt.h | 2 +- src/Magnum/Math/Algorithms/Svd.h | 4 +-- .../Math/Algorithms/Test/GaussJordanTest.cpp | 2 +- .../Math/Algorithms/Test/GramSchmidtTest.cpp | 2 +- src/Magnum/Math/Algorithms/Test/SvdTest.cpp | 2 +- src/Magnum/Math/Angle.h | 9 +++--- src/Magnum/Math/BoolVector.h | 2 +- src/Magnum/Math/Complex.h | 4 +-- src/Magnum/Math/Constants.h | 2 +- src/Magnum/Math/Dual.h | 2 +- src/Magnum/Math/DualComplex.h | 6 ++-- src/Magnum/Math/DualQuaternion.h | 6 ++-- src/Magnum/Math/Functions.h | 13 ++++----- src/Magnum/Math/Geometry/Distance.h | 4 +-- src/Magnum/Math/Geometry/Intersection.h | 2 +- src/Magnum/Math/Geometry/Rectangle.h | 2 +- .../Math/Geometry/Test/DistanceTest.cpp | 4 +-- .../Math/Geometry/Test/IntersectionTest.cpp | 2 +- src/Magnum/Math/Math.h | 2 +- src/Magnum/Math/Matrix.h | 2 +- src/Magnum/Math/Matrix3.h | 4 +-- src/Magnum/Math/Matrix4.h | 4 +-- src/Magnum/Math/Quaternion.h | 6 ++-- src/Magnum/Math/Range.h | 2 +- src/Magnum/Math/RectangularMatrix.h | 2 +- src/Magnum/Math/Swizzle.h | 2 +- src/Magnum/Math/Test/AngleTest.cpp | 2 +- src/Magnum/Math/Test/BoolVectorTest.cpp | 2 +- src/Magnum/Math/Test/ComplexTest.cpp | 4 +-- src/Magnum/Math/Test/ConstantsTest.cpp | 4 +-- src/Magnum/Math/Test/DualComplexTest.cpp | 4 +-- src/Magnum/Math/Test/DualQuaternionTest.cpp | 2 +- src/Magnum/Math/Test/DualTest.cpp | 2 +- src/Magnum/Math/Test/FunctionsTest.cpp | 4 +-- src/Magnum/Math/Test/Matrix3Test.cpp | 2 +- src/Magnum/Math/Test/Matrix4Test.cpp | 2 +- src/Magnum/Math/Test/MatrixTest.cpp | 2 +- src/Magnum/Math/Test/QuaternionTest.cpp | 4 +-- src/Magnum/Math/Test/RangeTest.cpp | 4 +-- .../Math/Test/RectangularMatrixTest.cpp | 2 +- src/Magnum/Math/Test/SwizzleTest.cpp | 2 +- src/Magnum/Math/Test/TypeTraitsTest.cpp | 2 +- src/Magnum/Math/Test/UnitTest.cpp | 2 +- src/Magnum/Math/Test/Vector2Test.cpp | 2 +- src/Magnum/Math/Test/Vector3Test.cpp | 2 +- src/Magnum/Math/Test/Vector4Test.cpp | 2 +- src/Magnum/Math/Test/VectorTest.cpp | 2 +- src/Magnum/Math/TypeTraits.h | 2 +- src/Magnum/Math/Unit.h | 2 +- src/Magnum/Math/Vector.h | 9 +++--- src/Magnum/Math/Vector2.h | 2 +- src/Magnum/Math/Vector3.h | 4 +-- src/Magnum/Math/Vector4.h | 2 +- src/Magnum/Math/instantiation.cpp | 6 ++-- src/Magnum/Mesh.cpp | 7 +++-- src/Magnum/Mesh.h | 2 +- src/Magnum/MeshTools/CombineIndexedArrays.h | 4 +-- src/Magnum/MeshTools/CompressIndices.cpp | 4 +-- src/Magnum/MeshTools/CompressIndices.h | 5 ++-- src/Magnum/MeshTools/Duplicate.h | 2 +- src/Magnum/MeshTools/FlipNormals.cpp | 2 +- src/Magnum/MeshTools/FlipNormals.h | 5 ++-- src/Magnum/MeshTools/FullScreenTriangle.cpp | 12 ++++---- src/Magnum/MeshTools/FullScreenTriangle.h | 4 +-- src/Magnum/MeshTools/GenerateFlatNormals.cpp | 4 +-- src/Magnum/MeshTools/GenerateFlatNormals.h | 5 ++-- src/Magnum/MeshTools/Interleave.h | 4 +-- src/Magnum/MeshTools/RemoveDuplicates.h | 4 +-- .../Test/CombineIndexedArraysTest.cpp | 4 +-- .../MeshTools/Test/CompressIndicesTest.cpp | 2 +- src/Magnum/MeshTools/Test/DuplicateTest.cpp | 4 +-- src/Magnum/MeshTools/Test/FlipNormalsTest.cpp | 4 +-- .../Test/GenerateFlatNormalsTest.cpp | 4 +-- src/Magnum/MeshTools/Test/InterleaveTest.cpp | 2 +- .../MeshTools/Test/RemoveDuplicatesTest.cpp | 2 +- .../SubdivideRemoveDuplicatesBenchmark.cpp | 6 ++-- .../Test/SubdivideRemoveDuplicatesBenchmark.h | 2 +- src/Magnum/MeshTools/Test/SubdivideTest.cpp | 4 +-- src/Magnum/MeshTools/Test/TipsifyTest.cpp | 4 +-- src/Magnum/MeshTools/Test/TransformTest.cpp | 6 ++-- src/Magnum/MeshTools/Tipsify.h | 4 +-- src/Magnum/MeshTools/Transform.h | 4 +-- .../MeshTools/magnumMeshToolsVisibility.h | 2 +- src/Magnum/MeshView.cpp | 2 +- src/Magnum/MeshView.h | 6 ++-- src/Magnum/OpenGL.cpp | 4 +-- src/Magnum/OpenGL.h | 18 ++++++------ src/Magnum/Platform/AbstractXApplication.cpp | 7 +++-- src/Magnum/Platform/AbstractXApplication.h | 4 +-- src/Magnum/Platform/GlutApplication.cpp | 7 ++--- src/Magnum/Platform/GlutApplication.h | 8 +++--- src/Magnum/Platform/GlxApplication.cpp | 5 ++-- src/Magnum/Platform/GlxApplication.h | 4 +-- .../Implementation/EglContextHandler.cpp | 4 +-- .../Implementation/EglContextHandler.h | 7 ++--- .../Implementation/GlxContextHandler.cpp | 4 +-- .../Implementation/GlxContextHandler.h | 7 +++-- src/Magnum/Platform/NaClApplication.cpp | 4 +-- src/Magnum/Platform/NaClApplication.h | 6 ++-- src/Magnum/Platform/Screen.h | 2 +- src/Magnum/Platform/ScreenedApplication.h | 4 +-- src/Magnum/Platform/ScreenedApplication.hpp | 5 ++-- src/Magnum/Platform/Sdl2Application.cpp | 6 ++-- src/Magnum/Platform/Sdl2Application.h | 6 ++-- .../Platform/WindowlessGlxApplication.cpp | 2 +- .../Platform/WindowlessGlxApplication.h | 5 ++-- .../Platform/WindowlessNaClApplication.cpp | 2 +- .../Platform/WindowlessNaClApplication.h | 2 +- src/Magnum/Platform/XEglApplication.cpp | 4 +-- src/Magnum/Platform/XEglApplication.h | 4 +-- src/Magnum/Platform/magnum-info.cpp | 24 ++++++++-------- src/Magnum/Primitives/Capsule.cpp | 14 +++++----- src/Magnum/Primitives/Capsule.h | 4 +-- src/Magnum/Primitives/Circle.cpp | 8 +++--- src/Magnum/Primitives/Circle.h | 5 ++-- src/Magnum/Primitives/Crosshair.cpp | 8 +++--- src/Magnum/Primitives/Crosshair.h | 5 ++-- src/Magnum/Primitives/Cube.cpp | 6 ++-- src/Magnum/Primitives/Cube.h | 5 ++-- src/Magnum/Primitives/Cylinder.cpp | 10 +++---- src/Magnum/Primitives/Cylinder.h | 6 ++-- src/Magnum/Primitives/Icosphere.cpp | 10 +++---- src/Magnum/Primitives/Icosphere.h | 5 ++-- .../Primitives/Implementation/Spheroid.cpp | 8 +++--- .../Primitives/Implementation/Spheroid.h | 4 +-- .../Implementation/WireframeSpheroid.cpp | 8 +++--- .../Implementation/WireframeSpheroid.h | 4 +-- src/Magnum/Primitives/Line.cpp | 8 +++--- src/Magnum/Primitives/Line.h | 5 ++-- src/Magnum/Primitives/Plane.cpp | 6 ++-- src/Magnum/Primitives/Plane.h | 5 ++-- src/Magnum/Primitives/Square.cpp | 6 ++-- src/Magnum/Primitives/Square.h | 5 ++-- src/Magnum/Primitives/Test/CapsuleTest.cpp | 8 +++--- src/Magnum/Primitives/Test/CircleTest.cpp | 6 ++-- src/Magnum/Primitives/Test/CylinderTest.cpp | 6 ++-- src/Magnum/Primitives/Test/IcosphereTest.cpp | 6 ++-- src/Magnum/Primitives/Test/UVSphereTest.cpp | 6 ++-- src/Magnum/Primitives/UVSphere.cpp | 10 +++---- src/Magnum/Primitives/UVSphere.h | 4 +-- .../Primitives/magnumPrimitivesVisibility.h | 2 +- src/Magnum/Query.cpp | 6 ++-- src/Magnum/Query.h | 4 +-- src/Magnum/Renderbuffer.cpp | 4 +-- src/Magnum/Renderbuffer.h | 6 ++-- src/Magnum/RenderbufferFormat.h | 2 +- src/Magnum/Renderer.cpp | 9 +++--- src/Magnum/Renderer.h | 6 ++-- src/Magnum/Resource.h | 5 ++-- src/Magnum/ResourceManager.h | 2 +- src/Magnum/Sampler.cpp | 8 +++--- src/Magnum/Sampler.h | 6 ++-- src/Magnum/SceneGraph/AbstractCamera.h | 9 +++--- src/Magnum/SceneGraph/AbstractCamera.hpp | 5 ++-- src/Magnum/SceneGraph/AbstractFeature.h | 4 +-- src/Magnum/SceneGraph/AbstractFeature.hpp | 2 +- .../SceneGraph/AbstractGroupedFeature.h | 4 +-- src/Magnum/SceneGraph/AbstractObject.h | 7 ++--- .../SceneGraph/AbstractTransformation.h | 4 +-- src/Magnum/SceneGraph/AbstractTranslation.h | 6 ++-- .../AbstractTranslationRotation2D.h | 2 +- .../AbstractTranslationRotation3D.h | 2 +- .../AbstractTranslationRotationScaling2D.h | 2 +- .../AbstractTranslationRotationScaling3D.h | 2 +- src/Magnum/SceneGraph/Animable.h | 5 ++-- src/Magnum/SceneGraph/Animable.hpp | 7 ++--- src/Magnum/SceneGraph/AnimableGroup.h | 5 ++-- src/Magnum/SceneGraph/Camera2D.h | 2 +- src/Magnum/SceneGraph/Camera2D.hpp | 4 +-- src/Magnum/SceneGraph/Camera3D.h | 2 +- src/Magnum/SceneGraph/Camera3D.hpp | 4 +-- src/Magnum/SceneGraph/Drawable.h | 2 +- src/Magnum/SceneGraph/Drawable.hpp | 2 +- .../SceneGraph/DualComplexTransformation.h | 6 ++-- .../SceneGraph/DualQuaternionTransformation.h | 6 ++-- src/Magnum/SceneGraph/FeatureGroup.h | 4 +-- src/Magnum/SceneGraph/FeatureGroup.hpp | 4 +-- .../SceneGraph/MatrixTransformation2D.h | 6 ++-- .../SceneGraph/MatrixTransformation3D.h | 6 ++-- src/Magnum/SceneGraph/Object.h | 7 ++--- src/Magnum/SceneGraph/Object.hpp | 7 ++--- .../SceneGraph/RigidMatrixTransformation2D.h | 8 +++--- .../SceneGraph/RigidMatrixTransformation3D.h | 8 +++--- src/Magnum/SceneGraph/Scene.h | 2 +- src/Magnum/SceneGraph/SceneGraph.h | 2 +- src/Magnum/SceneGraph/Test/AnimableTest.cpp | 6 ++-- src/Magnum/SceneGraph/Test/CameraTest.cpp | 14 +++++----- .../Test/DualComplexTransformationTest.cpp | 4 +-- .../Test/DualQuaternionTransformationTest.cpp | 4 +-- .../Test/MatrixTransformation2DTest.cpp | 4 +-- .../Test/MatrixTransformation3DTest.cpp | 4 +-- src/Magnum/SceneGraph/Test/ObjectTest.cpp | 4 +-- .../Test/RigidMatrixTransformation2DTest.cpp | 4 +-- .../Test/RigidMatrixTransformation3DTest.cpp | 4 +-- src/Magnum/SceneGraph/Test/SceneTest.cpp | 4 +-- .../Test/TranslationTransformationTest.cpp | 6 ++-- .../SceneGraph/TranslationTransformation.h | 8 +++--- src/Magnum/SceneGraph/instantiation.cpp | 28 +++++++++---------- .../SceneGraph/magnumSceneGraphVisibility.h | 2 +- src/Magnum/Shader.cpp | 5 ++-- src/Magnum/Shader.h | 6 ++-- src/Magnum/Shaders/AbstractVector.h | 2 +- src/Magnum/Shaders/DistanceFieldVector.cpp | 6 ++-- src/Magnum/Shaders/DistanceFieldVector.h | 13 ++++----- src/Magnum/Shaders/Flat.cpp | 6 ++-- src/Magnum/Shaders/Flat.h | 13 ++++----- src/Magnum/Shaders/Generic.h | 2 +- src/Magnum/Shaders/MeshVisualizer.cpp | 6 ++-- src/Magnum/Shaders/MeshVisualizer.h | 8 +++--- src/Magnum/Shaders/Phong.cpp | 6 ++-- src/Magnum/Shaders/Phong.h | 9 +++--- src/Magnum/Shaders/Shaders.h | 2 +- .../Test/DistanceFieldVectorGLTest.cpp | 6 ++-- src/Magnum/Shaders/Test/FlatGLTest.cpp | 6 ++-- .../Shaders/Test/MeshVisualizerGLTest.cpp | 10 +++---- src/Magnum/Shaders/Test/PhongGLTest.cpp | 6 ++-- src/Magnum/Shaders/Test/VectorGLTest.cpp | 6 ++-- src/Magnum/Shaders/Test/VertexColorGLTest.cpp | 6 ++-- src/Magnum/Shaders/Vector.cpp | 6 ++-- src/Magnum/Shaders/Vector.h | 13 ++++----- src/Magnum/Shaders/VertexColor.cpp | 6 ++-- src/Magnum/Shaders/VertexColor.h | 13 ++++----- .../Shaders/magnumShadersResourceImport.hpp | 2 +- src/Magnum/Shaders/magnumShadersVisibility.h | 2 +- src/Magnum/Shapes/AbstractShape.cpp | 4 +-- src/Magnum/Shapes/AbstractShape.h | 10 +++---- src/Magnum/Shapes/AxisAlignedBox.cpp | 6 ++-- src/Magnum/Shapes/AxisAlignedBox.h | 8 +++--- src/Magnum/Shapes/Box.h | 8 +++--- src/Magnum/Shapes/Capsule.cpp | 14 +++++----- src/Magnum/Shapes/Capsule.h | 8 +++--- src/Magnum/Shapes/Collision.h | 6 ++-- src/Magnum/Shapes/Composition.cpp | 2 +- src/Magnum/Shapes/Composition.h | 8 +++--- src/Magnum/Shapes/Cylinder.cpp | 14 +++++----- src/Magnum/Shapes/Cylinder.h | 8 +++--- .../Implementation/CollisionDispatch.cpp | 18 ++++++------ .../Shapes/Implementation/CollisionDispatch.h | 2 +- src/Magnum/Shapes/Line.cpp | 4 +-- src/Magnum/Shapes/Line.h | 6 ++-- src/Magnum/Shapes/LineSegment.h | 2 +- src/Magnum/Shapes/Plane.cpp | 6 ++-- src/Magnum/Shapes/Plane.h | 8 +++--- src/Magnum/Shapes/Point.cpp | 4 +-- src/Magnum/Shapes/Point.h | 6 ++-- src/Magnum/Shapes/Shape.cpp | 2 +- src/Magnum/Shapes/Shape.h | 7 ++--- src/Magnum/Shapes/ShapeGroup.cpp | 2 +- src/Magnum/Shapes/ShapeGroup.h | 7 ++--- src/Magnum/Shapes/Shapes.h | 2 +- src/Magnum/Shapes/Sphere.cpp | 14 +++++----- src/Magnum/Shapes/Sphere.h | 10 +++---- src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp | 8 +++--- src/Magnum/Shapes/Test/BoxTest.cpp | 6 ++-- src/Magnum/Shapes/Test/CapsuleTest.cpp | 12 ++++---- src/Magnum/Shapes/Test/CollisionTest.cpp | 4 +-- src/Magnum/Shapes/Test/CompositionTest.cpp | 12 ++++---- src/Magnum/Shapes/Test/CylinderTest.cpp | 12 ++++---- src/Magnum/Shapes/Test/LineTest.cpp | 6 ++-- src/Magnum/Shapes/Test/PlaneTest.cpp | 8 +++--- src/Magnum/Shapes/Test/PointTest.cpp | 6 ++-- .../Shapes/Test/ShapeImplementationTest.cpp | 2 +- src/Magnum/Shapes/Test/ShapeTest.cpp | 16 +++++------ src/Magnum/Shapes/Test/SphereTest.cpp | 12 ++++---- src/Magnum/Shapes/magnumShapesVisibility.h | 2 +- src/Magnum/Shapes/shapeImplementation.h | 8 +++--- src/Magnum/Swizzle.h | 4 +-- src/Magnum/Test/AbstractImageTest.cpp | 6 ++-- src/Magnum/Test/AbstractObjectGLTest.cpp | 8 +++--- src/Magnum/Test/AbstractOpenGLTester.h | 10 +++---- src/Magnum/Test/AbstractQueryGLTest.cpp | 4 +-- .../Test/AbstractShaderProgramGLTest.cpp | 14 +++++----- src/Magnum/Test/AbstractShaderProgramTest.cpp | 2 +- src/Magnum/Test/AbstractTextureGLTest.cpp | 8 +++--- src/Magnum/Test/ArrayTest.cpp | 2 +- src/Magnum/Test/BufferGLTest.cpp | 8 +++--- src/Magnum/Test/BufferImageGLTest.cpp | 6 ++-- src/Magnum/Test/BufferTextureGLTest.cpp | 6 ++-- src/Magnum/Test/ColorTest.cpp | 2 +- src/Magnum/Test/ContextGLTest.cpp | 6 ++-- src/Magnum/Test/CubeMapTextureArrayGLTest.cpp | 12 ++++---- src/Magnum/Test/CubeMapTextureGLTest.cpp | 12 ++++---- src/Magnum/Test/DebugGLTest.cpp | 11 ++++---- src/Magnum/Test/DebugMessageTest.cpp | 2 +- src/Magnum/Test/DefaultFramebufferTest.cpp | 2 +- src/Magnum/Test/FramebufferGLTest.cpp | 22 +++++++-------- src/Magnum/Test/FramebufferTest.cpp | 2 +- src/Magnum/Test/ImageReferenceTest.cpp | 4 +-- src/Magnum/Test/ImageTest.cpp | 4 +-- src/Magnum/Test/MeshGLTest.cpp | 24 ++++++++-------- src/Magnum/Test/MeshTest.cpp | 2 +- src/Magnum/Test/PrimitiveQueryGLTest.cpp | 18 ++++++------ src/Magnum/Test/RenderbufferGLTest.cpp | 12 ++++---- src/Magnum/Test/RendererTest.cpp | 2 +- src/Magnum/Test/ResourceManagerTest.cpp | 4 +-- src/Magnum/Test/SampleQueryGLTest.cpp | 18 ++++++------ src/Magnum/Test/SamplerTest.cpp | 2 +- src/Magnum/Test/ShaderGLTest.cpp | 8 +++--- src/Magnum/Test/ShaderTest.cpp | 2 +- src/Magnum/Test/TextureGLTest.cpp | 12 ++++---- src/Magnum/Test/TimeQueryGLTest.cpp | 4 +-- src/Magnum/Test/VersionTest.cpp | 2 +- src/Magnum/Text/AbstractFont.cpp | 2 +- src/Magnum/Text/AbstractFont.h | 8 +++--- src/Magnum/Text/AbstractFontConverter.cpp | 2 +- src/Magnum/Text/AbstractFontConverter.h | 6 ++-- src/Magnum/Text/Alignment.h | 2 +- src/Magnum/Text/DistanceFieldGlyphCache.cpp | 12 ++++---- src/Magnum/Text/DistanceFieldGlyphCache.h | 2 +- src/Magnum/Text/GlyphCache.cpp | 10 +++---- src/Magnum/Text/GlyphCache.h | 6 ++-- src/Magnum/Text/Renderer.cpp | 10 +++---- src/Magnum/Text/Renderer.h | 15 +++++----- .../Text/Test/AbstractFontConverterTest.cpp | 4 +-- src/Magnum/Text/Test/AbstractFontTest.cpp | 2 +- src/Magnum/Text/Test/AbstractLayouterTest.cpp | 4 +-- src/Magnum/Text/Test/GlyphCacheGLTest.cpp | 4 +-- src/Magnum/Text/Test/RendererGLTest.cpp | 6 ++-- src/Magnum/Text/Text.h | 5 ++-- src/Magnum/Text/TextRenderer.h | 2 +- src/Magnum/Text/fontconverter.cpp | 10 +++---- src/Magnum/Text/magnumTextVisibility.h | 2 +- src/Magnum/Texture.h | 4 +-- src/Magnum/TextureFormat.h | 2 +- src/Magnum/TextureTools/Atlas.cpp | 4 +-- src/Magnum/TextureTools/Atlas.h | 7 ++--- src/Magnum/TextureTools/DistanceField.cpp | 20 ++++++------- src/Magnum/TextureTools/DistanceField.h | 6 ++-- src/Magnum/TextureTools/Test/AtlasTest.cpp | 4 +-- .../TextureTools/distancefieldconverter.cpp | 22 +++++++-------- .../magnumTextureToolsResourceImport.hpp | 2 +- .../magnumTextureToolsVisibility.h | 2 +- src/Magnum/Timeline.cpp | 2 +- src/Magnum/Timeline.h | 11 ++++---- src/Magnum/Trade/AbstractImageConverter.h | 6 ++-- src/Magnum/Trade/AbstractImporter.cpp | 20 ++++++------- src/Magnum/Trade/AbstractImporter.h | 9 +++--- src/Magnum/Trade/AbstractMaterialData.h | 4 +-- src/Magnum/Trade/ImageData.h | 2 +- src/Magnum/Trade/MeshData2D.cpp | 2 +- src/Magnum/Trade/MeshData2D.h | 5 ++-- src/Magnum/Trade/MeshData3D.cpp | 2 +- src/Magnum/Trade/MeshData3D.h | 5 ++-- src/Magnum/Trade/MeshObjectData2D.h | 2 +- src/Magnum/Trade/MeshObjectData3D.h | 2 +- src/Magnum/Trade/ObjectData2D.h | 4 +-- src/Magnum/Trade/ObjectData3D.h | 4 +-- src/Magnum/Trade/PhongMaterialData.h | 6 ++-- src/Magnum/Trade/SceneData.h | 4 +-- .../Trade/Test/AbstractImageConverterTest.cpp | 6 ++-- .../Trade/Test/AbstractImporterTest.cpp | 2 +- .../Trade/Test/AbstractMaterialDataTest.cpp | 2 +- src/Magnum/Trade/Test/ImageDataTest.cpp | 4 +-- src/Magnum/Trade/Test/ObjectData2DTest.cpp | 2 +- src/Magnum/Trade/Test/ObjectData3DTest.cpp | 2 +- src/Magnum/Trade/Test/TextureDataTest.cpp | 2 +- src/Magnum/Trade/TextureData.h | 6 ++-- src/Magnum/Trade/Trade.h | 2 +- src/Magnum/Types.h | 2 +- src/Magnum/Version.h | 4 +-- src/Magnum/magnumVisibility.h | 2 +- src/MagnumPlugins/MagnumFont/MagnumFont.cpp | 7 ++--- src/MagnumPlugins/MagnumFont/MagnumFont.h | 4 +-- .../MagnumFont/Test/MagnumFontGLTest.cpp | 6 ++-- .../pluginRegistrationMagnumFont.cpp | 2 +- .../MagnumFontConverter.cpp | 10 +++---- .../MagnumFontConverter/MagnumFontConverter.h | 2 +- .../Test/MagnumFontConverterGLTest.cpp | 19 ++++++------- .../pluginRegistrationMagnumFontConverter.cpp | 2 +- .../Test/TgaImageConverterTest.cpp | 10 +++---- .../TgaImageConverter/TgaImageConverter.cpp | 12 ++++---- .../TgaImageConverter/TgaImageConverter.h | 2 +- .../pluginRegistrationTgaImageConverter.cpp | 2 +- .../TgaImporter/Test/TgaImporterTest.cpp | 6 ++-- src/MagnumPlugins/TgaImporter/TgaHeader.h | 2 +- src/MagnumPlugins/TgaImporter/TgaImporter.cpp | 7 ++--- src/MagnumPlugins/TgaImporter/TgaImporter.h | 2 +- .../pluginRegistrationTgaImporter.cpp | 2 +- .../WavAudioImporter/Test/WavImporterTest.cpp | 2 +- .../WavAudioImporter/WavHeader.h | 2 +- .../WavAudioImporter/WavImporter.cpp | 2 +- .../WavAudioImporter/WavImporter.h | 2 +- .../pluginRegistrationWavAudioImporter.cpp | 2 +- 483 files changed, 1351 insertions(+), 1389 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f51b4a48..0d60c1d7e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,14 +45,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CO # where only our headers will be used include_directories(${CMAKE_SOURCE_DIR}/src/MagnumExternal/OpenGL) -if(MAGNUM_BUILD_DEPRECATED) - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/Magnum - ${CMAKE_CURRENT_BINARY_DIR}/Magnum - ${CMAKE_CURRENT_SOURCE_DIR}/MagnumPlugins - ${CMAKE_CURRENT_SOURCE_DIR}/MagnumExternal) -endif() - add_subdirectory(MagnumExternal) add_subdirectory(Magnum) add_subdirectory(MagnumPlugins) diff --git a/src/Magnum/AbstractFramebuffer.cpp b/src/Magnum/AbstractFramebuffer.cpp index 2c0d67627..28855de2b 100644 --- a/src/Magnum/AbstractFramebuffer.cpp +++ b/src/Magnum/AbstractFramebuffer.cpp @@ -24,10 +24,10 @@ #include "AbstractFramebuffer.h" -#include "BufferImage.h" -#include "Context.h" -#include "Extensions.h" -#include "Image.h" +#include "Magnum/BufferImage.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Image.h" #include "Implementation/FramebufferState.h" #include "Implementation/State.h" diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h index 4167a3aa0..80555f5a8 100644 --- a/src/Magnum/AbstractFramebuffer.h +++ b/src/Magnum/AbstractFramebuffer.h @@ -30,9 +30,9 @@ #include -#include "Math/Range.h" -#include "Magnum.h" -#include "OpenGL.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/Math/Range.h" namespace Magnum { diff --git a/src/Magnum/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp index c6c3adf29..626cb9710 100644 --- a/src/Magnum/AbstractImage.cpp +++ b/src/Magnum/AbstractImage.cpp @@ -26,8 +26,8 @@ #include -#include "Math/Vector.h" -#include "ColorFormat.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Math/Vector.h" namespace Magnum { diff --git a/src/Magnum/AbstractImage.h b/src/Magnum/AbstractImage.h index fee386cea..a651755dc 100644 --- a/src/Magnum/AbstractImage.h +++ b/src/Magnum/AbstractImage.h @@ -30,8 +30,8 @@ #include -#include "Magnum.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractObject.cpp b/src/Magnum/AbstractObject.cpp index 10eb46795..2c55735e0 100644 --- a/src/Magnum/AbstractObject.cpp +++ b/src/Magnum/AbstractObject.cpp @@ -26,8 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" + #include "Implementation/State.h" #include "Implementation/DebugState.h" diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h index 33b0f26fc..a3a192c83 100644 --- a/src/Magnum/AbstractObject.h +++ b/src/Magnum/AbstractObject.h @@ -30,9 +30,9 @@ #include -#include "OpenGL.h" -#include "Types.h" -#include "magnumVisibility.h" +#include "Magnum/OpenGL.h" +#include "Magnum/Types.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractResourceLoader.h b/src/Magnum/AbstractResourceLoader.h index 892f13de3..a30c3c899 100644 --- a/src/Magnum/AbstractResourceLoader.h +++ b/src/Magnum/AbstractResourceLoader.h @@ -30,7 +30,7 @@ #include -#include "ResourceManager.h" +#include "Magnum/ResourceManager.h" namespace Magnum { diff --git a/src/Magnum/AbstractShaderProgram.cpp b/src/Magnum/AbstractShaderProgram.cpp index dc01a1f84..3d04f1a73 100644 --- a/src/Magnum/AbstractShaderProgram.cpp +++ b/src/Magnum/AbstractShaderProgram.cpp @@ -24,10 +24,11 @@ #include "AbstractShaderProgram.h" -#include "Math/RectangularMatrix.h" -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" +#include "Magnum/Math/RectangularMatrix.h" + #include "Implementation/DebugState.h" #include "Implementation/ShaderProgramState.h" #include "Implementation/State.h" diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 62c3092a1..713d3bd46 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -31,9 +31,9 @@ #include #include -#include "AbstractObject.h" -#include "Magnum.h" -#include "magnumVisibility.h" +#include "Magnum/AbstractObject.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index 342500779..df6d110fd 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/src/Magnum/AbstractTexture.cpp @@ -24,13 +24,14 @@ #include "AbstractTexture.h" -#include "BufferImage.h" -#include "ColorFormat.h" -#include "Context.h" -#include "Extensions.h" -#include "Image.h" -#include "Shader.h" -#include "TextureFormat.h" +#include "Magnum/BufferImage.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Image.h" +#include "Magnum/Shader.h" +#include "Magnum/TextureFormat.h" + #include "Implementation/DebugState.h" #include "Implementation/State.h" #include "Implementation/TextureState.h" diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index 35bd33f76..251c99f87 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -28,10 +28,10 @@ * @brief Class @ref Magnum::AbstractTexture */ -#include "Array.h" -#include "Color.h" -#include "Sampler.h" -#include "AbstractObject.h" +#include "Magnum/Array.h" +#include "Magnum/Color.h" +#include "Magnum/Sampler.h" +#include "Magnum/AbstractObject.h" namespace Magnum { diff --git a/src/Magnum/Array.h b/src/Magnum/Array.h index 622c48709..2e324e2c5 100644 --- a/src/Magnum/Array.h +++ b/src/Magnum/Array.h @@ -30,8 +30,8 @@ #include -#include "Math/BoolVector.h" /* for Math::Implementation::Sequence */ -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/BoolVector.h" /* for Math::Implementation::Sequence */ namespace Magnum { diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h index ce02c4f9a..5494e53f5 100644 --- a/src/Magnum/Audio/AbstractImporter.h +++ b/src/Magnum/Audio/AbstractImporter.h @@ -30,8 +30,8 @@ #include -#include "Magnum.h" -#include "Audio/Buffer.h" +#include "Magnum/Magnum.h" +#include "Magnum/Audio/Buffer.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Audio.cpp b/src/Magnum/Audio/Audio.cpp index fa382b100..cac27fa93 100644 --- a/src/Magnum/Audio/Audio.cpp +++ b/src/Magnum/Audio/Audio.cpp @@ -25,7 +25,7 @@ #include #include -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h index 1122f561c..52a6d9b24 100644 --- a/src/Magnum/Audio/Buffer.h +++ b/src/Magnum/Audio/Buffer.h @@ -32,8 +32,8 @@ #include #include -#include "Magnum.h" -#include "Audio/magnumAudioVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Audio/magnumAudioVisibility.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Context.cpp b/src/Magnum/Audio/Context.cpp index 9fdf451cb..e0f7a5785 100644 --- a/src/Magnum/Audio/Context.cpp +++ b/src/Magnum/Audio/Context.cpp @@ -28,7 +28,7 @@ #include #include -#include "Magnum.h" +#include "Magnum/Magnum.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Context.h b/src/Magnum/Audio/Context.h index 4a2088687..ae7459e6f 100644 --- a/src/Magnum/Audio/Context.h +++ b/src/Magnum/Audio/Context.h @@ -31,7 +31,7 @@ #include #include -#include "Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/magnumAudioVisibility.h" #ifndef DOXYGEN_GENERATING_OUTPUT typedef struct ALCdevice_struct ALCdevice; diff --git a/src/Magnum/Audio/Renderer.h b/src/Magnum/Audio/Renderer.h index 6d40a7bd1..338a30324 100644 --- a/src/Magnum/Audio/Renderer.h +++ b/src/Magnum/Audio/Renderer.h @@ -30,9 +30,9 @@ #include -#include "Math/Vector3.h" -#include "Magnum.h" -#include "Audio/magnumAudioVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Source.cpp b/src/Magnum/Audio/Source.cpp index e5a25acae..9c8ceb5e2 100644 --- a/src/Magnum/Audio/Source.cpp +++ b/src/Magnum/Audio/Source.cpp @@ -26,7 +26,7 @@ #include -#include "Audio/Buffer.h" +#include "Magnum/Audio/Buffer.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Source.h b/src/Magnum/Audio/Source.h index 591d35d7a..8de8a619c 100644 --- a/src/Magnum/Audio/Source.h +++ b/src/Magnum/Audio/Source.h @@ -32,10 +32,10 @@ #include #include -#include "Math/Vector3.h" -#include "Magnum.h" -#include "Audio/Audio.h" -#include "Audio/magnumAudioVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Audio/Audio.h" +#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp index 7bd92b9a1..908ffff7a 100644 --- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Audio/AbstractImporter.h" +#include "Magnum/Audio/AbstractImporter.h" #include "testConfigure.h" diff --git a/src/Magnum/Audio/Test/BufferTest.cpp b/src/Magnum/Audio/Test/BufferTest.cpp index 5e4bd63c9..e13def785 100644 --- a/src/Magnum/Audio/Test/BufferTest.cpp +++ b/src/Magnum/Audio/Test/BufferTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Audio/Buffer.h" +#include "Magnum/Audio/Buffer.h" namespace Magnum { namespace Audio { namespace Test { diff --git a/src/Magnum/Audio/Test/RendererTest.cpp b/src/Magnum/Audio/Test/RendererTest.cpp index 7751c67ea..6a4a953a8 100644 --- a/src/Magnum/Audio/Test/RendererTest.cpp +++ b/src/Magnum/Audio/Test/RendererTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Audio/Renderer.h" +#include "Magnum/Audio/Renderer.h" namespace Magnum { namespace Audio { namespace Test { diff --git a/src/Magnum/Audio/Test/SourceTest.cpp b/src/Magnum/Audio/Test/SourceTest.cpp index 35f658683..79f388895 100644 --- a/src/Magnum/Audio/Test/SourceTest.cpp +++ b/src/Magnum/Audio/Test/SourceTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Audio/Source.h" +#include "Magnum/Audio/Source.h" namespace Magnum { namespace Audio { namespace Test { diff --git a/src/Magnum/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/magnumAudioVisibility.h index f99a51c24..39d974f6d 100644 --- a/src/Magnum/Audio/magnumAudioVisibility.h +++ b/src/Magnum/Audio/magnumAudioVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumAudio_EXPORTS diff --git a/src/Magnum/Buffer.cpp b/src/Magnum/Buffer.cpp index a453a9e5c..80447462b 100644 --- a/src/Magnum/Buffer.cpp +++ b/src/Magnum/Buffer.cpp @@ -26,8 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" + #include "Implementation/State.h" #include "Implementation/BufferState.h" #include "Implementation/DebugState.h" diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index b03df8373..0ecfa0632 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -35,8 +35,8 @@ #include #include -#include "AbstractObject.h" -#include "Magnum.h" +#include "Magnum/AbstractObject.h" +#include "Magnum/Magnum.h" namespace Magnum { diff --git a/src/Magnum/BufferImage.h b/src/Magnum/BufferImage.h index aaab79b19..3d23a3844 100644 --- a/src/Magnum/BufferImage.h +++ b/src/Magnum/BufferImage.h @@ -30,10 +30,10 @@ */ #endif -#include "Math/Vector3.h" -#include "AbstractImage.h" -#include "Buffer.h" -#include "DimensionTraits.h" +#include "Magnum/AbstractImage.h" +#include "Magnum/Buffer.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { diff --git a/src/Magnum/BufferTexture.cpp b/src/Magnum/BufferTexture.cpp index 28688b929..151dd5248 100644 --- a/src/Magnum/BufferTexture.cpp +++ b/src/Magnum/BufferTexture.cpp @@ -25,9 +25,9 @@ #include "BufferTexture.h" #ifndef MAGNUM_TARGET_GLES -#include "Buffer.h" -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Buffer.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" #include "Implementation/State.h" #include "Implementation/TextureState.h" diff --git a/src/Magnum/BufferTexture.h b/src/Magnum/BufferTexture.h index e8b986c03..0923cd97c 100644 --- a/src/Magnum/BufferTexture.h +++ b/src/Magnum/BufferTexture.h @@ -30,7 +30,7 @@ */ #endif -#include "AbstractTexture.h" +#include "Magnum/AbstractTexture.h" #ifndef MAGNUM_TARGET_GLES namespace Magnum { diff --git a/src/Magnum/Color.h b/src/Magnum/Color.h index 4795dc5bc..bb41f0202 100644 --- a/src/Magnum/Color.h +++ b/src/Magnum/Color.h @@ -30,9 +30,9 @@ #include -#include "Math/Functions.h" -#include "Math/Vector4.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Vector4.h" namespace Magnum { diff --git a/src/Magnum/ColorFormat.h b/src/Magnum/ColorFormat.h index dadccf2cd..4b3b68305 100644 --- a/src/Magnum/ColorFormat.h +++ b/src/Magnum/ColorFormat.h @@ -28,9 +28,9 @@ * @brief Enum @ref Magnum::ColorFormat, @ref Magnum::ColorType */ -#include "Magnum.h" -#include "OpenGL.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index 6896c47fb..f5e29bfbc 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -29,17 +29,17 @@ #include #include -#include "AbstractFramebuffer.h" -#include "AbstractShaderProgram.h" -#include "AbstractTexture.h" -#include "Buffer.h" -#include "BufferTexture.h" -#include "DefaultFramebuffer.h" -#include "Extensions.h" -#include "Framebuffer.h" -#include "Mesh.h" -#include "Renderbuffer.h" -#include "Renderer.h" +#include "Magnum/AbstractFramebuffer.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/AbstractTexture.h" +#include "Magnum/Buffer.h" +#include "Magnum/BufferTexture.h" +#include "Magnum/DefaultFramebuffer.h" +#include "Magnum/Extensions.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/Renderer.h" #include "Implementation/State.h" diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index 300f465a6..fa1c6e13e 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -33,9 +33,9 @@ #include #include -#include "Magnum.h" -#include "OpenGL.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h index 80eb4f3b3..d9959e881 100644 --- a/src/Magnum/CubeMapTexture.h +++ b/src/Magnum/CubeMapTexture.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::CubeMapTexture */ -#include "AbstractTexture.h" +#include "Magnum/AbstractTexture.h" namespace Magnum { diff --git a/src/Magnum/CubeMapTextureArray.h b/src/Magnum/CubeMapTextureArray.h index bb5d9e9ce..2091d819a 100644 --- a/src/Magnum/CubeMapTextureArray.h +++ b/src/Magnum/CubeMapTextureArray.h @@ -30,7 +30,7 @@ */ #endif -#include "AbstractTexture.h" +#include "Magnum/AbstractTexture.h" #ifndef MAGNUM_TARGET_GLES namespace Magnum { diff --git a/src/Magnum/DebugMarker.h b/src/Magnum/DebugMarker.h index 802ade424..28f28860e 100644 --- a/src/Magnum/DebugMarker.h +++ b/src/Magnum/DebugMarker.h @@ -29,7 +29,7 @@ * @deprecated Use @ref DebugMessage.h instead. */ -#include "DebugMessage.h" +#include "Magnum/DebugMessage.h" #ifdef MAGNUM_BUILD_DEPRECATED namespace Magnum { diff --git a/src/Magnum/DebugMessage.cpp b/src/Magnum/DebugMessage.cpp index 76ef91f6c..726fbb441 100644 --- a/src/Magnum/DebugMessage.cpp +++ b/src/Magnum/DebugMessage.cpp @@ -26,10 +26,10 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Implementation/State.h" -#include "Implementation/DebugState.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Implementation/State.h" +#include "Magnum/Implementation/DebugState.h" namespace Magnum { diff --git a/src/Magnum/DebugMessage.h b/src/Magnum/DebugMessage.h index 4f9804390..320ac633a 100644 --- a/src/Magnum/DebugMessage.h +++ b/src/Magnum/DebugMessage.h @@ -30,9 +30,9 @@ #include -#include "Magnum.h" -#include "OpenGL.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/DebugTools/DebugTools.h b/src/Magnum/DebugTools/DebugTools.h index 3fee8ab9a..f8d0f5f2c 100644 --- a/src/Magnum/DebugTools/DebugTools.h +++ b/src/Magnum/DebugTools/DebugTools.h @@ -28,7 +28,7 @@ * @brief Forward declarations for Magnum::DebugTools namespace */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ForceRenderer.cpp b/src/Magnum/DebugTools/ForceRenderer.cpp index cf5f75421..b250fbf5e 100644 --- a/src/Magnum/DebugTools/ForceRenderer.cpp +++ b/src/Magnum/DebugTools/ForceRenderer.cpp @@ -24,13 +24,13 @@ #include "ForceRenderer.h" -#include "Buffer.h" -#include "Mesh.h" -#include "DebugTools/ResourceManager.h" -#include "SceneGraph/AbstractCamera.h" -#include "Shaders/Flat.h" +#include "Magnum/Buffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ResourceManager.h" +#include "Magnum/SceneGraph/AbstractCamera.h" +#include "Magnum/Shaders/Flat.h" -#include "DebugTools/Implementation/ForceRendererTransformation.h" +#include "Implementation/ForceRendererTransformation.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h index f54b892db..81acf7264 100644 --- a/src/Magnum/DebugTools/ForceRenderer.h +++ b/src/Magnum/DebugTools/ForceRenderer.h @@ -28,12 +28,11 @@ * @brief Class Magnum::DebugTools::ForceRenderer, Magnum::DebugTools::ForceRendererOptions, typedef Magnum::DebugTools::ForceRenderer2D, Magnum::DebugTools::ForceRenderer3D */ -#include "Color.h" -#include "Resource.h" -#include "SceneGraph/Drawable.h" -#include "Shaders/Shaders.h" - -#include "magnumDebugToolsVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/Resource.h" +#include "Magnum/SceneGraph/Drawable.h" +#include "Magnum/Shaders/Shaders.h" +#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp index 8e5cd07b6..41621d133 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp @@ -24,11 +24,11 @@ #include "AbstractBoxRenderer.h" -#include "Mesh.h" -#include "Primitives/Cube.h" -#include "Primitives/Square.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Primitives/Cube.h" +#include "Magnum/Primitives/Square.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h index d0375677f..369346190 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h +++ b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h @@ -26,8 +26,8 @@ #include "AbstractShapeRenderer.h" -#include "Resource.h" -#include "Shaders/Shaders.h" +#include "Magnum/Resource.h" +#include "Magnum/Shaders/Shaders.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp index d570806b0..a3703b010 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp @@ -24,14 +24,14 @@ #include "AbstractShapeRenderer.h" -#include "AbstractShaderProgram.h" -#include "Buffer.h" -#include "Mesh.h" -#include "DebugTools/ResourceManager.h" -#include "MeshTools/CompressIndices.h" -#include "Shaders/Flat.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Buffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ResourceManager.h" +#include "Magnum/MeshTools/CompressIndices.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h index 837724f70..0641f8c7c 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h +++ b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h @@ -24,12 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#include "DimensionTraits.h" -#include "Resource.h" -#include "DebugTools/DebugTools.h" -#include "SceneGraph/SceneGraph.h" -#include "Shaders/Shaders.h" -#include "Trade/Trade.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Resource.h" +#include "Magnum/DebugTools/DebugTools.h" +#include "Magnum/SceneGraph/SceneGraph.h" +#include "Magnum/Shaders/Shaders.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { diff --git a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp index dd90f600b..4a84b75f8 100644 --- a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp @@ -24,10 +24,10 @@ #include "AxisAlignedBoxRenderer.h" -#include "Mesh.h" -#include "DebugTools/ShapeRenderer.h" -#include "Shapes/AxisAlignedBox.h" -#include "Shaders/Flat.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Shapes/AxisAlignedBox.h" +#include "Magnum/Shaders/Flat.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h index f1eb9a990..479bdb277 100644 --- a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h +++ b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractBoxRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/BoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/BoxRenderer.cpp index 16ce142ee..539efc60c 100644 --- a/src/Magnum/DebugTools/Implementation/BoxRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/BoxRenderer.cpp @@ -24,10 +24,10 @@ #include "BoxRenderer.h" -#include "Mesh.h" -#include "DebugTools/ShapeRenderer.h" -#include "Shapes/Box.h" -#include "Shaders/Flat.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Shapes/Box.h" +#include "Magnum/Shaders/Flat.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/BoxRenderer.h b/src/Magnum/DebugTools/Implementation/BoxRenderer.h index f1a361b6d..55d84a5f0 100644 --- a/src/Magnum/DebugTools/Implementation/BoxRenderer.h +++ b/src/Magnum/DebugTools/Implementation/BoxRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractBoxRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp index a2f3d9568..79485b162 100644 --- a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp @@ -24,17 +24,17 @@ #include "CapsuleRenderer.h" -#include "Mesh.h" -#include "MeshView.h" -#include "DebugTools/ResourceManager.h" -#include "DebugTools/ShapeRenderer.h" -#include "Primitives/Capsule.h" -#include "Shapes/Capsule.h" -#include "Shaders/Flat.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" - -#include "DebugTools/Implementation/CapsuleRendererTransformation.h" +#include "Magnum/Mesh.h" +#include "Magnum/MeshView.h" +#include "Magnum/DebugTools/ResourceManager.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Primitives/Capsule.h" +#include "Magnum/Shapes/Capsule.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" + +#include "CapsuleRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h index a448e821e..620babf8d 100644 --- a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h +++ b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractShapeRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h b/src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h index 5f9271a67..4bcb8fe7e 100644 --- a/src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h +++ b/src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h @@ -26,11 +26,11 @@ #include -#include "Math/Functions.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "DimensionTraits.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp b/src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp index f7cfbd1e2..691e0dc95 100644 --- a/src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp @@ -24,16 +24,16 @@ #include "CylinderRenderer.h" -#include "Mesh.h" -#include "DebugTools/ShapeRenderer.h" -#include "Shapes/Cylinder.h" -#include "Primitives/Cylinder.h" -#include "Primitives/Square.h" -#include "Shaders/Flat.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" - -#include "DebugTools/Implementation/CylinderRendererTransformation.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Shapes/Cylinder.h" +#include "Magnum/Primitives/Cylinder.h" +#include "Magnum/Primitives/Square.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" + +#include "CylinderRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/CylinderRenderer.h b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h index c98aa5f51..4aadb3d0d 100644 --- a/src/Magnum/DebugTools/Implementation/CylinderRenderer.h +++ b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractShapeRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h b/src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h index 4caf8c5d6..b24704641 100644 --- a/src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h +++ b/src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h @@ -24,11 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Functions.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "DimensionTraits.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h b/src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h index 8674cbafa..11588d60a 100644 --- a/src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h +++ b/src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h @@ -24,11 +24,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Functions.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "DimensionTraits.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp index 0ed2c53e5..62fc800d0 100644 --- a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp @@ -24,15 +24,15 @@ #include "LineSegmentRenderer.h" -#include "Mesh.h" -#include "DebugTools/ShapeRenderer.h" -#include "Shapes/LineSegment.h" -#include "Primitives/Line.h" -#include "Shaders/Flat.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Shapes/LineSegment.h" +#include "Magnum/Primitives/Line.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" -#include "DebugTools/Implementation/LineSegmentRendererTransformation.h" +#include "LineSegmentRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h index 9e17c0a00..13fa095a7 100644 --- a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h +++ b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractShapeRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h b/src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h index 4d0927cd6..5764229de 100644 --- a/src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h +++ b/src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "DimensionTraits.h" +#include "Magnum/DimensionTraits.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/PointRenderer.cpp b/src/Magnum/DebugTools/Implementation/PointRenderer.cpp index 7a5243180..b36f814eb 100644 --- a/src/Magnum/DebugTools/Implementation/PointRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/PointRenderer.cpp @@ -24,13 +24,13 @@ #include "PointRenderer.h" -#include "Mesh.h" -#include "DebugTools/ShapeRenderer.h" -#include "Shapes/Point.h" -#include "Primitives/Crosshair.h" -#include "Shaders/Flat.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Primitives/Crosshair.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/PointRenderer.h b/src/Magnum/DebugTools/Implementation/PointRenderer.h index a3adc9f47..a172d7f77 100644 --- a/src/Magnum/DebugTools/Implementation/PointRenderer.h +++ b/src/Magnum/DebugTools/Implementation/PointRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractShapeRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/SphereRenderer.cpp b/src/Magnum/DebugTools/Implementation/SphereRenderer.cpp index 59362b226..1b6330925 100644 --- a/src/Magnum/DebugTools/Implementation/SphereRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/SphereRenderer.cpp @@ -24,14 +24,14 @@ #include "SphereRenderer.h" -#include "Mesh.h" -#include "DebugTools/ShapeRenderer.h" -#include "Shapes/Sphere.h" -#include "Primitives/Circle.h" -#include "Primitives/UVSphere.h" -#include "Shaders/Flat.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/DebugTools/ShapeRenderer.h" +#include "Magnum/Shapes/Sphere.h" +#include "Magnum/Primitives/Circle.h" +#include "Magnum/Primitives/UVSphere.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/Implementation/SphereRenderer.h b/src/Magnum/DebugTools/Implementation/SphereRenderer.h index 62f892e10..89f35e32d 100644 --- a/src/Magnum/DebugTools/Implementation/SphereRenderer.h +++ b/src/Magnum/DebugTools/Implementation/SphereRenderer.h @@ -26,8 +26,9 @@ #include +#include "Magnum/Shapes/Shapes.h" + #include "AbstractShapeRenderer.h" -#include "Shapes/Shapes.h" namespace Magnum { namespace DebugTools { namespace Implementation { diff --git a/src/Magnum/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp index dd20e7d8c..a406f2589 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.cpp +++ b/src/Magnum/DebugTools/ObjectRenderer.cpp @@ -24,11 +24,11 @@ #include "ObjectRenderer.h" -#include "Buffer.h" -#include "DebugTools/ResourceManager.h" -#include "MeshTools/Interleave.h" -#include "SceneGraph/AbstractCamera.h" -#include "Shaders/VertexColor.h" +#include "Magnum/Buffer.h" +#include "Magnum/DebugTools/ResourceManager.h" +#include "Magnum/MeshTools/Interleave.h" +#include "Magnum/SceneGraph/AbstractCamera.h" +#include "Magnum/Shaders/VertexColor.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h index 9110c4030..8d1f48144 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.h +++ b/src/Magnum/DebugTools/ObjectRenderer.h @@ -28,11 +28,10 @@ * @brief Class Magnum::DebugTools::ObjectRenderer, Magnum::DebugTools::ObjectRendererOptions, typedef Magnum::DebugTools::ObjectRenderer2D, Magnum::DebugTools::ObjectRenderer3D */ -#include "Resource.h" -#include "SceneGraph/Drawable.h" -#include "Shaders/Shaders.h" - -#include "magnumDebugToolsVisibility.h" +#include "Magnum/Resource.h" +#include "Magnum/SceneGraph/Drawable.h" +#include "Magnum/Shaders/Shaders.h" +#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/Profiler.cpp b/src/Magnum/DebugTools/Profiler.cpp index 2528ee29d..efdfbf7e6 100644 --- a/src/Magnum/DebugTools/Profiler.cpp +++ b/src/Magnum/DebugTools/Profiler.cpp @@ -28,7 +28,7 @@ #include #include -#include "Magnum.h" +#include "Magnum/Magnum.h" using namespace std::chrono; diff --git a/src/Magnum/DebugTools/Profiler.h b/src/Magnum/DebugTools/Profiler.h index bf28ea6cb..c0d7b1d3a 100644 --- a/src/Magnum/DebugTools/Profiler.h +++ b/src/Magnum/DebugTools/Profiler.h @@ -33,8 +33,8 @@ #include #include -#include "Types.h" -#include "magnumDebugToolsVisibility.h" +#include "Magnum/Types.h" +#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ResourceManager.cpp b/src/Magnum/DebugTools/ResourceManager.cpp index 94d9f29a4..74fe67698 100644 --- a/src/Magnum/DebugTools/ResourceManager.cpp +++ b/src/Magnum/DebugTools/ResourceManager.cpp @@ -26,12 +26,12 @@ #include "ResourceManager.h" -#include "Buffer.h" -#include "Mesh.h" -#include "MeshView.h" -#include "DebugTools/ForceRenderer.h" -#include "DebugTools/ObjectRenderer.h" -#include "DebugTools/ShapeRenderer.h" +#include "Magnum/Buffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/MeshView.h" +#include "Magnum/DebugTools/ForceRenderer.h" +#include "Magnum/DebugTools/ObjectRenderer.h" +#include "Magnum/DebugTools/ShapeRenderer.h" namespace Magnum { diff --git a/src/Magnum/DebugTools/ResourceManager.h b/src/Magnum/DebugTools/ResourceManager.h index eecd8c592..00c7da58b 100644 --- a/src/Magnum/DebugTools/ResourceManager.h +++ b/src/Magnum/DebugTools/ResourceManager.h @@ -28,18 +28,16 @@ * @brief Class Magnum::DebugTools::ResourceManager */ -#include "Magnum.h" - #ifndef MAGNUM_RESOURCEMANAGER_DEFINE_INTERNALINSTANCE #define MAGNUM_RESOURCEMANAGER_DONT_DEFINE_INTERNALINSTANCE #endif -#include "../ResourceManager.h" - -#include "SceneGraph/SceneGraph.h" -#include "Shapes/Shapes.h" -#include "DebugTools.h" +#include "Magnum/ResourceManager.h" -#include "magnumDebugToolsVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/DebugTools/DebugTools.h" +#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/SceneGraph/SceneGraph.h" +#include "Magnum/Shapes/Shapes.h" namespace Magnum { diff --git a/src/Magnum/DebugTools/ShapeRenderer.cpp b/src/Magnum/DebugTools/ShapeRenderer.cpp index 56c1bbe9b..403997a77 100644 --- a/src/Magnum/DebugTools/ShapeRenderer.cpp +++ b/src/Magnum/DebugTools/ShapeRenderer.cpp @@ -24,10 +24,10 @@ #include "ShapeRenderer.h" -#include "ResourceManager.h" -#include "Shapes/Composition.h" -#include "Shapes/Shape.h" -#include "SceneGraph/AbstractCamera.h" +#include "Magnum/DebugTools/ResourceManager.h" +#include "Magnum/Shapes/Composition.h" +#include "Magnum/Shapes/Shape.h" +#include "Magnum/SceneGraph/AbstractCamera.h" #include "Implementation/AxisAlignedBoxRenderer.h" #include "Implementation/BoxRenderer.h" diff --git a/src/Magnum/DebugTools/ShapeRenderer.h b/src/Magnum/DebugTools/ShapeRenderer.h index b6bf78925..0982d235c 100644 --- a/src/Magnum/DebugTools/ShapeRenderer.h +++ b/src/Magnum/DebugTools/ShapeRenderer.h @@ -28,13 +28,12 @@ * @brief Class Magnum::DebugTools::ShapeRenderer, Magnum::DebugTools::ShapeRendererOptions, typedef Magnum::DebugTools::ShapeRenderer2D, Magnum::DebugTools::ShapeRenderer3D */ -#include "Color.h" -#include "Resource.h" -#include "SceneGraph/Drawable.h" -#include "Shapes/Shapes.h" -#include "Shapes/shapeImplementation.h" - -#include "magnumDebugToolsVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/Resource.h" +#include "Magnum/SceneGraph/Drawable.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/shapeImplementation.h" +#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp index 65a28d4e3..b2f8c2138 100644 --- a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp @@ -24,7 +24,7 @@ #include -#include "DebugTools/Implementation/CapsuleRendererTransformation.h" +#include "../Implementation/CapsuleRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Test { diff --git a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp index 2b4d94c63..32cb1da4b 100644 --- a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp @@ -24,7 +24,7 @@ #include -#include "DebugTools/Implementation/CylinderRendererTransformation.h" +#include "../Implementation/CylinderRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Test { diff --git a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp index 2c440ac49..bdb33325a 100644 --- a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp @@ -24,7 +24,7 @@ #include -#include "DebugTools/Implementation/ForceRendererTransformation.h" +#include "../Implementation/ForceRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Implementation { namespace Test { diff --git a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp index 835e4b30f..4649a7726 100644 --- a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp @@ -24,10 +24,11 @@ #include -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "DebugTools/Implementation/LineSegmentRendererTransformation.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" + +#include "../Implementation/LineSegmentRendererTransformation.h" namespace Magnum { namespace DebugTools { namespace Test { diff --git a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h index d3405f72a..ea27d813e 100644 --- a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h +++ b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumDebugTools_EXPORTS diff --git a/src/Magnum/DefaultFramebuffer.cpp b/src/Magnum/DefaultFramebuffer.cpp index c4b81e1bc..327c2e716 100644 --- a/src/Magnum/DefaultFramebuffer.cpp +++ b/src/Magnum/DefaultFramebuffer.cpp @@ -26,10 +26,10 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Implementation/State.h" -#include "Implementation/FramebufferState.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Implementation/State.h" +#include "Magnum/Implementation/FramebufferState.h" namespace Magnum { diff --git a/src/Magnum/DefaultFramebuffer.h b/src/Magnum/DefaultFramebuffer.h index f264f61f4..5f27e9136 100644 --- a/src/Magnum/DefaultFramebuffer.h +++ b/src/Magnum/DefaultFramebuffer.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::DefaultFramebuffer */ -#include "AbstractFramebuffer.h" +#include "Magnum/AbstractFramebuffer.h" namespace Magnum { diff --git a/src/Magnum/DimensionTraits.h b/src/Magnum/DimensionTraits.h index 69eb13a05..290adf35d 100644 --- a/src/Magnum/DimensionTraits.h +++ b/src/Magnum/DimensionTraits.h @@ -24,8 +24,8 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Math.h" -#include "Types.h" +#include "Magnum/Math/Math.h" +#include "Magnum/Types.h" /** @file * @brief Class Magnum::DimensionTraits diff --git a/src/Magnum/Extensions.h b/src/Magnum/Extensions.h index a4d3c5c53..5db79256f 100644 --- a/src/Magnum/Extensions.h +++ b/src/Magnum/Extensions.h @@ -28,7 +28,7 @@ * @brief Namespace Magnum::Extensions */ -#include "Version.h" +#include "Magnum/Version.h" namespace Magnum { diff --git a/src/Magnum/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp index 4d9bbbe6d..ebbd5dcdd 100644 --- a/src/Magnum/Framebuffer.cpp +++ b/src/Magnum/Framebuffer.cpp @@ -24,12 +24,12 @@ #include "Framebuffer.h" -#include "BufferImage.h" -#include "Context.h" -#include "Extensions.h" -#include "Image.h" -#include "Renderbuffer.h" -#include "Texture.h" +#include "Magnum/BufferImage.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Image.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/Texture.h" #include "Implementation/DebugState.h" #include "Implementation/State.h" diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h index 8e09d8601..fd8b9617b 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::Framebuffer */ -#include "AbstractFramebuffer.h" -#include "CubeMapTexture.h" +#include "Magnum/AbstractFramebuffer.h" +#include "Magnum/CubeMapTexture.h" #ifdef _X11_XLIB_H_ /* Xlib.h, I hate you sincerely */ #undef Status diff --git a/src/Magnum/Image.h b/src/Magnum/Image.h index abf1eb8ba..530349b08 100644 --- a/src/Magnum/Image.h +++ b/src/Magnum/Image.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::Image, typedef @ref Magnum::Image1D, @ref Magnum::Image2D, @ref Magnum::Image3D */ -#include "ImageReference.h" +#include "Magnum/ImageReference.h" namespace Magnum { diff --git a/src/Magnum/ImageFormat.h b/src/Magnum/ImageFormat.h index 3d4bf688f..df7597aa3 100644 --- a/src/Magnum/ImageFormat.h +++ b/src/Magnum/ImageFormat.h @@ -31,7 +31,7 @@ */ #endif -#include "ColorFormat.h" +#include "Magnum/ColorFormat.h" #ifdef MAGNUM_BUILD_DEPRECATED namespace Magnum { diff --git a/src/Magnum/ImageReference.h b/src/Magnum/ImageReference.h index 85661d201..c785c3a35 100644 --- a/src/Magnum/ImageReference.h +++ b/src/Magnum/ImageReference.h @@ -28,9 +28,9 @@ * @brief Class @ref Magnum::ImageReference, typedef @ref Magnum::ImageReference1D, @ref Magnum::ImageReference2D, @ref Magnum::ImageReference3D */ -#include "Math/Vector3.h" -#include "AbstractImage.h" -#include "DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/AbstractImage.h" +#include "Magnum/DimensionTraits.h" namespace Magnum { diff --git a/src/Magnum/Implementation/BufferState.h b/src/Magnum/Implementation/BufferState.h index 6ca93515e..ab6873c2f 100644 --- a/src/Magnum/Implementation/BufferState.h +++ b/src/Magnum/Implementation/BufferState.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Buffer.h" +#include "Magnum/Buffer.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/DebugState.cpp b/src/Magnum/Implementation/DebugState.cpp index e00b1bb62..401b256be 100644 --- a/src/Magnum/Implementation/DebugState.cpp +++ b/src/Magnum/Implementation/DebugState.cpp @@ -24,9 +24,9 @@ #include "DebugState.h" -#include "AbstractObject.h" -#include "Context.h" -#include "Extensions.h" +#include "Magnum/AbstractObject.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/DebugState.h b/src/Magnum/Implementation/DebugState.h index 0b3ec18f1..bac702475 100644 --- a/src/Magnum/Implementation/DebugState.h +++ b/src/Magnum/Implementation/DebugState.h @@ -26,7 +26,7 @@ #include -#include "DebugMessage.h" +#include "Magnum/DebugMessage.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/FramebufferState.h b/src/Magnum/Implementation/FramebufferState.h index 87f72120d..13470de16 100644 --- a/src/Magnum/Implementation/FramebufferState.h +++ b/src/Magnum/Implementation/FramebufferState.h @@ -24,9 +24,9 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Range.h" -#include "Magnum.h" -#include "OpenGL.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/Math/Range.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/MeshState.h b/src/Magnum/Implementation/MeshState.h index e9b9f2dfb..a9b10f84f 100644 --- a/src/Magnum/Implementation/MeshState.h +++ b/src/Magnum/Implementation/MeshState.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Magnum.h" +#include "Magnum/Magnum.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/RendererState.h b/src/Magnum/Implementation/RendererState.h index e356c2e82..fea0bbb87 100644 --- a/src/Magnum/Implementation/RendererState.h +++ b/src/Magnum/Implementation/RendererState.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Renderer.h" +#include "Magnum/Renderer.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/ShaderProgramState.h b/src/Magnum/Implementation/ShaderProgramState.h index dd3afc347..bc1bab74b 100644 --- a/src/Magnum/Implementation/ShaderProgramState.h +++ b/src/Magnum/Implementation/ShaderProgramState.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "OpenGL.h" +#include "Magnum/OpenGL.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/ShaderState.h b/src/Magnum/Implementation/ShaderState.h index 678c114c9..77031310a 100644 --- a/src/Magnum/Implementation/ShaderState.h +++ b/src/Magnum/Implementation/ShaderState.h @@ -24,9 +24,9 @@ DEALINGS IN THE SOFTWARE. */ -#include "OpenGL.h" -#include "Types.h" -#include "magnumConfigure.h" +#include "Magnum/OpenGL.h" +#include "Magnum/Types.h" +#include "Magnum/magnumConfigure.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/State.cpp b/src/Magnum/Implementation/State.cpp index ff35e3c64..27cc5d709 100644 --- a/src/Magnum/Implementation/State.cpp +++ b/src/Magnum/Implementation/State.cpp @@ -24,16 +24,17 @@ #include "State.h" -#include "Context.h" -#include "Extensions.h" -#include "Implementation/BufferState.h" -#include "Implementation/DebugState.h" -#include "Implementation/FramebufferState.h" -#include "Implementation/MeshState.h" -#include "Implementation/RendererState.h" -#include "Implementation/ShaderState.h" -#include "Implementation/ShaderProgramState.h" -#include "Implementation/TextureState.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" + +#include "BufferState.h" +#include "DebugState.h" +#include "FramebufferState.h" +#include "MeshState.h" +#include "RendererState.h" +#include "ShaderState.h" +#include "ShaderProgramState.h" +#include "TextureState.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/State.h b/src/Magnum/Implementation/State.h index 36570baa3..252f3e07f 100644 --- a/src/Magnum/Implementation/State.h +++ b/src/Magnum/Implementation/State.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Magnum.h" +#include "Magnum/Magnum.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Implementation/TextureState.h b/src/Magnum/Implementation/TextureState.h index ab5d237fa..881a5eafe 100644 --- a/src/Magnum/Implementation/TextureState.h +++ b/src/Magnum/Implementation/TextureState.h @@ -26,7 +26,7 @@ #include -#include "OpenGL.h" +#include "Magnum/OpenGL.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 611d4dffd..4a36c74a2 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -30,9 +30,9 @@ #include -#include "Math/Math.h" -#include "Types.h" -#include "magnumConfigure.h" +#include "Magnum/Types.h" +#include "Magnum/magnumConfigure.h" +#include "Magnum/Math/Math.h" #ifdef MAGNUM_BUILD_DEPRECATED #include diff --git a/src/Magnum/Math/Algorithms/GaussJordan.h b/src/Magnum/Math/Algorithms/GaussJordan.h index 37bacfe51..c7ca79e94 100644 --- a/src/Magnum/Math/Algorithms/GaussJordan.h +++ b/src/Magnum/Math/Algorithms/GaussJordan.h @@ -28,7 +28,7 @@ * @brief Function Magnum::Math::Algorithms::gaussJordanInPlaceTransposed(), Magnum::Math::Algorithms::gaussJordanInPlace() */ -#include "Math/RectangularMatrix.h" +#include "Magnum/Math/RectangularMatrix.h" namespace Magnum { namespace Math { namespace Algorithms { diff --git a/src/Magnum/Math/Algorithms/GramSchmidt.h b/src/Magnum/Math/Algorithms/GramSchmidt.h index 5346fe9ee..8fbe5322d 100644 --- a/src/Magnum/Math/Algorithms/GramSchmidt.h +++ b/src/Magnum/Math/Algorithms/GramSchmidt.h @@ -28,7 +28,7 @@ * @brief Function Magnum::Math::Algorithms::gramSchmidtOrthogonalizeInPlace(), Magnum::Math::Algorithms::gramSchmidtOrthogonalize(), Magnum::Math::Algorithms::gramSchmidtOrthonormalizeInPlace(), Magnum::Math::Algorithms::gramSchmidtOrthonormalize() */ -#include "Math/RectangularMatrix.h" +#include "Magnum/Math/RectangularMatrix.h" namespace Magnum { namespace Math { namespace Algorithms { diff --git a/src/Magnum/Math/Algorithms/Svd.h b/src/Magnum/Math/Algorithms/Svd.h index 1ae6a46aa..3b4d53dc5 100644 --- a/src/Magnum/Math/Algorithms/Svd.h +++ b/src/Magnum/Math/Algorithms/Svd.h @@ -30,8 +30,8 @@ #include -#include "Math/Functions.h" -#include "Math/Matrix.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix.h" namespace Magnum { namespace Math { namespace Algorithms { diff --git a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp index 8148b9608..054ef1e26 100644 --- a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp @@ -24,7 +24,7 @@ #include -#include "Math/Algorithms/GaussJordan.h" +#include "Magnum/Math/Algorithms/GaussJordan.h" namespace Magnum { namespace Math { namespace Algorithms { namespace Test { diff --git a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp index 57c070d45..1ba6a4af3 100644 --- a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp @@ -24,7 +24,7 @@ #include -#include "Math/Algorithms/GramSchmidt.h" +#include "Magnum/Math/Algorithms/GramSchmidt.h" namespace Magnum { namespace Math { namespace Algorithms { namespace Test { diff --git a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp index b8b995f2b..b6161ff94 100644 --- a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp @@ -24,7 +24,7 @@ #include -#include "Math/Algorithms/Svd.h" +#include "Magnum/Math/Algorithms/Svd.h" namespace Magnum { namespace Math { namespace Algorithms { namespace Test { diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index e76a02c69..61719b021 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -31,11 +31,10 @@ #include #include -#include "Math/Constants.h" -#include "Math/Math.h" -#include "Math/Unit.h" - -#include "magnumVisibility.h" +#include "Magnum/magnumVisibility.h" +#include "Magnum/Math/Constants.h" +#include "Magnum/Math/Math.h" +#include "Magnum/Math/Unit.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h index dca661894..99c0fd6dc 100644 --- a/src/Magnum/Math/BoolVector.h +++ b/src/Magnum/Math/BoolVector.h @@ -31,7 +31,7 @@ #include #include -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Complex.h b/src/Magnum/Math/Complex.h index 6c992a677..7b8b88ab0 100644 --- a/src/Magnum/Math/Complex.h +++ b/src/Magnum/Math/Complex.h @@ -32,8 +32,8 @@ #include #include -#include "Math/Matrix.h" -#include "Math/Vector2.h" +#include "Magnum/Math/Matrix.h" +#include "Magnum/Math/Vector2.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Constants.h b/src/Magnum/Math/Constants.h index a2bc5a7b6..29f3b07d0 100644 --- a/src/Magnum/Math/Constants.h +++ b/src/Magnum/Math/Constants.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::Constants */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Dual.h b/src/Magnum/Math/Dual.h index 9cb42afa6..91ae02d59 100644 --- a/src/Magnum/Math/Dual.h +++ b/src/Magnum/Math/Dual.h @@ -31,7 +31,7 @@ #include #include -#include "Math/TypeTraits.h" +#include "Magnum/Math/TypeTraits.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h index 5cde5f0ad..eeceefe27 100644 --- a/src/Magnum/Math/DualComplex.h +++ b/src/Magnum/Math/DualComplex.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Math::DualComplex */ -#include "Math/Dual.h" -#include "Math/Complex.h" -#include "Math/Matrix3.h" +#include "Magnum/Math/Complex.h" +#include "Magnum/Math/Dual.h" +#include "Magnum/Math/Matrix3.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h index a1fd0526b..7d3003d4a 100644 --- a/src/Magnum/Math/DualQuaternion.h +++ b/src/Magnum/Math/DualQuaternion.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Math::DualQuaternion */ -#include "Math/Dual.h" -#include "Math/Matrix4.h" -#include "Math/Quaternion.h" +#include "Magnum/Math/Dual.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Quaternion.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Functions.h b/src/Magnum/Math/Functions.h index 6230b4390..9734c5c93 100644 --- a/src/Magnum/Math/Functions.h +++ b/src/Magnum/Math/Functions.h @@ -24,18 +24,17 @@ DEALINGS IN THE SOFTWARE. */ +/** @file + * @brief Functions usable with scalar and vector types + */ + #include #include #include #include -#include "Math/Vector.h" - -#include "magnumVisibility.h" - -/** @file - * @brief Functions usable with scalar and vector types - */ +#include "Magnum/magnumVisibility.h" +#include "Magnum/Math/Vector.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Geometry/Distance.h b/src/Magnum/Math/Geometry/Distance.h index c5aa422a9..dda91a890 100644 --- a/src/Magnum/Math/Geometry/Distance.h +++ b/src/Magnum/Math/Geometry/Distance.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Math::Geometry::Distance */ -#include "Math/Functions.h" -#include "Math/Vector3.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { namespace Geometry { diff --git a/src/Magnum/Math/Geometry/Intersection.h b/src/Magnum/Math/Geometry/Intersection.h index 35adfe578..4e19b75de 100644 --- a/src/Magnum/Math/Geometry/Intersection.h +++ b/src/Magnum/Math/Geometry/Intersection.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::Geometry::Intersection */ -#include "Math/Vector3.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { namespace Geometry { diff --git a/src/Magnum/Math/Geometry/Rectangle.h b/src/Magnum/Math/Geometry/Rectangle.h index bf44dfd7e..466afd789 100644 --- a/src/Magnum/Math/Geometry/Rectangle.h +++ b/src/Magnum/Math/Geometry/Rectangle.h @@ -29,7 +29,7 @@ * @deprecated Use @ref Math/Range.h instead. */ -#include "Math/Range.h" +#include "Magnum/Math/Range.h" #ifdef MAGNUM_BUILD_DEPRECATED #include diff --git a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp index 5d658d4d2..3b5907923 100644 --- a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp +++ b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/Constants.h" -#include "Math/Geometry/Distance.h" +#include "Magnum/Math/Constants.h" +#include "Magnum/Math/Geometry/Distance.h" namespace Magnum { namespace Math { namespace Geometry { namespace Test { diff --git a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp index 551a5a5f6..dcaf399f6 100644 --- a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp +++ b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Math/Geometry/Intersection.h" +#include "Magnum/Math/Geometry/Intersection.h" namespace Magnum { namespace Math { namespace Geometry { namespace Test { diff --git a/src/Magnum/Math/Math.h b/src/Magnum/Math/Math.h index 762af5290..10d12bde6 100644 --- a/src/Magnum/Math/Math.h +++ b/src/Magnum/Math/Math.h @@ -31,7 +31,7 @@ #include #include -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index 9833bbc16..5b3037041 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::Matrix */ -#include "RectangularMatrix.h" +#include "Magnum/Math/RectangularMatrix.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h index 380ba6ad6..ab6a4f6a9 100644 --- a/src/Magnum/Math/Matrix3.h +++ b/src/Magnum/Math/Matrix3.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Math::Matrix3 */ -#include "Math/Matrix.h" -#include "Math/Vector3.h" +#include "Magnum/Math/Matrix.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h index 702b506a8..380ab83f5 100644 --- a/src/Magnum/Math/Matrix4.h +++ b/src/Magnum/Math/Matrix4.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Math::Matrix4 */ -#include "Math/Matrix.h" -#include "Math/Vector4.h" +#include "Magnum/Math/Matrix.h" +#include "Magnum/Math/Vector4.h" #ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */ #undef near diff --git a/src/Magnum/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h index cfa6454a6..b25acb5b8 100644 --- a/src/Magnum/Math/Quaternion.h +++ b/src/Magnum/Math/Quaternion.h @@ -32,9 +32,9 @@ #include #include -#include "Math/TypeTraits.h" -#include "Math/Matrix.h" -#include "Math/Vector3.h" +#include "Magnum/Math/Matrix.h" +#include "Magnum/Math/TypeTraits.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h index e914f02ec..014039847 100644 --- a/src/Magnum/Math/Range.h +++ b/src/Magnum/Math/Range.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::Math::Range, @ref Magnum::Math::Range2D, @ref Magnum::Math::Range3D, alias @ref Magnum::Math::Range1D */ -#include "Math/Vector3.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index 21c17d60d..4e635fea4 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::RectangularMatrix */ -#include "Math/Vector.h" +#include "Magnum/Math/Vector.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Swizzle.h b/src/Magnum/Math/Swizzle.h index 0575b2e91..192347a94 100644 --- a/src/Magnum/Math/Swizzle.h +++ b/src/Magnum/Math/Swizzle.h @@ -28,7 +28,7 @@ * @brief Function Magnum::Math::swizzle() */ -#include "Vector.h" +#include "Magnum/Math/Vector.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp index 72120aa85..fb77d34da 100644 --- a/src/Magnum/Math/Test/AngleTest.cpp +++ b/src/Magnum/Math/Test/AngleTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Math/Angle.h" +#include "Magnum/Math/Angle.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/BoolVectorTest.cpp b/src/Magnum/Math/Test/BoolVectorTest.cpp index 72c2e134d..0ddb707f0 100644 --- a/src/Magnum/Math/Test/BoolVectorTest.cpp +++ b/src/Magnum/Math/Test/BoolVectorTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Math/BoolVector.h" +#include "Magnum/Math/BoolVector.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp index ff5d176e0..bd2e030e7 100644 --- a/src/Magnum/Math/Test/ComplexTest.cpp +++ b/src/Magnum/Math/Test/ComplexTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/Complex.h" -#include "Math/Matrix3.h" +#include "Magnum/Math/Complex.h" +#include "Magnum/Math/Matrix3.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/ConstantsTest.cpp b/src/Magnum/Math/Test/ConstantsTest.cpp index c443b14dc..9758cb56b 100644 --- a/src/Magnum/Math/Test/ConstantsTest.cpp +++ b/src/Magnum/Math/Test/ConstantsTest.cpp @@ -24,8 +24,8 @@ #include -#include "Math/Constants.h" -#include "Math/Functions.h" +#include "Magnum/Math/Constants.h" +#include "Magnum/Math/Functions.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp index a01374061..2638fae7c 100644 --- a/src/Magnum/Math/Test/DualComplexTest.cpp +++ b/src/Magnum/Math/Test/DualComplexTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/DualComplex.h" -#include "Math/DualQuaternion.h" +#include "Magnum/Math/DualComplex.h" +#include "Magnum/Math/DualQuaternion.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp index 27d337256..a24cf6934 100644 --- a/src/Magnum/Math/Test/DualQuaternionTest.cpp +++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Math/DualQuaternion.h" +#include "Magnum/Math/DualQuaternion.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index d5bf78614..76c353d32 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Math/Dual.h" +#include "Magnum/Math/Dual.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp index a72f897f3..e5d424474 100644 --- a/src/Magnum/Math/Test/FunctionsTest.cpp +++ b/src/Magnum/Math/Test/FunctionsTest.cpp @@ -24,8 +24,8 @@ #include -#include "Math/Functions.h" -#include "Math/Vector3.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp index 39bf78ae1..17ed60a81 100644 --- a/src/Magnum/Math/Test/Matrix3Test.cpp +++ b/src/Magnum/Math/Test/Matrix3Test.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Matrix3.h" +#include "Magnum/Math/Matrix3.h" struct Mat3 { float a[9]; diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp index 0f5eba0b8..385bf385f 100644 --- a/src/Magnum/Math/Test/Matrix4Test.cpp +++ b/src/Magnum/Math/Test/Matrix4Test.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Matrix4.h" +#include "Magnum/Math/Matrix4.h" struct Mat4 { float a[16]; diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index 6e28cb699..3f766f5d7 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Matrix.h" +#include "Magnum/Math/Matrix.h" struct Mat3 { float a[9]; diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index 8130ccf2f..f49dc89b3 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/Matrix4.h" -#include "Math/Quaternion.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Quaternion.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index ae54276e8..cce67fd21 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -26,10 +26,10 @@ #include #include -#include "Math/Range.h" +#include "Magnum/Math/Range.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include "Math/Geometry/Rectangle.h" +#include "Magnum/Math/Geometry/Rectangle.h" #endif namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index 445b4573d..914387544 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/RectangularMatrix.h" +#include "Magnum/Math/RectangularMatrix.h" struct Mat2x3 { float a[6]; diff --git a/src/Magnum/Math/Test/SwizzleTest.cpp b/src/Magnum/Math/Test/SwizzleTest.cpp index 476c12dd6..3ceb0627c 100644 --- a/src/Magnum/Math/Test/SwizzleTest.cpp +++ b/src/Magnum/Math/Test/SwizzleTest.cpp @@ -24,7 +24,7 @@ #include -#include "Math/Swizzle.h" +#include "Magnum/Math/Swizzle.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp index cc2d1ae4d..4b4f073fe 100644 --- a/src/Magnum/Math/Test/TypeTraitsTest.cpp +++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Math/TypeTraits.h" +#include "Magnum/Math/TypeTraits.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp index ec8420b0c..f931058ca 100644 --- a/src/Magnum/Math/Test/UnitTest.cpp +++ b/src/Magnum/Math/Test/UnitTest.cpp @@ -24,7 +24,7 @@ #include -#include "Math/Unit.h" +#include "Magnum/Math/Unit.h" namespace Magnum { namespace Math { namespace Test { diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp index 6e782bb6d..30fd16b30 100644 --- a/src/Magnum/Math/Test/Vector2Test.cpp +++ b/src/Magnum/Math/Test/Vector2Test.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Vector3.h" /* Vector3 used in Vector2::cross() */ +#include "Magnum/Math/Vector3.h" /* Vector3 used in Vector2::cross() */ struct Vec2 { float x, y; diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp index 34c37a4ac..a90fe5d80 100644 --- a/src/Magnum/Math/Test/Vector3Test.cpp +++ b/src/Magnum/Math/Test/Vector3Test.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Vector3.h" +#include "Magnum/Math/Vector3.h" struct Vec3 { float x, y, z; diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp index 91b32f8f9..64ede6c50 100644 --- a/src/Magnum/Math/Test/Vector4Test.cpp +++ b/src/Magnum/Math/Test/Vector4Test.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Vector4.h" +#include "Magnum/Math/Vector4.h" struct Vec4 { float x, y, z, w; diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index 1d8bc01fe..ac036721c 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Math/Vector.h" +#include "Magnum/Math/Vector.h" struct Vec3 { float x, y, z; diff --git a/src/Magnum/Math/TypeTraits.h b/src/Magnum/Math/TypeTraits.h index 213052604..f73429725 100644 --- a/src/Magnum/Math/TypeTraits.h +++ b/src/Magnum/Math/TypeTraits.h @@ -30,7 +30,7 @@ #include -#include "Types.h" +#include "Magnum/Types.h" /** @brief Precision when testing floats for equality */ #ifndef FLOAT_EQUALITY_PRECISION diff --git a/src/Magnum/Math/Unit.h b/src/Magnum/Math/Unit.h index a0822321c..a0c87c1a8 100644 --- a/src/Magnum/Math/Unit.h +++ b/src/Magnum/Math/Unit.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::Unit */ -#include "Math/TypeTraits.h" +#include "Magnum/Math/TypeTraits.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 42a00a239..02627fe01 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -34,11 +34,10 @@ #include #include -#include "Math/Angle.h" -#include "Math/BoolVector.h" -#include "Math/TypeTraits.h" - -#include "magnumVisibility.h" +#include "Magnum/magnumVisibility.h" +#include "Magnum/Math/Angle.h" +#include "Magnum/Math/BoolVector.h" +#include "Magnum/Math/TypeTraits.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Vector2.h b/src/Magnum/Math/Vector2.h index 4eac0abb7..0dffac05d 100644 --- a/src/Magnum/Math/Vector2.h +++ b/src/Magnum/Math/Vector2.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::Vector2 */ -#include "Vector.h" +#include "Magnum/Math/Vector.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Vector3.h b/src/Magnum/Math/Vector3.h index 04147cea0..03f7c0055 100644 --- a/src/Magnum/Math/Vector3.h +++ b/src/Magnum/Math/Vector3.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Math::Vector3 */ -#include "Vector2.h" -#include "Swizzle.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Math/Swizzle.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Vector4.h b/src/Magnum/Math/Vector4.h index 260d7e20f..eae27f307 100644 --- a/src/Magnum/Math/Vector4.h +++ b/src/Magnum/Math/Vector4.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Math::Vector4 */ -#include "Vector3.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/instantiation.cpp b/src/Magnum/Math/instantiation.cpp index 4c4b899ab..3c0915110 100644 --- a/src/Magnum/Math/instantiation.cpp +++ b/src/Magnum/Math/instantiation.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/DualComplex.h" -#include "Math/DualQuaternion.h" -#include "Math/Range.h" +#include "Magnum/Math/DualComplex.h" +#include "Magnum/Math/DualQuaternion.h" +#include "Magnum/Math/Range.h" namespace Corrade { namespace Utility { diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index 9ea11a1d8..baea5106a 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -26,9 +26,10 @@ #include -#include "Buffer.h" -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Buffer.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" + #include "Implementation/DebugState.h" #include "Implementation/BufferState.h" #include "Implementation/MeshState.h" diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 738c52b8b..cde708263 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -31,7 +31,7 @@ #include #include -#include "AbstractShaderProgram.h" +#include "Magnum/AbstractShaderProgram.h" namespace Magnum { diff --git a/src/Magnum/MeshTools/CombineIndexedArrays.h b/src/Magnum/MeshTools/CombineIndexedArrays.h index ab56624ec..4c7623b2c 100644 --- a/src/Magnum/MeshTools/CombineIndexedArrays.h +++ b/src/Magnum/MeshTools/CombineIndexedArrays.h @@ -32,8 +32,8 @@ #include #include -#include "Math/Vector.h" -#include "MeshTools/RemoveDuplicates.h" +#include "Magnum/Math/Vector.h" +#include "Magnum/MeshTools/RemoveDuplicates.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp index 7c726c42f..e0a5829e7 100644 --- a/src/Magnum/MeshTools/CompressIndices.cpp +++ b/src/Magnum/MeshTools/CompressIndices.cpp @@ -28,8 +28,8 @@ #include #include -#include "Math/Functions.h" -#include "Buffer.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Buffer.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h index fc4968d13..0aa956a71 100644 --- a/src/Magnum/MeshTools/CompressIndices.h +++ b/src/Magnum/MeshTools/CompressIndices.h @@ -30,9 +30,8 @@ #include -#include "Mesh.h" - -#include "magnumMeshToolsVisibility.h" +#include "Magnum/Mesh.h" +#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Duplicate.h b/src/Magnum/MeshTools/Duplicate.h index f35549990..94fac13c5 100644 --- a/src/Magnum/MeshTools/Duplicate.h +++ b/src/Magnum/MeshTools/Duplicate.h @@ -30,7 +30,7 @@ #include -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FlipNormals.cpp b/src/Magnum/MeshTools/FlipNormals.cpp index 0a2172b32..5170116f6 100644 --- a/src/Magnum/MeshTools/FlipNormals.cpp +++ b/src/Magnum/MeshTools/FlipNormals.cpp @@ -24,7 +24,7 @@ #include "FlipNormals.h" -#include "Math/Vector3.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FlipNormals.h b/src/Magnum/MeshTools/FlipNormals.h index 6bdbe705b..cc2a06283 100644 --- a/src/Magnum/MeshTools/FlipNormals.h +++ b/src/Magnum/MeshTools/FlipNormals.h @@ -30,9 +30,8 @@ #include -#include "Magnum.h" - -#include "magnumMeshToolsVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FullScreenTriangle.cpp b/src/Magnum/MeshTools/FullScreenTriangle.cpp index 5ccea0a09..0693836cd 100644 --- a/src/Magnum/MeshTools/FullScreenTriangle.cpp +++ b/src/Magnum/MeshTools/FullScreenTriangle.cpp @@ -24,12 +24,12 @@ #include "FullScreenTriangle.h" -#include "Math/Vector2.h" -#include "AbstractShaderProgram.h" -#include "Buffer.h" -#include "Context.h" -#include "Mesh.h" -#include "Version.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Buffer.h" +#include "Magnum/Context.h" +#include "Magnum/Mesh.h" +#include "Magnum/Version.h" +#include "Magnum/Math/Vector2.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FullScreenTriangle.h b/src/Magnum/MeshTools/FullScreenTriangle.h index 70290b48c..96256fd6f 100644 --- a/src/Magnum/MeshTools/FullScreenTriangle.h +++ b/src/Magnum/MeshTools/FullScreenTriangle.h @@ -31,8 +31,8 @@ #include #include -#include "Magnum.h" -#include "MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/GenerateFlatNormals.cpp b/src/Magnum/MeshTools/GenerateFlatNormals.cpp index e9703b124..0d5b22a2f 100644 --- a/src/Magnum/MeshTools/GenerateFlatNormals.cpp +++ b/src/Magnum/MeshTools/GenerateFlatNormals.cpp @@ -24,8 +24,8 @@ #include "GenerateFlatNormals.h" -#include "Math/Vector3.h" -#include "MeshTools/RemoveDuplicates.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/MeshTools/RemoveDuplicates.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/GenerateFlatNormals.h b/src/Magnum/MeshTools/GenerateFlatNormals.h index ed0a801ea..0ff158bfb 100644 --- a/src/Magnum/MeshTools/GenerateFlatNormals.h +++ b/src/Magnum/MeshTools/GenerateFlatNormals.h @@ -31,9 +31,8 @@ #include #include -#include "Magnum.h" - -#include "magnumMeshToolsVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h index cb6644162..d85467f7d 100644 --- a/src/Magnum/MeshTools/Interleave.h +++ b/src/Magnum/MeshTools/Interleave.h @@ -33,8 +33,8 @@ #include #include -#include "Mesh.h" -#include "Buffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/Buffer.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h index e1403fd6e..c76139818 100644 --- a/src/Magnum/MeshTools/RemoveDuplicates.h +++ b/src/Magnum/MeshTools/RemoveDuplicates.h @@ -33,8 +33,8 @@ #include #include -#include "Math/Functions.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp index de139add4..9dcd8fa2a 100644 --- a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp +++ b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp @@ -26,8 +26,8 @@ #include #include -#include "Types.h" -#include "MeshTools/CombineIndexedArrays.h" +#include "Magnum/Types.h" +#include "Magnum/MeshTools/CombineIndexedArrays.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp index 49be7308d..f55882799 100644 --- a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp +++ b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "MeshTools/CompressIndices.h" +#include "Magnum/MeshTools/CompressIndices.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp index 14736b9f1..de573070d 100644 --- a/src/Magnum/MeshTools/Test/DuplicateTest.cpp +++ b/src/Magnum/MeshTools/Test/DuplicateTest.cpp @@ -24,8 +24,8 @@ #include -#include "MeshTools/Duplicate.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/MeshTools/Duplicate.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp index 140388963..4ce8bfe3b 100644 --- a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/Vector3.h" -#include "MeshTools/FlipNormals.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/MeshTools/FlipNormals.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp index 4dbd95b94..bb94c4c7e 100644 --- a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/Vector3.h" -#include "MeshTools/GenerateFlatNormals.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/MeshTools/GenerateFlatNormals.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp index 4ab6712c9..b24bf2ed4 100644 --- a/src/Magnum/MeshTools/Test/InterleaveTest.cpp +++ b/src/Magnum/MeshTools/Test/InterleaveTest.cpp @@ -27,7 +27,7 @@ #include #include -#include "MeshTools/Interleave.h" +#include "Magnum/MeshTools/Interleave.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp index 9966be31a..d3ae8567f 100644 --- a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp +++ b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp @@ -24,7 +24,7 @@ #include -#include "MeshTools/RemoveDuplicates.h" +#include "Magnum/MeshTools/RemoveDuplicates.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp index 87025a70d..feaa5b384 100644 --- a/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp +++ b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp @@ -26,9 +26,9 @@ #include -#include "Primitives/Icosphere.h" -#include "MeshTools/RemoveDuplicates.h" -#include "MeshTools/Subdivide.h" +#include "Magnum/Primitives/Icosphere.h" +#include "Magnum/MeshTools/RemoveDuplicates.h" +#include "Magnum/MeshTools/Subdivide.h" QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::SubdivideRemoveDuplicatesBenchmark) diff --git a/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h index c82cf4ddf..e3a368202 100644 --- a/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h +++ b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h @@ -26,7 +26,7 @@ #include -#include "Magnum.h" +#include "Magnum/Magnum.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp index bd6afe8fd..602962867 100644 --- a/src/Magnum/MeshTools/Test/SubdivideTest.cpp +++ b/src/Magnum/MeshTools/Test/SubdivideTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "MeshTools/RemoveDuplicates.h" -#include "MeshTools/Subdivide.h" +#include "Magnum/MeshTools/RemoveDuplicates.h" +#include "Magnum/MeshTools/Subdivide.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/TipsifyTest.cpp b/src/Magnum/MeshTools/Test/TipsifyTest.cpp index 8c0f5b35a..2210d8d49 100644 --- a/src/Magnum/MeshTools/Test/TipsifyTest.cpp +++ b/src/Magnum/MeshTools/Test/TipsifyTest.cpp @@ -24,8 +24,8 @@ #include -#include "Magnum.h" -#include "MeshTools/Tipsify.h" +#include "Magnum/Magnum.h" +#include "Magnum/MeshTools/Tipsify.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp index 5bbc0b8bc..82a3d036b 100644 --- a/src/Magnum/MeshTools/Test/TransformTest.cpp +++ b/src/Magnum/MeshTools/Test/TransformTest.cpp @@ -25,9 +25,9 @@ #include #include -#include "Math/Matrix3.h" -#include "Magnum.h" -#include "MeshTools/Transform.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Magnum.h" +#include "Magnum/MeshTools/Transform.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Magnum/MeshTools/Tipsify.h b/src/Magnum/MeshTools/Tipsify.h index f50ed2a78..2b08d7da3 100644 --- a/src/Magnum/MeshTools/Tipsify.h +++ b/src/Magnum/MeshTools/Tipsify.h @@ -30,8 +30,8 @@ #include -#include "Types.h" -#include "magnumMeshToolsVisibility.h" +#include "Magnum/Types.h" +#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Transform.h b/src/Magnum/MeshTools/Transform.h index d04260275..98818c5f2 100644 --- a/src/Magnum/MeshTools/Transform.h +++ b/src/Magnum/MeshTools/Transform.h @@ -28,8 +28,8 @@ * @brief Function Magnum::MeshTools::transformVectorsInPlace(), Magnum::MeshTools::transformVectors(), Magnum::MeshTools::transformPointsInPlace(), Magnum::MeshTools::transformPoints() */ -#include "Math/DualQuaternion.h" -#include "Math/DualComplex.h" +#include "Magnum/Math/DualQuaternion.h" +#include "Magnum/Math/DualComplex.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h index 988c8a90e..c6a91ef5c 100644 --- a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h +++ b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) diff --git a/src/Magnum/MeshView.cpp b/src/Magnum/MeshView.cpp index af473a6f7..6214ce279 100644 --- a/src/Magnum/MeshView.cpp +++ b/src/Magnum/MeshView.cpp @@ -24,7 +24,7 @@ #include "MeshView.h" -#include "Mesh.h" +#include "Magnum/Mesh.h" namespace Magnum { diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h index 33eb4902c..20a50e6e1 100644 --- a/src/Magnum/MeshView.h +++ b/src/Magnum/MeshView.h @@ -28,9 +28,9 @@ * @brief Class @ref Magnum::MeshView */ -#include "Magnum.h" -#include "OpenGL.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/OpenGL.cpp b/src/Magnum/OpenGL.cpp index 91c48b7a9..fc6502fa8 100644 --- a/src/Magnum/OpenGL.cpp +++ b/src/Magnum/OpenGL.cpp @@ -24,8 +24,8 @@ #include -#include "OpenGL.h" -#include "Types.h" +#include "Magnum/OpenGL.h" +#include "Magnum/Types.h" namespace Magnum { diff --git a/src/Magnum/OpenGL.h b/src/Magnum/OpenGL.h index a2ca1416f..0171d3c04 100644 --- a/src/Magnum/OpenGL.h +++ b/src/Magnum/OpenGL.h @@ -30,13 +30,13 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" /** @todo Remove NaCl workaround when not needed */ /* Desktop OpenGL */ #ifndef MAGNUM_TARGET_GLES - #include "OpenGL/GL/gl_magnum.h" + #include "MagnumExternal/OpenGL/GL/gl_magnum.h" /* NaCl has its own gl2.h, the official one causes linker issues. Additionaly to NaCl's gl2ext.h we are including our own to prevent undeclared symbol @@ -54,19 +54,19 @@ typedef std::uint64_t GLuint64; typedef std::int64_t GLint64; #undef __gl2ext_h_ - #include "OpenGL/GLES2/gl2ext.h" + #include "MagnumExternal/OpenGL/GLES2/gl2ext.h" /* Generic OpenGL ES */ #else - #include "OpenGL/KHR/khrplatform.h" + #include "MagnumExternal/OpenGL/KHR/khrplatform.h" #ifndef MAGNUM_TARGET_GLES2 - #include "OpenGL/GLES3/gl3platform.h" - #include "OpenGL/GLES3/gl3.h" + #include "MagnumExternal/OpenGL/GLES3/gl3platform.h" + #include "MagnumExternal/OpenGL/GLES3/gl3.h" #else - #include "OpenGL/GLES2/gl2platform.h" - #include "OpenGL/GLES2/gl2.h" + #include "MagnumExternal/OpenGL/GLES2/gl2platform.h" + #include "MagnumExternal/OpenGL/GLES2/gl2.h" #endif - #include "OpenGL/GLES2/gl2ext.h" + #include "MagnumExternal/OpenGL/GLES2/gl2ext.h" #endif #endif diff --git a/src/Magnum/Platform/AbstractXApplication.cpp b/src/Magnum/Platform/AbstractXApplication.cpp index 26a2c553a..2edde7d69 100644 --- a/src/Magnum/Platform/AbstractXApplication.cpp +++ b/src/Magnum/Platform/AbstractXApplication.cpp @@ -26,9 +26,10 @@ #include -#include "Context.h" -#include "Version.h" -#include "Platform/Implementation/AbstractContextHandler.h" +#include "Magnum/Context.h" +#include "Magnum/Version.h" + +#include "Implementation/AbstractContextHandler.h" /* Mask for X events */ #define INPUT_MASK KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index 81bca66ef..0e0cda0c6 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -38,8 +38,8 @@ #undef None #undef Status -#include "Magnum.h" -#include "Math/Vector2.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector2.h" namespace Magnum { diff --git a/src/Magnum/Platform/GlutApplication.cpp b/src/Magnum/Platform/GlutApplication.cpp index e02f8873f..57adc3731 100644 --- a/src/Magnum/Platform/GlutApplication.cpp +++ b/src/Magnum/Platform/GlutApplication.cpp @@ -26,10 +26,9 @@ #include -#include "Context.h" -#include "Version.h" - -#include "Platform/ScreenedApplication.hpp" +#include "Magnum/Context.h" +#include "Magnum/Version.h" +#include "Magnum/Platform/ScreenedApplication.hpp" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h index 69c9ca410..7825f5e37 100644 --- a/src/Magnum/Platform/GlutApplication.h +++ b/src/Magnum/Platform/GlutApplication.h @@ -30,12 +30,12 @@ #include -#include "Platform/Platform.h" -#include "Math/Vector2.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Platform/Platform.h" /* We must include our own GL headers first to avoid conflicts */ -#include "OpenGL.h" +#include "Magnum/OpenGL.h" #include namespace Magnum { diff --git a/src/Magnum/Platform/GlxApplication.cpp b/src/Magnum/Platform/GlxApplication.cpp index 8aacac191..8988d6d6f 100644 --- a/src/Magnum/Platform/GlxApplication.cpp +++ b/src/Magnum/Platform/GlxApplication.cpp @@ -24,8 +24,9 @@ #include "GlxApplication.h" -#include "Platform/ScreenedApplication.hpp" -#include "Platform/Implementation/GlxContextHandler.h" +#include "Magnum/Platform/ScreenedApplication.hpp" + +#include "Implementation/GlxContextHandler.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/GlxApplication.h b/src/Magnum/Platform/GlxApplication.h index 66fa3e4a4..1b7848ab1 100644 --- a/src/Magnum/Platform/GlxApplication.h +++ b/src/Magnum/Platform/GlxApplication.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::Platform::GlxApplication */ -#include "Platform/AbstractXApplication.h" -#include "Platform/Platform.h" +#include "Magnum/Platform/AbstractXApplication.h" +#include "Magnum/Platform/Platform.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.cpp b/src/Magnum/Platform/Implementation/EglContextHandler.cpp index b17233341..2dcfca353 100644 --- a/src/Magnum/Platform/Implementation/EglContextHandler.cpp +++ b/src/Magnum/Platform/Implementation/EglContextHandler.cpp @@ -28,8 +28,8 @@ #include #include -#include "Context.h" -#include "Version.h" +#include "Magnum/Context.h" +#include "Magnum/Version.h" namespace Magnum { namespace Platform { namespace Implementation { diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h index 1b5640c19..081e34532 100644 --- a/src/Magnum/Platform/Implementation/EglContextHandler.h +++ b/src/Magnum/Platform/Implementation/EglContextHandler.h @@ -24,8 +24,6 @@ DEALINGS IN THE SOFTWARE. */ -#include "Magnum.h" - #ifndef SUPPORT_X11 #define SUPPORT_X11 // OpenGL ES on BeagleBoard needs this (?) #endif @@ -35,8 +33,9 @@ #include -#include "Platform/AbstractXApplication.h" -#include "Platform/Implementation/AbstractContextHandler.h" +#include "Magnum/Magnum.h" +#include "Magnum/Platform/AbstractXApplication.h" +#include "Magnum/Platform/Implementation/AbstractContextHandler.h" namespace Magnum { namespace Platform { namespace Implementation { diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.cpp b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp index 08ed88616..9657c6775 100644 --- a/src/Magnum/Platform/Implementation/GlxContextHandler.cpp +++ b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp @@ -29,8 +29,8 @@ #include #include -#include "Context.h" -#include "Version.h" +#include "Magnum/Context.h" +#include "Magnum/Version.h" namespace Magnum { namespace Platform { namespace Implementation { diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.h b/src/Magnum/Platform/Implementation/GlxContextHandler.h index a4f9ff66b..887688450 100644 --- a/src/Magnum/Platform/Implementation/GlxContextHandler.h +++ b/src/Magnum/Platform/Implementation/GlxContextHandler.h @@ -24,7 +24,8 @@ DEALINGS IN THE SOFTWARE. */ -#include "OpenGL.h" +#include "Magnum/OpenGL.h" + #define Status int #include /* undef Xlib nonsense to avoid conflicts */ @@ -35,8 +36,8 @@ #include -#include "Platform/AbstractXApplication.h" -#include "Platform/Implementation/AbstractContextHandler.h" +#include "Magnum/Platform/AbstractXApplication.h" +#include "Magnum/Platform/Implementation/AbstractContextHandler.h" namespace Magnum { namespace Platform { namespace Implementation { diff --git a/src/Magnum/Platform/NaClApplication.cpp b/src/Magnum/Platform/NaClApplication.cpp index f31bfd688..d2d42c144 100644 --- a/src/Magnum/Platform/NaClApplication.cpp +++ b/src/Magnum/Platform/NaClApplication.cpp @@ -29,8 +29,8 @@ #include #include -#include "Context.h" -#include "Platform/ScreenedApplication.hpp" +#include "Magnum/Context.h" +#include "Magnum/Platform/ScreenedApplication.hpp" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h index 3aa022531..50bda9533 100644 --- a/src/Magnum/Platform/NaClApplication.h +++ b/src/Magnum/Platform/NaClApplication.h @@ -38,9 +38,9 @@ #include #include -#include "Platform/Platform.h" -#include "Math/Vector2.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Platform/Platform.h" namespace pp { class Graphics3D; diff --git a/src/Magnum/Platform/Screen.h b/src/Magnum/Platform/Screen.h index 330920eff..f3599fba4 100644 --- a/src/Magnum/Platform/Screen.h +++ b/src/Magnum/Platform/Screen.h @@ -30,7 +30,7 @@ #include -#include "Platform/ScreenedApplication.h" +#include "Magnum/Platform/ScreenedApplication.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h index 43db79d4a..51d4b0c37 100644 --- a/src/Magnum/Platform/ScreenedApplication.h +++ b/src/Magnum/Platform/ScreenedApplication.h @@ -30,8 +30,8 @@ #include -#include "Magnum.h" -#include "Platform/Platform.h" +#include "Magnum/Magnum.h" +#include "Magnum/Platform/Platform.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/ScreenedApplication.hpp b/src/Magnum/Platform/ScreenedApplication.hpp index 1a27d2269..3bcb8ec91 100644 --- a/src/Magnum/Platform/ScreenedApplication.hpp +++ b/src/Magnum/Platform/ScreenedApplication.hpp @@ -26,9 +26,8 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref ScreenedApplication.h and @ref Screen.h */ -#include "ScreenedApplication.h" - -#include "Platform/Screen.h" +#include "Magnum/Platform/Screen.h" +#include "Magnum/Platform/ScreenedApplication.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index 8e3e871cd..2a607e8f3 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -30,9 +30,9 @@ #include #endif -#include "Context.h" -#include "Version.h" -#include "Platform/ScreenedApplication.hpp" +#include "Magnum/Context.h" +#include "Magnum/Version.h" +#include "Magnum/Platform/ScreenedApplication.hpp" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 76934c8fa..4ffa238ea 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -31,9 +31,9 @@ #include #include -#include "Platform/Platform.h" -#include "Math/Vector2.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Platform/Platform.h" #ifdef CORRADE_TARGET_WINDOWS /* Windows version of SDL2 redefines main(), we don't want that */ #define SDL_MAIN_HANDLED diff --git a/src/Magnum/Platform/WindowlessGlxApplication.cpp b/src/Magnum/Platform/WindowlessGlxApplication.cpp index ee2ddd6c7..9605353e1 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.cpp +++ b/src/Magnum/Platform/WindowlessGlxApplication.cpp @@ -27,7 +27,7 @@ #include #include -#include "Context.h" +#include "Magnum/Context.h" #define None 0L // redef Xlib nonsense diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index 8088b06d9..09aec4f42 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -29,7 +29,8 @@ */ #include -#include "OpenGL.h" + +#include "Magnum/OpenGL.h" #include #include #include @@ -39,7 +40,7 @@ #undef None #undef Status -#include "Magnum.h" +#include "Magnum/Magnum.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/WindowlessNaClApplication.cpp b/src/Magnum/Platform/WindowlessNaClApplication.cpp index 3e9ca18ed..a543b9c9e 100644 --- a/src/Magnum/Platform/WindowlessNaClApplication.cpp +++ b/src/Magnum/Platform/WindowlessNaClApplication.cpp @@ -29,7 +29,7 @@ #include #include -#include "Context.h" +#include "Magnum/Context.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/WindowlessNaClApplication.h b/src/Magnum/Platform/WindowlessNaClApplication.h index b2552b8a3..59d42e4d3 100644 --- a/src/Magnum/Platform/WindowlessNaClApplication.h +++ b/src/Magnum/Platform/WindowlessNaClApplication.h @@ -36,7 +36,7 @@ #include #include -#include "Magnum.h" +#include "Magnum/Magnum.h" namespace pp { class Graphics3D; diff --git a/src/Magnum/Platform/XEglApplication.cpp b/src/Magnum/Platform/XEglApplication.cpp index 41dd4b1d3..fd1131f71 100644 --- a/src/Magnum/Platform/XEglApplication.cpp +++ b/src/Magnum/Platform/XEglApplication.cpp @@ -24,8 +24,8 @@ #include "XEglApplication.h" -#include "Platform/ScreenedApplication.hpp" -#include "Platform/Implementation/EglContextHandler.h" +#include "Magnum/Platform/ScreenedApplication.hpp" +#include "Magnum/Platform/Implementation/EglContextHandler.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/XEglApplication.h b/src/Magnum/Platform/XEglApplication.h index 67f75d4d6..2d41f6267 100644 --- a/src/Magnum/Platform/XEglApplication.h +++ b/src/Magnum/Platform/XEglApplication.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::Platform::XEglApplication */ -#include "Platform/Platform.h" -#include "Platform/AbstractXApplication.h" +#include "Magnum/Platform/Platform.h" +#include "Magnum/Platform/AbstractXApplication.h" namespace Magnum { namespace Platform { diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp index 891b9e5e3..0dd5e9808 100644 --- a/src/Magnum/Platform/magnum-info.cpp +++ b/src/Magnum/Platform/magnum-info.cpp @@ -29,20 +29,20 @@ #include #endif -#include "AbstractShaderProgram.h" -#include "Buffer.h" -#include "BufferTexture.h" -#include "Context.h" -#include "DebugMessage.h" -#include "Extensions.h" -#include "Framebuffer.h" -#include "Mesh.h" -#include "Renderbuffer.h" -#include "Shader.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Buffer.h" +#include "Magnum/BufferTexture.h" +#include "Magnum/Context.h" +#include "Magnum/DebugMessage.h" +#include "Magnum/Extensions.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/Shader.h" #ifndef CORRADE_TARGET_NACL -#include "Platform/WindowlessGlxApplication.h" +#include "Magnum/Platform/WindowlessGlxApplication.h" #else -#include "Platform/WindowlessNaClApplication.h" +#include "Magnum/Platform/WindowlessNaClApplication.h" #endif namespace Magnum { diff --git a/src/Magnum/Primitives/Capsule.cpp b/src/Magnum/Primitives/Capsule.cpp index 5f4ee0220..51fe0f45b 100644 --- a/src/Magnum/Primitives/Capsule.cpp +++ b/src/Magnum/Primitives/Capsule.cpp @@ -24,13 +24,13 @@ #include "Capsule.h" -#include "Math/Vector3.h" -#include "Math/Functions.h" -#include "Mesh.h" -#include "Primitives/Implementation/Spheroid.h" -#include "Primitives/Implementation/WireframeSpheroid.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Mesh.h" +#include "Magnum/Primitives/Implementation/Spheroid.h" +#include "Magnum/Primitives/Implementation/WireframeSpheroid.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Capsule.h b/src/Magnum/Primitives/Capsule.h index 35508fe9e..937ab1f49 100644 --- a/src/Magnum/Primitives/Capsule.h +++ b/src/Magnum/Primitives/Capsule.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Primitives::Capsule */ -#include "Primitives/magnumPrimitivesVisibility.h" -#include "Trade/Trade.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Circle.cpp b/src/Magnum/Primitives/Circle.cpp index 0edbe633c..c3032a83d 100644 --- a/src/Magnum/Primitives/Circle.cpp +++ b/src/Magnum/Primitives/Circle.cpp @@ -24,10 +24,10 @@ #include "Circle.h" -#include "Math/Functions.h" -#include "Math/Vector2.h" -#include "Mesh.h" -#include "Trade/MeshData2D.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Mesh.h" +#include "Magnum/Trade/MeshData2D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Circle.h b/src/Magnum/Primitives/Circle.h index e0829c982..26a747bc3 100644 --- a/src/Magnum/Primitives/Circle.h +++ b/src/Magnum/Primitives/Circle.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Circle */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Crosshair.cpp b/src/Magnum/Primitives/Crosshair.cpp index ba3cfa26a..a3640fc1b 100644 --- a/src/Magnum/Primitives/Crosshair.cpp +++ b/src/Magnum/Primitives/Crosshair.cpp @@ -24,10 +24,10 @@ #include "Crosshair.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Crosshair.h b/src/Magnum/Primitives/Crosshair.h index eae905e2e..76ac2e1ba 100644 --- a/src/Magnum/Primitives/Crosshair.h +++ b/src/Magnum/Primitives/Crosshair.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Crosshair2D, Magnum::Primitives::Crosshair3D */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cube.cpp b/src/Magnum/Primitives/Cube.cpp index 15f5965e8..8b2bdeb29 100644 --- a/src/Magnum/Primitives/Cube.cpp +++ b/src/Magnum/Primitives/Cube.cpp @@ -24,9 +24,9 @@ #include "Cube.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cube.h b/src/Magnum/Primitives/Cube.h index 653db9e9a..7007ebb54 100644 --- a/src/Magnum/Primitives/Cube.h +++ b/src/Magnum/Primitives/Cube.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Cube */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cylinder.cpp b/src/Magnum/Primitives/Cylinder.cpp index ae85a1777..682914254 100644 --- a/src/Magnum/Primitives/Cylinder.cpp +++ b/src/Magnum/Primitives/Cylinder.cpp @@ -24,11 +24,11 @@ #include "Cylinder.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Primitives/Implementation/Spheroid.h" -#include "Primitives/Implementation/WireframeSpheroid.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Primitives/Implementation/Spheroid.h" +#include "Magnum/Primitives/Implementation/WireframeSpheroid.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h index bfe3ba5c7..4a6e93f14 100644 --- a/src/Magnum/Primitives/Cylinder.h +++ b/src/Magnum/Primitives/Cylinder.h @@ -30,9 +30,9 @@ #include -#include "Magnum.h" -#include "Primitives/magnumPrimitivesVisibility.h" -#include "Trade/Trade.h" +#include "Magnum/Magnum.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Icosphere.cpp b/src/Magnum/Primitives/Icosphere.cpp index 0c82d1217..2533bd683 100644 --- a/src/Magnum/Primitives/Icosphere.cpp +++ b/src/Magnum/Primitives/Icosphere.cpp @@ -24,11 +24,11 @@ #include "Icosphere.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "MeshTools/Subdivide.h" -#include "MeshTools/RemoveDuplicates.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/MeshTools/Subdivide.h" +#include "Magnum/MeshTools/RemoveDuplicates.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Icosphere.h b/src/Magnum/Primitives/Icosphere.h index 7ac15e4a2..17afc4734 100644 --- a/src/Magnum/Primitives/Icosphere.h +++ b/src/Magnum/Primitives/Icosphere.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Icosphere */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Implementation/Spheroid.cpp b/src/Magnum/Primitives/Implementation/Spheroid.cpp index 05d2e50a7..3b97429a2 100644 --- a/src/Magnum/Primitives/Implementation/Spheroid.cpp +++ b/src/Magnum/Primitives/Implementation/Spheroid.cpp @@ -24,10 +24,10 @@ #include "Spheroid.h" -#include "Math/Functions.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Mesh.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { namespace Implementation { diff --git a/src/Magnum/Primitives/Implementation/Spheroid.h b/src/Magnum/Primitives/Implementation/Spheroid.h index 16921141e..fd31112d8 100644 --- a/src/Magnum/Primitives/Implementation/Spheroid.h +++ b/src/Magnum/Primitives/Implementation/Spheroid.h @@ -26,8 +26,8 @@ #include -#include "Magnum.h" -#include "Trade/Trade.h" +#include "Magnum/Magnum.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { namespace Implementation { diff --git a/src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp b/src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp index 434da874b..3008d274d 100644 --- a/src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp +++ b/src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp @@ -24,10 +24,10 @@ #include "WireframeSpheroid.h" -#include "Math/Functions.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Mesh.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { namespace Implementation { diff --git a/src/Magnum/Primitives/Implementation/WireframeSpheroid.h b/src/Magnum/Primitives/Implementation/WireframeSpheroid.h index 04f40fc5f..6b1ea0f74 100644 --- a/src/Magnum/Primitives/Implementation/WireframeSpheroid.h +++ b/src/Magnum/Primitives/Implementation/WireframeSpheroid.h @@ -26,8 +26,8 @@ #include -#include "Magnum.h" -#include "Trade/Trade.h" +#include "Magnum/Magnum.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { namespace Implementation { diff --git a/src/Magnum/Primitives/Line.cpp b/src/Magnum/Primitives/Line.cpp index e7255b7cd..3f6acad07 100644 --- a/src/Magnum/Primitives/Line.cpp +++ b/src/Magnum/Primitives/Line.cpp @@ -24,10 +24,10 @@ #include "Line.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Line.h b/src/Magnum/Primitives/Line.h index 868e963bd..05c0743b9 100644 --- a/src/Magnum/Primitives/Line.h +++ b/src/Magnum/Primitives/Line.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Line2D, Magnum::Primitives::Line3D */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Plane.cpp b/src/Magnum/Primitives/Plane.cpp index 3451168f0..757c6b881 100644 --- a/src/Magnum/Primitives/Plane.cpp +++ b/src/Magnum/Primitives/Plane.cpp @@ -24,9 +24,9 @@ #include "Plane.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Mesh.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Plane.h b/src/Magnum/Primitives/Plane.h index efdc08d02..7601d1cf5 100644 --- a/src/Magnum/Primitives/Plane.h +++ b/src/Magnum/Primitives/Plane.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Plane */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Square.cpp b/src/Magnum/Primitives/Square.cpp index c83802563..0462c9e14 100644 --- a/src/Magnum/Primitives/Square.cpp +++ b/src/Magnum/Primitives/Square.cpp @@ -24,9 +24,9 @@ #include "Square.h" -#include "Math/Vector2.h" -#include "Mesh.h" -#include "Trade/MeshData2D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Trade/MeshData2D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Square.h b/src/Magnum/Primitives/Square.h index 85993082a..9b8fae70d 100644 --- a/src/Magnum/Primitives/Square.h +++ b/src/Magnum/Primitives/Square.h @@ -28,9 +28,8 @@ * @brief Class Magnum::Primitives::Square */ -#include "Trade/Trade.h" - -#include "Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Test/CapsuleTest.cpp b/src/Magnum/Primitives/Test/CapsuleTest.cpp index 9fe344b35..7c4ff50fd 100644 --- a/src/Magnum/Primitives/Test/CapsuleTest.cpp +++ b/src/Magnum/Primitives/Test/CapsuleTest.cpp @@ -28,10 +28,10 @@ #include #include -#include "Math/Vector3.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" -#include "Primitives/Capsule.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" +#include "Magnum/Primitives/Capsule.h" namespace Magnum { namespace Primitives { namespace Test { diff --git a/src/Magnum/Primitives/Test/CircleTest.cpp b/src/Magnum/Primitives/Test/CircleTest.cpp index b1a77618a..c8d8fb25c 100644 --- a/src/Magnum/Primitives/Test/CircleTest.cpp +++ b/src/Magnum/Primitives/Test/CircleTest.cpp @@ -24,9 +24,9 @@ #include -#include "Math/Vector2.h" -#include "Primitives/Circle.h" -#include "Trade/MeshData2D.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Primitives/Circle.h" +#include "Magnum/Trade/MeshData2D.h" namespace Magnum { namespace Primitives { namespace Test { diff --git a/src/Magnum/Primitives/Test/CylinderTest.cpp b/src/Magnum/Primitives/Test/CylinderTest.cpp index 03e5a64f3..aa70a9f76 100644 --- a/src/Magnum/Primitives/Test/CylinderTest.cpp +++ b/src/Magnum/Primitives/Test/CylinderTest.cpp @@ -25,9 +25,9 @@ #include #include -#include "Math/Vector3.h" -#include "Primitives/Cylinder.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Primitives/Cylinder.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { namespace Test { diff --git a/src/Magnum/Primitives/Test/IcosphereTest.cpp b/src/Magnum/Primitives/Test/IcosphereTest.cpp index 59ed877f9..5b4f63591 100644 --- a/src/Magnum/Primitives/Test/IcosphereTest.cpp +++ b/src/Magnum/Primitives/Test/IcosphereTest.cpp @@ -24,9 +24,9 @@ #include -#include "Math/Vector3.h" -#include "Primitives/Icosphere.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Primitives/Icosphere.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { namespace Test { diff --git a/src/Magnum/Primitives/Test/UVSphereTest.cpp b/src/Magnum/Primitives/Test/UVSphereTest.cpp index 7be1c2cca..65b69b1eb 100644 --- a/src/Magnum/Primitives/Test/UVSphereTest.cpp +++ b/src/Magnum/Primitives/Test/UVSphereTest.cpp @@ -25,9 +25,9 @@ #include #include -#include "Math/Vector3.h" -#include "Primitives/UVSphere.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Primitives/UVSphere.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { namespace Test { diff --git a/src/Magnum/Primitives/UVSphere.cpp b/src/Magnum/Primitives/UVSphere.cpp index b6ace4dc8..df10ec3ba 100644 --- a/src/Magnum/Primitives/UVSphere.cpp +++ b/src/Magnum/Primitives/UVSphere.cpp @@ -24,11 +24,11 @@ #include "UVSphere.h" -#include "Math/Vector3.h" -#include "Mesh.h" -#include "Primitives/Implementation/Spheroid.h" -#include "Primitives/Implementation/WireframeSpheroid.h" -#include "Trade/MeshData3D.h" +#include "Magnum/Mesh.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Primitives/Implementation/Spheroid.h" +#include "Magnum/Primitives/Implementation/WireframeSpheroid.h" +#include "Magnum/Trade/MeshData3D.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/UVSphere.h b/src/Magnum/Primitives/UVSphere.h index fee053691..cc10c5980 100644 --- a/src/Magnum/Primitives/UVSphere.h +++ b/src/Magnum/Primitives/UVSphere.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Primitives::UVSphere */ -#include "Primitives/magnumPrimitivesVisibility.h" -#include "Trade/Trade.h" +#include "Magnum/Trade/Trade.h" +#include "Magnum/Primitives/magnumPrimitivesVisibility.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/magnumPrimitivesVisibility.h index a3a60ec46..aa795f436 100644 --- a/src/Magnum/Primitives/magnumPrimitivesVisibility.h +++ b/src/Magnum/Primitives/magnumPrimitivesVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumPrimitives_EXPORTS diff --git a/src/Magnum/Query.cpp b/src/Magnum/Query.cpp index da4460996..f1233c222 100644 --- a/src/Magnum/Query.cpp +++ b/src/Magnum/Query.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Implementation/DebugState.h" -#include "Implementation/State.h" +#include "Magnum/Context.h" +#include "Magnum/Implementation/DebugState.h" +#include "Magnum/Implementation/State.h" namespace Magnum { diff --git a/src/Magnum/Query.h b/src/Magnum/Query.h index 9237efc32..97e8ea4f2 100644 --- a/src/Magnum/Query.h +++ b/src/Magnum/Query.h @@ -30,8 +30,8 @@ #include -#include "AbstractObject.h" -#include "magnumConfigure.h" +#include "Magnum/AbstractObject.h" +#include "Magnum/magnumConfigure.h" namespace Magnum { diff --git a/src/Magnum/Renderbuffer.cpp b/src/Magnum/Renderbuffer.cpp index 2ec609d99..c7e56e306 100644 --- a/src/Magnum/Renderbuffer.cpp +++ b/src/Magnum/Renderbuffer.cpp @@ -24,8 +24,8 @@ #include "Renderbuffer.h" -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" #include "Implementation/DebugState.h" #include "Implementation/FramebufferState.h" diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 33e641ef2..76de3a35f 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -28,9 +28,9 @@ * @brief Class @ref Magnum::Renderbuffer */ -#include "AbstractObject.h" -#include "Magnum.h" -#include "magnumVisibility.h" +#include "Magnum/AbstractObject.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/RenderbufferFormat.h b/src/Magnum/RenderbufferFormat.h index b1e1d542c..af722e8e5 100644 --- a/src/Magnum/RenderbufferFormat.h +++ b/src/Magnum/RenderbufferFormat.h @@ -28,7 +28,7 @@ * @brief Enum @ref Magnum::RenderbufferFormat */ -#include "OpenGL.h" +#include "Magnum/OpenGL.h" namespace Magnum { diff --git a/src/Magnum/Renderer.cpp b/src/Magnum/Renderer.cpp index 55675d6dc..881812fc2 100644 --- a/src/Magnum/Renderer.cpp +++ b/src/Magnum/Renderer.cpp @@ -24,10 +24,11 @@ #include "Renderer.h" -#include "Math/Range.h" -#include "Color.h" -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Math/Range.h" +#include "Magnum/Color.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" + #include "Implementation/State.h" #include "Implementation/RendererState.h" diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index e95dae180..ee16d7f7c 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -30,9 +30,9 @@ #include -#include "Magnum.h" -#include "OpenGL.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index cf33afe1c..1765fcec8 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -31,9 +31,8 @@ #include #include -#include "Magnum.h" - -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/ResourceManager.h b/src/Magnum/ResourceManager.h index 9186f00a5..247d3d0f3 100644 --- a/src/Magnum/ResourceManager.h +++ b/src/Magnum/ResourceManager.h @@ -30,7 +30,7 @@ #include -#include "Resource.h" +#include "Magnum/Resource.h" namespace Magnum { diff --git a/src/Magnum/Sampler.cpp b/src/Magnum/Sampler.cpp index 6b0452f33..edcd91ad0 100644 --- a/src/Magnum/Sampler.cpp +++ b/src/Magnum/Sampler.cpp @@ -26,10 +26,10 @@ #include -#include "Context.h" -#include "Implementation/State.h" -#include "Implementation/TextureState.h" -#include "Extensions.h" +#include "Magnum/Context.h" +#include "Magnum/Implementation/State.h" +#include "Magnum/Implementation/TextureState.h" +#include "Magnum/Extensions.h" namespace Magnum { diff --git a/src/Magnum/Sampler.h b/src/Magnum/Sampler.h index 974d60c2e..111298d5e 100644 --- a/src/Magnum/Sampler.h +++ b/src/Magnum/Sampler.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Sampler */ -#include "Magnum.h" -#include "OpenGL.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/OpenGL.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/SceneGraph/AbstractCamera.h b/src/Magnum/SceneGraph/AbstractCamera.h index 003c9d574..229f228f2 100644 --- a/src/Magnum/SceneGraph/AbstractCamera.h +++ b/src/Magnum/SceneGraph/AbstractCamera.h @@ -28,11 +28,10 @@ * @brief Class @ref Magnum::SceneGraph::AbstractCamera, enum @ref Magnum::SceneGraph::AspectRatioPolicy, alias @ref Magnum::SceneGraph::AbstractBasicCamera2D, @ref Magnum::SceneGraph::AbstractBasicCamera3D, typedef @ref Magnum::SceneGraph::AbstractCamera2D, @ref Magnum::SceneGraph::AbstractCamera3D */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "AbstractFeature.h" - -#include "magnumSceneGraphVisibility.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/SceneGraph/AbstractFeature.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractCamera.hpp b/src/Magnum/SceneGraph/AbstractCamera.hpp index 684ec1ddb..982663f2d 100644 --- a/src/Magnum/SceneGraph/AbstractCamera.hpp +++ b/src/Magnum/SceneGraph/AbstractCamera.hpp @@ -28,9 +28,8 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref AbstractCamera.h */ -#include "AbstractCamera.h" - -#include "Drawable.h" +#include "Magnum/SceneGraph/AbstractCamera.h" +#include "Magnum/SceneGraph/Drawable.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h index 58e63433e..0b6683601 100644 --- a/src/Magnum/SceneGraph/AbstractFeature.h +++ b/src/Magnum/SceneGraph/AbstractFeature.h @@ -31,8 +31,8 @@ #include #include -#include "Magnum.h" -#include "SceneGraph/AbstractObject.h" +#include "Magnum/Magnum.h" +#include "Magnum/SceneGraph/AbstractObject.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractFeature.hpp b/src/Magnum/SceneGraph/AbstractFeature.hpp index f9cd4ba4d..9a2398a4c 100644 --- a/src/Magnum/SceneGraph/AbstractFeature.hpp +++ b/src/Magnum/SceneGraph/AbstractFeature.hpp @@ -28,7 +28,7 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref AbstractFeature.h */ -#include "AbstractFeature.h" +#include "Magnum/SceneGraph/AbstractFeature.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractGroupedFeature.h b/src/Magnum/SceneGraph/AbstractGroupedFeature.h index d274ec41a..f9d8f6f2c 100644 --- a/src/Magnum/SceneGraph/AbstractGroupedFeature.h +++ b/src/Magnum/SceneGraph/AbstractGroupedFeature.h @@ -30,8 +30,8 @@ #include -#include "AbstractFeature.h" -#include "FeatureGroup.h" +#include "Magnum/SceneGraph/AbstractFeature.h" +#include "Magnum/SceneGraph/FeatureGroup.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index 24a0273c8..c9f157674 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -31,10 +31,9 @@ #include #include -#include "DimensionTraits.h" -#include "SceneGraph.h" - -#include "SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/SceneGraph/SceneGraph.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h index 0ba971d82..fe8c1e759 100644 --- a/src/Magnum/SceneGraph/AbstractTransformation.h +++ b/src/Magnum/SceneGraph/AbstractTransformation.h @@ -28,8 +28,8 @@ * @brief Class Magnum::SceneGraph::AbstractTransformation, alias Magnum::SceneGraph::AbstractBasicTransformation2D, Magnum::SceneGraph::AbstractBasicTransformation3D, typedef Magnum::SceneGraph::AbstractTransformation2D, Magnum::SceneGraph::AbstractTransformation3D, enum Magnum::SceneGraph::TransformationType */ -#include "SceneGraph/SceneGraph.h" -#include "SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/SceneGraph.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTranslation.h b/src/Magnum/SceneGraph/AbstractTranslation.h index 9270224e9..d83edb262 100644 --- a/src/Magnum/SceneGraph/AbstractTranslation.h +++ b/src/Magnum/SceneGraph/AbstractTranslation.h @@ -28,9 +28,9 @@ * @brief Class @ref Magnum::SceneGraph::AbstractTranslation, alias @ref Magnum::SceneGraph::AbstractBasicTranslation2D, @ref Magnum::SceneGraph::AbstractBasicTranslation3D, typedef @ref Magnum::SceneGraph::AbstractTranslation2D, @ref Magnum::SceneGraph::AbstractBasicTranslation3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "SceneGraph/AbstractTransformation.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/SceneGraph/AbstractTransformation.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h index 71587264e..bcff3eccb 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h @@ -28,7 +28,7 @@ * @brief Class Magnum::SceneGraph::AbstractBasicTranslationRotation2D, typedef Magnum::SceneGraph::AbstractTranslationRotation2D */ -#include "SceneGraph/AbstractTranslation.h" +#include "Magnum/SceneGraph/AbstractTranslation.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h index e4cfd11d6..4f60674bd 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h @@ -28,7 +28,7 @@ * @brief Class Magnum::SceneGraph::AbstractBasicTranslationRotation3D, typedef Magnum::SceneGraph::AbstractTranslationRotation3D */ -#include "SceneGraph/AbstractTranslation.h" +#include "Magnum/SceneGraph/AbstractTranslation.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h index fa75778cb..ac49571c3 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h @@ -28,7 +28,7 @@ * @brief Class Magnum::SceneGraph::AbstractBasicTranslationRotationScaling2D, typedef Magnum::SceneGraph::AbstractTranslationRotationScaling2D */ -#include "AbstractTranslationRotation2D.h" +#include "Magnum/SceneGraph/AbstractTranslationRotation2D.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h index 2074e0a44..b20b40789 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h @@ -28,7 +28,7 @@ * @brief Class Magnum::SceneGraph::AbstractBasicTranslationRotationScaling3D, typedef Magnum::SceneGraph::AbstractTranslationRotationScaling3D */ -#include "AbstractTranslationRotation3D.h" +#include "Magnum/SceneGraph/AbstractTranslationRotation3D.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h index b1e9a5c09..db595566f 100644 --- a/src/Magnum/SceneGraph/Animable.h +++ b/src/Magnum/SceneGraph/Animable.h @@ -28,9 +28,8 @@ * @brief Class @ref Magnum::SceneGraph::Animable, alias @ref Magnum::SceneGraph::BasicAnimable2D, @ref Magnum::SceneGraph::BasicAnimable3D, typedef @ref Magnum::SceneGraph::Animable2D, @ref Magnum::SceneGraph::Animable3D, enum @ref Magnum::SceneGraph::AnimationState */ -#include "AbstractGroupedFeature.h" - -#include "magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/AbstractGroupedFeature.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Animable.hpp b/src/Magnum/SceneGraph/Animable.hpp index ddb6c5b9e..db874dc72 100644 --- a/src/Magnum/SceneGraph/Animable.hpp +++ b/src/Magnum/SceneGraph/Animable.hpp @@ -28,10 +28,9 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Animable.h and @ref AnimableGroup.h */ -#include "AnimableGroup.h" -#include "Animable.h" - -#include "Timeline.h" +#include "Magnum/Timeline.h" +#include "Magnum/SceneGraph/AnimableGroup.h" +#include "Magnum/SceneGraph/Animable.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h index e9da03a08..5a4bfe47f 100644 --- a/src/Magnum/SceneGraph/AnimableGroup.h +++ b/src/Magnum/SceneGraph/AnimableGroup.h @@ -28,9 +28,8 @@ * @brief Class @ref Magnum::SceneGraph::AnimableGroup, alias @ref Magnum::SceneGraph::BasicAnimableGroup2D, @ref Magnum::SceneGraph::BasicAnimableGroup3D, typedef @ref Magnum::SceneGraph::AnimableGroup2D, @ref Magnum::SceneGraph::AnimableGroup3D */ -#include "FeatureGroup.h" - -#include "magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/FeatureGroup.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Camera2D.h b/src/Magnum/SceneGraph/Camera2D.h index c25b193bf..f495d69b5 100644 --- a/src/Magnum/SceneGraph/Camera2D.h +++ b/src/Magnum/SceneGraph/Camera2D.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::SceneGraph::BasicCamera2D, typedef @ref Magnum::SceneGraph::Camera2D */ -#include "AbstractCamera.h" +#include "Magnum/SceneGraph/AbstractCamera.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Camera2D.hpp b/src/Magnum/SceneGraph/Camera2D.hpp index ea85b5c76..52a1af9c6 100644 --- a/src/Magnum/SceneGraph/Camera2D.hpp +++ b/src/Magnum/SceneGraph/Camera2D.hpp @@ -28,8 +28,8 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Camera2D.h */ -#include "AbstractCamera.hpp" -#include "Camera2D.h" +#include "Magnum/SceneGraph/AbstractCamera.hpp" +#include "Magnum/SceneGraph/Camera2D.h" /** @todo Use AbstractBasicCamera2D when support for GCC 4.6 is dropped (also in header) */ diff --git a/src/Magnum/SceneGraph/Camera3D.h b/src/Magnum/SceneGraph/Camera3D.h index 0cc8c9694..10be6d426 100644 --- a/src/Magnum/SceneGraph/Camera3D.h +++ b/src/Magnum/SceneGraph/Camera3D.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::SceneGraph::BasicCamera3D, typedef @ref Magnum::SceneGraph::Camera3D */ -#include "AbstractCamera.h" +#include "Magnum/SceneGraph/AbstractCamera.h" #ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */ #undef near diff --git a/src/Magnum/SceneGraph/Camera3D.hpp b/src/Magnum/SceneGraph/Camera3D.hpp index 597f22fd0..40cfd2bbe 100644 --- a/src/Magnum/SceneGraph/Camera3D.hpp +++ b/src/Magnum/SceneGraph/Camera3D.hpp @@ -28,8 +28,8 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Camera3D.h */ -#include "AbstractCamera.hpp" -#include "Camera3D.h" +#include "Magnum/SceneGraph/AbstractCamera.hpp" +#include "Magnum/SceneGraph/Camera3D.h" /** @todo Use AbstractBasicCamera3D when support for GCC 4.6 is dropped (also in header) */ diff --git a/src/Magnum/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h index d5023301c..4eafef45c 100644 --- a/src/Magnum/SceneGraph/Drawable.h +++ b/src/Magnum/SceneGraph/Drawable.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::SceneGraph::Drawable, @ref Magnum::SceneGraph::DrawableGroup, alias @ref Magnum::SceneGraph::BasicDrawable2D, @ref Magnum::SceneGraph::BasicDrawable3D, @ref Magnum::SceneGraph::BasicDrawableGroup2D, @ref Magnum::SceneGraph::BasicDrawableGroup3D, typedef @ref Magnum::SceneGraph::Drawable2D, @ref Magnum::SceneGraph::Drawable3D, @ref Magnum::SceneGraph::DrawableGroup2D, @ref Magnum::SceneGraph::DrawableGroup3D */ -#include "AbstractGroupedFeature.h" +#include "Magnum/SceneGraph/AbstractGroupedFeature.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Drawable.hpp b/src/Magnum/SceneGraph/Drawable.hpp index 222b790ea..11c3eec02 100644 --- a/src/Magnum/SceneGraph/Drawable.hpp +++ b/src/Magnum/SceneGraph/Drawable.hpp @@ -28,7 +28,7 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref Drawable.h */ -#include "Drawable.h" +#include "Magnum/SceneGraph/Drawable.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/DualComplexTransformation.h b/src/Magnum/SceneGraph/DualComplexTransformation.h index e5302af2f..aa7e74e05 100644 --- a/src/Magnum/SceneGraph/DualComplexTransformation.h +++ b/src/Magnum/SceneGraph/DualComplexTransformation.h @@ -28,9 +28,9 @@ * @brief Class Magnum::SceneGraph::BasicDualComplexTransformation, typedef Magnum::SceneGraph::DualComplexTransformation */ -#include "Math/DualComplex.h" -#include "AbstractTranslationRotation2D.h" -#include "Object.h" +#include "Magnum/Math/DualComplex.h" +#include "Magnum/SceneGraph/AbstractTranslationRotation2D.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/DualQuaternionTransformation.h b/src/Magnum/SceneGraph/DualQuaternionTransformation.h index 6a39c8d5b..f7c5acd5e 100644 --- a/src/Magnum/SceneGraph/DualQuaternionTransformation.h +++ b/src/Magnum/SceneGraph/DualQuaternionTransformation.h @@ -28,9 +28,9 @@ * @brief Class Magnum::SceneGraph::BasicDualQuaternionTransformation, typedef Magnum::SceneGraph::DualQuaternionTransformation */ -#include "Math/DualQuaternion.h" -#include "AbstractTranslationRotation3D.h" -#include "Object.h" +#include "Magnum/Math/DualQuaternion.h" +#include "Magnum/SceneGraph/AbstractTranslationRotation3D.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index 34359ac05..043ff2099 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -31,8 +31,8 @@ #include #include -#include "SceneGraph/SceneGraph.h" -#include "SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/SceneGraph.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/FeatureGroup.hpp b/src/Magnum/SceneGraph/FeatureGroup.hpp index 7bc285dac..407c824f4 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.hpp +++ b/src/Magnum/SceneGraph/FeatureGroup.hpp @@ -28,10 +28,10 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref FeatureGroup.h */ -#include "FeatureGroup.h" - #include +#include "Magnum/SceneGraph/FeatureGroup.h" + namespace Magnum { namespace SceneGraph { template AbstractFeatureGroup::AbstractFeatureGroup() = default; diff --git a/src/Magnum/SceneGraph/MatrixTransformation2D.h b/src/Magnum/SceneGraph/MatrixTransformation2D.h index db6e238a8..896a84fc7 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation2D.h @@ -28,9 +28,9 @@ * @brief Class Magnum::SceneGraph::BasicMatrixTransformation2D, typedef Magnum::SceneGraph::MatrixTransformation2D */ -#include "Math/Matrix3.h" -#include "AbstractTranslationRotationScaling2D.h" -#include "Object.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/MatrixTransformation3D.h b/src/Magnum/SceneGraph/MatrixTransformation3D.h index f1d0d01e6..7f7f531ff 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation3D.h @@ -28,9 +28,9 @@ * @brief Class Magnum::SceneGraph::BasicMatrixTransformation3D, typedef Magnum::SceneGraph::MatrixTransformation3D */ -#include "Math/Matrix4.h" -#include "AbstractTranslationRotationScaling3D.h" -#include "Object.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h index 6832cee2e..a5ac2225a 100644 --- a/src/Magnum/SceneGraph/Object.h +++ b/src/Magnum/SceneGraph/Object.h @@ -30,10 +30,9 @@ #include -#include "AbstractFeature.h" -#include "AbstractObject.h" - -#include "magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/AbstractFeature.h" +#include "Magnum/SceneGraph/AbstractObject.h" +#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Object.hpp b/src/Magnum/SceneGraph/Object.hpp index b050a7a96..f0c67dee6 100644 --- a/src/Magnum/SceneGraph/Object.hpp +++ b/src/Magnum/SceneGraph/Object.hpp @@ -28,13 +28,12 @@ * @brief @ref compilation-speedup-hpp "Template implementation" for @ref AbstractObject.h, @ref AbstractTransformation.h and @ref Object.h */ -#include "AbstractTransformation.h" -#include "Object.h" - #include #include -#include "Scene.h" +#include "Magnum/SceneGraph/AbstractTransformation.h" +#include "Magnum/SceneGraph/Object.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h index e89ada21a..3fe5945a1 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h @@ -28,10 +28,10 @@ * @brief Class Magnum::SceneGraph::BasicRigidMatrixTransformation2D, typedef Magnum::SceneGraph::RigidMatrixTransformation2D */ -#include "Math/Matrix3.h" -#include "Math/Algorithms/GramSchmidt.h" -#include "AbstractTranslationRotation2D.h" -#include "Object.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Algorithms/GramSchmidt.h" +#include "Magnum/SceneGraph/AbstractTranslationRotation2D.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h index fa25cdcc5..9ac0a9553 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h @@ -28,10 +28,10 @@ * @brief Class Magnum::SceneGraph::BasicRigidMatrixTransformation3D, typedef Magnum::SceneGraph::RigidMatrixTransformation3D */ -#include "Math/Matrix4.h" -#include "Math/Algorithms/GramSchmidt.h" -#include "AbstractTranslationRotation3D.h" -#include "Object.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Algorithms/GramSchmidt.h" +#include "Magnum/SceneGraph/AbstractTranslationRotation3D.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Scene.h b/src/Magnum/SceneGraph/Scene.h index bdba1d6b6..1919d2acd 100644 --- a/src/Magnum/SceneGraph/Scene.h +++ b/src/Magnum/SceneGraph/Scene.h @@ -28,7 +28,7 @@ * @brief Class Magnum::SceneGraph::Scene */ -#include "Object.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/SceneGraph.h b/src/Magnum/SceneGraph/SceneGraph.h index 0370b6b5f..45ee7ddba 100644 --- a/src/Magnum/SceneGraph/SceneGraph.h +++ b/src/Magnum/SceneGraph/SceneGraph.h @@ -30,7 +30,7 @@ #include -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Test/AnimableTest.cpp b/src/Magnum/SceneGraph/Test/AnimableTest.cpp index 3dafc0ead..944248084 100644 --- a/src/Magnum/SceneGraph/Test/AnimableTest.cpp +++ b/src/Magnum/SceneGraph/Test/AnimableTest.cpp @@ -25,9 +25,9 @@ #include #include -#include "SceneGraph/Animable.h" -#include "SceneGraph/AnimableGroup.h" -#include "SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Animable.h" +#include "Magnum/SceneGraph/AnimableGroup.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/CameraTest.cpp b/src/Magnum/SceneGraph/Test/CameraTest.cpp index d21dec3d2..76dd5f97e 100644 --- a/src/Magnum/SceneGraph/Test/CameraTest.cpp +++ b/src/Magnum/SceneGraph/Test/CameraTest.cpp @@ -24,13 +24,13 @@ #include -#include "SceneGraph/AbstractCamera.hpp" /* only for aspectRatioFix(), so it doesn't have to be exported */ -#include "SceneGraph/Camera2D.h" -#include "SceneGraph/Camera3D.h" -#include "SceneGraph/Drawable.h" -#include "SceneGraph/MatrixTransformation2D.h" -#include "SceneGraph/MatrixTransformation3D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/AbstractCamera.hpp" /* only for aspectRatioFix(), so it doesn't have to be exported */ +#include "Magnum/SceneGraph/Camera2D.h" +#include "Magnum/SceneGraph/Camera3D.h" +#include "Magnum/SceneGraph/Drawable.h" +#include "Magnum/SceneGraph/MatrixTransformation2D.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp index 4acfc2aba..8a57dc727 100644 --- a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "SceneGraph/DualComplexTransformation.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/DualComplexTransformation.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp index 6cc743870..7b78184c6 100644 --- a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "SceneGraph/DualQuaternionTransformation.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/DualQuaternionTransformation.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp index 607f0ed3c..c8afa066a 100644 --- a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp +++ b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp @@ -24,8 +24,8 @@ #include -#include "SceneGraph/MatrixTransformation2D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/MatrixTransformation2D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp index 44fe948a4..c12df9d61 100644 --- a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp +++ b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp @@ -24,8 +24,8 @@ #include -#include "SceneGraph/MatrixTransformation3D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp index 82375a07a..b021ce436 100644 --- a/src/Magnum/SceneGraph/Test/ObjectTest.cpp +++ b/src/Magnum/SceneGraph/Test/ObjectTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "SceneGraph/MatrixTransformation3D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp index 8aaa7ba1b..de7ac1370 100644 --- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp +++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "SceneGraph/RigidMatrixTransformation2D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/RigidMatrixTransformation2D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp index f0ce9f7a9..326626564 100644 --- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp +++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "SceneGraph/RigidMatrixTransformation3D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/RigidMatrixTransformation3D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/SceneTest.cpp b/src/Magnum/SceneGraph/Test/SceneTest.cpp index ccb6676e7..d93ff7957 100644 --- a/src/Magnum/SceneGraph/Test/SceneTest.cpp +++ b/src/Magnum/SceneGraph/Test/SceneTest.cpp @@ -24,8 +24,8 @@ #include -#include "SceneGraph/MatrixTransformation3D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp index e3ca42edf..b9e379658 100644 --- a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp @@ -25,9 +25,9 @@ #include #include -#include "SceneGraph/Object.hpp" -#include "SceneGraph/TranslationTransformation.h" -#include "SceneGraph/Scene.h" +#include "Magnum/SceneGraph/Object.hpp" +#include "Magnum/SceneGraph/TranslationTransformation.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace SceneGraph { namespace Test { diff --git a/src/Magnum/SceneGraph/TranslationTransformation.h b/src/Magnum/SceneGraph/TranslationTransformation.h index 917ecc4dd..1c737395d 100644 --- a/src/Magnum/SceneGraph/TranslationTransformation.h +++ b/src/Magnum/SceneGraph/TranslationTransformation.h @@ -28,10 +28,10 @@ * @brief Class @ref Magnum::SceneGraph::TranslationTransformation, alias @ref Magnum::SceneGraph::BasicTranslationTransformation2D, @ref Magnum::SceneGraph::BasicTranslationTransformation3D, typedef @ref Magnum::SceneGraph::TranslationTransformation2D, @ref Magnum::SceneGraph::BasicTranslationTransformation3D */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "SceneGraph/AbstractTranslation.h" -#include "SceneGraph/Object.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/SceneGraph/AbstractTranslation.h" +#include "Magnum/SceneGraph/Object.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/instantiation.cpp b/src/Magnum/SceneGraph/instantiation.cpp index 4530719d4..3d854a867 100644 --- a/src/Magnum/SceneGraph/instantiation.cpp +++ b/src/Magnum/SceneGraph/instantiation.cpp @@ -22,20 +22,20 @@ DEALINGS IN THE SOFTWARE. */ -#include "SceneGraph/AbstractFeature.hpp" -#include "SceneGraph/Animable.hpp" -#include "SceneGraph/Camera2D.hpp" -#include "SceneGraph/Camera3D.hpp" -#include "SceneGraph/Drawable.hpp" -#include "SceneGraph/DualComplexTransformation.h" -#include "SceneGraph/DualQuaternionTransformation.h" -#include "SceneGraph/FeatureGroup.hpp" -#include "SceneGraph/MatrixTransformation2D.h" -#include "SceneGraph/MatrixTransformation3D.h" -#include "SceneGraph/Object.hpp" -#include "SceneGraph/RigidMatrixTransformation2D.h" -#include "SceneGraph/RigidMatrixTransformation3D.h" -#include "SceneGraph/TranslationTransformation.h" +#include "Magnum/SceneGraph/AbstractFeature.hpp" +#include "Magnum/SceneGraph/Animable.hpp" +#include "Magnum/SceneGraph/Camera2D.hpp" +#include "Magnum/SceneGraph/Camera3D.hpp" +#include "Magnum/SceneGraph/Drawable.hpp" +#include "Magnum/SceneGraph/DualComplexTransformation.h" +#include "Magnum/SceneGraph/DualQuaternionTransformation.h" +#include "Magnum/SceneGraph/FeatureGroup.hpp" +#include "Magnum/SceneGraph/MatrixTransformation2D.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Object.hpp" +#include "Magnum/SceneGraph/RigidMatrixTransformation2D.h" +#include "Magnum/SceneGraph/RigidMatrixTransformation3D.h" +#include "Magnum/SceneGraph/TranslationTransformation.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h index 4f6d10dd0..acedc76fd 100644 --- a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp index 842c5d663..b770cde89 100644 --- a/src/Magnum/Shader.cpp +++ b/src/Magnum/Shader.cpp @@ -28,8 +28,9 @@ #include #include -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" + #include "Implementation/DebugState.h" #include "Implementation/State.h" #include "Implementation/ShaderState.h" diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index dc3826cf8..40311f999 100644 --- a/src/Magnum/Shader.h +++ b/src/Magnum/Shader.h @@ -31,9 +31,9 @@ #include #include -#include "AbstractObject.h" -#include "Magnum.h" -#include "magnumVisibility.h" +#include "Magnum/AbstractObject.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h index ec4bedcb9..418406e13 100644 --- a/src/Magnum/Shaders/AbstractVector.h +++ b/src/Magnum/Shaders/AbstractVector.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Shaders::AbstractVector, typedef Magnum::Shaders::AbstractVector2D, Magnum::Shaders::AbstractVector3D */ -#include "Shaders/Generic.h" +#include "Magnum/Shaders/Generic.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp index fe846b59c..2b0b0850d 100644 --- a/src/Magnum/Shaders/DistanceFieldVector.cpp +++ b/src/Magnum/Shaders/DistanceFieldVector.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/DistanceFieldVector.h b/src/Magnum/Shaders/DistanceFieldVector.h index 9c61647de..43642f7f1 100644 --- a/src/Magnum/Shaders/DistanceFieldVector.h +++ b/src/Magnum/Shaders/DistanceFieldVector.h @@ -28,13 +28,12 @@ * @brief Class Magnum::Shaders::DistanceFieldVector, typedef Magnum::Shaders::DistanceFieldVector2D, Magnum::Shaders::DistanceFieldVector3D */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Color.h" -#include "DimensionTraits.h" -#include "AbstractVector.h" - -#include "magnumShadersVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shaders/AbstractVector.h" +#include "Magnum/Shaders/magnumShadersVisibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp index 058b7260e..23d36d6b5 100644 --- a/src/Magnum/Shaders/Flat.cpp +++ b/src/Magnum/Shaders/Flat.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h index 00740ddae..345721788 100644 --- a/src/Magnum/Shaders/Flat.h +++ b/src/Magnum/Shaders/Flat.h @@ -28,13 +28,12 @@ * @brief Class @ref Magnum::Shaders::Flat, typedef @ref Magnum::Shaders::Flat2D, @ref Magnum::Shaders::Flat3D */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Color.h" -#include "DimensionTraits.h" -#include "Shaders/Generic.h" - -#include "magnumShadersVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shaders/Generic.h" +#include "Magnum/Shaders/magnumShadersVisibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Generic.h b/src/Magnum/Shaders/Generic.h index 5676cbd0c..247de1559 100644 --- a/src/Magnum/Shaders/Generic.h +++ b/src/Magnum/Shaders/Generic.h @@ -28,7 +28,7 @@ * @brief Struct @ref Magnum::Shaders::Generic, typedef @ref Magnum::Shaders::Generic2D, @ref Magnum::Shaders::Generic3D */ -#include "AbstractShaderProgram.h" +#include "Magnum/AbstractShaderProgram.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp index 4a557d1a3..7eabe272f 100644 --- a/src/Magnum/Shaders/MeshVisualizer.cpp +++ b/src/Magnum/Shaders/MeshVisualizer.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/MeshVisualizer.h b/src/Magnum/Shaders/MeshVisualizer.h index b7289410b..d1caf439e 100644 --- a/src/Magnum/Shaders/MeshVisualizer.h +++ b/src/Magnum/Shaders/MeshVisualizer.h @@ -28,11 +28,11 @@ * @brief Class Magnum::Shaders::MeshVisualizer */ -#include "Math/Matrix4.h" -#include "AbstractShaderProgram.h" -#include "Color.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Color.h" -#include "Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/magnumShadersVisibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp index e33cfe27e..c8f20253d 100644 --- a/src/Magnum/Shaders/Phong.cpp +++ b/src/Magnum/Shaders/Phong.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index 2d380a7d7..81958035b 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/src/Magnum/Shaders/Phong.h @@ -28,11 +28,10 @@ * @brief Class Magnum::Shaders::Phong */ -#include "Math/Matrix4.h" -#include "Color.h" -#include "Shaders/Generic.h" - -#include "magnumShadersVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shaders/Generic.h" +#include "Magnum/Shaders/magnumShadersVisibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Shaders.h b/src/Magnum/Shaders/Shaders.h index 95d259f1d..09b21ca3d 100644 --- a/src/Magnum/Shaders/Shaders.h +++ b/src/Magnum/Shaders/Shaders.h @@ -28,7 +28,7 @@ * @brief Forward declarations for Magnum::Shaders namespace */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index 6616f2fab..8a6461548 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -22,11 +22,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Shaders/DistanceFieldVector.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Shaders/DistanceFieldVector.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/magnumShadersResourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index f0a47d5e2..486d2c10a 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -22,11 +22,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Shaders/Flat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Shaders/Flat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/magnumShadersResourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index 1a28c3a57..5d7ec7762 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -22,13 +22,13 @@ DEALINGS IN THE SOFTWARE. */ -#include "Context.h" -#include "Extensions.h" -#include "Shaders/MeshVisualizer.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shaders/MeshVisualizer.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/magnumShadersResourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 87c1ffbca..a043d1dbf 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -22,11 +22,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Shaders/Phong.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Shaders/Phong.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/magnumShadersResourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index c69d706de..3074526bc 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -22,11 +22,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Shaders/Vector.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Shaders/Vector.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/magnumShadersResourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp index 971fd555a..2426fc505 100644 --- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp @@ -22,11 +22,11 @@ DEALINGS IN THE SOFTWARE. */ -#include "Shaders/VertexColor.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Shaders/VertexColor.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/magnumShadersResourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp index 2069e3671..f62f5b05b 100644 --- a/src/Magnum/Shaders/Vector.cpp +++ b/src/Magnum/Shaders/Vector.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Vector.h b/src/Magnum/Shaders/Vector.h index 4f0ab789d..e3415d17f 100644 --- a/src/Magnum/Shaders/Vector.h +++ b/src/Magnum/Shaders/Vector.h @@ -28,13 +28,12 @@ * @brief Class @ref Magnum::Shaders::Vector, typedef @ref Magnum::Shaders::Vector2D, @ref Magnum::Shaders::Vector3D */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Color.h" -#include "DimensionTraits.h" -#include "Shaders/AbstractVector.h" - -#include "magnumShadersVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shaders/AbstractVector.h" +#include "Magnum/Shaders/magnumShadersVisibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp index 443b5841d..52ea5442f 100644 --- a/src/Magnum/Shaders/VertexColor.cpp +++ b/src/Magnum/Shaders/VertexColor.cpp @@ -26,9 +26,9 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/VertexColor.h b/src/Magnum/Shaders/VertexColor.h index 067e859f9..99af6fdd0 100644 --- a/src/Magnum/Shaders/VertexColor.h +++ b/src/Magnum/Shaders/VertexColor.h @@ -28,13 +28,12 @@ * @brief Class Magnum::Shaders::VertexColor */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Color.h" -#include "DimensionTraits.h" -#include "Shaders/Generic.h" - -#include "magnumShadersVisibility.h" +#include "Magnum/Color.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shaders/Generic.h" +#include "Magnum/Shaders/magnumShadersVisibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp index 2235ca5f0..08168a481 100644 --- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp +++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifdef MAGNUM_BUILD_STATIC #include diff --git a/src/Magnum/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/magnumShadersVisibility.h index 202006b11..22e80b7ea 100644 --- a/src/Magnum/Shaders/magnumShadersVisibility.h +++ b/src/Magnum/Shaders/magnumShadersVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShaders_EXPORTS diff --git a/src/Magnum/Shapes/AbstractShape.cpp b/src/Magnum/Shapes/AbstractShape.cpp index a6e25edc8..6e2b2401c 100644 --- a/src/Magnum/Shapes/AbstractShape.cpp +++ b/src/Magnum/Shapes/AbstractShape.cpp @@ -26,8 +26,8 @@ #include -#include "Shapes/ShapeGroup.h" -#include "Shapes/Implementation/CollisionDispatch.h" +#include "Magnum/Shapes/ShapeGroup.h" +#include "Magnum/Shapes/Implementation/CollisionDispatch.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/AbstractShape.h b/src/Magnum/Shapes/AbstractShape.h index cd888807e..c1dc7ea19 100644 --- a/src/Magnum/Shapes/AbstractShape.h +++ b/src/Magnum/Shapes/AbstractShape.h @@ -28,11 +28,11 @@ * @brief Class Magnum::Shapes::AbstractShape, typedef Magnum::Shapes::AbstractShape2D, Magnum::Shapes::AbstractShape3D */ -#include "Magnum.h" -#include "DimensionTraits.h" -#include "Shapes/magnumShapesVisibility.h" -#include "Shapes/shapeImplementation.h" -#include "SceneGraph/AbstractGroupedFeature.h" +#include "Magnum/Magnum.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/shapeImplementation.h" +#include "Magnum/SceneGraph/AbstractGroupedFeature.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/AxisAlignedBox.cpp b/src/Magnum/Shapes/AxisAlignedBox.cpp index 75c7df465..00318b8df 100644 --- a/src/Magnum/Shapes/AxisAlignedBox.cpp +++ b/src/Magnum/Shapes/AxisAlignedBox.cpp @@ -24,9 +24,9 @@ #include "AxisAlignedBox.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Shapes/Point.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Point.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/AxisAlignedBox.h b/src/Magnum/Shapes/AxisAlignedBox.h index 50aa7210f..39edbc3ea 100644 --- a/src/Magnum/Shapes/AxisAlignedBox.h +++ b/src/Magnum/Shapes/AxisAlignedBox.h @@ -28,10 +28,10 @@ * @brief Class Magnum::Shapes::AxisAlignedBox, typedef Magnum::Shapes::AxisAlignedBox2D, Magnum::Shapes.:AxisAlignedBox3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Box.h b/src/Magnum/Shapes/Box.h index f7abec1d2..424005127 100644 --- a/src/Magnum/Shapes/Box.h +++ b/src/Magnum/Shapes/Box.h @@ -28,10 +28,10 @@ * @brief Class Magnum::Shapes::Box, typedef Magnum::Shapes::Box2D, Magnum::Shapes::Box3D */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "DimensionTraits.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Capsule.cpp b/src/Magnum/Shapes/Capsule.cpp index d0df89afa..e53e6c59c 100644 --- a/src/Magnum/Shapes/Capsule.cpp +++ b/src/Magnum/Shapes/Capsule.cpp @@ -24,13 +24,13 @@ #include "Capsule.h" -#include "Math/Functions.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Math/Geometry/Distance.h" -#include "Magnum.h" -#include "Shapes/Point.h" -#include "Shapes/Sphere.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Geometry/Distance.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Sphere.h" using namespace Magnum::Math::Geometry; diff --git a/src/Magnum/Shapes/Capsule.h b/src/Magnum/Shapes/Capsule.h index d73f506d1..f6e2eb223 100644 --- a/src/Magnum/Shapes/Capsule.h +++ b/src/Magnum/Shapes/Capsule.h @@ -28,10 +28,10 @@ * @brief Class Magnum::Shapes::Capsule, typedef Magnum::Shapes::Capsule2D, Magnum::Shapes::Capsule3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Collision.h b/src/Magnum/Shapes/Collision.h index c1f3731ce..6ebf94ef5 100644 --- a/src/Magnum/Shapes/Collision.h +++ b/src/Magnum/Shapes/Collision.h @@ -28,9 +28,9 @@ * @brief Class @ref Magnum::Shapes::Collision */ -#include "Math/Vector2.h" -#include "Math/Vector3.h" -#include "DimensionTraits.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Composition.cpp b/src/Magnum/Shapes/Composition.cpp index 141937eb7..fc83e3268 100644 --- a/src/Magnum/Shapes/Composition.cpp +++ b/src/Magnum/Shapes/Composition.cpp @@ -27,7 +27,7 @@ #include #include -#include "Shapes/Implementation/CollisionDispatch.h" +#include "Magnum/Shapes/Implementation/CollisionDispatch.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h index 727b24ad4..1b5b107b3 100644 --- a/src/Magnum/Shapes/Composition.h +++ b/src/Magnum/Shapes/Composition.h @@ -33,10 +33,10 @@ #include #include -#include "DimensionTraits.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" -#include "Shapes/shapeImplementation.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/shapeImplementation.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Cylinder.cpp b/src/Magnum/Shapes/Cylinder.cpp index b24cc43f0..96aa8b1b8 100644 --- a/src/Magnum/Shapes/Cylinder.cpp +++ b/src/Magnum/Shapes/Cylinder.cpp @@ -24,13 +24,13 @@ #include "Cylinder.h" -#include "Math/Functions.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Math/Geometry/Distance.h" -#include "Magnum.h" -#include "Shapes/Point.h" -#include "Shapes/Sphere.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Geometry/Distance.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Sphere.h" using namespace Magnum::Math::Geometry; diff --git a/src/Magnum/Shapes/Cylinder.h b/src/Magnum/Shapes/Cylinder.h index 22ff553a1..0d9401c88 100644 --- a/src/Magnum/Shapes/Cylinder.h +++ b/src/Magnum/Shapes/Cylinder.h @@ -28,10 +28,10 @@ * @brief Class Magnum::Shapes::Cylinder, typedef Magnum::Shapes::Cylinder2D, Magnum::Shapes::Cylinder3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Implementation/CollisionDispatch.cpp b/src/Magnum/Shapes/Implementation/CollisionDispatch.cpp index 81eae99f2..1e28a490f 100644 --- a/src/Magnum/Shapes/Implementation/CollisionDispatch.cpp +++ b/src/Magnum/Shapes/Implementation/CollisionDispatch.cpp @@ -24,15 +24,15 @@ #include "CollisionDispatch.h" -#include "Shapes/AxisAlignedBox.h" -#include "Shapes/Box.h" -#include "Shapes/Capsule.h" -#include "Shapes/Cylinder.h" -#include "Shapes/LineSegment.h" -#include "Shapes/Plane.h" -#include "Shapes/Point.h" -#include "Shapes/Sphere.h" -#include "Shapes/shapeImplementation.h" +#include "Magnum/Shapes/AxisAlignedBox.h" +#include "Magnum/Shapes/Box.h" +#include "Magnum/Shapes/Capsule.h" +#include "Magnum/Shapes/Cylinder.h" +#include "Magnum/Shapes/LineSegment.h" +#include "Magnum/Shapes/Plane.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Sphere.h" +#include "Magnum/Shapes/shapeImplementation.h" namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Shapes/Implementation/CollisionDispatch.h b/src/Magnum/Shapes/Implementation/CollisionDispatch.h index a226e822c..21e2a83d6 100644 --- a/src/Magnum/Shapes/Implementation/CollisionDispatch.h +++ b/src/Magnum/Shapes/Implementation/CollisionDispatch.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Shapes/Line.cpp b/src/Magnum/Shapes/Line.cpp index 9a39dbf94..4ba6b3c9f 100644 --- a/src/Magnum/Shapes/Line.cpp +++ b/src/Magnum/Shapes/Line.cpp @@ -24,8 +24,8 @@ #include "Line.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Line.h b/src/Magnum/Shapes/Line.h index f908860fc..64a67834c 100644 --- a/src/Magnum/Shapes/Line.h +++ b/src/Magnum/Shapes/Line.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Shapes::Line, typedef Magnum::Shapes::Line2D, Magnum::Shapes::Line3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/LineSegment.h b/src/Magnum/Shapes/LineSegment.h index ee0f22dbc..5f9553462 100644 --- a/src/Magnum/Shapes/LineSegment.h +++ b/src/Magnum/Shapes/LineSegment.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Shapes::LineSegment, typedef Magnum::Shapes::LineSegment2D, Magnum::Shapes::LineSegment3D */ -#include "Line.h" +#include "Magnum/Shapes/Line.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Plane.cpp b/src/Magnum/Shapes/Plane.cpp index 7c2ef4fc0..32fa8aab8 100644 --- a/src/Magnum/Shapes/Plane.cpp +++ b/src/Magnum/Shapes/Plane.cpp @@ -26,9 +26,9 @@ #include -#include "Math/Matrix4.h" -#include "Math/Geometry/Intersection.h" -#include "Shapes/LineSegment.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Geometry/Intersection.h" +#include "Magnum/Shapes/LineSegment.h" using namespace Magnum::Math::Geometry; diff --git a/src/Magnum/Shapes/Plane.h b/src/Magnum/Shapes/Plane.h index c3a4d6a7c..cd514c412 100644 --- a/src/Magnum/Shapes/Plane.h +++ b/src/Magnum/Shapes/Plane.h @@ -28,10 +28,10 @@ * @brief Class Magnum::Shapes::Plane */ -#include "Math/Vector3.h" -#include "Magnum.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Point.cpp b/src/Magnum/Shapes/Point.cpp index 4badc0565..f1cc429d5 100644 --- a/src/Magnum/Shapes/Point.cpp +++ b/src/Magnum/Shapes/Point.cpp @@ -24,8 +24,8 @@ #include "Point.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Point.h b/src/Magnum/Shapes/Point.h index 47cdb89e0..cebc0d037 100644 --- a/src/Magnum/Shapes/Point.h +++ b/src/Magnum/Shapes/Point.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Shapes::Point, typedef Magnum::Shapes::Point2D, Magnum::Shapes::Point3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Shape.cpp b/src/Magnum/Shapes/Shape.cpp index a302db9aa..519d20514 100644 --- a/src/Magnum/Shapes/Shape.cpp +++ b/src/Magnum/Shapes/Shape.cpp @@ -24,7 +24,7 @@ #include "Shape.h" -#include "Shapes/Composition.h" +#include "Magnum/Shapes/Composition.h" namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h index e4ac03523..2170010d7 100644 --- a/src/Magnum/Shapes/Shape.h +++ b/src/Magnum/Shapes/Shape.h @@ -28,10 +28,9 @@ * @brief Class Magnum::Shapes::Shape */ -#include "Shapes/AbstractShape.h" -#include "Shapes/Shapes.h" - -#include "magnumShapesVisibility.h" +#include "Magnum/Shapes/AbstractShape.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/ShapeGroup.cpp b/src/Magnum/Shapes/ShapeGroup.cpp index a44d06480..016e2eba1 100644 --- a/src/Magnum/Shapes/ShapeGroup.cpp +++ b/src/Magnum/Shapes/ShapeGroup.cpp @@ -24,7 +24,7 @@ #include "ShapeGroup.h" -#include "Shapes/AbstractShape.h" +#include "Magnum/Shapes/AbstractShape.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/ShapeGroup.h b/src/Magnum/Shapes/ShapeGroup.h index fb683650c..3f1c8e5c5 100644 --- a/src/Magnum/Shapes/ShapeGroup.h +++ b/src/Magnum/Shapes/ShapeGroup.h @@ -30,10 +30,9 @@ #include -#include "Shapes/AbstractShape.h" -#include "SceneGraph/FeatureGroup.h" - -#include "magnumShapesVisibility.h" +#include "Magnum/SceneGraph/FeatureGroup.h" +#include "Magnum/Shapes/AbstractShape.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Shapes.h b/src/Magnum/Shapes/Shapes.h index dcb300193..6cf7a3669 100644 --- a/src/Magnum/Shapes/Shapes.h +++ b/src/Magnum/Shapes/Shapes.h @@ -28,7 +28,7 @@ * @brief Forward declarations for Magnum::Shapes namespace */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Sphere.cpp b/src/Magnum/Shapes/Sphere.cpp index 8b86fa3ad..5025d2416 100644 --- a/src/Magnum/Shapes/Sphere.cpp +++ b/src/Magnum/Shapes/Sphere.cpp @@ -24,13 +24,13 @@ #include "Sphere.h" -#include "Math/Functions.h" -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Math/Geometry/Distance.h" -#include "Magnum.h" -#include "Shapes/LineSegment.h" -#include "Shapes/Point.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Math/Geometry/Distance.h" +#include "Magnum/Shapes/LineSegment.h" +#include "Magnum/Shapes/Point.h" using namespace Magnum::Math::Geometry; diff --git a/src/Magnum/Shapes/Sphere.h b/src/Magnum/Shapes/Sphere.h index 64ec6e2c6..c7991f733 100644 --- a/src/Magnum/Shapes/Sphere.h +++ b/src/Magnum/Shapes/Sphere.h @@ -28,11 +28,11 @@ * @brief Class Magnum::Shapes::Sphere, typedef Magnum::Shapes::Sphere2D, Magnum::Shapes::Sphere3D */ -#include "Math/Vector3.h" -#include "DimensionTraits.h" -#include "Shapes/Collision.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Shapes/Collision.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp b/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp index 8f4a940c5..31f6f309a 100644 --- a/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp +++ b/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/AxisAlignedBox.h" -#include "Shapes/Point.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Magnum.h" +#include "Magnum/Shapes/AxisAlignedBox.h" +#include "Magnum/Shapes/Point.h" #include "ShapeTestBase.h" diff --git a/src/Magnum/Shapes/Test/BoxTest.cpp b/src/Magnum/Shapes/Test/BoxTest.cpp index 53140f695..7fb312809 100644 --- a/src/Magnum/Shapes/Test/BoxTest.cpp +++ b/src/Magnum/Shapes/Test/BoxTest.cpp @@ -24,9 +24,9 @@ #include -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/Box.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Box.h" namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/Test/CapsuleTest.cpp b/src/Magnum/Shapes/Test/CapsuleTest.cpp index ebbb78241..06b275b90 100644 --- a/src/Magnum/Shapes/Test/CapsuleTest.cpp +++ b/src/Magnum/Shapes/Test/CapsuleTest.cpp @@ -22,12 +22,12 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/Capsule.h" -#include "Shapes/Point.h" -#include "Shapes/Sphere.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Capsule.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Sphere.h" #include "ShapeTestBase.h" diff --git a/src/Magnum/Shapes/Test/CollisionTest.cpp b/src/Magnum/Shapes/Test/CollisionTest.cpp index 8501bb80d..0f02c6940 100644 --- a/src/Magnum/Shapes/Test/CollisionTest.cpp +++ b/src/Magnum/Shapes/Test/CollisionTest.cpp @@ -24,8 +24,8 @@ #include -#include "Shapes/Collision.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Shapes/Collision.h" namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/Test/CompositionTest.cpp b/src/Magnum/Shapes/Test/CompositionTest.cpp index cb6f3f76c..917de2b20 100644 --- a/src/Magnum/Shapes/Test/CompositionTest.cpp +++ b/src/Magnum/Shapes/Test/CompositionTest.cpp @@ -22,12 +22,12 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Shapes/Point.h" -#include "Shapes/AxisAlignedBox.h" -#include "Shapes/Composition.h" -#include "Shapes/Sphere.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/AxisAlignedBox.h" +#include "Magnum/Shapes/Composition.h" +#include "Magnum/Shapes/Sphere.h" #include "ShapeTestBase.h" diff --git a/src/Magnum/Shapes/Test/CylinderTest.cpp b/src/Magnum/Shapes/Test/CylinderTest.cpp index 013f16da9..dc0967ada 100644 --- a/src/Magnum/Shapes/Test/CylinderTest.cpp +++ b/src/Magnum/Shapes/Test/CylinderTest.cpp @@ -22,12 +22,12 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/Cylinder.h" -#include "Shapes/Point.h" -#include "Shapes/Sphere.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Cylinder.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Sphere.h" #include "ShapeTestBase.h" diff --git a/src/Magnum/Shapes/Test/LineTest.cpp b/src/Magnum/Shapes/Test/LineTest.cpp index 73e2681bc..21f80ea31 100644 --- a/src/Magnum/Shapes/Test/LineTest.cpp +++ b/src/Magnum/Shapes/Test/LineTest.cpp @@ -24,9 +24,9 @@ #include -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/Line.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Line.h" namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/Test/PlaneTest.cpp b/src/Magnum/Shapes/Test/PlaneTest.cpp index 5041aeb85..41e30bbe4 100644 --- a/src/Magnum/Shapes/Test/PlaneTest.cpp +++ b/src/Magnum/Shapes/Test/PlaneTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix4.h" -#include "Shapes/LineSegment.h" -#include "Shapes/Point.h" -#include "Shapes/Plane.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/LineSegment.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Plane.h" #include "ShapeTestBase.h" diff --git a/src/Magnum/Shapes/Test/PointTest.cpp b/src/Magnum/Shapes/Test/PointTest.cpp index 3a6f02be7..1cea3ad9f 100644 --- a/src/Magnum/Shapes/Test/PointTest.cpp +++ b/src/Magnum/Shapes/Test/PointTest.cpp @@ -24,9 +24,9 @@ #include -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/Point.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/Point.h" namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp index 27c58566f..4e1985da8 100644 --- a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp +++ b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Shapes/shapeImplementation.h" +#include "Magnum/Shapes/shapeImplementation.h" namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/Test/ShapeTest.cpp b/src/Magnum/Shapes/Test/ShapeTest.cpp index 2f86d4949..49dbf2c3c 100644 --- a/src/Magnum/Shapes/Test/ShapeTest.cpp +++ b/src/Magnum/Shapes/Test/ShapeTest.cpp @@ -24,14 +24,14 @@ #include -#include "Shapes/ShapeGroup.h" -#include "Shapes/Shape.h" -#include "Shapes/Point.h" -#include "Shapes/Composition.h" -#include "Shapes/Sphere.h" -#include "SceneGraph/MatrixTransformation2D.h" -#include "SceneGraph/MatrixTransformation3D.h" -#include "SceneGraph/Scene.h" +#include "Magnum/Shapes/Composition.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Shape.h" +#include "Magnum/Shapes/ShapeGroup.h" +#include "Magnum/Shapes/Sphere.h" +#include "Magnum/SceneGraph/MatrixTransformation2D.h" +#include "Magnum/SceneGraph/MatrixTransformation3D.h" +#include "Magnum/SceneGraph/Scene.h" namespace Magnum { namespace Shapes { namespace Test { diff --git a/src/Magnum/Shapes/Test/SphereTest.cpp b/src/Magnum/Shapes/Test/SphereTest.cpp index 5a32c4721..1bd3cce83 100644 --- a/src/Magnum/Shapes/Test/SphereTest.cpp +++ b/src/Magnum/Shapes/Test/SphereTest.cpp @@ -22,12 +22,12 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix3.h" -#include "Math/Matrix4.h" -#include "Magnum.h" -#include "Shapes/LineSegment.h" -#include "Shapes/Point.h" -#include "Shapes/Sphere.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix3.h" +#include "Magnum/Math/Matrix4.h" +#include "Magnum/Shapes/LineSegment.h" +#include "Magnum/Shapes/Point.h" +#include "Magnum/Shapes/Sphere.h" #include "ShapeTestBase.h" diff --git a/src/Magnum/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/magnumShapesVisibility.h index 008ae8a88..94d163e2b 100644 --- a/src/Magnum/Shapes/magnumShapesVisibility.h +++ b/src/Magnum/Shapes/magnumShapesVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShapes_EXPORTS diff --git a/src/Magnum/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h index fc6301a53..ef7fa1cc3 100644 --- a/src/Magnum/Shapes/shapeImplementation.h +++ b/src/Magnum/Shapes/shapeImplementation.h @@ -28,10 +28,10 @@ #include #include -#include "DimensionTraits.h" -#include "Magnum.h" -#include "Shapes/Shapes.h" -#include "Shapes/magnumShapesVisibility.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Magnum.h" +#include "Magnum/Shapes/Shapes.h" +#include "Magnum/Shapes/magnumShapesVisibility.h" namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Swizzle.h b/src/Magnum/Swizzle.h index cb8f06c17..8ca272d33 100644 --- a/src/Magnum/Swizzle.h +++ b/src/Magnum/Swizzle.h @@ -31,8 +31,8 @@ */ #endif -#include "Math/Swizzle.h" -#include "Color.h" +#include "Magnum/Math/Swizzle.h" +#include "Magnum/Color.h" #ifdef MAGNUM_BUILD_DEPRECATED namespace Magnum { diff --git a/src/Magnum/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp index 9e386f235..8667dc985 100644 --- a/src/Magnum/Test/AbstractImageTest.cpp +++ b/src/Magnum/Test/AbstractImageTest.cpp @@ -25,9 +25,9 @@ #include #include -#include "AbstractImage.h" -#include "Image.h" -#include "ColorFormat.h" +#include "Magnum/AbstractImage.h" +#include "Magnum/Image.h" +#include "Magnum/ColorFormat.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/AbstractObjectGLTest.cpp b/src/Magnum/Test/AbstractObjectGLTest.cpp index fe27d3973..10adfe59d 100644 --- a/src/Magnum/Test/AbstractObjectGLTest.cpp +++ b/src/Magnum/Test/AbstractObjectGLTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include "Buffer.h" -#include "Context.h" -#include "Extensions.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Buffer.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h index f2743b7ae..0a0725966 100644 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ b/src/Magnum/Test/AbstractOpenGLTester.h @@ -27,13 +27,13 @@ #include #include -#include "Context.h" -#include "Extensions.h" -#include "DebugMessage.h" -#include "Renderer.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/DebugMessage.h" +#include "Magnum/Renderer.h" #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES) -#include "Platform/WindowlessGlxApplication.h" +#include "Magnum/Platform/WindowlessGlxApplication.h" #else #error Cannot run OpenGL tests on this platform #endif diff --git a/src/Magnum/Test/AbstractQueryGLTest.cpp b/src/Magnum/Test/AbstractQueryGLTest.cpp index 750f07286..807617dae 100644 --- a/src/Magnum/Test/AbstractQueryGLTest.cpp +++ b/src/Magnum/Test/AbstractQueryGLTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include "Query.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Query.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp index 858c7cd2e..2f8016a32 100644 --- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp @@ -24,13 +24,13 @@ #include -#include "Math/Matrix.h" -#include "Math/Vector4.h" -#include "AbstractShaderProgram.h" -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" +#include "Magnum/Math/Matrix.h" +#include "Magnum/Math/Vector4.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/AbstractShaderProgramTest.cpp b/src/Magnum/Test/AbstractShaderProgramTest.cpp index c09832c9d..06f71f1f3 100644 --- a/src/Magnum/Test/AbstractShaderProgramTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramTest.cpp @@ -24,7 +24,7 @@ #include -#include "AbstractShaderProgram.h" +#include "Magnum/AbstractShaderProgram.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/AbstractTextureGLTest.cpp b/src/Magnum/Test/AbstractTextureGLTest.cpp index 753d90337..32510cff9 100644 --- a/src/Magnum/Test/AbstractTextureGLTest.cpp +++ b/src/Magnum/Test/AbstractTextureGLTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include "Context.h" -#include "Extensions.h" -#include "Texture.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Texture.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ArrayTest.cpp b/src/Magnum/Test/ArrayTest.cpp index 84bca1274..b362d123c 100644 --- a/src/Magnum/Test/ArrayTest.cpp +++ b/src/Magnum/Test/ArrayTest.cpp @@ -24,7 +24,7 @@ #include -#include "Array.h" +#include "Magnum/Array.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp index e565797d2..7e6cc6e78 100644 --- a/src/Magnum/Test/BufferGLTest.cpp +++ b/src/Magnum/Test/BufferGLTest.cpp @@ -26,10 +26,10 @@ #include #include -#include "Buffer.h" -#include "Context.h" -#include "Extensions.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Buffer.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp index 72d257f50..e5320d1cd 100644 --- a/src/Magnum/Test/BufferImageGLTest.cpp +++ b/src/Magnum/Test/BufferImageGLTest.cpp @@ -24,9 +24,9 @@ #include -#include "BufferImage.h" -#include "ColorFormat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/BufferImage.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp index 1ea39e425..f8336d7ef 100644 --- a/src/Magnum/Test/BufferTextureGLTest.cpp +++ b/src/Magnum/Test/BufferTextureGLTest.cpp @@ -24,9 +24,9 @@ #include -#include "Buffer.h" -#include "BufferTexture.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Buffer.h" +#include "Magnum/BufferTexture.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ColorTest.cpp b/src/Magnum/Test/ColorTest.cpp index 0762c00cd..44bc742fd 100644 --- a/src/Magnum/Test/ColorTest.cpp +++ b/src/Magnum/Test/ColorTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Color.h" +#include "Magnum/Color.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ContextGLTest.cpp b/src/Magnum/Test/ContextGLTest.cpp index 44b1ef6a9..5c2f1d5ac 100644 --- a/src/Magnum/Test/ContextGLTest.cpp +++ b/src/Magnum/Test/ContextGLTest.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include "Context.h" -#include "Extensions.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp index c71aae2e9..a17a6b936 100644 --- a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp @@ -24,12 +24,12 @@ #include -#include "BufferImage.h" -#include "ColorFormat.h" -#include "Image.h" -#include "CubeMapTextureArray.h" -#include "TextureFormat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/BufferImage.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "Magnum/CubeMapTextureArray.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp index 2276be95b..880a18fee 100644 --- a/src/Magnum/Test/CubeMapTextureGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp @@ -24,12 +24,12 @@ #include -#include "BufferImage.h" -#include "ColorFormat.h" -#include "Image.h" -#include "CubeMapTexture.h" -#include "TextureFormat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/BufferImage.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "Magnum/CubeMapTexture.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/DebugGLTest.cpp b/src/Magnum/Test/DebugGLTest.cpp index ea21aef3e..fae9969e0 100644 --- a/src/Magnum/Test/DebugGLTest.cpp +++ b/src/Magnum/Test/DebugGLTest.cpp @@ -22,16 +22,15 @@ DEALINGS IN THE SOFTWARE. */ -#include "Test/AbstractOpenGLTester.h" - #include -#include "Context.h" -#include "DebugMessage.h" -#include "Extensions.h" +#include "Magnum/Context.h" +#include "Magnum/DebugMessage.h" +#include "Magnum/Extensions.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_DEPRECATED -#include "DebugMarker.h" +#include "Magnum/DebugMarker.h" #endif namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/DebugMessageTest.cpp b/src/Magnum/Test/DebugMessageTest.cpp index 5fb963e18..c323eadf7 100644 --- a/src/Magnum/Test/DebugMessageTest.cpp +++ b/src/Magnum/Test/DebugMessageTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "DebugMessage.h" +#include "Magnum/DebugMessage.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/DefaultFramebufferTest.cpp b/src/Magnum/Test/DefaultFramebufferTest.cpp index 1a09256bc..baf5c2aee 100644 --- a/src/Magnum/Test/DefaultFramebufferTest.cpp +++ b/src/Magnum/Test/DefaultFramebufferTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "DefaultFramebuffer.h" +#include "Magnum/DefaultFramebuffer.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp index 85c46a37c..9a83b82bf 100644 --- a/src/Magnum/Test/FramebufferGLTest.cpp +++ b/src/Magnum/Test/FramebufferGLTest.cpp @@ -22,17 +22,17 @@ DEALINGS IN THE SOFTWARE. */ -#include "BufferImage.h" -#include "ColorFormat.h" -#include "Context.h" -#include "Extensions.h" -#include "Framebuffer.h" -#include "Image.h" -#include "Renderbuffer.h" -#include "RenderbufferFormat.h" -#include "Texture.h" -#include "TextureFormat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/BufferImage.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Image.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/RenderbufferFormat.h" +#include "Magnum/Texture.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/FramebufferTest.cpp b/src/Magnum/Test/FramebufferTest.cpp index 2879c4722..a1c4febf0 100644 --- a/src/Magnum/Test/FramebufferTest.cpp +++ b/src/Magnum/Test/FramebufferTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Framebuffer.h" +#include "Magnum/Framebuffer.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ImageReferenceTest.cpp b/src/Magnum/Test/ImageReferenceTest.cpp index 4be244c97..b5efefcec 100644 --- a/src/Magnum/Test/ImageReferenceTest.cpp +++ b/src/Magnum/Test/ImageReferenceTest.cpp @@ -24,8 +24,8 @@ #include -#include "ColorFormat.h" -#include "ImageReference.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/ImageReference.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp index db8d69a46..b2a7be0bd 100644 --- a/src/Magnum/Test/ImageTest.cpp +++ b/src/Magnum/Test/ImageTest.cpp @@ -24,8 +24,8 @@ #include -#include "ColorFormat.h" -#include "Image.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp index 3b730d2fc..7f54eeaaf 100644 --- a/src/Magnum/Test/MeshGLTest.cpp +++ b/src/Magnum/Test/MeshGLTest.cpp @@ -22,18 +22,18 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Matrix.h" -#include "Math/Vector4.h" -#include "Buffer.h" -#include "ColorFormat.h" -#include "Framebuffer.h" -#include "Image.h" -#include "Mesh.h" -#include "MeshView.h" -#include "Renderbuffer.h" -#include "RenderbufferFormat.h" -#include "Shader.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Buffer.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Image.h" +#include "Magnum/Mesh.h" +#include "Magnum/MeshView.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/RenderbufferFormat.h" +#include "Magnum/Shader.h" +#include "Magnum/Math/Matrix.h" +#include "Magnum/Math/Vector4.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp index bc942adab..d97f32e39 100644 --- a/src/Magnum/Test/MeshTest.cpp +++ b/src/Magnum/Test/MeshTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Mesh.h" +#include "Magnum/Mesh.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp index fe09a43ed..840170d0e 100644 --- a/src/Magnum/Test/PrimitiveQueryGLTest.cpp +++ b/src/Magnum/Test/PrimitiveQueryGLTest.cpp @@ -25,15 +25,15 @@ #include #include -#include "AbstractShaderProgram.h" -#include "Buffer.h" -#include "Framebuffer.h" -#include "Mesh.h" -#include "Query.h" -#include "Renderbuffer.h" -#include "RenderbufferFormat.h" -#include "Shader.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Buffer.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/Query.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/RenderbufferFormat.h" +#include "Magnum/Shader.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/RenderbufferGLTest.cpp b/src/Magnum/Test/RenderbufferGLTest.cpp index c7481506f..11aa6e080 100644 --- a/src/Magnum/Test/RenderbufferGLTest.cpp +++ b/src/Magnum/Test/RenderbufferGLTest.cpp @@ -22,12 +22,12 @@ DEALINGS IN THE SOFTWARE. */ -#include "Math/Vector2.h" -#include "Context.h" -#include "Extensions.h" -#include "Renderbuffer.h" -#include "RenderbufferFormat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/RenderbufferFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/RendererTest.cpp b/src/Magnum/Test/RendererTest.cpp index 07d6493f1..db4457539 100644 --- a/src/Magnum/Test/RendererTest.cpp +++ b/src/Magnum/Test/RendererTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Renderer.h" +#include "Magnum/Renderer.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp index e6cb366e1..e56356287 100644 --- a/src/Magnum/Test/ResourceManagerTest.cpp +++ b/src/Magnum/Test/ResourceManagerTest.cpp @@ -26,8 +26,8 @@ #include #include -#include "AbstractResourceLoader.h" -#include "ResourceManager.h" +#include "Magnum/AbstractResourceLoader.h" +#include "Magnum/ResourceManager.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp index bc6a1d91b..93c2e064d 100644 --- a/src/Magnum/Test/SampleQueryGLTest.cpp +++ b/src/Magnum/Test/SampleQueryGLTest.cpp @@ -25,15 +25,15 @@ #include #include -#include "AbstractShaderProgram.h" -#include "Buffer.h" -#include "Framebuffer.h" -#include "Mesh.h" -#include "Query.h" -#include "Renderbuffer.h" -#include "RenderbufferFormat.h" -#include "Shader.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Buffer.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/Query.h" +#include "Magnum/Renderbuffer.h" +#include "Magnum/RenderbufferFormat.h" +#include "Magnum/Shader.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/SamplerTest.cpp b/src/Magnum/Test/SamplerTest.cpp index a4fcfeb73..a058d95fe 100644 --- a/src/Magnum/Test/SamplerTest.cpp +++ b/src/Magnum/Test/SamplerTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Sampler.h" +#include "Magnum/Sampler.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp index e8de60201..a8d091c6c 100644 --- a/src/Magnum/Test/ShaderGLTest.cpp +++ b/src/Magnum/Test/ShaderGLTest.cpp @@ -24,10 +24,10 @@ #include -#include "Context.h" -#include "Extensions.h" -#include "Shader.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Shader.h" +#include "Magnum/Test/AbstractOpenGLTester.h" #include "ShaderGLTestConfigure.h" diff --git a/src/Magnum/Test/ShaderTest.cpp b/src/Magnum/Test/ShaderTest.cpp index 3301e17cc..e139113ba 100644 --- a/src/Magnum/Test/ShaderTest.cpp +++ b/src/Magnum/Test/ShaderTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Shader.h" +#include "Magnum/Shader.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp index 3650af957..d61ee20b8 100644 --- a/src/Magnum/Test/TextureGLTest.cpp +++ b/src/Magnum/Test/TextureGLTest.cpp @@ -24,12 +24,12 @@ #include -#include "BufferImage.h" -#include "ColorFormat.h" -#include "Image.h" -#include "Texture.h" -#include "TextureFormat.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/BufferImage.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "Magnum/Texture.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/TimeQueryGLTest.cpp b/src/Magnum/Test/TimeQueryGLTest.cpp index 163f94a83..36292e4fc 100644 --- a/src/Magnum/Test/TimeQueryGLTest.cpp +++ b/src/Magnum/Test/TimeQueryGLTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include "Query.h" -#include "Test/AbstractOpenGLTester.h" +#include "Magnum/Query.h" +#include "Magnum/Test/AbstractOpenGLTester.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp index 406398841..f6ef91460 100644 --- a/src/Magnum/Test/VersionTest.cpp +++ b/src/Magnum/Test/VersionTest.cpp @@ -24,7 +24,7 @@ #include -#include "Version.h" +#include "Magnum/Version.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp index 176ec02e0..c8141e10f 100644 --- a/src/Magnum/Text/AbstractFont.cpp +++ b/src/Magnum/Text/AbstractFont.cpp @@ -28,7 +28,7 @@ #include #include -#include "Text/GlyphCache.h" +#include "Magnum/Text/GlyphCache.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h index 1dbfa864e..4b4e6c66c 100644 --- a/src/Magnum/Text/AbstractFont.h +++ b/src/Magnum/Text/AbstractFont.h @@ -33,10 +33,10 @@ #include #include -#include "Magnum.h" -#include "Texture.h" -#include "Text/Text.h" -#include "Text/magnumTextVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Texture.h" +#include "Magnum/Text/Text.h" +#include "Magnum/Text/magnumTextVisibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp index 3f543d507..e007c21fc 100644 --- a/src/Magnum/Text/AbstractFontConverter.cpp +++ b/src/Magnum/Text/AbstractFontConverter.cpp @@ -30,7 +30,7 @@ #include #include -#include "Text/GlyphCache.h" +#include "Magnum/Text/GlyphCache.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h index b9cf01e4b..ab7fde66a 100644 --- a/src/Magnum/Text/AbstractFontConverter.h +++ b/src/Magnum/Text/AbstractFontConverter.h @@ -31,9 +31,9 @@ #include #include -#include "Magnum.h" -#include "Text/Text.h" -#include "Text/magnumTextVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Text/Text.h" +#include "Magnum/Text/magnumTextVisibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Alignment.h b/src/Magnum/Text/Alignment.h index 0677e0a1e..5225b7be6 100644 --- a/src/Magnum/Text/Alignment.h +++ b/src/Magnum/Text/Alignment.h @@ -28,7 +28,7 @@ * @brief Enum @ref Magnum::Text::Alignment */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/DistanceFieldGlyphCache.cpp b/src/Magnum/Text/DistanceFieldGlyphCache.cpp index 64fc47517..562136ecb 100644 --- a/src/Magnum/Text/DistanceFieldGlyphCache.cpp +++ b/src/Magnum/Text/DistanceFieldGlyphCache.cpp @@ -25,13 +25,13 @@ #include "DistanceFieldGlyphCache.h" #ifndef CORRADE_NO_ASSERT -#include "ColorFormat.h" +#include "Magnum/ColorFormat.h" #endif -#include "Context.h" -#include "Extensions.h" -#include "ImageReference.h" -#include "TextureFormat.h" -#include "TextureTools/DistanceField.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/ImageReference.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/TextureTools/DistanceField.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/DistanceFieldGlyphCache.h b/src/Magnum/Text/DistanceFieldGlyphCache.h index 5f3c1de8f..8754c1ba5 100644 --- a/src/Magnum/Text/DistanceFieldGlyphCache.h +++ b/src/Magnum/Text/DistanceFieldGlyphCache.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::Text::DistanceFieldGlyphCache */ -#include "Text/GlyphCache.h" +#include "Magnum/Text/GlyphCache.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/GlyphCache.cpp b/src/Magnum/Text/GlyphCache.cpp index b5f1beab3..3c007ded8 100644 --- a/src/Magnum/Text/GlyphCache.cpp +++ b/src/Magnum/Text/GlyphCache.cpp @@ -24,11 +24,11 @@ #include "GlyphCache.h" -#include "Context.h" -#include "Extensions.h" -#include "Image.h" -#include "TextureFormat.h" -#include "TextureTools/Atlas.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Image.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/TextureTools/Atlas.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h index 5fa5ede88..9b841e55c 100644 --- a/src/Magnum/Text/GlyphCache.h +++ b/src/Magnum/Text/GlyphCache.h @@ -31,9 +31,9 @@ #include #include -#include "Math/Range.h" -#include "Texture.h" -#include "Text/magnumTextVisibility.h" +#include "Magnum/Math/Range.h" +#include "Magnum/Texture.h" +#include "Magnum/Text/magnumTextVisibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp index 0ce12aeba..7f7144ac6 100644 --- a/src/Magnum/Text/Renderer.cpp +++ b/src/Magnum/Text/Renderer.cpp @@ -24,11 +24,11 @@ #include "Renderer.h" -#include "Context.h" -#include "Extensions.h" -#include "Mesh.h" -#include "Shaders/AbstractVector.h" -#include "Text/AbstractFont.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Mesh.h" +#include "Magnum/Shaders/AbstractVector.h" +#include "Magnum/Text/AbstractFont.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Renderer.h b/src/Magnum/Text/Renderer.h index 27da6a9c9..820da2bfb 100644 --- a/src/Magnum/Text/Renderer.h +++ b/src/Magnum/Text/Renderer.h @@ -32,14 +32,13 @@ #include #include -#include "Math/Range.h" -#include "Buffer.h" -#include "DimensionTraits.h" -#include "Mesh.h" -#include "Text/Text.h" -#include "Text/Alignment.h" - -#include "magnumTextVisibility.h" +#include "Magnum/Math/Range.h" +#include "Magnum/Buffer.h" +#include "Magnum/DimensionTraits.h" +#include "Magnum/Mesh.h" +#include "Magnum/Text/Text.h" +#include "Magnum/Text/Alignment.h" +#include "Magnum/Text/magnumTextVisibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index c22cd8e2d..5df0f7656 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -27,8 +27,8 @@ #include #include -#include "Text/AbstractFontConverter.h" -#include "Text/GlyphCache.h" +#include "Magnum/Text/AbstractFontConverter.h" +#include "Magnum/Text/GlyphCache.h" #include "testConfigure.h" diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp index 3c5e3eb8d..15250ebb9 100644 --- a/src/Magnum/Text/Test/AbstractFontTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Text/AbstractFont.h" +#include "Magnum/Text/AbstractFont.h" #include "testConfigure.h" diff --git a/src/Magnum/Text/Test/AbstractLayouterTest.cpp b/src/Magnum/Text/Test/AbstractLayouterTest.cpp index 53e9a109c..dee5a0fd7 100644 --- a/src/Magnum/Text/Test/AbstractLayouterTest.cpp +++ b/src/Magnum/Text/Test/AbstractLayouterTest.cpp @@ -24,8 +24,8 @@ #include -#include "Math/Range.h" -#include "Text/AbstractFont.h" +#include "Magnum/Math/Range.h" +#include "Magnum/Text/AbstractFont.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Test/GlyphCacheGLTest.cpp b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp index 76c95f6a7..9f535af91 100644 --- a/src/Magnum/Text/Test/GlyphCacheGLTest.cpp +++ b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -#include "Test/AbstractOpenGLTester.h" -#include "Text/GlyphCache.h" +#include "Magnum/Test/AbstractOpenGLTester.h" +#include "Magnum/Text/GlyphCache.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Test/RendererGLTest.cpp b/src/Magnum/Text/Test/RendererGLTest.cpp index 13a85d42d..e5a962122 100644 --- a/src/Magnum/Text/Test/RendererGLTest.cpp +++ b/src/Magnum/Text/Test/RendererGLTest.cpp @@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE. */ -#include "Test/AbstractOpenGLTester.h" -#include "Text/AbstractFont.h" -#include "Text/Renderer.h" +#include "Magnum/Test/AbstractOpenGLTester.h" +#include "Magnum/Text/AbstractFont.h" +#include "Magnum/Text/Renderer.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Text.h b/src/Magnum/Text/Text.h index 4a0960e60..01440e0c9 100644 --- a/src/Magnum/Text/Text.h +++ b/src/Magnum/Text/Text.h @@ -28,9 +28,8 @@ * @brief Forward declarations for Magnum::Text namespace */ -#include "Types.h" - -#include "magnumConfigure.h" +#include "Magnum/Types.h" +#include "Magnum/magnumConfigure.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/TextRenderer.h b/src/Magnum/Text/TextRenderer.h index 5f29e3270..d92dd97b5 100644 --- a/src/Magnum/Text/TextRenderer.h +++ b/src/Magnum/Text/TextRenderer.h @@ -1,7 +1,7 @@ #ifndef Magnum_Text_TextRenderer_h #define Magnum_Text_TextRenderer_h -#include "Text/Renderer.h" +#include "Magnum/Text/Renderer.h" #ifdef MAGNUM_BUILD_DEPRECATED namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp index 8ea4d40e0..df1601918 100644 --- a/src/Magnum/Text/fontconverter.cpp +++ b/src/Magnum/Text/fontconverter.cpp @@ -26,11 +26,11 @@ #include #include -#include "Platform/WindowlessGlxApplication.h" -#include "Text/AbstractFont.h" -#include "Text/AbstractFontConverter.h" -#include "Text/DistanceFieldGlyphCache.h" -#include "Trade/AbstractImageConverter.h" +#include "Magnum/Platform/WindowlessGlxApplication.h" +#include "Magnum/Text/AbstractFont.h" +#include "Magnum/Text/AbstractFontConverter.h" +#include "Magnum/Text/DistanceFieldGlyphCache.h" +#include "Magnum/Trade/AbstractImageConverter.h" #include "configure.h" diff --git a/src/Magnum/Text/magnumTextVisibility.h b/src/Magnum/Text/magnumTextVisibility.h index ab2fe21ae..b00be6019 100644 --- a/src/Magnum/Text/magnumTextVisibility.h +++ b/src/Magnum/Text/magnumTextVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumText_EXPORTS diff --git a/src/Magnum/Texture.h b/src/Magnum/Texture.h index b7aa34608..e5d70e745 100644 --- a/src/Magnum/Texture.h +++ b/src/Magnum/Texture.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::Texture, typedef @ref Magnum::Texture1D, @ref Magnum::Texture2D, @ref Magnum::Texture3D */ -#include "AbstractTexture.h" -#include "DimensionTraits.h" +#include "Magnum/AbstractTexture.h" +#include "Magnum/DimensionTraits.h" namespace Magnum { diff --git a/src/Magnum/TextureFormat.h b/src/Magnum/TextureFormat.h index 7d465f55f..2d994df25 100644 --- a/src/Magnum/TextureFormat.h +++ b/src/Magnum/TextureFormat.h @@ -28,7 +28,7 @@ * @brief Enum @ref Magnum::TextureFormat */ -#include "OpenGL.h" +#include "Magnum/OpenGL.h" namespace Magnum { diff --git a/src/Magnum/TextureTools/Atlas.cpp b/src/Magnum/TextureTools/Atlas.cpp index 2db816d0b..0533fadc1 100644 --- a/src/Magnum/TextureTools/Atlas.cpp +++ b/src/Magnum/TextureTools/Atlas.cpp @@ -24,8 +24,8 @@ #include "Atlas.h" -#include "Math/Functions.h" -#include "Math/Range.h" +#include "Magnum/Math/Functions.h" +#include "Magnum/Math/Range.h" namespace Magnum { namespace TextureTools { diff --git a/src/Magnum/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h index f6ad66e8a..769fcf24f 100644 --- a/src/Magnum/TextureTools/Atlas.h +++ b/src/Magnum/TextureTools/Atlas.h @@ -30,10 +30,9 @@ #include -#include "Math/Vector2.h" -#include "Magnum.h" - -#include "magnumTextureToolsVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector2.h" +#include "Magnum/TextureTools/magnumTextureToolsVisibility.h" namespace Magnum { namespace TextureTools { diff --git a/src/Magnum/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp index 0d1a1561d..9a6b1d1d0 100644 --- a/src/Magnum/TextureTools/DistanceField.cpp +++ b/src/Magnum/TextureTools/DistanceField.cpp @@ -22,19 +22,19 @@ DEALINGS IN THE SOFTWARE. */ -#include "TextureTools/DistanceField.h" +#include "DistanceField.h" #include -#include "Math/Range.h" -#include "AbstractShaderProgram.h" -#include "Buffer.h" -#include "Context.h" -#include "Extensions.h" -#include "Framebuffer.h" -#include "Mesh.h" -#include "Shader.h" -#include "Texture.h" +#include "Magnum/Math/Range.h" +#include "Magnum/AbstractShaderProgram.h" +#include "Magnum/Buffer.h" +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" +#include "Magnum/Framebuffer.h" +#include "Magnum/Mesh.h" +#include "Magnum/Shader.h" +#include "Magnum/Texture.h" namespace Magnum { namespace TextureTools { diff --git a/src/Magnum/TextureTools/DistanceField.h b/src/Magnum/TextureTools/DistanceField.h index dae2ec61c..0472e8e1f 100644 --- a/src/Magnum/TextureTools/DistanceField.h +++ b/src/Magnum/TextureTools/DistanceField.h @@ -29,11 +29,11 @@ */ #ifndef MAGNUM_TARGET_GLES -#include "Math/Vector2.h" +#include "Magnum/Math/Vector2.h" #endif -#include "Magnum.h" +#include "Magnum/Magnum.h" -#include "TextureTools/magnumTextureToolsVisibility.h" +#include "Magnum/TextureTools/magnumTextureToolsVisibility.h" namespace Magnum { namespace TextureTools { diff --git a/src/Magnum/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp index 2ef4fea7a..18797cfbd 100644 --- a/src/Magnum/TextureTools/Test/AtlasTest.cpp +++ b/src/Magnum/TextureTools/Test/AtlasTest.cpp @@ -25,8 +25,8 @@ #include #include -#include "Math/Range.h" -#include "TextureTools/Atlas.h" +#include "Magnum/Math/Range.h" +#include "Magnum/TextureTools/Atlas.h" namespace Magnum { namespace TextureTools { namespace Test { diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index 0174eaddb..954f92fc5 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -25,17 +25,17 @@ #include #include -#include "Math/Range.h" -#include "ColorFormat.h" -#include "Image.h" -#include "Renderer.h" -#include "Texture.h" -#include "TextureFormat.h" -#include "Platform/WindowlessGlxApplication.h" -#include "TextureTools/DistanceField.h" -#include "Trade/AbstractImporter.h" -#include "Trade/AbstractImageConverter.h" -#include "Trade/ImageData.h" +#include "Magnum/Math/Range.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "Magnum/Renderer.h" +#include "Magnum/Texture.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/Platform/WindowlessGlxApplication.h" +#include "Magnum/TextureTools/DistanceField.h" +#include "Magnum/Trade/AbstractImporter.h" +#include "Magnum/Trade/AbstractImageConverter.h" +#include "Magnum/Trade/ImageData.h" #include "configure.h" diff --git a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp index d6d00ea1f..1114a7138 100644 --- a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp +++ b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifdef MAGNUM_BUILD_STATIC #include diff --git a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h index 93de7e8cf..d1fd6a7fa 100644 --- a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h +++ b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumTextureTools_EXPORTS diff --git a/src/Magnum/Timeline.cpp b/src/Magnum/Timeline.cpp index 020ecf7c0..74d8a5748 100644 --- a/src/Magnum/Timeline.cpp +++ b/src/Magnum/Timeline.cpp @@ -27,7 +27,7 @@ #include #include -#include "Magnum.h" +#include "Magnum/Magnum.h" using namespace std::chrono; diff --git a/src/Magnum/Timeline.h b/src/Magnum/Timeline.h index 16ead00de..1a31fdbbf 100644 --- a/src/Magnum/Timeline.h +++ b/src/Magnum/Timeline.h @@ -24,16 +24,15 @@ DEALINGS IN THE SOFTWARE. */ -#include - -#include "Types.h" - -#include "magnumVisibility.h" - /** @file * @brief Class Magnum::Timeline */ +#include + +#include "Magnum/Types.h" +#include "Magnum/magnumVisibility.h" + namespace Magnum { /** diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index e9712c654..ab679cf06 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -30,9 +30,9 @@ #include -#include "Magnum.h" -#include "Text/Text.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" +#include "Magnum/Text/Text.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index fc443f4c0..cf1b67800 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -28,16 +28,16 @@ #include #include -#include "Trade/AbstractMaterialData.h" -#include "Trade/CameraData.h" -#include "Trade/ImageData.h" -#include "Trade/LightData.h" -#include "Trade/MeshData2D.h" -#include "Trade/MeshData3D.h" -#include "Trade/ObjectData2D.h" -#include "Trade/ObjectData3D.h" -#include "Trade/SceneData.h" -#include "Trade/TextureData.h" +#include "Magnum/Trade/AbstractMaterialData.h" +#include "Magnum/Trade/CameraData.h" +#include "Magnum/Trade/ImageData.h" +#include "Magnum/Trade/LightData.h" +#include "Magnum/Trade/MeshData2D.h" +#include "Magnum/Trade/MeshData3D.h" +#include "Magnum/Trade/ObjectData2D.h" +#include "Magnum/Trade/ObjectData3D.h" +#include "Magnum/Trade/SceneData.h" +#include "Magnum/Trade/TextureData.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index edab4f813..69626fb38 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -32,11 +32,10 @@ #include #include -#include "Optional/optional.hpp" - -#include "Magnum.h" -#include "magnumVisibility.h" -#include "Trade/Trade.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" +#include "Magnum/Trade/Trade.h" +#include "MagnumExternal/Optional/optional.hpp" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h index e233bcd12..2d278134a 100644 --- a/src/Magnum/Trade/AbstractMaterialData.h +++ b/src/Magnum/Trade/AbstractMaterialData.h @@ -28,8 +28,8 @@ * @brief Class @ref Magnum::Trade::AbstractMaterialData, enum @ref Magnum::Trade::MaterialType */ -#include "magnumVisibility.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/ImageData.h b/src/Magnum/Trade/ImageData.h index 2fd5ae143..18b51b1af 100644 --- a/src/Magnum/Trade/ImageData.h +++ b/src/Magnum/Trade/ImageData.h @@ -28,7 +28,7 @@ * @brief Class @ref Magnum::Trade::ImageData, typedef @ref Magnum::Trade::ImageData1D, @ref Magnum::Trade::ImageData2D, @ref Magnum::Trade::ImageData3D */ -#include "ImageReference.h" +#include "Magnum/ImageReference.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData2D.cpp b/src/Magnum/Trade/MeshData2D.cpp index 217de6e10..dd166c56b 100644 --- a/src/Magnum/Trade/MeshData2D.cpp +++ b/src/Magnum/Trade/MeshData2D.cpp @@ -24,7 +24,7 @@ #include "MeshData2D.h" -#include "Math/Vector2.h" +#include "Magnum/Math/Vector2.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h index a064977cb..3a61a5482 100644 --- a/src/Magnum/Trade/MeshData2D.h +++ b/src/Magnum/Trade/MeshData2D.h @@ -30,9 +30,8 @@ #include -#include "Magnum.h" - -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData3D.cpp b/src/Magnum/Trade/MeshData3D.cpp index fa103dc8d..b415c8c19 100644 --- a/src/Magnum/Trade/MeshData3D.cpp +++ b/src/Magnum/Trade/MeshData3D.cpp @@ -24,7 +24,7 @@ #include "MeshData3D.h" -#include "Math/Vector3.h" +#include "Magnum/Math/Vector3.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h index d1440affb..5bd92a702 100644 --- a/src/Magnum/Trade/MeshData3D.h +++ b/src/Magnum/Trade/MeshData3D.h @@ -30,9 +30,8 @@ #include -#include "Magnum.h" - -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshObjectData2D.h b/src/Magnum/Trade/MeshObjectData2D.h index 77f819b18..dee6f3cac 100644 --- a/src/Magnum/Trade/MeshObjectData2D.h +++ b/src/Magnum/Trade/MeshObjectData2D.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Trade::MeshObjectData2D */ -#include "ObjectData2D.h" +#include "Magnum/Trade/ObjectData2D.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshObjectData3D.h b/src/Magnum/Trade/MeshObjectData3D.h index 1a5b820af..b5855ea35 100644 --- a/src/Magnum/Trade/MeshObjectData3D.h +++ b/src/Magnum/Trade/MeshObjectData3D.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Trade::MeshObjectData3D */ -#include "ObjectData3D.h" +#include "Magnum/Trade/ObjectData3D.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/ObjectData2D.h b/src/Magnum/Trade/ObjectData2D.h index 98b64bf7f..a38d96bd2 100644 --- a/src/Magnum/Trade/ObjectData2D.h +++ b/src/Magnum/Trade/ObjectData2D.h @@ -30,8 +30,8 @@ #include -#include "Math/Matrix3.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix3.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/ObjectData3D.h b/src/Magnum/Trade/ObjectData3D.h index 8fcaf1b46..e7f3aa34a 100644 --- a/src/Magnum/Trade/ObjectData3D.h +++ b/src/Magnum/Trade/ObjectData3D.h @@ -30,8 +30,8 @@ #include -#include "Math/Matrix4.h" -#include "Magnum.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Matrix4.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/PhongMaterialData.h b/src/Magnum/Trade/PhongMaterialData.h index 1f91ff21c..2febb730d 100644 --- a/src/Magnum/Trade/PhongMaterialData.h +++ b/src/Magnum/Trade/PhongMaterialData.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Trade::PhongMaterialData */ -#include "Math/Vector3.h" -#include "Magnum.h" -#include "AbstractMaterialData.h" +#include "Magnum/Magnum.h" +#include "Magnum/Math/Vector3.h" +#include "Magnum/Trade/AbstractMaterialData.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index 2a2a5d7fa..e8f99ad0e 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -31,8 +31,8 @@ #include #include -#include "Types.h" -#include "magnumVisibility.h" +#include "Magnum/Types.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 72a352445..bfa8ec510 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -27,9 +27,9 @@ #include #include -#include "ColorFormat.h" -#include "ImageReference.h" -#include "Trade/AbstractImageConverter.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/ImageReference.h" +#include "Magnum/Trade/AbstractImageConverter.h" #include "testConfigure.h" diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp index 62372489d..f41b1bbab 100644 --- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp @@ -26,7 +26,7 @@ #include #include -#include "Trade/AbstractImporter.h" +#include "Magnum/Trade/AbstractImporter.h" #include "testConfigure.h" diff --git a/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp index 1ebc7c94d..5683382b9 100644 --- a/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Trade/AbstractMaterialData.h" +#include "Magnum/Trade/AbstractMaterialData.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp index 95728d240..f5a4d15a5 100644 --- a/src/Magnum/Trade/Test/ImageDataTest.cpp +++ b/src/Magnum/Trade/Test/ImageDataTest.cpp @@ -24,8 +24,8 @@ #include -#include "ColorFormat.h" -#include "Trade/ImageData.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Trade/ImageData.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/ObjectData2DTest.cpp b/src/Magnum/Trade/Test/ObjectData2DTest.cpp index 38ab97478..88b371331 100644 --- a/src/Magnum/Trade/Test/ObjectData2DTest.cpp +++ b/src/Magnum/Trade/Test/ObjectData2DTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Trade/ObjectData2D.h" +#include "Magnum/Trade/ObjectData2D.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/ObjectData3DTest.cpp b/src/Magnum/Trade/Test/ObjectData3DTest.cpp index 0170384a2..2cd5dba25 100644 --- a/src/Magnum/Trade/Test/ObjectData3DTest.cpp +++ b/src/Magnum/Trade/Test/ObjectData3DTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Trade/ObjectData3D.h" +#include "Magnum/Trade/ObjectData3D.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/TextureDataTest.cpp b/src/Magnum/Trade/Test/TextureDataTest.cpp index 408f887e3..60ed6bcc8 100644 --- a/src/Magnum/Trade/Test/TextureDataTest.cpp +++ b/src/Magnum/Trade/Test/TextureDataTest.cpp @@ -25,7 +25,7 @@ #include #include -#include "Trade/TextureData.h" +#include "Magnum/Trade/TextureData.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/TextureData.h b/src/Magnum/Trade/TextureData.h index e4457b02e..485f11afc 100644 --- a/src/Magnum/Trade/TextureData.h +++ b/src/Magnum/Trade/TextureData.h @@ -28,9 +28,9 @@ * @brief Class Magnum::Trade::TextureData */ -#include "Array.h" -#include "Sampler.h" -#include "magnumVisibility.h" +#include "Magnum/Array.h" +#include "Magnum/Sampler.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/Trade.h b/src/Magnum/Trade/Trade.h index 33ad440a1..8bf30adfa 100644 --- a/src/Magnum/Trade/Trade.h +++ b/src/Magnum/Trade/Trade.h @@ -28,7 +28,7 @@ * @brief Forward declarations for Magnum::Trade namespace */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Types.h b/src/Magnum/Types.h index 18627ff63..4c0d75140 100644 --- a/src/Magnum/Types.h +++ b/src/Magnum/Types.h @@ -30,7 +30,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" namespace Magnum { diff --git a/src/Magnum/Version.h b/src/Magnum/Version.h index 279088dc6..10b8bedae 100644 --- a/src/Magnum/Version.h +++ b/src/Magnum/Version.h @@ -30,8 +30,8 @@ #include -#include "Magnum.h" -#include "magnumVisibility.h" +#include "Magnum/Magnum.h" +#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/magnumVisibility.h b/src/Magnum/magnumVisibility.h index 2d5b0f886..250e01701 100644 --- a/src/Magnum/magnumVisibility.h +++ b/src/Magnum/magnumVisibility.h @@ -26,7 +26,7 @@ #include -#include "magnumConfigure.h" +#include "Magnum/magnumConfigure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(Magnum_EXPORTS) || defined(MagnumMathObjects_EXPORTS) diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp index 9bab28e1f..b37038786 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp @@ -29,10 +29,9 @@ #include #include -#include "Text/GlyphCache.h" -#include "Trade/ImageData.h" - -#include "TgaImporter/TgaImporter.h" +#include "Magnum/Text/GlyphCache.h" +#include "Magnum/Trade/ImageData.h" +#include "MagnumPlugins/TgaImporter/TgaImporter.h" namespace Magnum { namespace Text { diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.h b/src/MagnumPlugins/MagnumFont/MagnumFont.h index a7e3ec65e..2bf5f0e28 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.h +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Text::MagnumFont */ -#include "Text/AbstractFont.h" -#include "Trade/Trade.h" +#include "Magnum/Text/AbstractFont.h" +#include "Magnum/Trade/Trade.h" namespace Magnum { namespace Text { diff --git a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp index 1d453c2c7..176c0ac31 100644 --- a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp +++ b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp @@ -24,9 +24,9 @@ #include -#include "Test/AbstractOpenGLTester.h" -#include "Text/GlyphCache.h" -#include "MagnumFont/MagnumFont.h" +#include "Magnum/Test/AbstractOpenGLTester.h" +#include "Magnum/Text/GlyphCache.h" +#include "MagnumPlugins/MagnumFont/MagnumFont.h" #include "magnumFontTestConfigure.h" diff --git a/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp b/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp index 374ca3657..ddd27376d 100644 --- a/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp +++ b/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "MagnumFont/MagnumFont.h" +#include "MagnumPlugins/MagnumFont/MagnumFont.h" CORRADE_PLUGIN_REGISTER(MagnumFont, Magnum::Text::MagnumFont, "cz.mosra.magnum.Text.AbstractFont/0.2.3") diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp index 721bf7860..cdeeb87aa 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -28,11 +28,11 @@ #include #include -#include "ColorFormat.h" -#include "Image.h" -#include "Text/GlyphCache.h" -#include "Text/AbstractFont.h" -#include "TgaImageConverter/TgaImageConverter.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "Magnum/Text/GlyphCache.h" +#include "Magnum/Text/AbstractFont.h" +#include "MagnumPlugins/TgaImageConverter/TgaImageConverter.h" namespace Magnum { namespace Text { diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h index a1a830861..40dfed169 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h +++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Text::MagnumFontConverter */ -#include "Text/AbstractFontConverter.h" +#include "Magnum/Text/AbstractFontConverter.h" namespace Magnum { namespace Text { diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp index 05d54cea3..baf60b0f9 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp @@ -25,16 +25,15 @@ #include #include -#include "ColorFormat.h" -#include "Extensions.h" -#include "TextureFormat.h" -#include "Test/AbstractOpenGLTester.h" -#include "Text/GlyphCache.h" -#include "Trade/ImageData.h" - -#include "Text/AbstractFont.h" -#include "MagnumFontConverter/MagnumFontConverter.h" -#include "TgaImporter/TgaImporter.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Extensions.h" +#include "Magnum/TextureFormat.h" +#include "Magnum/Test/AbstractOpenGLTester.h" +#include "Magnum/Text/GlyphCache.h" +#include "Magnum/Text/AbstractFont.h" +#include "Magnum/Trade/ImageData.h" +#include "MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h" +#include "MagnumPlugins/TgaImporter/TgaImporter.h" #include "magnumFontTestConfigure.h" #include "magnumFontConverterTestConfigure.h" diff --git a/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp index 4f7bc44df..36ffb1362 100644 --- a/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "MagnumFontConverter/MagnumFontConverter.h" +#include "MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h" CORRADE_PLUGIN_REGISTER(MagnumFontConverter, Magnum::Text::MagnumFontConverter, "cz.mosra.magnum.Text.AbstractFontConverter/0.1.1") diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index b86cc4184..c0ab443e3 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -28,11 +28,11 @@ #include #include -#include "ColorFormat.h" -#include "Image.h" -#include "Trade/ImageData.h" -#include "TgaImageConverter/TgaImageConverter.h" -#include "TgaImporter/TgaImporter.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "Magnum/Trade/ImageData.h" +#include "MagnumPlugins/TgaImageConverter/TgaImageConverter.h" +#include "MagnumPlugins/TgaImporter/TgaImporter.h" #include "configure.h" diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp index c212ae7f2..519c7deb4 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp @@ -26,21 +26,19 @@ #include #include - #include #include -#include "ColorFormat.h" -#include "Image.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Image.h" +#include "MagnumPlugins/TgaImporter/TgaHeader.h" #ifdef MAGNUM_TARGET_GLES #include -#include "Math/Swizzle.h" -#include "Math/Vector4.h" +#include "Magnum/Math/Swizzle.h" +#include "Magnum/Math/Vector4.h" #endif -#include "TgaImporter/TgaHeader.h" - namespace Magnum { namespace Trade { TgaImageConverter::TgaImageConverter() = default; diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h index da7a73292..4a381068c 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h +++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Trade::TgaImageConverter */ -#include "Trade/AbstractImageConverter.h" +#include "Magnum/Trade/AbstractImageConverter.h" #ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC diff --git a/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp index fe5767e82..d86424f94 100644 --- a/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp +++ b/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "TgaImageConverter/TgaImageConverter.h" +#include "MagnumPlugins/TgaImageConverter/TgaImageConverter.h" CORRADE_PLUGIN_REGISTER(TgaImageConverter, Magnum::Trade::TgaImageConverter, "cz.mosra.magnum.Trade.AbstractImageConverter/0.2.1") diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp index 3ce181d5a..c1edf8b60 100644 --- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp @@ -27,9 +27,9 @@ #include #include -#include "ColorFormat.h" -#include "Trade/ImageData.h" -#include "TgaImporter/TgaImporter.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Trade/ImageData.h" +#include "MagnumPlugins/TgaImporter/TgaImporter.h" #include "configure.h" diff --git a/src/MagnumPlugins/TgaImporter/TgaHeader.h b/src/MagnumPlugins/TgaImporter/TgaHeader.h index def766d8e..c7416baea 100644 --- a/src/MagnumPlugins/TgaImporter/TgaHeader.h +++ b/src/MagnumPlugins/TgaImporter/TgaHeader.h @@ -28,7 +28,7 @@ * @brief Struct Magnum::Trade::TgaHeader */ -#include +#include "Magnum/Types.h" namespace Magnum { namespace Trade { diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp index aa8e2267c..c780714d7 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp @@ -29,8 +29,9 @@ #include #include -#include "ColorFormat.h" -#include "Trade/ImageData.h" +#include "Magnum/ColorFormat.h" +#include "Magnum/Trade/ImageData.h" +#include "MagnumPlugins/TgaImporter/TgaHeader.h" #ifdef MAGNUM_TARGET_GLES #include @@ -40,8 +41,6 @@ #include "Extensions.h" #endif -#include "TgaHeader.h" - namespace Magnum { namespace Trade { TgaImporter::TgaImporter(): in(nullptr) {} diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h index c3eace385..0042b9a98 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.h +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.h @@ -30,7 +30,7 @@ #include -#include "Trade/AbstractImporter.h" +#include "Magnum/Trade/AbstractImporter.h" #ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC diff --git a/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp b/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp index 25a34e435..8b5fd7294 100644 --- a/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp +++ b/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "TgaImporter.h" +#include "MagnumPlugins/TgaImporter/TgaImporter.h" CORRADE_PLUGIN_REGISTER(TgaImporter, Magnum::Trade::TgaImporter, "cz.mosra.magnum.Trade.AbstractImporter/0.3") diff --git a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp index a5dfba801..63aad6fdf 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp +++ b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp @@ -27,7 +27,7 @@ #include #include -#include "WavAudioImporter/WavImporter.h" +#include "MagnumPlugins/WavAudioImporter/WavImporter.h" #include "configure.h" diff --git a/src/MagnumPlugins/WavAudioImporter/WavHeader.h b/src/MagnumPlugins/WavAudioImporter/WavHeader.h index 32779d21c..c4d94a8a0 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavHeader.h +++ b/src/MagnumPlugins/WavAudioImporter/WavHeader.h @@ -28,7 +28,7 @@ * @brief Struct Magnum::Audio::WavHeader */ -#include "Types.h" +#include "Magnum/Types.h" namespace Magnum { namespace Audio { diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp index 5c1bd54ce..1fb7e096a 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp @@ -28,7 +28,7 @@ #include #include -#include "WavHeader.h" +#include "MagnumPlugins/WavAudioImporter/WavHeader.h" namespace Magnum { namespace Audio { diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h index 73595b00e..45a04fe40 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.h +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.h @@ -30,7 +30,7 @@ #include -#include "Audio/AbstractImporter.h" +#include "Magnum/Audio/AbstractImporter.h" namespace Magnum { namespace Audio { diff --git a/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp b/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp index 7b7a69a6b..afcd8b3f6 100644 --- a/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp +++ b/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp @@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "WavAudioImporter/WavImporter.h" +#include "MagnumPlugins/WavAudioImporter/WavImporter.h" CORRADE_PLUGIN_REGISTER(WavAudioImporter, Magnum::Audio::WavImporter, "cz.mosra.magnum.Audio.AbstractImporter/0.1") From 7a683621703df55496241050dd406f00f538342c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 19:34:49 +0100 Subject: [PATCH 55/79] Making includes absolute, part 6: better filenames for internal files. As we are now using absolute includes, there is no need to prefix everything with "magnum" etc. All generated configuration files are renamed to configure.h and their path is included _before_ everything else to avoid accidental collisions. --- modules/FindMagnum.cmake | 2 +- src/Magnum/AbstractImage.h | 2 +- src/Magnum/AbstractObject.h | 2 +- src/Magnum/AbstractShaderProgram.h | 1 - src/Magnum/Audio/Buffer.h | 2 +- src/Magnum/Audio/CMakeLists.txt | 2 +- src/Magnum/Audio/Context.h | 2 +- src/Magnum/Audio/Renderer.h | 2 +- src/Magnum/Audio/Source.h | 2 +- src/Magnum/Audio/Test/AbstractImporterTest.cpp | 2 +- src/Magnum/Audio/Test/CMakeLists.txt | 6 +++--- .../Test/{testConfigure.h.cmake => configure.h.cmake} | 0 .../Audio/{magnumAudioVisibility.h => visibility.h} | 6 +++--- src/Magnum/CMakeLists.txt | 8 ++++---- src/Magnum/ColorFormat.h | 2 +- src/Magnum/Context.h | 2 +- src/Magnum/DebugMessage.h | 2 +- src/Magnum/DebugTools/CMakeLists.txt | 2 +- src/Magnum/DebugTools/ForceRenderer.h | 2 +- src/Magnum/DebugTools/ObjectRenderer.h | 2 +- src/Magnum/DebugTools/Profiler.h | 2 +- src/Magnum/DebugTools/ResourceManager.h | 2 +- src/Magnum/DebugTools/ShapeRenderer.h | 2 +- .../{magnumDebugToolsVisibility.h => visibility.h} | 6 +++--- src/Magnum/Implementation/ShaderState.h | 2 +- src/Magnum/Magnum.h | 1 - src/Magnum/Math/Angle.h | 2 +- src/Magnum/Math/Functions.h | 2 +- src/Magnum/Math/Vector.h | 2 +- src/Magnum/MeshTools/CMakeLists.txt | 2 +- src/Magnum/MeshTools/CompressIndices.h | 2 +- src/Magnum/MeshTools/FlipNormals.h | 2 +- src/Magnum/MeshTools/FullScreenTriangle.h | 2 +- src/Magnum/MeshTools/GenerateFlatNormals.h | 2 +- src/Magnum/MeshTools/Tipsify.h | 2 +- .../{magnumMeshToolsVisibility.h => visibility.h} | 6 +++--- src/Magnum/MeshView.h | 2 +- src/Magnum/OpenGL.h | 2 +- src/Magnum/Primitives/CMakeLists.txt | 2 +- src/Magnum/Primitives/Capsule.h | 2 +- src/Magnum/Primitives/Circle.h | 2 +- src/Magnum/Primitives/Crosshair.h | 2 +- src/Magnum/Primitives/Cube.h | 2 +- src/Magnum/Primitives/Cylinder.h | 2 +- src/Magnum/Primitives/Icosphere.h | 2 +- src/Magnum/Primitives/Line.h | 2 +- src/Magnum/Primitives/Plane.h | 2 +- src/Magnum/Primitives/Square.h | 2 +- src/Magnum/Primitives/UVSphere.h | 2 +- .../{magnumPrimitivesVisibility.h => visibility.h} | 6 +++--- src/Magnum/Query.h | 2 +- src/Magnum/Renderbuffer.h | 1 - src/Magnum/Renderer.h | 2 +- src/Magnum/Resource.h | 2 +- src/Magnum/Sampler.h | 2 +- src/Magnum/SceneGraph/AbstractCamera.h | 2 +- src/Magnum/SceneGraph/AbstractObject.h | 2 +- src/Magnum/SceneGraph/AbstractTransformation.h | 2 +- src/Magnum/SceneGraph/Animable.h | 2 +- src/Magnum/SceneGraph/AnimableGroup.h | 2 +- src/Magnum/SceneGraph/CMakeLists.txt | 2 +- src/Magnum/SceneGraph/FeatureGroup.h | 2 +- src/Magnum/SceneGraph/Object.h | 2 +- .../{magnumSceneGraphVisibility.h => visibility.h} | 6 +++--- src/Magnum/Shader.h | 1 - src/Magnum/Shaders/CMakeLists.txt | 2 +- src/Magnum/Shaders/DistanceFieldVector.h | 2 +- src/Magnum/Shaders/Flat.h | 2 +- src/Magnum/Shaders/MeshVisualizer.h | 2 +- src/Magnum/Shaders/Phong.h | 2 +- src/Magnum/Shaders/Vector.h | 2 +- src/Magnum/Shaders/VertexColor.h | 2 +- src/Magnum/Shaders/magnumShadersResourceImport.hpp | 2 +- .../Shaders/{magnumShadersVisibility.h => visibility.h} | 2 +- src/Magnum/Shapes/AbstractShape.h | 4 ++-- src/Magnum/Shapes/AxisAlignedBox.h | 2 +- src/Magnum/Shapes/Box.h | 2 +- src/Magnum/Shapes/CMakeLists.txt | 4 ++-- src/Magnum/Shapes/Capsule.h | 2 +- src/Magnum/Shapes/Composition.h | 2 +- src/Magnum/Shapes/Cylinder.h | 2 +- src/Magnum/Shapes/Line.h | 2 +- src/Magnum/Shapes/Plane.h | 2 +- src/Magnum/Shapes/Point.h | 2 +- src/Magnum/Shapes/Shape.h | 2 +- src/Magnum/Shapes/ShapeGroup.h | 2 +- src/Magnum/Shapes/Sphere.h | 2 +- src/Magnum/Shapes/shapeImplementation.h | 2 +- .../Shapes/{magnumShapesVisibility.h => visibility.h} | 6 +++--- src/Magnum/Test/CMakeLists.txt | 6 +++--- src/Magnum/Test/ShaderGLTest.cpp | 2 +- .../{ShaderGLTestConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/Text/AbstractFont.h | 2 +- src/Magnum/Text/AbstractFontConverter.h | 2 +- src/Magnum/Text/CMakeLists.txt | 4 ++-- src/Magnum/Text/GlyphCache.h | 2 +- src/Magnum/Text/Renderer.h | 2 +- src/Magnum/Text/Test/AbstractFontConverterTest.cpp | 2 +- src/Magnum/Text/Test/AbstractFontTest.cpp | 2 +- src/Magnum/Text/Test/CMakeLists.txt | 6 +++--- .../Test/{testConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/Text/Text.h | 2 +- src/Magnum/Text/{magnumTextVisibility.h => visibility.h} | 6 +++--- src/Magnum/TextureTools/CMakeLists.txt | 4 ++-- src/Magnum/TextureTools/distancefieldconverter.cpp | 2 +- ...re.h.cmake => distancefieldconverterConfigure.h.cmake} | 0 src/Magnum/TextureTools/magnumTextureToolsVisibility.h | 2 +- src/Magnum/Timeline.h | 2 +- src/Magnum/Trade/AbstractImageConverter.h | 2 +- src/Magnum/Trade/AbstractImporter.h | 2 +- src/Magnum/Trade/AbstractMaterialData.h | 2 +- src/Magnum/Trade/MeshData2D.h | 2 +- src/Magnum/Trade/MeshData3D.h | 2 +- src/Magnum/Trade/SceneData.h | 2 +- src/Magnum/Trade/Test/AbstractImageConverterTest.cpp | 2 +- src/Magnum/Trade/Test/AbstractImporterTest.cpp | 2 +- src/Magnum/Trade/Test/CMakeLists.txt | 6 +++--- .../Test/{testConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/Trade/TextureData.h | 2 +- src/Magnum/Types.h | 2 +- src/Magnum/Version.h | 2 +- src/Magnum/{magnumConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/{magnumVisibility.h => visibility.h} | 6 +++--- src/MagnumPlugins/MagnumFont/CMakeLists.txt | 2 +- src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt | 6 +++--- src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp | 2 +- ...{magnumFontTestConfigure.h.cmake => configure.h.cmake} | 0 ...nRegistrationMagnumFont.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt | 2 +- src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt | 7 +++---- .../Test/MagnumFontConverterGLTest.cpp | 4 ++-- ...ntConverterTestConfigure.h.cmake => configure.h.cmake} | 0 ...tionMagnumFontConverter.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/TgaImageConverter/CMakeLists.txt | 2 +- src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt | 2 +- ...rationTgaImageConverter.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/TgaImporter/CMakeLists.txt | 2 +- src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt | 2 +- ...RegistrationTgaImporter.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/WavAudioImporter/CMakeLists.txt | 2 +- src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt | 2 +- ...trationWavAudioImporter.cpp => pluginRegistration.cpp} | 0 142 files changed, 161 insertions(+), 166 deletions(-) rename src/Magnum/Audio/Test/{testConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/Audio/{magnumAudioVisibility.h => visibility.h} (92%) rename src/Magnum/DebugTools/{magnumDebugToolsVisibility.h => visibility.h} (91%) rename src/Magnum/MeshTools/{magnumMeshToolsVisibility.h => visibility.h} (91%) rename src/Magnum/Primitives/{magnumPrimitivesVisibility.h => visibility.h} (91%) rename src/Magnum/SceneGraph/{magnumSceneGraphVisibility.h => visibility.h} (91%) rename src/Magnum/Shaders/{magnumShadersVisibility.h => visibility.h} (97%) rename src/Magnum/Shapes/{magnumShapesVisibility.h => visibility.h} (92%) rename src/Magnum/Test/{ShaderGLTestConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/Text/Test/{testConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/Text/{magnumTextVisibility.h => visibility.h} (92%) rename src/Magnum/TextureTools/{configure.h.cmake => distancefieldconverterConfigure.h.cmake} (100%) rename src/Magnum/Trade/Test/{testConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/{magnumConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/{magnumVisibility.h => visibility.h} (93%) rename src/MagnumPlugins/MagnumFont/Test/{magnumFontTestConfigure.h.cmake => configure.h.cmake} (100%) rename src/MagnumPlugins/MagnumFont/{pluginRegistrationMagnumFont.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/MagnumFontConverter/Test/{magnumFontConverterTestConfigure.h.cmake => configure.h.cmake} (100%) rename src/MagnumPlugins/MagnumFontConverter/{pluginRegistrationMagnumFontConverter.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/TgaImageConverter/{pluginRegistrationTgaImageConverter.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/TgaImporter/{pluginRegistrationTgaImporter.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/WavAudioImporter/{pluginRegistrationWavAudioImporter.cpp => pluginRegistration.cpp} (100%) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 63e62714c..a2cd65275 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -133,7 +133,7 @@ find_path(MAGNUM_INCLUDE_DIR NAMES Magnum/Magnum.h) # Configuration -file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/magnumConfigure.h _magnumConfigure) +file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/configure.h _magnumConfigure) string(FIND "${_magnumConfigure}" "#define MAGNUM_BUILD_DEPRECATED" _BUILD_DEPRECATED) if(NOT _BUILD_DEPRECATED EQUAL -1) diff --git a/src/Magnum/AbstractImage.h b/src/Magnum/AbstractImage.h index a651755dc..a905073c4 100644 --- a/src/Magnum/AbstractImage.h +++ b/src/Magnum/AbstractImage.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h index a3a192c83..0011b1a25 100644 --- a/src/Magnum/AbstractObject.h +++ b/src/Magnum/AbstractObject.h @@ -32,7 +32,7 @@ #include "Magnum/OpenGL.h" #include "Magnum/Types.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 713d3bd46..8b89c42ef 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -33,7 +33,6 @@ #include "Magnum/AbstractObject.h" #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h index 52a6d9b24..3f2d44bc5 100644 --- a/src/Magnum/Audio/Buffer.h +++ b/src/Magnum/Audio/Buffer.h @@ -33,7 +33,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/CMakeLists.txt b/src/Magnum/Audio/CMakeLists.txt index 3f1a20870..ce213f309 100644 --- a/src/Magnum/Audio/CMakeLists.txt +++ b/src/Magnum/Audio/CMakeLists.txt @@ -42,7 +42,7 @@ set(MagnumAudio_HEADERS Renderer.h Source.h - magnumAudioVisibility.h) + visibility.h) add_library(MagnumAudio ${SHARED_OR_STATIC} ${MagnumAudio_SOURCES}) target_link_libraries(MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES} ${OPENAL_LIBRARY}) diff --git a/src/Magnum/Audio/Context.h b/src/Magnum/Audio/Context.h index ae7459e6f..c129d43bc 100644 --- a/src/Magnum/Audio/Context.h +++ b/src/Magnum/Audio/Context.h @@ -31,7 +31,7 @@ #include #include -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" #ifndef DOXYGEN_GENERATING_OUTPUT typedef struct ALCdevice_struct ALCdevice; diff --git a/src/Magnum/Audio/Renderer.h b/src/Magnum/Audio/Renderer.h index 338a30324..a2171b8e6 100644 --- a/src/Magnum/Audio/Renderer.h +++ b/src/Magnum/Audio/Renderer.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" #include "Magnum/Math/Vector3.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Source.h b/src/Magnum/Audio/Source.h index 8de8a619c..f0e2a1aae 100644 --- a/src/Magnum/Audio/Source.h +++ b/src/Magnum/Audio/Source.h @@ -34,7 +34,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Audio/Audio.h" -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" #include "Magnum/Math/Vector3.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp index 908ffff7a..feca5915e 100644 --- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Audio/AbstractImporter.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Audio { namespace Test { diff --git a/src/Magnum/Audio/Test/CMakeLists.txt b/src/Magnum/Audio/Test/CMakeLists.txt index 3a42d1f27..132ece4fa 100644 --- a/src/Magnum/Audio/Test/CMakeLists.txt +++ b/src/Magnum/Audio/Test/CMakeLists.txt @@ -22,10 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio) diff --git a/src/Magnum/Audio/Test/testConfigure.h.cmake b/src/Magnum/Audio/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Audio/Test/testConfigure.h.cmake rename to src/Magnum/Audio/Test/configure.h.cmake diff --git a/src/Magnum/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/visibility.h similarity index 92% rename from src/Magnum/Audio/magnumAudioVisibility.h rename to src/Magnum/Audio/visibility.h index 39d974f6d..9e20065a0 100644 --- a/src/Magnum/Audio/magnumAudioVisibility.h +++ b/src/Magnum/Audio/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Audio_magnumAudioVisibility_h -#define Magnum_Audio_magnumAudioVisibility_h +#ifndef Magnum_Audio_visibility_h +#define Magnum_Audio_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumAudio_EXPORTS diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index fdb6d5d5d..96d789364 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -22,8 +22,8 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) # Files shared between main library and unit test library set(Magnum_SRCS @@ -119,7 +119,7 @@ set(Magnum_HEADERS Types.h Version.h - magnumVisibility.h) + visibility.h) # Deprecated headers if(BUILD_DEPRECATED) @@ -182,7 +182,7 @@ install(TARGETS Magnum LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) install(FILES ${Magnum_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) add_subdirectory(Math) add_subdirectory(Platform) diff --git a/src/Magnum/ColorFormat.h b/src/Magnum/ColorFormat.h index 4b3b68305..a25a1d79a 100644 --- a/src/Magnum/ColorFormat.h +++ b/src/Magnum/ColorFormat.h @@ -30,7 +30,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index fa1c6e13e..efe95f141 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -35,7 +35,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/DebugMessage.h b/src/Magnum/DebugMessage.h index 320ac633a..f87de89c7 100644 --- a/src/Magnum/DebugMessage.h +++ b/src/Magnum/DebugMessage.h @@ -32,7 +32,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/DebugTools/CMakeLists.txt b/src/Magnum/DebugTools/CMakeLists.txt index 987e07a5e..5c1743b57 100644 --- a/src/Magnum/DebugTools/CMakeLists.txt +++ b/src/Magnum/DebugTools/CMakeLists.txt @@ -47,7 +47,7 @@ set(MagnumDebugTools_HEADERS ResourceManager.h ShapeRenderer.h - magnumDebugToolsVisibility.h) + visibility.h) add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS}) if(BUILD_STATIC_PIC) diff --git a/src/Magnum/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h index 81acf7264..6d2f00aba 100644 --- a/src/Magnum/DebugTools/ForceRenderer.h +++ b/src/Magnum/DebugTools/ForceRenderer.h @@ -32,7 +32,7 @@ #include "Magnum/Resource.h" #include "Magnum/SceneGraph/Drawable.h" #include "Magnum/Shaders/Shaders.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h index 8d1f48144..cd049e441 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.h +++ b/src/Magnum/DebugTools/ObjectRenderer.h @@ -31,7 +31,7 @@ #include "Magnum/Resource.h" #include "Magnum/SceneGraph/Drawable.h" #include "Magnum/Shaders/Shaders.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/Profiler.h b/src/Magnum/DebugTools/Profiler.h index c0d7b1d3a..2ff81cde5 100644 --- a/src/Magnum/DebugTools/Profiler.h +++ b/src/Magnum/DebugTools/Profiler.h @@ -34,7 +34,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ResourceManager.h b/src/Magnum/DebugTools/ResourceManager.h index 00c7da58b..3930e3051 100644 --- a/src/Magnum/DebugTools/ResourceManager.h +++ b/src/Magnum/DebugTools/ResourceManager.h @@ -35,7 +35,7 @@ #include "Magnum/Magnum.h" #include "Magnum/DebugTools/DebugTools.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" #include "Magnum/SceneGraph/SceneGraph.h" #include "Magnum/Shapes/Shapes.h" diff --git a/src/Magnum/DebugTools/ShapeRenderer.h b/src/Magnum/DebugTools/ShapeRenderer.h index 0982d235c..d691ce426 100644 --- a/src/Magnum/DebugTools/ShapeRenderer.h +++ b/src/Magnum/DebugTools/ShapeRenderer.h @@ -33,7 +33,7 @@ #include "Magnum/SceneGraph/Drawable.h" #include "Magnum/Shapes/Shapes.h" #include "Magnum/Shapes/shapeImplementation.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/visibility.h similarity index 91% rename from src/Magnum/DebugTools/magnumDebugToolsVisibility.h rename to src/Magnum/DebugTools/visibility.h index ea27d813e..71077d7ad 100644 --- a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h +++ b/src/Magnum/DebugTools/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_DebugTools_magnumDebugToolsVisibility_h -#define Magnum_DebugTools_magnumDebugToolsVisibility_h +#ifndef Magnum_DebugTools_visibility_h +#define Magnum_DebugTools_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumDebugTools_EXPORTS diff --git a/src/Magnum/Implementation/ShaderState.h b/src/Magnum/Implementation/ShaderState.h index 77031310a..345505870 100644 --- a/src/Magnum/Implementation/ShaderState.h +++ b/src/Magnum/Implementation/ShaderState.h @@ -26,7 +26,7 @@ #include "Magnum/OpenGL.h" #include "Magnum/Types.h" -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 4a36c74a2..940f270fc 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -31,7 +31,6 @@ #include #include "Magnum/Types.h" -#include "Magnum/magnumConfigure.h" #include "Magnum/Math/Math.h" #ifdef MAGNUM_BUILD_DEPRECATED diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index 61719b021..0e7b4fd23 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -31,7 +31,7 @@ #include #include -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Math/Constants.h" #include "Magnum/Math/Math.h" #include "Magnum/Math/Unit.h" diff --git a/src/Magnum/Math/Functions.h b/src/Magnum/Math/Functions.h index 9734c5c93..f1e7777fa 100644 --- a/src/Magnum/Math/Functions.h +++ b/src/Magnum/Math/Functions.h @@ -33,7 +33,7 @@ #include #include -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Math/Vector.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 02627fe01..b3901c86b 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -34,7 +34,7 @@ #include #include -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Math/Angle.h" #include "Magnum/Math/BoolVector.h" #include "Magnum/Math/TypeTraits.h" diff --git a/src/Magnum/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt index 8f47e0c20..ab0fe5d66 100644 --- a/src/Magnum/MeshTools/CMakeLists.txt +++ b/src/Magnum/MeshTools/CMakeLists.txt @@ -46,7 +46,7 @@ set(MagnumMeshTools_HEADERS Tipsify.h Transform.h - magnumMeshToolsVisibility.h) + visibility.h) # Set shared library flags for the objects, as they will be part of shared lib # TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h index 0aa956a71..55b726576 100644 --- a/src/Magnum/MeshTools/CompressIndices.h +++ b/src/Magnum/MeshTools/CompressIndices.h @@ -31,7 +31,7 @@ #include #include "Magnum/Mesh.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FlipNormals.h b/src/Magnum/MeshTools/FlipNormals.h index cc2a06283..a343cc1a1 100644 --- a/src/Magnum/MeshTools/FlipNormals.h +++ b/src/Magnum/MeshTools/FlipNormals.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FullScreenTriangle.h b/src/Magnum/MeshTools/FullScreenTriangle.h index 96256fd6f..e89fd95b4 100644 --- a/src/Magnum/MeshTools/FullScreenTriangle.h +++ b/src/Magnum/MeshTools/FullScreenTriangle.h @@ -32,7 +32,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/GenerateFlatNormals.h b/src/Magnum/MeshTools/GenerateFlatNormals.h index 0ff158bfb..0ce4e28b0 100644 --- a/src/Magnum/MeshTools/GenerateFlatNormals.h +++ b/src/Magnum/MeshTools/GenerateFlatNormals.h @@ -32,7 +32,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Tipsify.h b/src/Magnum/MeshTools/Tipsify.h index 2b08d7da3..fb007c2ed 100644 --- a/src/Magnum/MeshTools/Tipsify.h +++ b/src/Magnum/MeshTools/Tipsify.h @@ -31,7 +31,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/visibility.h similarity index 91% rename from src/Magnum/MeshTools/magnumMeshToolsVisibility.h rename to src/Magnum/MeshTools/visibility.h index c6a91ef5c..876020128 100644 --- a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h +++ b/src/Magnum/MeshTools/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_MeshTools_magnumMeshToolsVisibility_h -#define Magnum_MeshTools_magnumMeshToolsVisibility_h +#ifndef Magnum_MeshTools_visibility_h +#define Magnum_MeshTools_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h index 20a50e6e1..72d72b83d 100644 --- a/src/Magnum/MeshView.h +++ b/src/Magnum/MeshView.h @@ -30,7 +30,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/OpenGL.h b/src/Magnum/OpenGL.h index 0171d3c04..9cbade659 100644 --- a/src/Magnum/OpenGL.h +++ b/src/Magnum/OpenGL.h @@ -30,7 +30,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" /** @todo Remove NaCl workaround when not needed */ diff --git a/src/Magnum/Primitives/CMakeLists.txt b/src/Magnum/Primitives/CMakeLists.txt index c58cb02df..2d930edbc 100644 --- a/src/Magnum/Primitives/CMakeLists.txt +++ b/src/Magnum/Primitives/CMakeLists.txt @@ -49,7 +49,7 @@ set(MagnumPrimitives_HEADERS Square.h UVSphere.h - magnumPrimitivesVisibility.h) + visibility.h) add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS}) if(BUILD_STATIC_PIC) diff --git a/src/Magnum/Primitives/Capsule.h b/src/Magnum/Primitives/Capsule.h index 937ab1f49..42024300c 100644 --- a/src/Magnum/Primitives/Capsule.h +++ b/src/Magnum/Primitives/Capsule.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Capsule */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Circle.h b/src/Magnum/Primitives/Circle.h index 26a747bc3..6f0c45247 100644 --- a/src/Magnum/Primitives/Circle.h +++ b/src/Magnum/Primitives/Circle.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Circle */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Crosshair.h b/src/Magnum/Primitives/Crosshair.h index 76ac2e1ba..3c48354f1 100644 --- a/src/Magnum/Primitives/Crosshair.h +++ b/src/Magnum/Primitives/Crosshair.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Crosshair2D, Magnum::Primitives::Crosshair3D */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cube.h b/src/Magnum/Primitives/Cube.h index 7007ebb54..a1bc9681f 100644 --- a/src/Magnum/Primitives/Cube.h +++ b/src/Magnum/Primitives/Cube.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Cube */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h index 4a6e93f14..5e696f166 100644 --- a/src/Magnum/Primitives/Cylinder.h +++ b/src/Magnum/Primitives/Cylinder.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Icosphere.h b/src/Magnum/Primitives/Icosphere.h index 17afc4734..72eee9fa1 100644 --- a/src/Magnum/Primitives/Icosphere.h +++ b/src/Magnum/Primitives/Icosphere.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Icosphere */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Line.h b/src/Magnum/Primitives/Line.h index 05c0743b9..a82a8d682 100644 --- a/src/Magnum/Primitives/Line.h +++ b/src/Magnum/Primitives/Line.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Line2D, Magnum::Primitives::Line3D */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Plane.h b/src/Magnum/Primitives/Plane.h index 7601d1cf5..20abc3ce6 100644 --- a/src/Magnum/Primitives/Plane.h +++ b/src/Magnum/Primitives/Plane.h @@ -29,7 +29,7 @@ */ #include "Magnum/Trade/Trade.h" -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Square.h b/src/Magnum/Primitives/Square.h index 9b8fae70d..eb88743e4 100644 --- a/src/Magnum/Primitives/Square.h +++ b/src/Magnum/Primitives/Square.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Square */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/UVSphere.h b/src/Magnum/Primitives/UVSphere.h index cc10c5980..1238527cc 100644 --- a/src/Magnum/Primitives/UVSphere.h +++ b/src/Magnum/Primitives/UVSphere.h @@ -29,7 +29,7 @@ */ #include "Magnum/Trade/Trade.h" -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/visibility.h similarity index 91% rename from src/Magnum/Primitives/magnumPrimitivesVisibility.h rename to src/Magnum/Primitives/visibility.h index aa795f436..8dca7d5cb 100644 --- a/src/Magnum/Primitives/magnumPrimitivesVisibility.h +++ b/src/Magnum/Primitives/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Primitives_magnumPrimitivesVisibility_h -#define Magnum_Primitives_magnumPrimitivesVisibility_h +#ifndef Magnum_Primitives_visibility_h +#define Magnum_Primitives_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumPrimitives_EXPORTS diff --git a/src/Magnum/Query.h b/src/Magnum/Query.h index 97e8ea4f2..3f0000610 100644 --- a/src/Magnum/Query.h +++ b/src/Magnum/Query.h @@ -31,7 +31,7 @@ #include #include "Magnum/AbstractObject.h" -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 76de3a35f..e4bf5e6b1 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -30,7 +30,6 @@ #include "Magnum/AbstractObject.h" #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index ee16d7f7c..5d5dc675d 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -32,7 +32,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index 1765fcec8..38fcfbd96 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -32,7 +32,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Sampler.h b/src/Magnum/Sampler.h index 111298d5e..b1d0e74e3 100644 --- a/src/Magnum/Sampler.h +++ b/src/Magnum/Sampler.h @@ -30,7 +30,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/SceneGraph/AbstractCamera.h b/src/Magnum/SceneGraph/AbstractCamera.h index 229f228f2..ccfcf6f2b 100644 --- a/src/Magnum/SceneGraph/AbstractCamera.h +++ b/src/Magnum/SceneGraph/AbstractCamera.h @@ -31,7 +31,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/SceneGraph/AbstractFeature.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index c9f157674..6c64963ec 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -33,7 +33,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/SceneGraph/SceneGraph.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h index fe8c1e759..6ebfb8998 100644 --- a/src/Magnum/SceneGraph/AbstractTransformation.h +++ b/src/Magnum/SceneGraph/AbstractTransformation.h @@ -29,7 +29,7 @@ */ #include "Magnum/SceneGraph/SceneGraph.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h index db595566f..be3b3467e 100644 --- a/src/Magnum/SceneGraph/Animable.h +++ b/src/Magnum/SceneGraph/Animable.h @@ -29,7 +29,7 @@ */ #include "Magnum/SceneGraph/AbstractGroupedFeature.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h index 5a4bfe47f..73955bc3a 100644 --- a/src/Magnum/SceneGraph/AnimableGroup.h +++ b/src/Magnum/SceneGraph/AnimableGroup.h @@ -29,7 +29,7 @@ */ #include "Magnum/SceneGraph/FeatureGroup.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt index 72822a81a..347668e6c 100644 --- a/src/Magnum/SceneGraph/CMakeLists.txt +++ b/src/Magnum/SceneGraph/CMakeLists.txt @@ -66,7 +66,7 @@ set(MagnumSceneGraph_HEADERS SceneGraph.h TranslationTransformation.h - magnumSceneGraphVisibility.h) + visibility.h) # Set shared library flags for the objects, as they will be part of shared lib # TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index 043ff2099..7becfe9a7 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -32,7 +32,7 @@ #include #include "Magnum/SceneGraph/SceneGraph.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h index a5ac2225a..1be32a566 100644 --- a/src/Magnum/SceneGraph/Object.h +++ b/src/Magnum/SceneGraph/Object.h @@ -32,7 +32,7 @@ #include "Magnum/SceneGraph/AbstractFeature.h" #include "Magnum/SceneGraph/AbstractObject.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/visibility.h similarity index 91% rename from src/Magnum/SceneGraph/magnumSceneGraphVisibility.h rename to src/Magnum/SceneGraph/visibility.h index acedc76fd..9845594a5 100644 --- a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/Magnum/SceneGraph/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_SceneGraph_magnumSceneGraphVisibility_h -#define Magnum_SceneGraph_magnumSceneGraphVisibility_h +#ifndef Magnum_SceneGraph_visibility_h +#define Magnum_SceneGraph_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index 40311f999..47680a114 100644 --- a/src/Magnum/Shader.h +++ b/src/Magnum/Shader.h @@ -33,7 +33,6 @@ #include "Magnum/AbstractObject.h" #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index cd66e8b93..42d1b642e 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -44,7 +44,7 @@ set(MagnumShaders_HEADERS Vector.h VertexColor.h - magnumShadersVisibility.h) + visibility.h) if(BUILD_STATIC) set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp) diff --git a/src/Magnum/Shaders/DistanceFieldVector.h b/src/Magnum/Shaders/DistanceFieldVector.h index 43642f7f1..335d3aec6 100644 --- a/src/Magnum/Shaders/DistanceFieldVector.h +++ b/src/Magnum/Shaders/DistanceFieldVector.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/AbstractVector.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h index 345721788..0fc86d603 100644 --- a/src/Magnum/Shaders/Flat.h +++ b/src/Magnum/Shaders/Flat.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/Generic.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/MeshVisualizer.h b/src/Magnum/Shaders/MeshVisualizer.h index d1caf439e..76f006653 100644 --- a/src/Magnum/Shaders/MeshVisualizer.h +++ b/src/Magnum/Shaders/MeshVisualizer.h @@ -32,7 +32,7 @@ #include "Magnum/AbstractShaderProgram.h" #include "Magnum/Color.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index 81958035b..83b20160e 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/src/Magnum/Shaders/Phong.h @@ -31,7 +31,7 @@ #include "Magnum/Color.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/Generic.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Vector.h b/src/Magnum/Shaders/Vector.h index e3415d17f..fac824290 100644 --- a/src/Magnum/Shaders/Vector.h +++ b/src/Magnum/Shaders/Vector.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/AbstractVector.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/VertexColor.h b/src/Magnum/Shaders/VertexColor.h index 99af6fdd0..c80330da4 100644 --- a/src/Magnum/Shaders/VertexColor.h +++ b/src/Magnum/Shaders/VertexColor.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/Generic.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp index 08168a481..9aed71540 100644 --- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp +++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifdef MAGNUM_BUILD_STATIC #include diff --git a/src/Magnum/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/visibility.h similarity index 97% rename from src/Magnum/Shaders/magnumShadersVisibility.h rename to src/Magnum/Shaders/visibility.h index 22e80b7ea..6a9400db4 100644 --- a/src/Magnum/Shaders/magnumShadersVisibility.h +++ b/src/Magnum/Shaders/visibility.h @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShaders_EXPORTS diff --git a/src/Magnum/Shapes/AbstractShape.h b/src/Magnum/Shapes/AbstractShape.h index c1dc7ea19..ae7bd56e2 100644 --- a/src/Magnum/Shapes/AbstractShape.h +++ b/src/Magnum/Shapes/AbstractShape.h @@ -30,9 +30,9 @@ #include "Magnum/Magnum.h" #include "Magnum/DimensionTraits.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" -#include "Magnum/Shapes/shapeImplementation.h" #include "Magnum/SceneGraph/AbstractGroupedFeature.h" +#include "Magnum/Shapes/shapeImplementation.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/AxisAlignedBox.h b/src/Magnum/Shapes/AxisAlignedBox.h index 39edbc3ea..f9e1574db 100644 --- a/src/Magnum/Shapes/AxisAlignedBox.h +++ b/src/Magnum/Shapes/AxisAlignedBox.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Box.h b/src/Magnum/Shapes/Box.h index 424005127..84ba50c58 100644 --- a/src/Magnum/Shapes/Box.h +++ b/src/Magnum/Shapes/Box.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/CMakeLists.txt b/src/Magnum/Shapes/CMakeLists.txt index 992639f60..1528ad5d6 100644 --- a/src/Magnum/Shapes/CMakeLists.txt +++ b/src/Magnum/Shapes/CMakeLists.txt @@ -57,8 +57,8 @@ set(MagnumShapes_HEADERS Point.h Sphere.h - magnumShapesVisibility.h - shapeImplementation.h) + shapeImplementation.h + visibility.h) add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS}) if(BUILD_STATIC_PIC) diff --git a/src/Magnum/Shapes/Capsule.h b/src/Magnum/Shapes/Capsule.h index f6e2eb223..e67ea1be2 100644 --- a/src/Magnum/Shapes/Capsule.h +++ b/src/Magnum/Shapes/Capsule.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h index 1b5b107b3..8b18a1e50 100644 --- a/src/Magnum/Shapes/Composition.h +++ b/src/Magnum/Shapes/Composition.h @@ -35,8 +35,8 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" #include "Magnum/Shapes/shapeImplementation.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Cylinder.h b/src/Magnum/Shapes/Cylinder.h index 0d9401c88..b19dedf2a 100644 --- a/src/Magnum/Shapes/Cylinder.h +++ b/src/Magnum/Shapes/Cylinder.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Line.h b/src/Magnum/Shapes/Line.h index 64a67834c..4c9e9f391 100644 --- a/src/Magnum/Shapes/Line.h +++ b/src/Magnum/Shapes/Line.h @@ -30,7 +30,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Plane.h b/src/Magnum/Shapes/Plane.h index cd514c412..1b2e5e7d7 100644 --- a/src/Magnum/Shapes/Plane.h +++ b/src/Magnum/Shapes/Plane.h @@ -31,7 +31,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Point.h b/src/Magnum/Shapes/Point.h index cebc0d037..380b6ceda 100644 --- a/src/Magnum/Shapes/Point.h +++ b/src/Magnum/Shapes/Point.h @@ -30,7 +30,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h index 2170010d7..6314e63da 100644 --- a/src/Magnum/Shapes/Shape.h +++ b/src/Magnum/Shapes/Shape.h @@ -30,7 +30,7 @@ #include "Magnum/Shapes/AbstractShape.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/ShapeGroup.h b/src/Magnum/Shapes/ShapeGroup.h index 3f1c8e5c5..c52419b27 100644 --- a/src/Magnum/Shapes/ShapeGroup.h +++ b/src/Magnum/Shapes/ShapeGroup.h @@ -32,7 +32,7 @@ #include "Magnum/SceneGraph/FeatureGroup.h" #include "Magnum/Shapes/AbstractShape.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Sphere.h b/src/Magnum/Shapes/Sphere.h index c7991f733..2223b4799 100644 --- a/src/Magnum/Shapes/Sphere.h +++ b/src/Magnum/Shapes/Sphere.h @@ -32,7 +32,7 @@ #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Collision.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h index ef7fa1cc3..fc6a68da5 100644 --- a/src/Magnum/Shapes/shapeImplementation.h +++ b/src/Magnum/Shapes/shapeImplementation.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Magnum.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/visibility.h similarity index 92% rename from src/Magnum/Shapes/magnumShapesVisibility.h rename to src/Magnum/Shapes/visibility.h index 94d163e2b..c0ae3226f 100644 --- a/src/Magnum/Shapes/magnumShapesVisibility.h +++ b/src/Magnum/Shapes/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Shapes_magnumShapesVisibility_h -#define Magnum_Shapes_magnumShapesVisibility_h +#ifndef Magnum_Shapes_visibility_h +#define Magnum_Shapes_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShapes_EXPORTS diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt index f3d69c991..8beda53b4 100644 --- a/src/Magnum/Test/CMakeLists.txt +++ b/src/Magnum/Test/CMakeLists.txt @@ -70,9 +70,9 @@ if(BUILD_GL_TESTS) ${QueryGLTest_RES} LIBRARIES ${GL_TEST_LIBRARIES}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ShaderGLTestConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/ShaderGLTestConfigure.h) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) + include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) if(NOT MAGNUM_TARGET_GLES2) diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp index a8d091c6c..90f5a5cd6 100644 --- a/src/Magnum/Test/ShaderGLTest.cpp +++ b/src/Magnum/Test/ShaderGLTest.cpp @@ -29,7 +29,7 @@ #include "Magnum/Shader.h" #include "Magnum/Test/AbstractOpenGLTester.h" -#include "ShaderGLTestConfigure.h" +#include "configure.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ShaderGLTestConfigure.h.cmake b/src/Magnum/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Test/ShaderGLTestConfigure.h.cmake rename to src/Magnum/Test/configure.h.cmake diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h index 4b4e6c66c..6c344a317 100644 --- a/src/Magnum/Text/AbstractFont.h +++ b/src/Magnum/Text/AbstractFont.h @@ -36,7 +36,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Texture.h" #include "Magnum/Text/Text.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h index ab7fde66a..fcd628ffd 100644 --- a/src/Magnum/Text/AbstractFontConverter.h +++ b/src/Magnum/Text/AbstractFontConverter.h @@ -33,7 +33,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Text/Text.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 8f61ce1fe..6302f5c9f 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -37,7 +37,7 @@ set(MagnumText_HEADERS Renderer.h Text.h - magnumTextVisibility.h) + visibility.h) if(MAGNUM_BUILD_DEPRECATED) set(MagnumText_HEADERS ${MagnumText_HEADERS} @@ -65,7 +65,7 @@ if(WITH_FONTCONVERTER) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) + include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) add_executable(magnum-fontconverter fontconverter.cpp) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) diff --git a/src/Magnum/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h index 9b841e55c..6289c64cc 100644 --- a/src/Magnum/Text/GlyphCache.h +++ b/src/Magnum/Text/GlyphCache.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Range.h" #include "Magnum/Texture.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Renderer.h b/src/Magnum/Text/Renderer.h index 820da2bfb..f00eceff5 100644 --- a/src/Magnum/Text/Renderer.h +++ b/src/Magnum/Text/Renderer.h @@ -38,7 +38,7 @@ #include "Magnum/Mesh.h" #include "Magnum/Text/Text.h" #include "Magnum/Text/Alignment.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index 5df0f7656..7526f4ceb 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -30,7 +30,7 @@ #include "Magnum/Text/AbstractFontConverter.h" #include "Magnum/Text/GlyphCache.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp index 15250ebb9..b52ae5181 100644 --- a/src/Magnum/Text/Test/AbstractFontTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Text/AbstractFont.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Test/CMakeLists.txt b/src/Magnum/Text/Test/CMakeLists.txt index e48529eaa..62f613fa1 100644 --- a/src/Magnum/Text/Test/CMakeLists.txt +++ b/src/Magnum/Text/Test/CMakeLists.txt @@ -22,10 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText) corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText) diff --git a/src/Magnum/Text/Test/testConfigure.h.cmake b/src/Magnum/Text/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Text/Test/testConfigure.h.cmake rename to src/Magnum/Text/Test/configure.h.cmake diff --git a/src/Magnum/Text/Text.h b/src/Magnum/Text/Text.h index 01440e0c9..3b518812e 100644 --- a/src/Magnum/Text/Text.h +++ b/src/Magnum/Text/Text.h @@ -29,7 +29,7 @@ */ #include "Magnum/Types.h" -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/magnumTextVisibility.h b/src/Magnum/Text/visibility.h similarity index 92% rename from src/Magnum/Text/magnumTextVisibility.h rename to src/Magnum/Text/visibility.h index b00be6019..9bf30e9a9 100644 --- a/src/Magnum/Text/magnumTextVisibility.h +++ b/src/Magnum/Text/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Text_magnumTextVisibility_h -#define Magnum_Text_magnumTextVisibility_h +#ifndef Magnum_Text_visibility_h +#define Magnum_Text_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumText_EXPORTS diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index 05623f9c0..cf6871bda 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -51,8 +51,8 @@ if(WITH_DISTANCEFIELDCONVERTER) message(FATAL_ERROR "magnum-distancefieldconverter is not available on this platform. Set WITH_DISTANCEFIELDCONVERTER to OFF to suppress this warning.") endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/distancefieldconverterConfigure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/distancefieldconverterConfigure.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index 954f92fc5..876a4f1f6 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -37,7 +37,7 @@ #include "Magnum/Trade/AbstractImageConverter.h" #include "Magnum/Trade/ImageData.h" -#include "configure.h" +#include "distancefieldconverterConfigure.h" namespace Magnum { namespace TextureTools { diff --git a/src/Magnum/TextureTools/configure.h.cmake b/src/Magnum/TextureTools/distancefieldconverterConfigure.h.cmake similarity index 100% rename from src/Magnum/TextureTools/configure.h.cmake rename to src/Magnum/TextureTools/distancefieldconverterConfigure.h.cmake diff --git a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h index d1fd6a7fa..68ea9e6c4 100644 --- a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h +++ b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumTextureTools_EXPORTS diff --git a/src/Magnum/Timeline.h b/src/Magnum/Timeline.h index 1a31fdbbf..c774c4a5e 100644 --- a/src/Magnum/Timeline.h +++ b/src/Magnum/Timeline.h @@ -31,7 +31,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index ab679cf06..4601c620f 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Text/Text.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index 69626fb38..602aad875 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -33,7 +33,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Trade/Trade.h" #include "MagnumExternal/Optional/optional.hpp" diff --git a/src/Magnum/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h index 2d278134a..26247d7e8 100644 --- a/src/Magnum/Trade/AbstractMaterialData.h +++ b/src/Magnum/Trade/AbstractMaterialData.h @@ -29,7 +29,7 @@ */ #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h index 3a61a5482..0ba2f024d 100644 --- a/src/Magnum/Trade/MeshData2D.h +++ b/src/Magnum/Trade/MeshData2D.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h index 5bd92a702..6780922f6 100644 --- a/src/Magnum/Trade/MeshData3D.h +++ b/src/Magnum/Trade/MeshData3D.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index e8f99ad0e..a37ba850a 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -32,7 +32,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index bfa8ec510..dc538fc97 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -31,7 +31,7 @@ #include "Magnum/ImageReference.h" #include "Magnum/Trade/AbstractImageConverter.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp index f41b1bbab..15fe9caee 100644 --- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Trade/AbstractImporter.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/CMakeLists.txt b/src/Magnum/Trade/Test/CMakeLists.txt index d1a162e92..8a3bd4515 100644 --- a/src/Magnum/Trade/Test/CMakeLists.txt +++ b/src/Magnum/Trade/Test/CMakeLists.txt @@ -22,10 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TradeAbstractImageConverterTest AbstractImageConverterTest.cpp LIBRARIES Magnum) corrade_add_test(TradeAbstractImporterTest AbstractImporterTest.cpp LIBRARIES Magnum) diff --git a/src/Magnum/Trade/Test/testConfigure.h.cmake b/src/Magnum/Trade/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Trade/Test/testConfigure.h.cmake rename to src/Magnum/Trade/Test/configure.h.cmake diff --git a/src/Magnum/Trade/TextureData.h b/src/Magnum/Trade/TextureData.h index 485f11afc..1a95049c9 100644 --- a/src/Magnum/Trade/TextureData.h +++ b/src/Magnum/Trade/TextureData.h @@ -30,7 +30,7 @@ #include "Magnum/Array.h" #include "Magnum/Sampler.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Types.h b/src/Magnum/Types.h index 4c0d75140..bd332b6b8 100644 --- a/src/Magnum/Types.h +++ b/src/Magnum/Types.h @@ -30,7 +30,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { diff --git a/src/Magnum/Version.h b/src/Magnum/Version.h index 10b8bedae..68c59a77b 100644 --- a/src/Magnum/Version.h +++ b/src/Magnum/Version.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/magnumConfigure.h.cmake b/src/Magnum/configure.h.cmake similarity index 100% rename from src/Magnum/magnumConfigure.h.cmake rename to src/Magnum/configure.h.cmake diff --git a/src/Magnum/magnumVisibility.h b/src/Magnum/visibility.h similarity index 93% rename from src/Magnum/magnumVisibility.h rename to src/Magnum/visibility.h index 250e01701..abcadc967 100644 --- a/src/Magnum/magnumVisibility.h +++ b/src/Magnum/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_magnumVisibility_h -#define Magnum_magnumVisibility_h +#ifndef Magnum_visibility_h +#define Magnum_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(Magnum_EXPORTS) || defined(MagnumMathObjects_EXPORTS) diff --git a/src/MagnumPlugins/MagnumFont/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/CMakeLists.txt index 8c6a47117..fbff53fea 100644 --- a/src/MagnumPlugins/MagnumFont/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(MagnumFontObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED add_plugin(MagnumFont ${MAGNUM_PLUGINS_FONT_INSTALL_DIR} MagnumFont.conf $ - pluginRegistrationMagnumFont.cpp) + pluginRegistration.cpp) target_link_libraries(MagnumFont Magnum MagnumText) if(WIN32) diff --git a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt index 4b91644ed..4f1d89ded 100644 --- a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt @@ -22,9 +22,9 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumFontTestConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/magnumFontTestConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp LIBRARIES MagnumFontTestLib ${GL_TEST_LIBRARIES}) diff --git a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp index 176c0ac31..2ca6675b1 100644 --- a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp +++ b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Text/GlyphCache.h" #include "MagnumPlugins/MagnumFont/MagnumFont.h" -#include "magnumFontTestConfigure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFont/Test/configure.h.cmake similarity index 100% rename from src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake rename to src/MagnumPlugins/MagnumFont/Test/configure.h.cmake diff --git a/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp b/src/MagnumPlugins/MagnumFont/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp rename to src/MagnumPlugins/MagnumFont/pluginRegistration.cpp diff --git a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt index 5f590b7e8..50bbd169c 100644 --- a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(MagnumFontConverterObjects PROPERTIES COMPILE_FLAGS "${CMA add_plugin(MagnumFontConverter ${MAGNUM_PLUGINS_FONTCONVERTER_INSTALL_DIR} MagnumFontConverter.conf $ - pluginRegistrationMagnumFontConverter.cpp) + pluginRegistration.cpp) target_link_libraries(MagnumFontConverter Magnum MagnumText) if(WIN32) diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt index 6ca4fda60..7525fb99b 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt @@ -22,11 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumFontConverterTestConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/magnumFontConverterTestConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../MagnumFont/Test/ - ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(MagnumFontConverterGLTest MagnumFontConverterGLTest.cpp LIBRARIES MagnumFontConverterTestLib diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp index baf60b0f9..152f05d21 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp @@ -35,8 +35,8 @@ #include "MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h" #include "MagnumPlugins/TgaImporter/TgaImporter.h" -#include "magnumFontTestConfigure.h" -#include "magnumFontConverterTestConfigure.h" +#include "../../MagnumFont/Test/configure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFontConverter/Test/configure.h.cmake similarity index 100% rename from src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake rename to src/MagnumPlugins/MagnumFontConverter/Test/configure.h.cmake diff --git a/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp rename to src/MagnumPlugins/MagnumFontConverter/pluginRegistration.cpp diff --git a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt index 1efdd806e..c374a2bdf 100644 --- a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(TgaImageConverterObjects PROPERTIES COMPILE_FLAGS "-DTgaIm add_plugin(TgaImageConverter ${MAGNUM_PLUGINS_IMAGECONVERTER_INSTALL_DIR} TgaImageConverter.conf $ - pluginRegistrationTgaImageConverter.cpp) + pluginRegistration.cpp) target_link_libraries(TgaImageConverter Magnum) install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter) diff --git a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt index f1c56f698..874dff234 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt @@ -25,6 +25,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES TgaImageConverterTestLib TgaImporterTestLib) diff --git a/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp rename to src/MagnumPlugins/TgaImageConverter/pluginRegistration.cpp diff --git a/src/MagnumPlugins/TgaImporter/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/CMakeLists.txt index 2f893e5f0..1df89a098 100644 --- a/src/MagnumPlugins/TgaImporter/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImporter/CMakeLists.txt @@ -35,7 +35,7 @@ set_target_properties(TgaImporterObjects PROPERTIES COMPILE_FLAGS "-DTgaImporter add_plugin(TgaImporter ${MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR} TgaImporter.conf $ - pluginRegistrationTgaImporter.cpp) + pluginRegistration.cpp) target_link_libraries(TgaImporter Magnum) install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter) diff --git a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt index 3e825ad47..cc9dbc3fc 100644 --- a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt @@ -25,6 +25,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES TgaImporterTestLib) diff --git a/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp b/src/MagnumPlugins/TgaImporter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp rename to src/MagnumPlugins/TgaImporter/pluginRegistration.cpp diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt index a1a406d74..b55568489 100644 --- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt @@ -39,7 +39,7 @@ set_target_properties(WavAudioImporterObjects PROPERTIES COMPILE_FLAGS "-DWavAud add_plugin(WavAudioImporter ${MAGNUM_PLUGINS_AUDIOIMPORTER_INSTALL_DIR} WavAudioImporter.conf $ - pluginRegistrationWavAudioImporter.cpp) + pluginRegistration.cpp) target_link_libraries(WavAudioImporter Magnum MagnumAudio) install(FILES ${WavAudioImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/WavAudioImporter) diff --git a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt index fda7c7e61..bf72a385b 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt @@ -25,6 +25,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(WavAudioImporterTest WavImporterTest.cpp LIBRARIES WavAudioImporterTestLib) diff --git a/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp b/src/MagnumPlugins/WavAudioImporter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp rename to src/MagnumPlugins/WavAudioImporter/pluginRegistration.cpp From 222292239b631c7a2a356a008a3799378d9f5638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 00:31:02 +0100 Subject: [PATCH 56/79] Making includes absolute, part 7: fix documentation. --- Doxyfile | 7 ++++--- doc/building.dox | 6 +++--- doc/getting-started.dox | 10 +++++----- doc/namespaces.dox | 37 +++++++++++++++++------------------- src/Magnum/Array.h | 2 +- src/Magnum/Buffer.h | 2 +- src/Magnum/Context.h | 2 +- src/Magnum/Renderer.h | 2 +- src/Magnum/Resource.h | 2 +- src/Magnum/ResourceManager.h | 2 +- src/Magnum/Swizzle.h | 2 +- 11 files changed, 36 insertions(+), 38 deletions(-) diff --git a/Doxyfile b/Doxyfile index 72837b78a..f6ba88232 100644 --- a/Doxyfile +++ b/Doxyfile @@ -689,11 +689,12 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src/ \ +INPUT = src/Magnum \ + src/MagnumPlugins \ doc/ \ - ../magnum-plugins/src/ \ + ../magnum-plugins/src/MagnumPlugins \ ../magnum-plugins/doc/ \ - ../magnum-integration/src/ \ + ../magnum-integration/src/Magnum \ ../magnum-integration/doc/ \ ../magnum-examples/doc/ diff --git a/doc/building.dox b/doc/building.dox index 08d302075..31ce244a2 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -139,9 +139,9 @@ available for desktop OpenGL only, see @ref requires-gl. emulation in desktop OpenGL library. Might not be supported in all drivers. The features used can be conveniently detected in depending projects both in -CMake and C++ sources, see @ref cmake and @ref src/Magnum.h for more -information. See also @ref corrade-cmake and @ref src/Corrade.h for additional -information. +CMake and C++ sources, see @ref cmake and @ref Magnum/Magnum.h for more +information. See also @ref corrade-cmake and @ref Corrade/Corrade.h for +additional information. By default the engine is built with nearly everything except Audio library, plugins and application libraries (see below). Using `WITH_*` CMake parameters diff --git a/doc/getting-started.dox b/doc/getting-started.dox index 297862778..0e9daef78 100644 --- a/doc/getting-started.dox +++ b/doc/getting-started.dox @@ -85,8 +85,8 @@ repository. Directory `src/` contains the actual project. To keep things simple, the project consists of just one source file with the most minimal code possible: @code -#include -#include +#include +#include using namespace Magnum; @@ -160,9 +160,9 @@ the concepts of graphics programming, we can change clear color to something else and also print basic information about the GPU the engine is running on. First include the needed headers: @code -#include -#include -#include +#include +#include +#include @endcode And in the constructor (which is currently empty) change the clear color and diff --git a/doc/namespaces.dox b/doc/namespaces.dox index 1bd43d68a..e1b4aa8b1 100644 --- a/doc/namespaces.dox +++ b/doc/namespaces.dox @@ -22,10 +22,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @dir magnum - * @brief %Magnum library - */ -/** @dir magnum/src +/** @dir Magnum * @brief Namespace Magnum */ /** @namespace Magnum @@ -39,7 +36,7 @@ to `${MAGNUM_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir Platform +/** @dir Magnum/Platform * @brief Namespace Magnum::Platform */ /** @namespace Magnum::Platform @@ -57,7 +54,7 @@ documentation, @ref building, @ref cmake and @ref platform for more information. */ -/** @dir Math +/** @dir Magnum/Math * @brief Namespace Magnum::Math */ /** @namespace Magnum::Math @@ -71,7 +68,7 @@ to `${MAGNUM_LIBRARIES}`. See @ref building, @ref cmake, @ref matrix-vector and @ref transformations for more information. */ -/** @dir Math/Algorithms +/** @dir Magnum/Math/Algorithms * @brief Namespace Magnum::Math::Algorithms */ /** @namespace Magnum::Math::Algorithms @@ -85,7 +82,7 @@ to `${MAGNUM_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir Math/Geometry +/** @dir Magnum/Math/Geometry * @brief Namespace Magnum::Math::Geometry */ /** @namespace Magnum::Math::Geometry @@ -99,7 +96,7 @@ to `${MAGNUM_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir Audio +/** @dir Magnum/Audio * @brief Namespace Magnum::Audio */ /** @namespace Magnum::Audio @@ -116,7 +113,7 @@ particular `*Importer` class documentation, @ref building-plugins, @ref cmake-plugins and @ref plugins for more information. */ -/** @dir DebugTools +/** @dir Magnum/DebugTools * @brief Namespace Magnum::DebugTools */ /** @namespace Magnum::DebugTools @@ -130,7 +127,7 @@ package in CMake and link to `${MAGNUM_DEBUGTOOLS_LIBRARIES}`. See @ref building, @ref cmake and @ref debug-tools for more information. */ -/** @dir MeshTools +/** @dir Magnum/MeshTools * @brief Namespace Magnum::MeshTools */ /** @namespace Magnum::MeshTools @@ -144,11 +141,11 @@ package in CMake and link to `${MAGNUM_MESHTOOLS_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir Plugins - * @brief Basic plugins +/** @dir MagnumPlugins + * @brief Plugins for %Magnum library */ -/** @dir Primitives +/** @dir Magnum/Primitives * @brief Namespace Magnum::Primitives */ /** @namespace Magnum::Primitives @@ -162,7 +159,7 @@ package in CMake and link to `${MAGNUM_PRIMITIVES_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir SceneGraph +/** @dir Magnum/SceneGraph * @brief Namespace Magnum::SceneGraph */ /** @@ -177,7 +174,7 @@ package in CMake and link to `${MAGNUM_SCENEGRAPH_LIBRARIES}`. See @ref building, @ref cmake and @ref scenegraph for more information. */ -/** @dir Shaders +/** @dir Magnum/Shaders * @brief Namespace Magnum::Shaders */ /** @namespace Magnum::Shaders @@ -191,7 +188,7 @@ in CMake and link to `${MAGNUM_MESHTOOLS_SHADERS}`. See @ref building and @ref cmake for more information. */ -/** @dir Shapes +/** @dir Magnum/Shapes * @brief Namespace Magnum::Shapes */ /** @namespace Magnum::Shapes @@ -205,7 +202,7 @@ CMake and link to `${MAGNUM_SHAPES_LIBRARIES}`. See @ref building, @ref cmake and @ref shapes for more information. */ -/** @dir Text +/** @dir Magnum/Text * @brief Namespace Magnum::Text */ /** @namespace Magnum::Text @@ -221,7 +218,7 @@ for more information. Additional plugins are enabled separately, see particular @ref cmake-plugins and @ref plugins for more information. */ -/** @dir TextureTools +/** @dir Magnum/TextureTools * @brief Namespace Magnum::TextureTools */ /** @namespace Magnum::TextureTools @@ -235,7 +232,7 @@ package in CMake and link to `${MAGNUM_TEXTURETOOLS_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir Trade +/** @dir Magnum/Trade * @brief Namespace Magnum::Trade */ /** @namespace Magnum::Trade diff --git a/src/Magnum/Array.h b/src/Magnum/Array.h index 2e324e2c5..35586f899 100644 --- a/src/Magnum/Array.h +++ b/src/Magnum/Array.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file /Array.h +/** @file * @brief Class Magnum::Array, Magnum::Array1D, Magnum::Array2D, Magnum::Array3D */ diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index 0ecfa0632..e3e975ae7 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file /Buffer.h +/** @file * @brief Class @ref Magnum::Buffer, enum @ref Magnum::BufferUsage */ diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index efe95f141..c0b4c6647 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file /Context.h +/** @file * @brief Class @ref Magnum::Context, @ref Magnum::Extension, macro @ref MAGNUM_ASSERT_VERSION_SUPPORTED(), @ref MAGNUM_ASSERT_EXTENSION_SUPPORTED() */ diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index 5d5dc675d..af166007e 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file /Renderer.h +/** @file * @brief Class Magnum::Renderer */ diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index 38fcfbd96..c82f22565 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file /Resource.h +/** @file * @brief Class Magnum::ResourceKey, Magnum::Resource, enum Magnum::ResourceState */ diff --git a/src/Magnum/ResourceManager.h b/src/Magnum/ResourceManager.h index 247d3d0f3..3785ea303 100644 --- a/src/Magnum/ResourceManager.h +++ b/src/Magnum/ResourceManager.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file /ResourceManager.h +/** @file * @brief Class Magnum::ResourceManager, enum Magnum::ResourceDataState, Magnum::ResourcePolicy */ diff --git a/src/Magnum/Swizzle.h b/src/Magnum/Swizzle.h index 8ca272d33..01fa066a0 100644 --- a/src/Magnum/Swizzle.h +++ b/src/Magnum/Swizzle.h @@ -25,7 +25,7 @@ */ #ifdef MAGNUM_BUILD_DEPRECATED -/** @file /Swizzle.h +/** @file * @brief Function @ref Magnum::swizzle() * @deprecated Use @ref Math/Swizzle.h instead. */ From 42b1d2696543dcbefad9fe69ca9679782b08bccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 19:56:57 +0100 Subject: [PATCH 57/79] Shaders: renamed magnumShadersResourceImport.hpp to resourceImport.hpp. No need to duplicate the namespaces in filename. The old file is alias to new one, is marked as deprecated and will be removed in future release. --- src/Magnum/Shaders/CMakeLists.txt | 6 ++- .../Shaders/magnumShadersResourceImport.hpp | 14 +++---- src/Magnum/Shaders/resourceImport.hpp | 41 +++++++++++++++++++ 3 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 src/Magnum/Shaders/resourceImport.hpp diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index 42d1b642e..6ce657365 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -47,7 +47,11 @@ set(MagnumShaders_HEADERS visibility.h) if(BUILD_STATIC) - set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp) + set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} resourceImport.hpp) + + if(BUILD_DEPRECATED) + set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp) + endif() endif() add_library(MagnumShaders ${SHARED_OR_STATIC} ${MagnumShaders_SRCS}) diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp index 9aed71540..3aa3a1c90 100644 --- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp +++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp @@ -27,13 +27,13 @@ #include "Magnum/configure.h" #ifdef MAGNUM_BUILD_STATIC -#include -#include - -static int magnumShadersResourceImport() { - CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS) - return 0; -} CORRADE_AUTOMATIC_INITIALIZER(magnumShadersResourceImport) +#ifdef MAGNUM_BUILD_DEPRECATED +#include "Magnum/Shaders/resourceImport.h" +#else +#error use Magnum/Shaders/resourceImport.h instead +#endif +#else +#error this header is available only in static build #endif #endif diff --git a/src/Magnum/Shaders/resourceImport.hpp b/src/Magnum/Shaders/resourceImport.hpp new file mode 100644 index 000000000..87fdb771d --- /dev/null +++ b/src/Magnum/Shaders/resourceImport.hpp @@ -0,0 +1,41 @@ +#ifndef Magnum_Shaders_resourceImport_hpp +#define Magnum_Shaders_resourceImport_hpp +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include "Magnum/configure.h" + +#ifdef MAGNUM_BUILD_STATIC +#include +#include + +static int magnumShadersResourceImport() { + CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS) + return 0; +} CORRADE_AUTOMATIC_INITIALIZER(magnumShadersResourceImport) +#else +#error this header is available only in static build +#endif + +#endif From d34ea5d5be136f59084abee3c33772b64cc54529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:01:12 +0100 Subject: [PATCH 58/79] doc: added Doxygen layout file. Will be used to tweak the documentation output even more. --- DoxygenLayout.xml | 194 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 DoxygenLayout.xml diff --git a/DoxygenLayout.xml b/DoxygenLayout.xml new file mode 100644 index 000000000..6fb2b7ed4 --- /dev/null +++ b/DoxygenLayout.xml @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e2abab17b7fded57bc9b6d16f0d841f0f7eee3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:17:57 +0100 Subject: [PATCH 59/79] doc: show include for each class. Had to explicitly disable showing includes for files. Useless stuff. --- Doxyfile | 6 ++++-- DoxygenLayout.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Doxyfile b/Doxyfile index f6ba88232..194dda0b2 100644 --- a/Doxyfile +++ b/Doxyfile @@ -132,7 +132,9 @@ FULL_PATH_NAMES = YES # relative paths, which will be relative from the directory where doxygen is # started. -STRIP_FROM_PATH = ../ +STRIP_FROM_PATH = ../magnum/src \ + ../magnum-plugins/src \ + ../magnum-integration/src # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -478,7 +480,7 @@ HIDE_SCOPE_NAMES = NO # will put a list of the files that are included by a file in the documentation # of that file. -SHOW_INCLUDE_FILES = NO +SHOW_INCLUDE_FILES = YES # If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen # will list include files with double quotes in the documentation diff --git a/DoxygenLayout.xml b/DoxygenLayout.xml index 6fb2b7ed4..646da8cdf 100644 --- a/DoxygenLayout.xml +++ b/DoxygenLayout.xml @@ -108,7 +108,7 @@ - + From 24d470e0b1c4c9b288ef873a88c0339804a3086b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:18:25 +0100 Subject: [PATCH 60/79] doc: don't show files used to generate the documentation. Also useless. --- Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doxyfile b/Doxyfile index 194dda0b2..7e9af6368 100644 --- a/Doxyfile +++ b/Doxyfile @@ -586,7 +586,7 @@ MAX_INITIALIZER_LINES = 30 # at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. -SHOW_USED_FILES = YES +SHOW_USED_FILES = NO # Set the SHOW_FILES tag to NO to disable the generation of the Files page. # This will remove the Files entry from the Quick Index and from the From 4698c4276fb23e47aebf37976511dcc0f8916d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:18:58 +0100 Subject: [PATCH 61/79] doc: updated directory documentation. Noting what dir is part of which library. --- doc/namespaces.dox | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/namespaces.dox b/doc/namespaces.dox index e1b4aa8b1..94bea4b1f 100644 --- a/doc/namespaces.dox +++ b/doc/namespaces.dox @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. */ -/** @dir Magnum - * @brief Namespace Magnum +/** @dir magnum/src/Magnum + * @brief Namespace Magnum (part of @ref building "Magnum library") */ /** @namespace Magnum @brief Root namespace @@ -141,10 +141,6 @@ package in CMake and link to `${MAGNUM_MESHTOOLS_LIBRARIES}`. See @ref building and @ref cmake for more information. */ -/** @dir MagnumPlugins - * @brief Plugins for %Magnum library - */ - /** @dir Magnum/Primitives * @brief Namespace Magnum::Primitives */ @@ -248,3 +244,7 @@ information. Additional plugins are enabled separately, see particular `*Importer` and `*ImageConverter` class documentation, @ref building-plugins, @ref cmake-plugins and @ref plugins for more information. */ + +/** @dir magnum/src/MagnumPlugins + * @brief %Magnum plugins (part of @ref building "Magnum library") + */ From 159623120fcdc891942813377bbbefdfd4de2963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:25:10 +0100 Subject: [PATCH 62/79] package: adapted to Corrade Jenkins CI changes. Namely using deprecated/non-deprecated Corrade build. --- package/ci/jenkins-mingw32.xml | 2 +- package/ci/jenkins.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ci/jenkins-mingw32.xml b/package/ci/jenkins-mingw32.xml index 81c54c69d..343df8bf8 100644 --- a/package/ci/jenkins-mingw32.xml +++ b/package/ci/jenkins-mingw32.xml @@ -77,7 +77,7 @@ cd build-mingw32-${libraries}-${compatibility} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/archlinux/basic-mingw32.cmake \ - -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/mingw32-${libraries} \ + -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/mingw32-${libraries}-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/mingw32-${libraries}-${compatibility} \ -DBUILD_TESTS=ON \ -DBUILD_DEPRECATED=${deprecated_build_flag} \ diff --git a/package/ci/jenkins.xml b/package/ci/jenkins.xml index fb03d00dc..d3f3307a7 100644 --- a/package/ci/jenkins.xml +++ b/package/ci/jenkins.xml @@ -121,9 +121,9 @@ cd build-${compiler}-${libraries}-${compatibility}-${gl} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/${compiler}-${libraries} \ + -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl} \ - -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/${compiler}-${libraries}/lib;${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl}/lib" \ + -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}/lib;${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl}/lib" \ -DCMAKE_CXX_COMPILER=${compiler_binary} \ "${compiler_flags[@]}" \ -DBUILD_TESTS=ON \ From 9743d2abf3233bb265357fd3ccd3310b9ab2a662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:39:21 +0100 Subject: [PATCH 63/79] SceneGraph: fixed compilation of Drawable on GCC 4.6. This error was present since the very beginning but it didn't appear until we were explicitly instantiating the Drawable class. --- src/Magnum/SceneGraph/Drawable.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Magnum/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h index 4eafef45c..a26dbb025 100644 --- a/src/Magnum/SceneGraph/Drawable.h +++ b/src/Magnum/SceneGraph/Drawable.h @@ -147,12 +147,20 @@ template class Drawable: public AbstractGrouped * If the drawable doesn't belong to any group, returns `nullptr`. */ DrawableGroup* drawables() { + #ifndef CORRADE_GCC46_COMPATIBILITY return AbstractGroupedFeature, T>::group(); + #else + return static_cast*>(AbstractGroupedFeature, T>::group()); + #endif } /** @overload */ const DrawableGroup* drawables() const { + #ifndef CORRADE_GCC46_COMPATIBILITY return AbstractGroupedFeature, T>::group(); + #else + return static_cast*>(AbstractGroupedFeature, T>::group()); + #endif } /** From 38ded20b94a70cf4ae5b23b2046d00b288071ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:40:35 +0100 Subject: [PATCH 64/79] SceneGraph: fix documentation of DrawableGroup aliases. --- src/Magnum/SceneGraph/Drawable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h index a26dbb025..efa589594 100644 --- a/src/Magnum/SceneGraph/Drawable.h +++ b/src/Magnum/SceneGraph/Drawable.h @@ -240,7 +240,7 @@ template class DrawableGroup: public FeatureGro Convenience alternative to %DrawableGroup<2, T>. See @ref Drawable for more information. -@note Not available on GCC < 4.7. Use %Drawable<2, T> instead. +@note Not available on GCC < 4.7. Use %DrawableGroup<2, T> instead. @see @ref DrawableGroup2D, @ref BasicDrawableGroup3D */ template using BasicDrawableGroup2D = DrawableGroup<2, T>; @@ -263,7 +263,7 @@ typedef DrawableGroup<2, Float> DrawableGroup2D; Convenience alternative to %DrawableGroup<3, T>. See @ref Drawable for more information. -@note Not available on GCC < 4.7. Use %Drawable<3, T> instead. +@note Not available on GCC < 4.7. Use %DrawableGroup<3, T> instead. @see @ref DrawableGroup3D, @ref BasicDrawableGroup2D */ template using BasicDrawableGroup3D = DrawableGroup<3, T>; From 3df96b59447fd3507173094f7bd886c297f52571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:41:04 +0100 Subject: [PATCH 65/79] Shaders: don't use deprecated header in tests. --- src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp | 2 +- src/Magnum/Shaders/Test/FlatGLTest.cpp | 2 +- src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp | 2 +- src/Magnum/Shaders/Test/PhongGLTest.cpp | 2 +- src/Magnum/Shaders/Test/VectorGLTest.cpp | 2 +- src/Magnum/Shaders/Test/VertexColorGLTest.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index 8a6461548..0250b34c9 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -26,7 +26,7 @@ #include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Magnum/Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/resourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 486d2c10a..403bfc51b 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -26,7 +26,7 @@ #include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Magnum/Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/resourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index 5d7ec7762..736a53c6d 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Magnum/Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/resourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index a043d1dbf..373c6d099 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -26,7 +26,7 @@ #include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Magnum/Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/resourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index 3074526bc..ad49686ef 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -26,7 +26,7 @@ #include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Magnum/Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/resourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp index 2426fc505..e31e171c5 100644 --- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp @@ -26,7 +26,7 @@ #include "Magnum/Test/AbstractOpenGLTester.h" #ifdef MAGNUM_BUILD_STATIC -#include "Magnum/Shaders/magnumShadersResourceImport.hpp" +#include "Magnum/Shaders/resourceImport.hpp" #endif namespace Magnum { namespace Shaders { namespace Test { From 597a14d76077bd34852cde912ab8d5b2eebd9567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:52:13 +0100 Subject: [PATCH 66/79] Fixed OpenGL ES 2.0 and 3.0 build. --- src/Magnum/AbstractFramebuffer.cpp | 2 ++ src/Magnum/AbstractTexture.cpp | 2 ++ src/Magnum/Context.cpp | 2 ++ src/Magnum/Framebuffer.cpp | 4 ++++ src/Magnum/Platform/magnum-info.cpp | 2 ++ src/Magnum/Test/CubeMapTextureGLTest.cpp | 3 +++ src/Magnum/Test/FramebufferGLTest.cpp | 3 +++ src/Magnum/Test/TextureGLTest.cpp | 3 +++ src/MagnumPlugins/TgaImporter/TgaImporter.cpp | 11 +++++++---- 9 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/Magnum/AbstractFramebuffer.cpp b/src/Magnum/AbstractFramebuffer.cpp index 28855de2b..03219ad3d 100644 --- a/src/Magnum/AbstractFramebuffer.cpp +++ b/src/Magnum/AbstractFramebuffer.cpp @@ -24,7 +24,9 @@ #include "AbstractFramebuffer.h" +#ifndef MAGNUM_TARGET_GLES2 #include "Magnum/BufferImage.h" +#endif #include "Magnum/Context.h" #include "Magnum/Extensions.h" #include "Magnum/Image.h" diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index df6d110fd..128188d0a 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/src/Magnum/AbstractTexture.cpp @@ -24,7 +24,9 @@ #include "AbstractTexture.h" +#ifndef MAGNUM_TARGET_GLES2 #include "Magnum/BufferImage.h" +#endif #include "Magnum/ColorFormat.h" #include "Magnum/Context.h" #include "Magnum/Extensions.h" diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index f5e29bfbc..d13f7b848 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -33,7 +33,9 @@ #include "Magnum/AbstractShaderProgram.h" #include "Magnum/AbstractTexture.h" #include "Magnum/Buffer.h" +#ifndef MAGNUM_TARGET_GLES #include "Magnum/BufferTexture.h" +#endif #include "Magnum/DefaultFramebuffer.h" #include "Magnum/Extensions.h" #include "Magnum/Framebuffer.h" diff --git a/src/Magnum/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp index ebbd5dcdd..cc29b484e 100644 --- a/src/Magnum/Framebuffer.cpp +++ b/src/Magnum/Framebuffer.cpp @@ -24,7 +24,11 @@ #include "Framebuffer.h" +#include + +#ifndef MAGNUM_TARGET_GLES2 #include "Magnum/BufferImage.h" +#endif #include "Magnum/Context.h" #include "Magnum/Extensions.h" #include "Magnum/Image.h" diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp index 0dd5e9808..991705010 100644 --- a/src/Magnum/Platform/magnum-info.cpp +++ b/src/Magnum/Platform/magnum-info.cpp @@ -31,7 +31,9 @@ #include "Magnum/AbstractShaderProgram.h" #include "Magnum/Buffer.h" +#ifndef MAGNUM_TARGET_GLES #include "Magnum/BufferTexture.h" +#endif #include "Magnum/Context.h" #include "Magnum/DebugMessage.h" #include "Magnum/Extensions.h" diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp index 880a18fee..c3e382ad3 100644 --- a/src/Magnum/Test/CubeMapTextureGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp @@ -24,7 +24,10 @@ #include +#include "Magnum/configure.h" +#ifndef MAGNUM_TARGET_GLES2 #include "Magnum/BufferImage.h" +#endif #include "Magnum/ColorFormat.h" #include "Magnum/Image.h" #include "Magnum/CubeMapTexture.h" diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp index 9a83b82bf..75f692630 100644 --- a/src/Magnum/Test/FramebufferGLTest.cpp +++ b/src/Magnum/Test/FramebufferGLTest.cpp @@ -22,7 +22,10 @@ DEALINGS IN THE SOFTWARE. */ +#include "Magnum/configure.h" +#ifndef MAGNUM_TARGET_GLES2 #include "Magnum/BufferImage.h" +#endif #include "Magnum/ColorFormat.h" #include "Magnum/Context.h" #include "Magnum/Extensions.h" diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp index d61ee20b8..0ee243dc3 100644 --- a/src/Magnum/Test/TextureGLTest.cpp +++ b/src/Magnum/Test/TextureGLTest.cpp @@ -24,7 +24,10 @@ #include +#include "Magnum/configure.h" +#ifndef MAGNUM_TARGET_GLES2 #include "Magnum/BufferImage.h" +#endif #include "Magnum/ColorFormat.h" #include "Magnum/Image.h" #include "Magnum/Texture.h" diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp index c780714d7..8f301756d 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp @@ -35,10 +35,13 @@ #ifdef MAGNUM_TARGET_GLES #include -#include "Math/Swizzle.h" -#include "Math/Vector4.h" -#include "Context.h" -#include "Extensions.h" +#include "Magnum/Math/Swizzle.h" +#include "Magnum/Math/Vector4.h" +#endif + +#ifdef MAGNUM_TARGET_GLES2 +#include "Magnum/Context.h" +#include "Magnum/Extensions.h" #endif namespace Magnum { namespace Trade { From f06495dc04f140b041c53dbdfd485d93a0b23e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 14:08:08 +0100 Subject: [PATCH 67/79] Doc++ --- doc/portability.dox | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/portability.dox b/doc/portability.dox index 1596e55d0..6114973a1 100644 --- a/doc/portability.dox +++ b/doc/portability.dox @@ -145,8 +145,8 @@ void main() { It is often desirable to query extension presence based on actually used GLSL version -- while the extension might be supported in the driver, it might not be available in given GLSL version (e.g. causing compilation errors). You can -use @ref Context::isExtensionSupported(Version) to check that the extension -is present in given version: +use @ref Context::isExtensionSupported(Version) const to check that the +extension is present in given version: @code if(!Context::instance()->isExtensionSupported(version)) { bindAttributeLocation(Position::Location, "position"); From 412011f2f87d3c2f7c3aa2fa4bd26e07bebb8a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 16:04:54 +0100 Subject: [PATCH 68/79] Fixed linker errors on Windows. --- src/Magnum/AbstractImage.cpp | 6 +++--- src/Magnum/SceneGraph/Drawable.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Magnum/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp index 626cb9710..1a97a4eff 100644 --- a/src/Magnum/AbstractImage.cpp +++ b/src/Magnum/AbstractImage.cpp @@ -146,8 +146,8 @@ template std::size_t AbstractImage::dataSize(Math::Vecto return rowSize*size.product(); } -template std::size_t AbstractImage::dataSize<1>(Math::Vector<1, Int>) const; -template std::size_t AbstractImage::dataSize<2>(Math::Vector<2, Int>) const; -template std::size_t AbstractImage::dataSize<3>(Math::Vector<3, Int>) const; +template MAGNUM_EXPORT std::size_t AbstractImage::dataSize<1>(Math::Vector<1, Int>) const; +template MAGNUM_EXPORT std::size_t AbstractImage::dataSize<2>(Math::Vector<2, Int>) const; +template MAGNUM_EXPORT std::size_t AbstractImage::dataSize<3>(Math::Vector<3, Int>) const; } diff --git a/src/Magnum/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h index efa589594..0978a9759 100644 --- a/src/Magnum/SceneGraph/Drawable.h +++ b/src/Magnum/SceneGraph/Drawable.h @@ -280,6 +280,10 @@ typedef BasicDrawableGroup3D DrawableGroup3D; typedef DrawableGroup<3, Float> DrawableGroup3D; #endif +#ifdef CORRADE_TARGET_WINDOWS +extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<2, Float>; +extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<3, Float>; +#endif }} #endif From 6e2dcec59c52ac1c01c44d22cd158259b2a2efa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Jan 2014 15:23:27 +0100 Subject: [PATCH 69/79] Platform: better checks for magnum-info compilation. In particular GLX is not available on OS X. --- src/Magnum/Platform/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 03e14004c..f660f6a0a 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -177,15 +177,13 @@ endif() # Magnum Info if(WITH_MAGNUMINFO) - if(NOT UNIX AND NOT CORRADE_TARGET_NACL) - message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.") - endif() - add_executable(magnum-info magnum-info.cpp) - if(UNIX AND NOT CORRADE_TARGET_NACL) + if(UNIX AND NOT CORRADE_TARGET_NACL AND NOT APPLE) target_link_libraries(magnum-info MagnumWindowlessGlxApplication ${X11_LIBRARIES}) elseif(CORRADE_TARGET_NACL) target_link_libraries(magnum-info MagnumWindowlessNaClApplication ppapi_cpp ppapi) + else() + message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.") endif() target_link_libraries(magnum-info Magnum) From 4820476beb5555bb7a5e1f6ac0235f3fa49d16c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Jan 2014 20:05:48 +0100 Subject: [PATCH 70/79] Doc++ Also added new Doxygen alias for more specific GL function links. --- Doxyfile | 1 + src/Magnum/AbstractShaderProgram.h | 2 +- src/Magnum/AbstractTexture.h | 3 ++- src/Magnum/Buffer.h | 4 ++-- src/Magnum/DebugMessage.h | 7 ++++--- src/Magnum/Framebuffer.h | 21 +++++++++++---------- src/Magnum/Mesh.h | 5 +++++ src/Magnum/Query.h | 1 + src/Magnum/Texture.h | 2 +- 9 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Doxyfile b/Doxyfile index 7e9af6368..4654c9f5f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -209,6 +209,7 @@ ALIASES = \ "collisionoperator{2}=@relates \1\n@brief %Collision of %\1 and %\2\n@see \2::operator/(const \1&) const" \ "todoc=@xrefitem todoc \"Documentation todo\" \"Documentation-related todo list\"" \ "fn_gl{1}=gl\1()" \ + "fn_gl2{2}=gl\1()" \ "fn_gl_extension{3}=gl\1\2()" \ "fn_gl_extension2{3}=gl\1\2()" \ "fn_gles_extension{3}=gl\1\2()" \ diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 8b89c42ef..a991a01e9 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -589,7 +589,7 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { /** * @brief Attach shader * - * @fn_gl{AttachShader} + * @see @fn_gl{AttachShader} */ void attachShader(Shader& shader); diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index 251c99f87..224add195 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -95,6 +95,7 @@ nothing. @todo `GL_MAX_TEXTURE_LOD_BIAS` when `TEXTURE_LOD_BIAS` is implemented @todo `GL_NUM_COMPRESSED_TEXTURE_FORMATS` when compressed textures are implemented @todo `GL_MAX_SAMPLE_MASK_WORDS` when @extension{ARB,texture_multisample} is done +@todo Query for immutable levels (@extension{ARB,ES3_compatibility}) */ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { friend class Context; @@ -293,7 +294,7 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { * @param level Mip level * * If running on OpenGL ES or extension @extension{ARB,invalidate_subdata} - * is not available, this function does nothing. + * (part of OpenGL 4.3) is not available, this function does nothing. * @see @ref Texture::invalidateSubImage() "invalidateSubImage()", * @fn_gl{InvalidateTexImage} */ diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index e3e975ae7..b753658c3 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -741,7 +741,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @return Reference to self (for method chaining) * * If running on OpenGL ES or extension @extension{ARB,invalidate_subdata} - * is not available, this function does nothing. + * (part of OpenGL 4.3) is not available, this function does nothing. * @see @ref MapFlag::InvalidateBuffer, @fn_gl{InvalidateBufferData} */ Buffer& invalidateData() { @@ -756,7 +756,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @return Reference to self (for method chaining) * * If running on OpenGL ES or extension @extension{ARB,invalidate_subdata} - * is not available, this function does nothing. + * (part of OpenGL 4.3) is not available, this function does nothing. * @see @ref MapFlag::InvalidateRange, @fn_gl{InvalidateBufferData} */ Buffer& invalidateSubData(GLintptr offset, GLsizeiptr length) { diff --git a/src/Magnum/DebugMessage.h b/src/Magnum/DebugMessage.h index f87de89c7..9be705f51 100644 --- a/src/Magnum/DebugMessage.h +++ b/src/Magnum/DebugMessage.h @@ -281,7 +281,8 @@ class MAGNUM_EXPORT DebugMessage { * supported and @extension{KHR,debug} is not available, this function * does nothing. * @see @ref setDefaultCallback(), - * @ref Renderer::Feature::DebugOutputSynchronous + * @ref Renderer::Feature::DebugOutputSynchronous, + * @fn_gl{DebugMessageCallback} */ static void setCallback(Callback callback, const void* userParam = nullptr); @@ -296,8 +297,8 @@ class MAGNUM_EXPORT DebugMessage { * DebugMessage::Type::Marker, 1337, DebugMessage::Severity::Notification, "Hello from OpenGL command stream!"); * @endcode * - * 
%DebugMessage::Source::Application %DebugMessage::Type::Marker -1 %DebugMessage::Severity::Notification
-         *     Hello from OpenGL command stream!
+ * > %DebugMessage::Source::Application %DebugMessage::Type::Marker -1 %DebugMessage::Severity::Notification\n + * >     Hello from OpenGL command stream! */ static void setDefaultCallback(); diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h index fd8b9617b..a1ac6b7a7 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -276,10 +276,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje #endif #ifndef MAGNUM_TARGET_GLES - /** @todo Why exactly this is not needed? */ /** * Mismatched layered color attachments - * @requires_gl Not available in OpenGL ES. + * @requires_gl Geometry shaders are not available in OpenGL ES. */ IncompleteLayerTargets = GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS #endif @@ -494,8 +493,8 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * If @extension{EXT,direct_state_access} is not available and the * framebufferbuffer is not currently bound, it is bound before the * operation. - * @see @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} or - * @fn_gl_extension{NamedFramebufferTexture1D,EXT,direct_state_access} + * @see @fn_gl{BindFramebuffer}, @fn_gl2{FramebufferTexture1D,FramebufferTexture} + * or @fn_gl_extension{NamedFramebufferTexture1D,EXT,direct_state_access} * @requires_gl Only 2D and 3D textures are available in OpenGL ES. */ Framebuffer& attachTexture1D(BufferAttachment attachment, Texture1D& texture, Int level) { @@ -514,8 +513,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * If @extension{EXT,direct_state_access} is not available and the * framebufferbuffer is not currently bound, it is bound before the * operation. - * @see @ref attachCubeMapTexture(), @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} - * or @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} + * @see @ref attachCubeMapTexture(), @fn_gl{BindFramebuffer}, + * @fn_gl2{FramebufferTexture2D,FramebufferTexture} or + * @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} */ Framebuffer& attachTexture2D(BufferAttachment attachment, Texture2D& texture, Int level); @@ -530,8 +530,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * If @extension{EXT,direct_state_access} is not available and the * framebufferbuffer is not currently bound, it is bound before the * operation. - * @see @ref attachTexture2D(), @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} - * or @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} + * @see @ref attachTexture2D(), @fn_gl{BindFramebuffer}, + * @fn_gl2{FramebufferTexture2D,FramebufferTexture} or + * @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} */ Framebuffer& attachCubeMapTexture(BufferAttachment attachment, CubeMapTexture& texture, CubeMapTexture::Coordinate coordinate, Int level) { (this->*texture2DImplementation)(attachment, GLenum(coordinate), texture.id(), level); @@ -549,8 +550,8 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * If @extension{EXT,direct_state_access} is not available and the * framebufferbuffer is not currently bound, it is bound before the * operation. - * @see @fn_gl{BindFramebuffer}, @fn_gl{FramebufferTexture} or - * @fn_gl_extension{NamedFramebufferTexture3D,EXT,direct_state_access} + * @see @fn_gl{BindFramebuffer}, @fn_gl2{FramebufferTexture3D,FramebufferTexture} + * or @fn_gl_extension{NamedFramebufferTexture3D,EXT,direct_state_access} * @requires_es_extension %Extension @es_extension{OES,texture_3D} */ Framebuffer& attachTexture3D(BufferAttachment attachment, Texture3D& texture, Int level, Int layer) { diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index cde708263..374553682 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -63,12 +63,14 @@ enum class MeshPrimitive: GLenum { /** * Line strip with adjacency information. * @requires_gl32 %Extension @extension{ARB,geometry_shader4} + * @requires_gl Geometry shaders are not available in OpenGL ES. */ LineStripAdjacency = GL_LINE_STRIP_ADJACENCY, /** * Lines with adjacency information. * @requires_gl32 %Extension @extension{ARB,geometry_shader4} + * @requires_gl Geometry shaders are not available in OpenGL ES. */ LinesAdjacency = GL_LINES_ADJACENCY, #endif @@ -92,18 +94,21 @@ enum class MeshPrimitive: GLenum { /** * Triangle strip with adjacency information. * @requires_gl32 %Extension @extension{ARB,geometry_shader4} + * @requires_gl Geometry shaders are not available in OpenGL ES. */ TriangleStripAdjacency = GL_TRIANGLE_STRIP_ADJACENCY, /** * Triangles with adjacency information. * @requires_gl32 %Extension @extension{ARB,geometry_shader4} + * @requires_gl Geometry shaders are not available in OpenGL ES. */ TrianglesAdjacency = GL_TRIANGLES_ADJACENCY, /** * Patches. * @requires_gl40 %Extension @extension{ARB,tessellation_shader} + * @requires_gl Tessellation shaders are not available in OpenGL ES. */ Patches = GL_PATCHES #endif diff --git a/src/Magnum/Query.h b/src/Magnum/Query.h index 3f0000610..5f5ac4d2b 100644 --- a/src/Magnum/Query.h +++ b/src/Magnum/Query.h @@ -41,6 +41,7 @@ namespace Magnum { See @ref PrimitiveQuery, @ref SampleQuery and @ref TimeQuery documentation for more information. @todo Support for AMD's query buffer (@extension{AMD,query_buffer_object}) +@todo `QUERY_COUNTER_BITS` (not sure since when this is supported) */ class MAGNUM_EXPORT AbstractQuery: public AbstractObject { public: diff --git a/src/Magnum/Texture.h b/src/Magnum/Texture.h index e5d70e745..dc4794b72 100644 --- a/src/Magnum/Texture.h +++ b/src/Magnum/Texture.h @@ -426,7 +426,7 @@ template class Texture: public AbstractTexture { * @param size Size of invalidated data * * If running on OpenGL ES or extension @extension{ARB,invalidate_subdata} - * is not available, this function does nothing. + * (part of OpenGL 4.3) is not available, this function does nothing. * @see @ref invalidateImage(), @fn_gl{InvalidateTexSubImage} */ void invalidateSubImage(Int level, const typename DimensionTraits::VectorType& offset, const typename DimensionTraits::VectorType& size) { From d563d0906f63dc275ab32d34c3c990aaaffce6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Jan 2014 20:06:40 +0100 Subject: [PATCH 71/79] Buffer::mapAlignment() requires ARB_map_buffer_alignment. Return 0 if the extension is not supported. --- src/Magnum/Buffer.cpp | 3 +++ src/Magnum/Buffer.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Buffer.cpp b/src/Magnum/Buffer.cpp index 80447462b..7f5369a65 100644 --- a/src/Magnum/Buffer.cpp +++ b/src/Magnum/Buffer.cpp @@ -80,6 +80,9 @@ void Buffer::initializeContextBasedFunctionality(Context& context) { #ifndef MAGNUM_TARGET_GLES Int Buffer::minMapAlignment() { + if(!Context::current()->isExtensionSupported()) + return 0; + GLint& value = Context::current()->state().buffer->minMapAlignment; if(value == 0) diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index b753658c3..4489b2730 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -422,7 +422,8 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @brief Minimal supported mapping alignment * * The result is cached, repeated queries don't result in repeated - * OpenGL calls. + * OpenGL calls. If extension @extension{ARB,map_buffer_alignment} is + * not available, returns `0`. * @see @ref map(), @fn_gl{Get} with @def_gl{MIN_MAP_BUFFER_ALIGNMENT} * @requires_gl No minimal value is specified for OpenGL ES. */ From 09cc03888b8b63da4c67f246c12d50648aa22565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Jan 2014 20:08:10 +0100 Subject: [PATCH 72/79] Skip mipmap generation test cases if required extension is not available. --- src/Magnum/Test/TextureGLTest.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp index 0ee243dc3..b4e4527e8 100644 --- a/src/Magnum/Test/TextureGLTest.cpp +++ b/src/Magnum/Test/TextureGLTest.cpp @@ -1625,6 +1625,9 @@ void TextureGLTest::subImageRectangleBuffer() { #ifndef MAGNUM_TARGET_GLES void TextureGLTest::generateMipmap1D() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not supported.")); + Texture1D texture; texture.setImage(0, TextureFormat::RGBA8, ImageReference1D(ColorFormat::RGBA, ColorType::UnsignedByte, 32)); @@ -1648,6 +1651,11 @@ void TextureGLTest::generateMipmap1D() { #endif void TextureGLTest::generateMipmap2D() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not supported.")); + #endif + Texture2D texture; texture.setImage(0, TextureFormat::RGBA8, ImageReference2D(ColorFormat::RGBA, ColorType::UnsignedByte, Vector2i(32))); @@ -1676,7 +1684,10 @@ void TextureGLTest::generateMipmap2D() { } void TextureGLTest::generateMipmap3D() { - #ifdef MAGNUM_TARGET_GLES2 + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not supported.")); + #elif defined(MAGNUM_TARGET_GLES2) if(!Context::current()->isExtensionSupported()) CORRADE_SKIP(Extensions::GL::OES::texture_3D::string() + std::string(" is not supported.")); #endif @@ -1710,6 +1721,8 @@ void TextureGLTest::generateMipmap3D() { #ifndef MAGNUM_TARGET_GLES void TextureGLTest::generateMipmap1DArray() { + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not supported.")); if(!Context::current()->isExtensionSupported()) CORRADE_SKIP(Extensions::GL::EXT::texture_array::string() + std::string(" is not supported.")); @@ -1738,6 +1751,8 @@ void TextureGLTest::generateMipmap1DArray() { #ifndef MAGNUM_TARGET_GLES2 void TextureGLTest::generateMipmap2DArray() { #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not supported.")); if(!Context::current()->isExtensionSupported()) CORRADE_SKIP(Extensions::GL::EXT::texture_array::string() + std::string(" is not supported.")); #endif From 1dd8b51e699373763aee6027965c9a522c6359c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Jan 2014 20:09:11 +0100 Subject: [PATCH 73/79] doc: added OpenGL support status and OpenGL command mapping. --- Doxyfile | 2 +- doc/coding-style.dox | 2 +- doc/opengl-mapping.dox | 275 ++++++++++++++++ doc/opengl-support.dox | 337 ++++++++++++++++++++ doc/{required-extensions.dox => opengl.dox} | 37 ++- doc/portability.dox | 2 +- doc/unsupported.dox | 62 ---- 7 files changed, 638 insertions(+), 79 deletions(-) create mode 100644 doc/opengl-mapping.dox create mode 100644 doc/opengl-support.dox rename doc/{required-extensions.dox => opengl.dox} (71%) delete mode 100644 doc/unsupported.dox diff --git a/Doxyfile b/Doxyfile index 4654c9f5f..c57a9fdc0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -214,7 +214,7 @@ ALIASES = \ "fn_gl_extension2{3}=gl\1\2()" \ "fn_gles_extension{3}=gl\1\2()" \ "def_gl{1}=`GL_\1`" \ - "deprecated_gl=@xrefitem deprecated-gl \"Deprecated OpenGL API\" \"Deprecated OpenGL API list\"" \ + "deprecated_gl=@xrefitem opengl-deprecated \"Deprecated OpenGL API\" \"Deprecated OpenGL API list\"" \ "requires_gl30=@xrefitem requires-gl30 \"Requires OpenGL 3.0\" \"Functionality requiring OpenGL 3.0\"" \ "requires_gl31=@xrefitem requires-gl31 \"Requires OpenGL 3.1\" \"Functionality requiring OpenGL 3.1\"" \ "requires_gl32=@xrefitem requires-gl32 \"Requires OpenGL 3.2\" \"Functionality requiring OpenGL 3.2\"" \ diff --git a/doc/coding-style.dox b/doc/coding-style.dox index b20bab75d..ceffb19b1 100644 --- a/doc/coding-style.dox +++ b/doc/coding-style.dox @@ -187,7 +187,7 @@ and OpenGL ES version/extension, first come desktop requirements, then ES requirements. All classes and functions using those commands are cross-referenced in page -@ref required-extensions. +@ref opengl-required-extensions. @section unit-tests Unit tests diff --git a/doc/opengl-mapping.dox b/doc/opengl-mapping.dox new file mode 100644 index 000000000..0b6c9183f --- /dev/null +++ b/doc/opengl-mapping.dox @@ -0,0 +1,275 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +namespace Magnum { + +/** @page opengl-mapping OpenGL command mapping +@brief List of OpenGL commands corresponding to particular %Magnum API. + +@tableofcontents + +@section opengl-mapping-functions Functions + +Features mentioned in @ref opengl-unsupported are marked as *not supported*, +empty value means that the feature is not implemented yet. + +OpenGL function | Matching API +-------------------------------------- | ------------ +@fn_gl{ActiveShaderProgram} | | +@fn_gl{ActiveTexture} | @ref AbstractTexture::bind() +@fn_gl{AttachShader} | @ref AbstractShaderProgram::attachShader() +@fn_gl{BeginConditionalRender}, `glEndConditionalRender()` | @ref SampleQuery::beginConditionalRender(), \n @ref SampleQuery::endConditionalRender() +@fn_gl{BeginQuery}, `glEndQuery()` | @ref PrimitiveQuery::begin(), \n @ref SampleQuery::begin(), \n @ref TimeQuery::begin(), \n @ref AbstractQuery::end() +@fn_gl{BeginQueryIndexed}, `glEndQueryIndexed()` | | +@fn_gl{BeginTransformFeedback}, `glEndTransformFeedback()` | | +@fn_gl{BindAttribLocation} | @ref AbstractShaderProgram::bindAttributeLocation() +@fn_gl{BindBuffer} | not needed, handhled internally in @ref Buffer and elsewhere +@fn_gl{BindBufferBase} | | +@fn_gl{BindBufferRange} | | +@fn_gl{BindBuffersBase} | | +@fn_gl{BindBuffersRange} | | +@fn_gl{BindFragDataLocation} | @ref AbstractShaderProgram::bindFragmentDataLocation() +@fn_gl{BindFragDataLocationIndexed} | @ref AbstractShaderProgram::bindFragmentDataLocationIndexed() +@fn_gl{BindFramebuffer} | @ref Framebuffer::bind() +@fn_gl{BindImageTexture} | | +@fn_gl{BindImageTextures} | | +@fn_gl{BindProgramPipeline} | | +@fn_gl{BindRenderbuffer} | not needed, handhled internally in @ref Renderbuffer +@fn_gl{BindSampler} | | +@fn_gl{BindSamplers} | | +@fn_gl{BindTexture}, \n @fn_gl_extension{BindMultiTexture,EXT,direct_state_access} | @ref AbstractTexture::bind() +@fn_gl{BindTextures} | | +@fn_gl{BindTransformFeedback} | | +@fn_gl{BindVertexArray} | not needed, handhled internally in @ref Mesh +@fn_gl{BindVertexBuffer} | | +@fn_gl{BindVertexBuffers} | | +@fn_gl{BlendColor} | @ref Renderer::setBlendColor() +@fn_gl{BlendEquation}, \n @fn_gl{BlendEquationSeparate} | @ref Renderer::setBlendEquation() +@fn_gl{BlendFunc}, \n @fn_gl{BlendFuncSeparate} | @ref Renderer::setBlendFunction() +@fn_gl{BlitFramebuffer} | @ref AbstractFramebuffer::blit() +@fn_gl{BufferData}, \n @fn_gl_extension{NamedBufferData,EXT,direct_state_access} | @ref Buffer::setData() +@fn_gl{BufferStorage} | | +@fn_gl{BufferSubData}, \n @fn_gl_extension{NamedBufferSubData,EXT,direct_state_access} | @ref Buffer::setSubData() +@fn_gl{CheckFramebufferStatus}, \n @fn_gl_extension{CheckNamedFramebufferStatus,EXT,direct_state_access} | @ref DefaultFramebuffer::checkStatus(), \n @ref Framebuffer::checkStatus() +@fn_gl{ClampColor} | | +@fn_gl{Clear} | @ref AbstractFramebuffer::clear() +@fn_gl{ClearBuffer} | | +@fn_gl{ClearBufferData} | | +@fn_gl{ClearBufferSubData} | | +@fn_gl{ClearColor} | @ref Renderer::setClearColor() +@fn_gl{ClearDepth} | @ref Renderer::setClearDepth() +@fn_gl{ClearStencil} | @ref Renderer::setClearStencil() +@fn_gl{ClearTexImage} | | +@fn_gl{ClearTexSubImage} | | +@fn_gl{ClientWaitSync} | | +@fn_gl{ColorMask} | @ref Renderer::setColorMask() +@fn_gl{CompileShader} | @ref Shader::compile() +@fn_gl{CompressedTexImage1D}, \n @fn_gl{CompressedTexImage2D}, \n @fn_gl{CompressedTexImage3D} | | +@fn_gl{CompressedTexSubImage1D}, \n @fn_gl{CompressedTexSubImage2D}, \n @fn_gl{CompressedTexSubImage3D} | | +@fn_gl{CopyBufferSubData}, \n @fn_gl_extension{NamedCopyBufferSubData,EXT,direct_state_access} | @ref Buffer::copy() +@fn_gl{CopyImageSubData} | | +@fn_gl{CopyTexImage1D}, \n @fn_gl{CopyTexImage2D} | | +@fn_gl{CopyTexSubImage1D}, \n @fn_gl{CopyTexSubImage2D}, \n @fn_gl{CopyTexSubImage3D} | | +@fn_gl{CreateProgram}, @fn_gl{DeleteProgram} | @ref AbstractShaderProgram constructor and destructor +@fn_gl{CreateShader}, @fn_gl{DeleteShader} | @ref Shader constructor and destructor +@fn_gl{CreateShaderProgram} | | +@fn_gl{CullFace} | @ref Renderer::setFaceCullingMode() +@fn_gl{DebugMessageCallback} | @ref DebugMessage::setCallback() +@fn_gl{DebugMessageControl} | | +@fn_gl{DebugMessageInsert}, \n @fn_gl_extension2{InsertEventMarker,EXT,debug_marker}, \n @fn_gl_extension{StringMarker,GREMEDY,string_marker} | @ref DebugMessage::insert() +@fn_gl{DepthFunc} | @ref Renderer::setDepthFunction() +@fn_gl{DepthMask} | @ref Renderer::setDepthMask() +@fn_gl{DepthRange} | | +@fn_gl{DepthRangeArray} | | +@fn_gl{DepthRangeIndexed} | | +@fn_gl{DetachShader} | | +@fn_gl{DispatchCompute} | | +@fn_gl{DispatchComputeIndirect} | | +@fn_gl{DrawArrays}, \n @fn_gl{DrawElements}, \n @fn_gl{DrawRangeElements} | @ref Mesh::draw() +@fn_gl{DrawArraysIndirect}, \n @fn_gl{DrawArraysInstanced}, \n @fn_gl{DrawArraysInstancedBaseInstance}, \n @fn_gl{DrawElementsBaseVertex}, \n @fn_gl{DrawElementsIndirect}, \n @fn_gl{DrawElementsInstanced}, \n @fn_gl{DrawElementsInstancedBaseInstance}, \n @fn_gl{DrawElementsInstancedBaseVertex}, \n @fn_gl{DrawElementsInstancedBaseVertexBaseInstance}, \n @fn_gl{DrawRangeElementsBaseVertex} | | +@fn_gl{DrawBuffer}, \n @fn_gl_extension{FramebufferDrawBuffers,EXT,direct_state_access}, \n @fn_gl{DrawBuffers}, \n @fn_gl_extension{FramebufferDrawBuffers,EXT,direct_state_access} | @ref DefaultFramebuffer::mapForDraw(), \n @ref Framebuffer::mapForDraw() +@fn_gl{DrawTransformFeedback}, \n @fn_gl{DrawTransformFeedbackInstanced}, \n @fn_gl{DrawTransformFeedbackStream}, \n @fn_gl{DrawTransformFeedbackStreamInstanced} | | +@fn_gl{Enable}, `glDisable()` | @ref Renderer::setFeature() +@fn_gl{EnableVertexAttribArray}, \n @fn_gl_extension{EnableVertexArrayAttrib,EXT,direct_state_access} \n @fn_gl2{DisableVertexAttribArray,EnableVertexAttribArray}, \n @fn_gl_extension{DisableVertexArrayAttrib,EXT,direct_state_access} | @ref Mesh::addVertexBuffer() +@fn_gl{FenceSync}, @fn_gl{DeleteSync} | | +@fn_gl{Finish} | @ref Renderer::finish() +@fn_gl{Flush} | @ref Renderer::flush() +@fn_gl{FlushMappedBufferRange}, \n @fn_gl_extension{FlushMappedNamedBufferRange,EXT,direct_state_access} | @ref Buffer::flushMappedRange() +@fn_gl2{FramebufferParameter,FramebufferParameteri} | | +@fn_gl{FramebufferRenderbuffer}, \n @fn_gl_extension{NamedFramebufferRenderbuffer,EXT,direct_state_access} | @ref Framebuffer::attachRenderbuffer() +@fn_gl{FramebufferTexture} | | +@fn_gl2{FramebufferTexture1D,FramebufferTexture}, \n @fn_gl_extension{NamedFramebufferTexture1D,EXT,direct_state_access} | @ref Framebuffer::attachTexture1D() +@fn_gl2{FramebufferTexture2D,FramebufferTexture}, \n @fn_gl_extension{NamedFramebufferTexture2D,EXT,direct_state_access} | @ref Framebuffer::attachTexture2D() +@fn_gl2{FramebufferTexture3D,FramebufferTexture}, \n @fn_gl_extension{NamedFramebufferTexture3D,EXT,direct_state_access} | @ref Framebuffer::attachTexture3D() +@fn_gl{FramebufferTextureLayer} | | +@fn_gl{FrontFace} | @ref Renderer::setFrontFace() +@fn_gl{GenBuffers}, @fn_gl{DeleteBuffers} | @ref Buffer constructor and destructor +@fn_gl{GenFramebuffers}, @fn_gl{DeleteFramebuffers} | @ref Framebuffer constructor and destructor +@fn_gl{GenProgramPipelines}, @fn_gl{DeleteProgramPipelines} | | +@fn_gl{GenQueries}, @fn_gl{DeleteQueries} | @ref AbstractQuery constructor and destructor +@fn_gl{GenRenderbuffers}, @fn_gl{DeleteRenderbuffers} | @ref Renderbuffer constructor and destructor +@fn_gl{GenSamplers}, @fn_gl{DeleteSamplers} | | +@fn_gl{GenTextures}, @fn_gl{DeleteTextures} | @ref AbstractTexture constructor and destructor +@fn_gl{GenTransformFeedbacks}, @fn_gl{DeleteTransformFeedbacks} | | +@fn_gl{GenVertexArrays}, @fn_gl{DeleteVertexArrays} | @ref Mesh constructor and destructor +@fn_gl{GenerateMipmap}, \n @fn_gl_extension{GenerateTextureMipmap,EXT,direct_state_access} | @ref AbstractTexture::generateMipmap() +@fn_gl{Get} | see table below +@fn_gl2{GetActiveAtomicCounterBuffer,GetActiveAtomicCounterBufferiv} | not supported +@fn_gl{GetActiveAttrib} | not supported +@fn_gl{GetActiveSubroutineName} | not supported +@fn_gl{GetActiveSubroutineUniform} | not supported +@fn_gl{GetActiveSubroutineUniformName} | not supported +@fn_gl{GetActiveUniform} | not supported +@fn_gl{GetActiveUniformBlock} | not supported +@fn_gl{GetActiveUniformBlockName} | not supported +@fn_gl{GetActiveUniformName} | not supported +@fn_gl{GetActiveUniforms} | not supported +@fn_gl{GetAttachedShaders} | not supported +@fn_gl{GetAttribLocation} | not supported +@fn_gl{GetBufferParameter}, \n @fn_gl_extension{GetNamedBufferParameter,EXT,direct_state_access} | @ref Buffer::size() +@fn_gl2{GetBufferPointer,GetBufferPointerv} | not supported +@fn_gl{GetBufferSubData}, \n @fn_gl_extension{GetNamedBufferSubData,EXT,direct_state_access} | @ref Buffer::data(), \n @ref Buffer::subData() +@fn_gl{GetCompressedTexImage} | | +@fn_gl{GetDebugMessageLog} | | +@fn_gl{GetError} | @ref Renderer::error() +@fn_gl{GetFragDataIndex}, @fn_gl{GetFragDataLocation} | not supported +@fn_gl{GetFramebufferAttachmentParameter} | not suppported +@fn_gl{GetFramebufferParameter} | not supported +@fn_gl_extension{GetGraphicsResetStatus,ARB,robustness} | @ref Renderer::graphicsResetStatus() +@fn_gl{GetInternalformat} | | +@fn_gl{GetMultisample} | | +@fn_gl{GetObjectLabel}, \n @fn_gl{GetObjectPtrLabel} | not supported +@fn_gl{GetProgram}, \n @fn_gl{GetProgramInfoLog} | @ref AbstractShaderProgram::link(), \n @ref AbstractShaderProgram::validate() +@fn_gl{GetProgramBinary} | | +@fn_gl{GetProgramInterface} | | +@fn_gl{GetProgramPipeline} | | +@fn_gl{GetProgramPipelineInfoLog} | | +@fn_gl{GetProgramResource} | | +@fn_gl{GetProgramResourceIndex} | | +@fn_gl{GetProgramResourceLocation} | | +@fn_gl{GetProgramResourceLocationIndex}| | +@fn_gl{GetProgramResourceName} | | +@fn_gl{GetProgramStage} | | +@fn_gl{GetQueryIndexed} | | +@fn_gl{GetQueryObject} | @ref AbstractQuery::result() +@fn_gl2{GetQuery,GetQueryiv} | | +@fn_gl{GetRenderbufferParameter} | not supported +@fn_gl{GetSamplerParameter} | | +@fn_gl{GetShader}, \n @fn_gl{GetShaderInfoLog} | @ref Shader::compile() +@fn_gl{GetShaderPrecisionFormat} | | +@fn_gl{GetShaderSource} | not supported +@fn_gl{GetSubroutineIndex} | | +@fn_gl{GetSubroutineUniformLocation} | | +@fn_gl{GetSync} | | +@fn_gl{GetTexImage}, \n @fn_gl_extension{GetTextureImage,EXT,direct_state_access}, \n @fn_gl_extension{GetnTexImage,ARB,robustness} | @ref Texture::image(), \n @ref CubeMapTexture::image(), \n @ref CubeMapTextureArray::image() +@fn_gl{GetTexLevelParameter}, \n @fn_gl_extension{GetTextureLevelParameter,EXT,direct_state_access} | @ref Texture::imageSize(), \n @ref CubeMapTexture::imageSize(), \n @ref CubeMapTextureArray::imageSize() +@fn_gl{GetTexParameter} | | +@fn_gl{GetTransformFeedbackVarying} | | +@fn_gl{GetUniform} | not supported +@fn_gl{GetUniformBlockIndex} | | +@fn_gl{GetUniformIndices} | | +@fn_gl{GetUniformLocation} | @ref AbstractShaderProgram::uniformLocation() +@fn_gl{GetUniformSubroutine} | | +@fn_gl{GetVertexAttrib} | not supported +@fn_gl{InvalidateBufferData} | @ref Buffer::invalidateData() +@fn_gl{InvalidateBufferSubData} | @ref Buffer::invalidateSubData() +@fn_gl{InvalidateFramebuffer}, \n @fn_gles_extension{DiscardFramebuffer,EXT,discard_framebuffer} | @ref DefaultFramebuffer::invalidate(), \n @ref Framebuffer::invalidate() +@fn_gl{InvalidateSubFramebuffer}, \n @fn_gles_extension{DiscardSubFramebuffer,EXT,discard_framebuffer} | @ref DefaultFramebuffer::invalidate(), \n @ref Framebuffer::invalidate() +@fn_gl{InvalidateTexImage} | @ref AbstractTexture::invalidateImage() +@fn_gl{InvalidateTexSubImage} | @ref Texture::invalidateSubImage(),\n @ref CubeMapTexture::invalidateSubImage(), \n @ref CubeMapTextureArray::invalidateSubImage() +`glIs*()` | not needed (objects are strongly typed) +@fn_gl{IsEnabled} | not supported +@fn_gl{LineWidth} | @ref Renderer::setLineWidth() +@fn_gl{LinkProgram} | @ref AbstractShaderProgram::link() +@fn_gl{LogicOp} | @ref Renderer::setLogicOperation() +@fn_gl{MapBuffer}, `glUnmapBuffer()`, \n @fn_gl_extension{MapNamedBuffer,EXT,direct_state_access}, @fn_gl_extension{UnmapNamedBuffer,EXT,direct_state_access}, \n @fn_gl{MapBufferRange}, \n @fn_gl_extension{MapNamedBufferRange,EXT,direct_state_access} | @ref Buffer::map(), @ref Buffer::unmap() +@fn_gl_extension{MapBufferSubData,CHROMIUM,map_sub}, @fn_gl_extension{UnmapBufferSubData,CHROMIUM,map_sub} | @ref Buffer::mapSub(), @ref Buffer::unmapSub() +@fn_gl{MemoryBarrier} | | +@fn_gl{MinSampleShading} | | +@fn_gl{MultiDrawArrays}, \n @fn_gl{MultiDrawArraysIndirect}, \n @fn_gl{MultiDrawElements}, \n @fn_gl{MultiDrawElementsBaseVertex}, \n @fn_gl{MultiDrawElementsIndirect} | | +@fn_gl{ObjectLabel}, \n @fn_gl{ObjectPtrLabel}, \n @fn_gl_extension2{LabelObject,EXT,debug_label} | @ref AbstractShaderProgram::setLabel(), \n @ref AbstractQuery::setLabel(), \n @ref AbstractTexture::setLabel(), \n @ref Buffer::setLabel(), \n @ref Framebuffer::setLabel(), \n @ref Mesh::setLabel(), \n @ref Renderbuffer::setLabel(), \n @ref Shader::setLabel() +@fn_gl{PatchParameter} | | +@fn_gl{PauseTransformFeedback}, @fn_gl{ResumeTransformFeedback} | | +@fn_gl{PixelStore} | | +@fn_gl{PointParameter} | | +@fn_gl{PointSize} | @ref Renderer::setPointSize() +@fn_gl{PolygonMode} | @ref Renderer::setPolygonMode() +@fn_gl{PolygonOffset} | @ref Renderer::setPolygonOffset() +@fn_gl{PrimitiveRestartIndex} | | +@fn_gl{ProgramBinary} | | +@fn_gl{ProgramParameter} | @ref AbstractShaderProgram::setRetrievableBinary(), \n @ref AbstractShaderProgram::setSeparable() +@fn_gl{ProvokingVertex} | @ref Renderer::setProvokingVertex() +@fn_gl{PushDebugGroup}, @fn_gl{PopDebugGroup} | | +@fn_gl{QueryCounter} | @ref TimeQuery::timestamp() +@fn_gl{ReadBuffer}, \n @fn_gl_extension{FramebufferReadBuffer,EXT,direct_state_access} | @ref DefaultFramebuffer::mapForRead(), \n @ref Framebuffer::mapForRead() +@fn_gl{ReadPixels}, \n @fn_gl_extension{ReadnPixels,ARB,robustness} | @ref DefaultFramebuffer::read(), \n @ref Framebuffer::read() +@fn_gl{ReleaseShaderCompiler} | | +@fn_gl{RenderbufferStorage}, \n @fn_gl_extension{NamedRenderbufferStorage,EXT,direct_state_access} | @ref Renderbuffer::setStorage() +@fn_gl{RenderbufferStorageMultisample}, \n @fn_gl_extension{NamedRenderbufferStorageMultisample,EXT,direct_state_access} | @ref Renderbuffer::setStorageMultisample() +@fn_gl{SampleCoverage} | | +@fn_gl{SampleMaski} | | +@fn_gl{SamplerParameter} | | +@fn_gl{Scissor} | @ref Renderer::setScissor() +@fn_gl{ScissorArray} | | +@fn_gl{ScissorIndexed} | | +@fn_gl{ShaderBinary} | | +@fn_gl{ShaderSource} | @ref Shader::addFile(), \n @ref Shader::addSource() +@fn_gl{ShaderStorageBlockBinding} | | +@fn_gl{StencilFunc}, \n @fn_gl{StencilFuncSeparate} | @ref Renderer::setStencilFunction() +@fn_gl{StencilMask}, \n @fn_gl{StencilMaskSeparate} | @ref Renderer::setStencilMask() +@fn_gl{StencilOp}, \n @fn_gl{StencilOpSeparate} | @ref Renderer::setStencilOperation() +@fn_gl{TexBuffer}, \n @fn_gl_extension{TextureBuffer,EXT,direct_state_access}, \n @fn_gl{TexBufferRange}, \n @fn_gl_extension{TextureBufferRange,EXT,direct_state_access} | @ref BufferTexture::setBuffer() +@fn_gl{TexImage1D}, \n @fn_gl_extension{TextureImage1D,EXT,direct_state_access} \n @fn_gl{TexImage2D}, \n @fn_gl_extension{TextureImage2D,EXT,direct_state_access}, \n @fn_gl{TexImage3D}, \n @fn_gl_extension{TextureImage3D,EXT,direct_state_access} | @ref Texture::setImage(), \n @ref CubeMapTexture::setImage(), \n @ref CubeMapTextureArray::setImage() +@fn_gl{TexImage2DMultisample}, \n @fn_gl{TexImage3DMultisample} | | +@fn_gl{TexParameter}, \n @fn_gl_extension{TextureParameter,EXT,direct_state_access} | @ref AbstractTexture::setMinificationFilter(), \n @ref AbstractTexture::setMagnificationFilter(), \n @ref AbstractTexture::setBorderColor(), \n @ref AbstractTexture::setMaxAnisotropy(), \n @ref Texture::setWrapping(), \n @ref CubeMapTexture::setWrapping(), \n @ref CubeMapTextureArray::setWrapping() +@fn_gl{TexStorage1D}, \n @fn_gl_extension{TextureStorage1D,EXT,direct_state_access}, \n @fn_gl{TexStorage2D}, \n @fn_gl_extension{TextureStorage2D,EXT,direct_state_access}, \n @fn_gl{TexStorage3D}, \n @fn_gl_extension{TextureStorage3D,EXT,direct_state_access} | @ref Texture::setStorage(), \n @ref CubeMapTexture::setStorage(), \n @ref CubeMapTextureArray::setStorage() +@fn_gl{TexStorage2DMultisample}, \n @fn_gl{TexStorage3DMultisample} | | +@fn_gl{TexSubImage1D}, \n @fn_gl_extension{TextureSubImage1D,EXT,direct_state_access}, \n @fn_gl{TexSubImage2D}, \n @fn_gl_extension{TextureSubImage2D,EXT,direct_state_access}, \n @fn_gl{TexSubImage3D}, \n @fn_gl_extension{TextureSubImage3D,EXT,direct_state_access} | @ref Texture::setSubImage(), \n @ref CubeMapTexture::setSubImage(), \n @ref CubeMapTextureArray::setSubImage() +@fn_gl{TextureView} | | +@fn_gl{TransformFeedbackVaryings} | | +@fn_gl{Uniform}, \n @fn_gl{ProgramUniform}, \n @fn_gl_extension{ProgramUniform,EXT,direct_state_access} | @ref AbstractShaderProgram::setUniform() +@fn_gl{UniformBlockBinding} | | +@fn_gl{UniformSubroutines} | | +@fn_gl{UseProgram} | @ref AbstractShaderProgram::use() +@fn_gl{UseProgramStages} | | +@fn_gl{ValidateProgram} | @ref AbstractShaderProgram::validate() +@fn_gl{ValidateProgramPipeline} | | +`glVertexAttrib*()` | not supported +@fn_gl{VertexAttribBinding} | | +@fn_gl{VertexAttribDivisor} | | +@fn_gl{VertexAttribFormat} | | +@fn_gl{VertexAttribPointer}, \n @fn_gl_extension{VertexArrayVertexAttribOffset,EXT,direct_state_access} | @ref Mesh::addVertexBuffer() +@fn_gl{VertexBindingDivisor} | | +@fn_gl{Viewport} | @ref DefaultFramebuffer::setViewport(), \n @ref Framebuffer::setViewport() +@fn_gl{ViewportArray} | | +@fn_gl{ViewportIndexed} | | +@fn_gl{WaitSync} | | + +@section opengl-mapping-limits Limit queries + +@todoc Do this also. + +*/ + +} diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox new file mode 100644 index 000000000..6bee4c53e --- /dev/null +++ b/doc/opengl-support.dox @@ -0,0 +1,337 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +/** @page opengl-support OpenGL support state +@brief List of (un)supported OpenGL features and extensions. + +@tableofcontents + +@section opengl-support-state OpenGL implementation state + +The extension implementation is considered complete if all its defined types, +functions and enum values are exposed through the API, except for features +listed below in @ref opengl-unsupported-features. + +@subsection opengl-support-21 OpenGL 2.1 + +The core subset of OpenGL 2.1 should be fully implemented, except for the +following: + +- Pixel store state (@fn_gl{PixelStore} function) +- Compressed texture upload +- Proxy textures +- Copying framebuffer to texture (@fn_gl{CopyTexImage2D} etc.) +- Some forgotten limit queries + +@subsection opengl-support-30 OpenGL 3.0 + +@todo @extension{APPLE,flush_buffer_range} doesn't add anything to @extension{ARB,map_buffer_range} +@todo @extension{EXT,texture_array} overlaps with @extension{ARB,framebuffer_object} + +%Extension | Status +-------------------------------------------- | ------ +@extension{APPLE,flush_buffer_range} | done (GL 3.0 subset) +@extension{APPLE,vertex_array_object} | done (GL 3.0 subset) +@extension{ARB,map_buffer_range} | done +@extension{ARB,color_buffer_float} | | +@extension{ARB,half_float_pixel} | done +@extension{ARB,texture_float} | done +@extension{ARB,depth_buffer_float} | done +@extension{ARB,texture_rg} | done +@extension{ARB,framebuffer_object} | missing texture layer attachments +@extension{EXT,gpu_shader4} | done +@extension{EXT,packed_float} | done +@extension{EXT,texture_array} | missing texture layer attachments +@extension{EXT,texture_compression_rgtc} | done +@extension{EXT,texture_shared_exponent} | done +@extension{EXT,framebuffer_sRGB} | | +@extension{EXT,draw_buffers2} | | +@extension{EXT,texture_integer} | missing integer color specification functions +@extension{EXT,transform_feedback} | | +@extension{NV,half_float} | done (GL 3.0 subset) +@extension{NV,depth_buffer_float} | | +@extension{NV,conditional_render} | done + +@subsection opengl-support-31 OpenGL 3.1 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,texture_rectangle} | missing limit query +@extension{ARB,draw_instanced} | | +@extension{ARB,texture_buffer_object} | missing limit query +@extension{ARB,uniform_buffer_object} | | +@extension{ARB,copy_buffer} | done +@extension{EXT,texture_snorm} | done +@extension{NV,primitive_restart} | | + +@subsection opengl-support-32 OpenGL 3.2 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,geometry_shader4} | done (GL 3.2 subset) +@extension{ARB,depth_clamp} | done +@extension{ARB,draw_elements_base_vertex} | | +@extension{ARB,fragment_coord_conventions} | done (shading language only) +@extension{ARB,provoking_vertex} | done +@extension{ARB,seamless_cube_map} | done +@extension{ARB,sync} | | +@extension{ARB,texture_multisample} | | +@extension{ARB,vertex_array_bgra} | done + +@subsection opengl-support-33 OpenGL 3.3 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,instanced_arrays} | | +@extension{ARB,blend_func_extended} | missing limit query +@extension{ARB,explicit_attrib_location} | done (shading language only) +@extension{ARB,occlusion_query2} | done +@extension{ARB,sampler_objects} | | +@extension{ARB,shader_bit_encoding} | done (shading language only) +@extension{ARB,texture_rgb10_a2ui} | done +@extension{ARB,texture_swizzle} | | +@extension{ARB,timer_query} | missing direct query +@extension{ARB,vertex_type_2_10_10_10_rev} | done + +@subsection opengl-support-40 OpenGL 4.0 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,draw_buffers_blend} | | +@extension{ARB,sample_shading} | | +@extension{ARB,texture_cube_map_array} | done +@extension{ARB,texture_gather} | missing limit queries +@extension{ARB,texture_query_lod} | done (shading language only) +@extension{ARB,draw_indirect} | | +@extension{ARB,gpu_shader5} | missing limit queries +@extension{ARB,gpu_shader_fp64} | done +@extension{ARB,shader_subroutine} | | +@extension{ARB,tessellation_shader} | missing some limit queries and patch parameter specification function +@extension{ARB,texture_buffer_object_rgb32} | done +@extension{ARB,transform_feedback2} | | +@extension{ARB,transform_feedback3} | | + +@subsection opengl-support-41 OpenGL 4.1 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,ES2_compatibility} | only float depth clear +@extension{ARB,get_program_binary} | | +@extension{ARB,separate_shader_objects} | | +@extension{ARB,shader_precision} | done (shading language only) +@extension{ARB,vertex_attrib_64bit} | done +@extension{ARB,viewport_array} | | + +@subsection opengl-support-42 OpenGL 4.2 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,texture_compression_bptc} | done +@extension{ARB,base_instance} | | +@extension{ARB,shading_language_420pack} | done (shading language only) +@extension{ARB,transform_feedback_instanced} | | +@extension{ARB,compressed_texture_pixel_storage} | | +@extension{ARB,conservative_depth} | done (shading language only) +@extension{ARB,internalformat_query} | | +@extension{ARB,map_buffer_alignment} | done +@extension{ARB,shader_atomic_counters} | | +@extension{ARB,shader_image_load_store} | | +@extension{ARB,shading_language_packing} | done (shading language only) +@extension{ARB,texture_storage} | done + +@subsection opengl-support-43 OpenGL 4.3 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,arrays_of_arrays} | done (shading language only) +@extension{ARB,ES3_compatibility} | only conservative sample query +@extension{ARB,clear_buffer_object} | | +@extension{ARB,compute_shader} | | +@extension{ARB,copy_image} | | +@extension{KHR,debug} (also in ES) | missing log control and retrieval, sync, pipeline, transform feedback and sampler label and debug groups +@extension{ARB,explicit_uniform_location} | done +@extension{ARB,fragment_layer_viewport} | done (shading language only) +@extension{ARB,framebuffer_no_attachments} | | +@extension{ARB,internalformat_query2} | | +@extension{ARB,invalidate_subdata} | done +@extension{ARB,multi_draw_indirect} | | +@extension{ARB,program_interface_query} | | +@extension{ARB,robust_buffer_access_behavior} | done (nothing to do) +@extension{ARB,shader_image_size} | done (shading language only) +@extension{ARB,shader_storage_buffer_object} | only limit queries +@extension{ARB,stencil_texturing} | | +@extension{ARB,texture_buffer_range} | done +@extension{ARB,texture_query_levels} | done (shading language only) +@extension{ARB,texture_storage_multisample} | | +@extension{ARB,texture_view} | | +@extension{ARB,vertex_attrib_binding} | | + +@subsection opengl-support-44 OpenGL 4.4 + +%Extension | Status +-------------------------------------------- | ------ +@extension{ARB,buffer_storage} | | +@extension{ARB,clear_texture} | | +@extension{ARB,enhanced_layouts} | done (shading language only) +@extension{ARB,multi_bind} | | +@extension{ARB,query_buffer_object} | | +@extension{ARB,texture_mirror_clamp_to_edge} | done +@extension{ARB,texture_stencil8} | done +@extension{ARB,vertex_type_10f_11f_11f_rev} | | + +@subsection opengl-support-extensions OpenGL extensions + +%Extension | Status +-------------------------------------------- | ------ +@extension{AMD,vertex_shader_layer} | done (shading language only) +@extension{AMD,shader_trinary_minmax} | done (shading language only) +@extension{ARB,robustness} | done +@extension{ATI,texture_mirror_once} | done (GL 4.4 subset) +@extension{EXT,texture_filter_anisotropic} (also in ES) | done +@extension{EXT,texture_mirror_clamp} | only GL 4.4 subset +@extension{EXT,direct_state_access} | done for implemented functionality +@extension2{EXT,debug_label} (also in ES) | missing pipeline, transform feedback and sampler label +@extension2{EXT,debug_marker} (also in ES) | missing marker groups +@extension{GREMEDY,string_marker} | done + +@subsection opengl-support-es20 OpenGL ES 2.0 + +Features that have their equivalents implemented in desktop version are +supported. + +@subsection opengl-support-es30 OpenGL ES 3.0 + +Features that have their equivalents implemented in desktop version are +supported. + +@subsection opengl-support-es30-extensions OpenGL ES 2.0 extensions to match ES 3.0 functionality + +%Extension | Status +-------------------------------------------- | ------ +@es_extension{ANGLE,framebuffer_blit} | done +@es_extension{ANGLE,framebuffer_multisample} | done +@es_extension{ANGLE,depth_texture} | done +@es_extension{APPLE,framebuffer_multisample} | done (ES 3.0 subset) +@es_extension{ARM,rgba8} | done +@es_extension{EXT,texture_type_2_10_10_10_REV} | done +@es_extension{EXT,discard_framebuffer} | done +@es_extension2{EXT,blend_minmax,blend_minmax} | done +@es_extension{EXT,occlusion_query_boolean} | done +@es_extension{EXT,texture_rg} | done +@es_extension{EXT,texture_storage} | done +@es_extension{EXT,map_buffer_range} | done +@es_extension{NV,draw_buffers} | done +@es_extension{NV,fbo_color_attachments} | done +@es_extension{NV,read_buffer} | done +@es_extension{NV,framebuffer_blit} | done +@es_extension{NV,framebuffer_multisample} | done +@es_extension{OES,depth24} | done +@es_extension{OES,element_index_uint} | done +@es_extension{OES,rgb8_rgba8} | done (desktop-compatible subset) +@es_extension2{OES,texture_half_float_linear,OES_texture_float_linear} | done +@es_extension{OES,texture_float_linear} | done +@es_extension2{OES,texture_half_float,OES_texture_float} | done +@es_extension{OES,texture_float} | done +@es_extension{OES,vertex_half_float} | done +@es_extension{OES,packed_depth_stencil} | done +@es_extension{OES,depth_texture} | done +@es_extension{OES,standard_derivatives} | done +@es_extension{OES,vertex_array_object} | done +@es_extension{OES,required_internalformat} | done (desktop-compatible subset) +@es_extension{OES,surfaceless_context} | done + +@subsection opengl-support-es-extensions OpenGL ES extensions to match desktop functionality + +Only extensions not already listed in above tables are included here. + +%Extension | Status +-------------------------------------------- | ------ +@es_extension{APPLE,texture_format_BGRA8888} | done +@es_extension{CHROMIUM,map_sub} | only buffer mapping +@es_extension{EXT,texture_format_BGRA8888} | done +@es_extension{EXT,read_format_bgra} | done +@es_extension{EXT,disjoint_timer_query} | only time elapsed query +@es_extension{EXT,separate_shader_objects} | | +@es_extension{EXT,sRGB} | done +@es_extension{EXT,multisampled_render_to_texture} | only renderbuffer storage +@es_extension{EXT,robustness} | done +@es_extension2{NV,read_buffer_front,NV_read_buffer} | done +@es_extension2{NV,read_depth,NV_read_depth_stencil} | done +@es_extension2{NV,read_stencil,NV_read_depth_stencil} | done +@es_extension{NV,read_depth_stencil} | done +@es_extension{NV,texture_border_clamp} | done +@es_extension{OES,depth32} | done +@es_extension{OES,mapbuffer} | done +@es_extension{OES,stencil1} | done +@es_extension{OES,stencil4} | done +@es_extension{OES,texture_3D} | missing limit query + +@section opengl-unsupported Unsupported OpenGL features + +Some functionality, which is either soon-to-be deprecated or isn't proven to +add any performance gains, is not supported in %Magnum. See also +@ref opengl-deprecated. + +@subsection opengl-unsupported-features Unsupported features + +- State queries (various `glIs*()`, `glGet*()` functions) are not supported. + %Magnum API is designed to prevent the need for most of them. On the other + hand queries of implementation-defined values (various limits etc.) and + queries of generated values (buffer data, texture data) are supported. +- Line and polygon smoothing (`GL_LINE_SMOOTH`, `GL_POLYGON_SMOOTH`) and + related functions are not supported, as the driver might do it in software + with serious performance drops. Multisampling is far superior solution. +- Fixed precision data types (`GL_FIXED` in OpenGL ES) are not supported, as + they occupy the same memory as floats and they aren't faster than floats on + current hardware anymore. +- Shader compiler is assumed to be present (`GL_SHADER_COMPILER` returning + true), as all desktop GL implementations and also ES3 are required to + support it. +- Querying shader attribute locations (as opposed to setting them) is not + supported, as newer GL versions encourage setting them explicitly in shader + code. +- Direct vertex data specification (as opposed to using buffers) is not + supported, as it encourages bad practices. + +@subsection opengl-unsupported-extensions Unsupported extensions + +- @extension{INTEL,map_texture} negatively affects texture access performance. + Combination of buffer mapping and pixel buffers might be of the same or + better performance, without affecting texture access speed. +- @extension{NV,draw_texture} can be done with framebuffer blitting and + doesn't make any full-screen postprocessing easier, as shaders are excluded. + +*/ + +/** @page opengl-deprecated Deprecated OpenGL API list + +See also @ref opengl-unsupported and @ref deprecated. + +*/ + +/** @page deprecated Deprecated list + +See also @ref opengl-deprecated. + +*/ diff --git a/doc/required-extensions.dox b/doc/opengl.dox similarity index 71% rename from doc/required-extensions.dox rename to doc/opengl.dox index 8761f2254..8f6b5e392 100644 --- a/doc/required-extensions.dox +++ b/doc/opengl.dox @@ -22,21 +22,28 @@ DEALINGS IN THE SOFTWARE. */ -/** @page required-extensions Functionality requiring specific OpenGL version or extensions -@brief List of functions not available on OpenGL 2.1 / OpenGL ES 2. +/** @page opengl OpenGL +@brief State of OpenGL support, version and extension requirements. -The engine is meant to be run on OpenGL 3 capable hardware, but most of the -functionality is working in OpenGL 2.1 hardware too (i.e. integrated Intel -GPUs), unless stated otherwise. OpenGL ES is also supported. +The following table maps OpenGL function names to %Magnum API, useful for +developers with existing OpenGL background. Note that, as reverse mapping, each +function documentation also contains list of OpenGL functions used. -@see @ref building, @ref cmake, @ref MAGNUM_TARGET_GLES, - @ref MAGNUM_TARGET_GLES2 +- @subpage opengl-mapping + +State of implementation of particular OpenGL versions and extensions is in the +following table. + +- @subpage opengl-support -Following are lists of functionality requiring specific OpenGL version. In -most cases it is also specified which extension is required for given -functionality, so if given hardware supports required extension, it doesn't -need to have required OpenGL version too (e.g. `APPLE_vertex_array_object` is -supported on Intel GPUs even if they are capable of OpenGL 2.1 only). +@section opengl-required-extensions Version and extension requirements + +The engine requires at least OpenGL 2.1 or OpenGL ES 2.0, but some specific +functionality has greater requirements. Following are lists of features +requiring specific OpenGL version. In most cases it is also specified which +extension is required, so if given hardware supports required extension, it +doesn't need to have required OpenGL version too (e.g. `APPLE_vertex_array_object` +is supported on older Intel GPUs even if they are capable of OpenGL 2.1 only). - @subpage requires-gl30 - @subpage requires-gl31 @@ -52,7 +59,9 @@ supported on Intel GPUs even if they are capable of OpenGL 2.1 only). - @subpage requires-gles20 - @subpage requires-gles30 - @subpage requires-es-extension -- @subpage unsupported + +@see @ref building, @ref cmake, @ref MAGNUM_TARGET_GLES, + @ref MAGNUM_TARGET_GLES2 @page requires-gl30 Functionality requiring OpenGL 3.0 @page requires-gl31 Functionality requiring OpenGL 3.1 @@ -69,7 +78,7 @@ supported on Intel GPUs even if they are capable of OpenGL 2.1 only). @page requires-gl Functionality requiring desktop OpenGL (not available on OpenGL ES) @see @ref MAGNUM_TARGET_GLES -@page requires-gles20 Functionality requiring OpenGL ES 2.0 (not available in ES 3.0 and desktop OpenGL) +@page requires-gles20 Functionality requiring OpenGL ES 2.0 (not available on desktop or ES 3.0) @see @ref MAGNUM_TARGET_GLES2 @page requires-gles30 Functionality requiring OpenGL ES 3.0 diff --git a/doc/portability.dox b/doc/portability.dox index 6114973a1..c697221fe 100644 --- a/doc/portability.dox +++ b/doc/portability.dox @@ -107,7 +107,7 @@ advantage of some extensions and enable faster code paths if given extension is available, but also have proper fallback when it's not, see for example @ref AbstractShaderProgram-performance-optimization "AbstractShaderProgram", @ref AbstractTexture-performance-optimization "AbstractTexture" or -@ref Mesh-performance-optimization "Mesh". See also @ref required-extensions. +@ref Mesh-performance-optimization "Mesh". See also @ref opengl-required-extensions. @section portability-shaders Writing portable shaders diff --git a/doc/unsupported.dox b/doc/unsupported.dox deleted file mode 100644 index e4e371880..000000000 --- a/doc/unsupported.dox +++ /dev/null @@ -1,62 +0,0 @@ -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @page unsupported Unsupported OpenGL features - -Some functionality, which is either soon-to-be deprecated or isn't proven to -add any performance gains, is not supported in %Magnum. See also @ref deprecated-gl. - -@section unsupported-features Unsupported features - -- Line and polygon smoothing (`GL_LINE_SMOOTH`, `GL_POLYGON_SMOOTH`) and - related functions are not supported, as the driver might do it in software - with serious performance drops. Multisampling is far superior solution. -- Fixed precision data types (`GL_FIXED` in OpenGL ES) are not supported, as - they occupy the same memory as floats and they aren't faster than floats on - current hardware anymore. -- Shader compiler is assumed to be present (`GL_SHADER_COMPILER` returning - true), as all desktop GL implementations and also ES3 are required to - support it. - -@section unsupported-extensions Unsupported extensions - -- @extension{INTEL,map_texture} negatively affects texture access performance. - Combination of buffer mapping and pixel buffers might be of the same or - better performance, without affecting texture access speed. -- @extension{NV,draw_texture} can be done with framebuffer blitting and - doesn't make any full-screen postprocessing easier, as shaders are excluded. - -*/ - -/** @page deprecated-gl Deprecated OpenGL API list - -See also @ref unsupported and @ref deprecated. - -*/ - -/** @page deprecated Deprecated list - -See also @ref deprecated-gl. - -*/ From 072ee4e28819ccba73cc029a55b571716c472833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 15 Jan 2014 23:57:31 +0100 Subject: [PATCH 74/79] doc: mapping of OpenGL limit and state queries, various improvements. --- Doxyfile | 1 + doc/opengl-mapping.dox | 175 ++++++++++++++++++++++++++++++++++------- doc/opengl-support.dox | 11 ++- src/Magnum/Renderer.h | 1 + 4 files changed, 155 insertions(+), 33 deletions(-) diff --git a/Doxyfile b/Doxyfile index c57a9fdc0..542a114ab 100644 --- a/Doxyfile +++ b/Doxyfile @@ -214,6 +214,7 @@ ALIASES = \ "fn_gl_extension2{3}=gl\1\2()" \ "fn_gles_extension{3}=gl\1\2()" \ "def_gl{1}=`GL_\1`" \ + "def_gl_extension{3}=GL_\1_\2" \ "deprecated_gl=@xrefitem opengl-deprecated \"Deprecated OpenGL API\" \"Deprecated OpenGL API list\"" \ "requires_gl30=@xrefitem requires-gl30 \"Requires OpenGL 3.0\" \"Functionality requiring OpenGL 3.0\"" \ "requires_gl31=@xrefitem requires-gl31 \"Requires OpenGL 3.1\" \"Functionality requiring OpenGL 3.1\"" \ diff --git a/doc/opengl-mapping.dox b/doc/opengl-mapping.dox index 0b6c9183f..a9c6c4b2f 100644 --- a/doc/opengl-mapping.dox +++ b/doc/opengl-mapping.dox @@ -29,10 +29,13 @@ namespace Magnum { @tableofcontents -@section opengl-mapping-functions Functions +Legend: +- *not needed* -- given feature is implemented in a way that makes the + function unnecessary +- *not queryable*, *not supported* -- see @ref opengl-unsupported +- (empty) -- given feature is not yet implemented -Features mentioned in @ref opengl-unsupported are marked as *not supported*, -empty value means that the feature is not implemented yet. +@section opengl-mapping-functions Functions OpenGL function | Matching API -------------------------------------- | ------------ @@ -134,32 +137,24 @@ OpenGL function | Matching API @fn_gl{GenTransformFeedbacks}, @fn_gl{DeleteTransformFeedbacks} | | @fn_gl{GenVertexArrays}, @fn_gl{DeleteVertexArrays} | @ref Mesh constructor and destructor @fn_gl{GenerateMipmap}, \n @fn_gl_extension{GenerateTextureMipmap,EXT,direct_state_access} | @ref AbstractTexture::generateMipmap() -@fn_gl{Get} | see table below -@fn_gl2{GetActiveAtomicCounterBuffer,GetActiveAtomicCounterBufferiv} | not supported -@fn_gl{GetActiveAttrib} | not supported -@fn_gl{GetActiveSubroutineName} | not supported -@fn_gl{GetActiveSubroutineUniform} | not supported -@fn_gl{GetActiveSubroutineUniformName} | not supported -@fn_gl{GetActiveUniform} | not supported -@fn_gl{GetActiveUniformBlock} | not supported -@fn_gl{GetActiveUniformBlockName} | not supported -@fn_gl{GetActiveUniformName} | not supported -@fn_gl{GetActiveUniforms} | not supported -@fn_gl{GetAttachedShaders} | not supported -@fn_gl{GetAttribLocation} | not supported +@fn_gl{Get} | see @ref opengl-mapping-state "table below" +@fn_gl2{GetActiveAtomicCounterBuffer,GetActiveAtomicCounterBufferiv} | not queryable +@fn_gl{GetActiveAttrib}, \n @fn_gl{GetActiveSubroutineName}, \n @fn_gl{GetActiveSubroutineUniform}, \n @fn_gl{GetActiveSubroutineUniformName}, \n @fn_gl{GetActiveUniform}, \n @fn_gl{GetActiveUniformBlock}, \n @fn_gl{GetActiveUniformBlockName}, \n @fn_gl{GetActiveUniformName}, \n @fn_gl{GetActiveUniforms} | not queryable +@fn_gl{GetAttachedShaders} | not queryable, @ref AbstractShaderProgram::attachShader() setter only +@fn_gl{GetAttribLocation} | not queryable, @ref AbstractShaderProgram::bindAttributeLocation() setter only @fn_gl{GetBufferParameter}, \n @fn_gl_extension{GetNamedBufferParameter,EXT,direct_state_access} | @ref Buffer::size() -@fn_gl2{GetBufferPointer,GetBufferPointerv} | not supported +@fn_gl2{GetBufferPointer,GetBufferPointerv} | not queryable, @ref Buffer::map() setter only @fn_gl{GetBufferSubData}, \n @fn_gl_extension{GetNamedBufferSubData,EXT,direct_state_access} | @ref Buffer::data(), \n @ref Buffer::subData() @fn_gl{GetCompressedTexImage} | | @fn_gl{GetDebugMessageLog} | | @fn_gl{GetError} | @ref Renderer::error() -@fn_gl{GetFragDataIndex}, @fn_gl{GetFragDataLocation} | not supported -@fn_gl{GetFramebufferAttachmentParameter} | not suppported -@fn_gl{GetFramebufferParameter} | not supported +@fn_gl{GetFragDataIndex}, @fn_gl{GetFragDataLocation} | not queryable, @ref AbstractShaderProgram::bindFragmentDataLocation() and \n @ref AbstractShaderProgram::bindFragmentDataLocationIndexed() setters only +@fn_gl{GetFramebufferAttachmentParameter} | not queryable, @ref Framebuffer setters only +@fn_gl{GetFramebufferParameter} | not queryable, @ref DefaultFramebuffer and \n @ref Framebuffer setters only @fn_gl_extension{GetGraphicsResetStatus,ARB,robustness} | @ref Renderer::graphicsResetStatus() @fn_gl{GetInternalformat} | | @fn_gl{GetMultisample} | | -@fn_gl{GetObjectLabel}, \n @fn_gl{GetObjectPtrLabel} | not supported +@fn_gl{GetObjectLabel}, \n @fn_gl{GetObjectPtrLabel} | not queryable, @ref AbstractShaderProgram::setLabel(), \n @ref AbstractQuery::setLabel(), \n @ref AbstractTexture::setLabel(), \n @ref Buffer::setLabel(), \n @ref Framebuffer::setLabel(), \n @ref Mesh::setLabel(), \n @ref Renderbuffer::setLabel() and \n @ref Shader::setLabel() setters only @fn_gl{GetProgram}, \n @fn_gl{GetProgramInfoLog} | @ref AbstractShaderProgram::link(), \n @ref AbstractShaderProgram::validate() @fn_gl{GetProgramBinary} | | @fn_gl{GetProgramInterface} | | @@ -174,11 +169,12 @@ OpenGL function | Matching API @fn_gl{GetQueryIndexed} | | @fn_gl{GetQueryObject} | @ref AbstractQuery::result() @fn_gl2{GetQuery,GetQueryiv} | | -@fn_gl{GetRenderbufferParameter} | not supported +@fn_gl{GetRenderbufferParameter} | not queryable, @ref Renderbuffer::setStorage() and \n @ref Renderbuffer::setStorageMultisample() setter only @fn_gl{GetSamplerParameter} | | @fn_gl{GetShader}, \n @fn_gl{GetShaderInfoLog} | @ref Shader::compile() @fn_gl{GetShaderPrecisionFormat} | | -@fn_gl{GetShaderSource} | not supported +@fn_gl{GetShaderSource} | not queryable but tracked in @ref Shader::sources() +@fn_gl{GetString} | @ref Context::supportedExtensions(), \n @ref Context::rendererString(), \n @ref Context::shadingLanguageVersionString(), \n @ref Context::vendorString(), \n @ref Context::versionString() @fn_gl{GetSubroutineIndex} | | @fn_gl{GetSubroutineUniformLocation} | | @fn_gl{GetSync} | | @@ -186,20 +182,20 @@ OpenGL function | Matching API @fn_gl{GetTexLevelParameter}, \n @fn_gl_extension{GetTextureLevelParameter,EXT,direct_state_access} | @ref Texture::imageSize(), \n @ref CubeMapTexture::imageSize(), \n @ref CubeMapTextureArray::imageSize() @fn_gl{GetTexParameter} | | @fn_gl{GetTransformFeedbackVarying} | | -@fn_gl{GetUniform} | not supported +@fn_gl{GetUniform} | not queryable, @ref AbstractShaderProgram::setUniform() setter only @fn_gl{GetUniformBlockIndex} | | @fn_gl{GetUniformIndices} | | @fn_gl{GetUniformLocation} | @ref AbstractShaderProgram::uniformLocation() @fn_gl{GetUniformSubroutine} | | -@fn_gl{GetVertexAttrib} | not supported +@fn_gl{GetVertexAttrib} | not queryable, @ref Mesh::addVertexBuffer() setter only @fn_gl{InvalidateBufferData} | @ref Buffer::invalidateData() @fn_gl{InvalidateBufferSubData} | @ref Buffer::invalidateSubData() @fn_gl{InvalidateFramebuffer}, \n @fn_gles_extension{DiscardFramebuffer,EXT,discard_framebuffer} | @ref DefaultFramebuffer::invalidate(), \n @ref Framebuffer::invalidate() @fn_gl{InvalidateSubFramebuffer}, \n @fn_gles_extension{DiscardSubFramebuffer,EXT,discard_framebuffer} | @ref DefaultFramebuffer::invalidate(), \n @ref Framebuffer::invalidate() @fn_gl{InvalidateTexImage} | @ref AbstractTexture::invalidateImage() @fn_gl{InvalidateTexSubImage} | @ref Texture::invalidateSubImage(),\n @ref CubeMapTexture::invalidateSubImage(), \n @ref CubeMapTextureArray::invalidateSubImage() -`glIs*()` | not needed (objects are strongly typed) -@fn_gl{IsEnabled} | not supported +@fn_gl{IsBuffer}, \n @fn_gl{IsFramebuffer}, \n @fn_gl{IsProgram}, \n @fn_gl{IsProgramPipeline}, \n @fn_gl{IsQuery}, \n @fn_gl{IsRenderbuffer}, \n @fn_gl{IsSampler}, \n @fn_gl{IsShader}, \n @fn_gl{IsSync}, \n @fn_gl{IsTexture}, \n @fn_gl{IsTransformFeedback}, \n @fn_gl{IsVertexArray} | not needed, objects are strongly typed +@fn_gl{IsEnabled} | not queryable, @ref Renderer::setFeature() setter only @fn_gl{LineWidth} | @ref Renderer::setLineWidth() @fn_gl{LinkProgram} | @ref AbstractShaderProgram::link() @fn_gl{LogicOp} | @ref Renderer::setLogicOperation() @@ -255,7 +251,7 @@ OpenGL function | Matching API @fn_gl{UseProgramStages} | | @fn_gl{ValidateProgram} | @ref AbstractShaderProgram::validate() @fn_gl{ValidateProgramPipeline} | | -`glVertexAttrib*()` | not supported +@fn_gl{VertexAttrib} | not supported (@ref opengl-unsupported "details") @fn_gl{VertexAttribBinding} | | @fn_gl{VertexAttribDivisor} | | @fn_gl{VertexAttribFormat} | | @@ -266,9 +262,128 @@ OpenGL function | Matching API @fn_gl{ViewportIndexed} | | @fn_gl{WaitSync} | | -@section opengl-mapping-limits Limit queries +@section opengl-mapping-state Limit and state queries -@todoc Do this also. +@todo Things marked only as *not queryable* should have at least setter + +@fn_gl{Get} parameter | Matching API +-------------------------------------- | ------------ +@def_gl{ACTIVE_TEXTURE}, \n @def_gl{TEXTURE_BINDING_1D_ARRAY}, \n @def_gl{TEXTURE_BINDING_1D}, \n @def_gl{TEXTURE_BINDING_2D_ARRAY}, \n @def_gl{TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY}, \n @def_gl{TEXTURE_BINDING_2D_MULTISAMPLE}, \n @def_gl{TEXTURE_BINDING_2D} , \n @def_gl{TEXTURE_BINDING_3D}, \n @def_gl{TEXTURE_BINDING_BUFFER}, \n @def_gl{TEXTURE_BINDING_BUFFER}, \n @def_gl{TEXTURE_BINDING_CUBE_MAP}, \n @def_gl{TEXTURE_BINDING_RECTANGLE} | not queryable but tracked internally +@def_gl{ALIASED_LINE_WIDTH_RANGE} | | +@def_gl{ARRAY_BUFFER_BINDING}, \n @def_gl{DISPATCH_INDIRECT_BUFFER_BINDING}, \n @def_gl{ELEMENT_ARRAY_BUFFER_BINDING}, \n @def_gl{PIXEL_PACK_BUFFER_BINDING}, \n @def_gl{PIXEL_UNPACK_BUFFER_BINDING} | not queryable but tracked internally +@def_gl{BLEND_COLOR} | not queryable, @ref Renderer::setBlendColor() setter only +@def_gl{BLEND_DST_ALPHA}, \n @def_gl{BLEND_DST_RGB}, \n @def_gl{BLEND_SRC_ALPHA}, \n @def_gl{BLEND_SRC_RGB} | not queryable, @ref Renderer::setBlendFunction() setter only +@def_gl{BLEND_EQUATION_ALPHA}, \n @def_gl{BLEND_EQUATION_RGB} | not queryable, @ref Renderer::setBlendEquation() setter only +@def_gl{BLEND}, \n @def_gl{COLOR_LOGIC_OP}, \n @def_gl{CULL_FACE}, \n @def_gl{DEBUG_OUTPUT}, \n @def_gl{DEBUG_OUTPUT_SYNCHRONOUS}, \n @def_gl{DEPTH_CLAMP}, \n @def_gl{DEPTH_TEST}, \n @def_gl{DITHER}, \n @def_gl{MULTISAMPLE}, \n @def_gl{POLYGON_OFFSET_FILL}, \n @def_gl{POLYGON_OFFSET_LINE}, \n @def_gl{POLYGON_OFFSET_POINT}, \n @def_gl{PROGRAM_POINT_SIZE}, \n @def_gl{SCISSOR}, \n @def_gl{TEXTURE_CUBE_MAP_SEAMLESS}, \n @def_gl{STENCIL_TEST} | not queryable, @ref Renderer::setFeature() setter only +@def_gl{COLOR_CLEAR_VALUE}, \n @def_gl{DEPTH_CLEAR_VALUE}, \n @def_gl{STENCIL_CLEAR_VALUE} | not queryable, @ref Renderer::setClearColor(), \n @ref Renderer::setClearDepth() and \n @ref Renderer::setClearStencil() setters only +@def_gl{COLOR_WRITEMASK}, \n @def_gl{DEPTH_WRITEMASK}, \n @def_gl{STENCIL_BACK_WRITEMASK}, \n @def_gl{STENCIL_WRITEMASK} | not queryable, @ref Renderer::setColorMask(), \n @ref Renderer::setDepthMask() and \n @ref Renderer::setStencilMask() setters only +@def_gl{COMPRESSED_TEXTURE_FORMATS} | | +@def_gl{CONTEXT_FLAGS} | @ref Context::flags() +@def_gl{CURRENT_PROGRAM} | not queryable but tracked internally +@def_gl{DEBUG_GROUP_STACK_DEPTH} | | +@def_gl{DEPTH_FUNC} | not queryable, @ref Renderer::setDepthFunction() setter only +@def_gl{DEPTH_RANGE} | not queryable +@def_gl{DOUBLEBUFFER}, \n @def_gl{STEREO} | | +@def_gl{DRAW_BUFFERi}, \n @def_gl{DRAW_BUFFER}, \n @def_gl{READ_BUFFER} | not queryable, @ref DefaultFramebuffer::mapForDraw(), \n @ref DefaultFramebuffer::mapForRead(), \n @ref Framebuffer::mapForDraw() and \n @ref Framebuffer::mapForRead() setters only +@def_gl{DRAW_FRAMEBUFFER_BINDING}, \n @def_gl{READ_FRAMEBUFFER_BINDING} | not queryable but tracked internally +@def_gl{FRAGMENT_SHADER_DERIVATIVE_HINT}, \n @def_gl{LINE_SMOOTH_HINT}, \n @def_gl{POLYGON_SMOOTH_HINT}, \n @def_gl{TEXTURE_COMPRESSION_HINT} | not queryable +@def_gl{IMPLEMENTATION_COLOR_READ_FORMAT} | | +@def_gl{IMPLEMENTATION_COLOR_READ_TYPE} | | +@def_gl{LAYER_PROVOKING_VERTEX} | | +@def_gl{LINE_SMOOTH}, \n @def_gl{POLYGON_SMOOTH} | not supported (@ref opengl-unsupported "details") +@def_gl{LINE_WIDTH_GRANULARITY}, \n @def_gl{LINE_WIDTH_RANGE} | | +@def_gl{LINE_WIDTH} | not queryable, @ref Renderer::setLineWidth() setter only +@def_gl{LOGIC_OP_MODE} | not queryable, @ref Renderer::setLogicOperation() setter only +@def_gl{MAJOR_VERSION}, \n @def_gl{MINOR_VERSION} | @ref Context::version() +`GL_MAX_*_ATOMIC_COUNTER_BUFFERS`, \n @def_gl{MAX_COMBINED_ATOMIC_COUNTER_BUFFERS} | @ref Shader::maxAtomicCounterBuffers(), \n @ref Shader::maxCombinedAtomicCounterBuffers() +`GL_MAX_*_ATOMIC_COUNTERS`, \n @def_gl{MAX_COMBINED_ATOMIC_COUNTERS} | @ref Shader::maxAtomicCounters(), \n @ref Shader::maxCombinedAtomicCounters() +`GL_MAX_*_IMAGE_UNIFORMS`, \n @def_gl{MAX_COMBINED_IMAGE_UNIFORMS} | @ref Shader::maxImageUniforms(), \n @ref Shader::maxCombinedImageUniforms() +`GL_MAX_*_SHADER_STORAGE_BLOCKS`, \n @def_gl{MAX_COMBINED_SHADER_STORAGE_BLOCKS} | @ref Shader::maxShaderStorageBlocks(), \n @ref Shader::maxCombinedShaderStorageBlocks() +`GL_MAX_*_TEXTURE_IMAGE_UNITS`, \n @def_gl{MAX_TEXTURE_IMAGE_UNITS}, \n @def_gl{MAX_COMBINED_TEXTURE_IMAGE_UNITS} | @ref Shader::maxTextureImageUnits(), \n @ref Shader::maxCombinedTextureImageUnits() +`GL_MAX_*_UNIFORM_BLOCKS`, \n @def_gl{MAX_COMBINED_UNIFORM_BLOCKS} | @ref Shader::maxUniformBlocks(), \n @ref Shader::maxCombinedUniformBlocks() +`GL_MAX_*_UNIFORM_COMPONENTS`, \n @def_gl{MAX_VERTEX_UNIFORM_VECTORS}, \n @def_gl{MAX_FRAGMENT_UNIFORM_VECTORS} | @ref Shader::maxUniformComponents() +`GL_MAX_COMBINED_*_UNIFORM_COMPONENTS` | @ref Shader::maxCombinedUniformComponents() +@def_gl{MAX_3D_TEXTURE_SIZE}, \n @def_gl{MAX_ARRAY_TEXTURE_LAYERS}, \n @def_gl{MAX_CUBE_MAP_TEXTURE_SIZE}, \n @def_gl{MAX_RECTANGLE_TEXTURE_SIZE}, \n @def_gl{MAX_TEXTURE_SIZE} | | +@def_gl{MAX_ATOMIC_COUNTER_BUFFER_SIZE} | @ref AbstractShaderProgram::maxAtomicCounterBufferSize() +@def_gl{MAX_ATOMIC_COUNTER_BUFFER_BINDINGS} | @ref Buffer::maxAtomicCounterBindings() +@def_gl{MAX_COLOR_ATTACHMENTS} | @ref Framebuffer::maxColorAttachments() +@def_gl{MAX_COMBINED_SHADER_OUTPUT_RESOURCES} | @ref AbstractShaderProgram::maxCombinedShaderOutputResources() +@def_gl{MAX_COMPUTE_SHARED_MEMORY_SIZE} | @ref AbstractShaderProgram::maxComputeSharedMemorySize() +@def_gl{MAX_COMPUTE_WORK_GROUP_COUNT} | | +@def_gl{MAX_COMPUTE_WORK_GROUP_INVOCATIONS} | @ref AbstractShaderProgram::maxComputeWorkGroupInvocations() +@def_gl{MAX_COMPUTE_WORK_GROUP_SIZE} | | +@def_gl{MAX_DEBUG_LOGGED_MESSAGES} | @ref DebugMessage::maxLoggedMessages() +@def_gl{MAX_DEBUG_MESSAGE_LENGTH} | @ref DebugMessage::maxMessageLength() +@def_gl{MAX_DEBUG_GROUP_STACK_DEPTH} | | +@def_gl{MAX_CLIP_DISTANCES} | | +@def_gl{MAX_COLOR_TEXTURE_SAMPLES}, \n @def_gl{MAX_DEPTH_TEXTURE_SAMPLES}, \n @def_gl{MAX_INTEGER_SAMPLES} | @ref AbstractTexture::maxColorSamples(), \n @ref AbstractTexture::maxDepthSamples(), \n @ref AbstractTexture::maxIntegerSamples() +@def_gl{MAX_DRAW_BUFFERS} | @ref AbstractFramebuffer::maxDrawBuffers() +@def_gl{MAX_DUAL_SOURCE_DRAW_BUFFERS} | @ref AbstractFramebuffer::maxDualSourceDrawBuffers() +@def_gl{MAX_ELEMENTS_INDICES} | @ref Mesh::maxElementsIndices() +@def_gl{MAX_ELEMENTS_VERTICES} | @ref Mesh::maxElementsVertices() +@def_gl{MAX_ELEMENT_INDEX} | | +@def_gl{MAX_FRAMEBUFFER_HEIGHT} | | +@def_gl{MAX_FRAMEBUFFER_LAYERS} | | +@def_gl{MAX_FRAMEBUFFER_SAMPLES} | | +@def_gl{MAX_FRAMEBUFFER_WIDTH} | | +@def_gl{MAX_FRAGMENT_INPUT_COMPONENTS}, \n @def_gl{MAX_GEOMETRY_INPUT_COMPONENTS}, \n @def_gl{MAX_GEOMETRY_OUTPUT_COMPONENTS}, \n @def_gl{MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS}, \n @def_gl{MAX_TESS_CONTROL_INPUT_COMPONENTS}, \n @def_gl{MAX_TESS_CONTROL_OUTPUT_COMPONENTS}, \n @def_gl{MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS}, \n @def_gl{MAX_TESS_EVALUATION_INPUT_COMPONENTS}, \n @def_gl{MAX_TESS_EVALUATION_OUTPUT_COMPONENTS}, \n @def_gl{MAX_VERTEX_OUTPUT_COMPONENTS}, \n @def_gl{MAX_VARYING_COMPONENTS}, \n @def_gl{MAX_VARYING_FLOATS}, \n @def_gl{MAX_VARYING_VECTORS} | @ref Shader::maxFragmentInputComponents(), \n @ref Shader::maxGeometryInputComponents(), \n @ref Shader::maxGeometryOutputComponents(), \n @ref Shader::maxGeometryTotalOutputComponents(), \n @ref Shader::maxTessellationControlInputComponents(), \n @ref Shader::maxTessellationControlOutputComponents(), \n @ref Shader::maxTessellationControlTotalOutputComponents(), \n @ref Shader::maxTessellationEvaluationInputComponents(), \n @ref Shader::maxTessellationEvaluationOutputComponents(), \n @ref Shader::maxVertexOutputComponents() +@def_gl{MAX_IMAGE_SAMPLES} | @ref AbstractShaderProgram::maxImageSamples() +@def_gl{MAX_IMAGE_UNITS} | @ref AbstractShaderProgram::maxImageUnits() +@def_gl{MAX_LABEL_LENGTH} | @ref AbstractObject::maxLabelLength() +@def_gl{MAX_RENDERBUFFER_SIZE} | @ref Renderbuffer::maxSize() +@def_gl{MAX_SAMPLE_MASK_WORDS} | | +@def_gl{MAX_SERVER_WAIT_TIMEOUT} | | +@def_gl{MAX_SHADER_STORAGE_BLOCK_SIZE} | @ref AbstractShaderProgram::maxShaderStorageBlockSize() +@def_gl{MAX_SHADER_STORAGE_BUFFER_BINDINGS} | @ref Buffer::maxShaderStorageBindings() +@def_gl{MAX_TEXTURE_BUFFER_SIZE} | | +@def_gl_extension{MAX_TEXTURE_MAX_ANISOTROPY,EXT,texture_filter_anisotropic} | @ref Sampler::maxMaxAnisotropy() +@def_gl{MAX_TEXTURE_LOD_BIAS} | | +@def_gl{MAX_UNIFORM_BLOCK_SIZE} | @ref AbstractShaderProgram::maxUniformBlockSize() +@def_gl{MAX_UNIFORM_BUFFER_BINDINGS} | @ref Buffer::maxUniformBindings() +@def_gl{MAX_UNIFORM_LOCATIONS} | @ref AbstractShaderProgram::maxUniformLocations() +@def_gl{MAX_VERTEX_ATTRIBS} | @ref AbstractShaderProgram::maxVertexAttributes() +@def_gl{MAX_VERTEX_ATTRIB_BINDINGS} | @ref Buffer::maxVertexAttributeBindings() +@def_gl{MAX_VERTEX_ATTRIB_RELATIVE_OFFSET} | | +@def_gl{MAX_VIEWPORTS} | | +@def_gl{MAX_VIEWPORT_DIMS} | @ref AbstractFramebuffer::maxViewportSize() +@def_gl{MIN_MAP_BUFFER_ALIGNMENT} | @ref Buffer::minMapAlignment() +@def_gl{MIN_PROGRAM_TEXEL_OFFSET}, \n @def_gl{MAX_PROGRAM_TEXEL_OFFSET} | @ref AbstractShaderProgram::minTexelOffset(), \n @ref AbstractShaderProgram::maxTexelOffset() +@def_gl{NUM_COMPRESSED_TEXTURE_FORMATS} | | +@def_gl{NUM_EXTENSIONS} | @ref Context::supportedExtensions() +@def_gl{NUM_PROGRAM_BINARY_FORMATS}, \n @def_gl{PROGRAM_BINARY_FORMATS} | | +@def_gl{NUM_SHADER_BINARY_FORMATS}, \n @def_gl{SHADER_BINARY_FORMATS} | | +@def_gl{PACK_ALIGNMENT}, \n @def_gl{PACK_IMAGE_HEIGHT}, \n @def_gl{PACK_LSB_FIRST}, \n @def_gl{PACK_ROW_LENGTH}, \n @def_gl{PACK_SKIP_IMAGES}, \n @def_gl{PACK_SKIP_PIXELS}, \n @def_gl{PACK_SKIP_ROWS}, \n @def_gl{PACK_SWAP_BYTES}, \n @def_gl{UNPACK_ALIGNMENT}, \n @def_gl{UNPACK_IMAGE_HEIGHT}, \n @def_gl{UNPACK_LSB_FIRST}, \n @def_gl{UNPACK_ROW_LENGTH}, \n @def_gl{UNPACK_SKIP_IMAGES}, \n @def_gl{UNPACK_SKIP_PIXELS}, \n @def_gl{UNPACK_SKIP_ROWS}, \n @def_gl{UNPACK_SWAP_BYTES} | not queryable +@def_gl{POINT_FADE_THRESHOLD_SIZE} | | +@def_gl{POINT_SIZE_GRANULARITY}, \n @def_gl{POINT_SIZE_RANGE} | | +@def_gl{POINT_SIZE} | not queryable, @ref Renderer::setPointSize() setter only +@def_gl{POLYGON_OFFSET_FACTOR}, \n @def_gl{POLYGON_OFFSET_UNITS} | not queryable, @ref Renderer::setPolygonOffset() setter only +@def_gl{PRIMITIVE_RESTART_INDEX} | not queryable +@def_gl{PROGRAM_PIPELINE_BINDING} | not queryable +@def_gl{PROVOKING_VERTEX} | not queryable, @ref Renderer::setProvokingVertex() setter only +@def_gl{RENDERBUFFER_BINDING} | not queryable but tracked internally +@def_gl{SAMPLER_BINDING} | not queryable +@def_gl{SAMPLES} | @ref Renderbuffer::maxSamples() +@def_gl{SAMPLE_BUFFERS} | | +@def_gl{SAMPLE_COVERAGE_INVERT}, \n @def_gl{SAMPLE_COVERAGE_VALUE} | | +@def_gl{SCISSOR_BOX} | not queryable, @ref Renderer::setScissor() setter only +@def_gl{SHADER_COMPILER} | not supported (@ref opengl-unsupported "details") +@def_gl{SHADER_STORAGE_BUFFER_BINDING}, \n @def_gl{SHADER_STORAGE_BUFFER_SIZE}, \n @def_gl{SHADER_STORAGE_BUFFER_START} | not queryable +@def_gl{SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT} | @ref Buffer::shaderStorageOffsetAlignment() +@def_gl{SMOOTH_LINE_WIDTH_GRANULARITY}, \n @def_gl{SMOOTH_LINE_WIDTH_RANGE} | | +@def_gl{STENCIL_BACK_FUNC}, \n @def_gl{STENCIL_BACK_REF}, \n @def_gl{STENCIL_BACK_VALUE_MASK}, \n @def_gl{STENCIL_FUNC}, \n @def_gl{STENCIL_REF}, \n @def_gl{STENCIL_VALUE_MASK} | not queryable, @ref Renderer::setStencilFunction() setter only +@def_gl{STENCIL_BACK_FAIL}, \n @def_gl{STENCIL_BACK_PASS_DEPTH_FAIL}, \n @def_gl{STENCIL_BACK_PASS_DEPTH_PASS}, \n @def_gl{STENCIL_FAIL}, \n @def_gl{STENCIL_PASS_DEPTH_FAIL}, \n @def_gl{STENCIL_PASS_DEPTH_PASS} | not queryable, @ref Renderer::setStencilOperation() setter only +@def_gl{SUBPIXEL_BITS} | | +@def_gl{TEXTURE_BUFFER_OFFSET_ALIGNMENT} | @ref BufferTexture::offsetAlignment() +@def_gl{TIMESTAMP} | | +@def_gl{TRANSFORM_FEEDBACK_BUFFER_BINDING}, \n @def_gl{TRANSFORM_FEEDBACK_BUFFER_SIZE}, \n @def_gl{TRANSFORM_FEEDBACK_BUFFER_START} | not queryable +@def_gl{UNIFORM_BUFFER_OFFSET_ALIGNMENT} | | +@def_gl{UNIFORM_BUFFER_BINDING}, \n @def_gl{UNIFORM_BUFFER_SIZE}, \n @def_gl{UNIFORM_BUFFER_START} | not queryable +@def_gl{VERTEX_BINDING_DIVISOR}, \n @def_gl{VERTEX_BINDING_OFFSET}, \n @def_gl{VERTEX_BINDING_STRIDE} | not queryable +@def_gl{VERTEX_PROGRAM_POINT_SIZE} | not queryable +@def_gl{VIEWPORT_BOUNDS_RANGE} | | +@def_gl{VIEWPORT_INDEX_PROVOKING_VERTEX} | | +@def_gl{VIEWPORT_SUBPIXEL_BITS} | | +@def_gl{VIEWPORT} | not queryable but tracked in @ref AbstractFramebuffer::viewport() */ diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox index 6bee4c53e..948d2874c 100644 --- a/doc/opengl-support.dox +++ b/doc/opengl-support.dox @@ -296,9 +296,14 @@ add any performance gains, is not supported in %Magnum. See also @subsection opengl-unsupported-features Unsupported features - State queries (various `glIs*()`, `glGet*()` functions) are not supported. - %Magnum API is designed to prevent the need for most of them. On the other - hand queries of implementation-defined values (various limits etc.) and - queries of generated values (buffer data, texture data) are supported. + %Magnum API is designed to prevent the need for majority of them, many of + them are tracked internally to avoid redundant state changes and in many + cases it is easier to set the state to some value rather than query it and + then decide on the result. For detailed state introspection please use + external debugger (such as ApiTrace), which is more convenient to use than + manual queries. Queries of implementation-defined values (various limits + etc.) and queries of generated values (buffer data, texture data) are + supported. - Line and polygon smoothing (`GL_LINE_SMOOTH`, `GL_POLYGON_SMOOTH`) and related functions are not supported, as the driver might do it in software with serious performance drops. Multisampling is far superior solution. diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index af166007e..5cf2d4be6 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -223,6 +223,7 @@ class MAGNUM_EXPORT Renderer { * @brief Hint * * @see setHint() + * @todo other hints */ enum class Hint: GLenum { /** From 09a273928adf9704459e8561970e90fc46465763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Jan 2014 00:40:49 +0100 Subject: [PATCH 75/79] doc: new page with troubleshooting for common issues. --- doc/tips.dox | 2 + doc/troubleshooting.dox | 93 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 doc/troubleshooting.dox diff --git a/doc/tips.dox b/doc/tips.dox index 3931ccd7f..c1407728e 100644 --- a/doc/tips.dox +++ b/doc/tips.dox @@ -30,5 +30,7 @@ namespace Magnum { - @subpage portability -- @copybrief portability - @subpage best-practices -- @copybrief best-practices - @subpage compilation-speedup -- @copybrief compilation-speedup +- @subpage troubleshooting -- @copybrief troubleshooting + */ } diff --git a/doc/troubleshooting.dox b/doc/troubleshooting.dox new file mode 100644 index 000000000..81897e5a2 --- /dev/null +++ b/doc/troubleshooting.dox @@ -0,0 +1,93 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +namespace Magnum { +/** @page troubleshooting Troubleshooting + +@brief Various tricks to overcome to common building and rendering issues. + +@section troubleshooting-building Building issues + +If your project suddenly stops building after %Magnum upgrade, check these +things: + +- If the building fails on CMake step, be sure that you have up-to-date + `FindCorrade.cmake`, `FindMagnum.cmake` and other CMake modules in your + project (`FindSDL2.cmake`). They are contained in `modules/` directory of + %Magnum sources (and sources of other projects) also are installed into + `share/cmake/Magnum`. +- In some cases when the changes done to build system are too drastic, + recreating the build dir or clearing CMake cache is needed, but this is + a very rare occasion. +- The library is constantly evolving, thus some API might get deprecated over + time (and later removed). Either build the libraries with `BUILD_DEPRECATED` + or switch to non-deprecated features. See @ref building for more + information. + +@section troubleshooting-rendering Rendering issues + +If you are experiencing so-called "black screen of death", you might want to +try these things: + +- Verify that @ref Renderer::error() "no OpenGL error was emitted". +- Check that you use only extensions that are + @ref Context::isExtensionSupported() "available on your system". +- Check that you didn't exceed any implementation-defined limit (see + `magnum-info` output for list of all of them). +- Enable @ref DebugMessage "debug output" to see more detailed errors, + warnings and performance hints. +- If using framebuffer objects, @ref Framebuffer::checkStatus() "check that they are complete". +- Change @ref Renderer::setClearColor() "framebuffer clear color" to + something else than black to verify that at least something is drawn. +- If nothing is drawn, use @ref PrimitiveQuery to check that at least some + primitives were generated. Use @ref SampleQuery to check whether fragments + were drawn. +- Verify that the mesh is properly set up -- nonzero vertex/index count, + matching type in buffer and @ref Mesh::addVertexBuffer() "vertex specification", + properly set up @ref Mesh::setIndexBuffer() "index buffer" and index count + for indexed mesh. If you specified index range, be sure that all indices + fall into it, otherwise you would get undefined behavior. +- Try disabling @ref Renderer::Feature::DepthTest "depth test", + @ref Renderer::Feature::FaceCulling "face culling" and other renderer + features that might affect the fragments. +- Verify that your projection and transformation matrix is properly set up -- + try drawing points instead of triangles, to see if they are at least at + proper places. +- @ref AbstractShaderProgram::validate() "Validate the shader", check that + all used uniforms and attributes have proper locations. Try reducing it + until it is able to draw something, possibly also with some simpler mesh. + +@section troubleshooting-debugging Debugging rendering + +- Enable @ref DebugMessage "debug output" to see additional performance hints + and implementation-dependent information. +- Use @ref TimeQuery to find hot spots in the rendering code. +- @ref DebugMessage::insert() "Mark relevant parts of code" to find them + easier in the debugger. +- Use ApiTrace to trace the program call by call, verify buffer and texture + contents, vertex binding and count of generated primitives, rendered + fragments and time spent in various calls. + +*/ +} From 848d2fe45b9e88c969c6436f3b86b01d02a11c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Jan 2014 00:41:15 +0100 Subject: [PATCH 76/79] Doc++ Somehow explicit references are not working here. --- src/Magnum/Context.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index c0b4c6647..15884a309 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -269,7 +269,8 @@ class MAGNUM_EXPORT Context { * If no version from the list is supported, returns lowest available * OpenGL version (@ref Version::GL210 for desktop OpenGL, * @ref Version::GLES200 for OpenGL ES). - * @see @ref isExtensionSupported(Version) + * @see isExtensionSupported(Version) const + * @todoc Explicit reference when Doxygen is sane */ Version supportedVersion(std::initializer_list versions) const; @@ -286,8 +287,9 @@ class MAGNUM_EXPORT Context { * } * @endcode * - * @see @ref isExtensionSupported(const Extension&) const, + * @see isExtensionSupported(const Extension&) const, * @ref MAGNUM_ASSERT_EXTENSION_SUPPORTED() + * @todoc Explicit reference when Doxygen is sane */ template bool isExtensionSupported() const { return isVersionSupported(T::coreVersion()) || (isVersionSupported(T::requiredVersion()) && extensionStatus[T::Index]); From a653c2129839c0cb482bc973b323375ca041c7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Jan 2014 16:16:11 +0100 Subject: [PATCH 77/79] package: updated to Corrade's Jenkins CI changes. --- package/ci/jenkins-emscripten.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ci/jenkins-emscripten.xml b/package/ci/jenkins-emscripten.xml index 70cff54fd..b04c4c093 100644 --- a/package/ci/jenkins-emscripten.xml +++ b/package/ci/jenkins-emscripten.xml @@ -67,7 +67,7 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \ - -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/emscripten \ + -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ -DBUILD_TESTS=ON \ -DBUILD_DEPRECATED=${deprecated_build_flag} \ From 7ff7ac73d4e1813d05eddc95ebabfb9783611cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Jan 2014 16:20:58 +0100 Subject: [PATCH 78/79] package: don't bother with the tests on Emscripten at all. They are slow to link and are always failing anyway. --- package/ci/jenkins-emscripten.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/ci/jenkins-emscripten.xml b/package/ci/jenkins-emscripten.xml index b04c4c093..bea34b38b 100644 --- a/package/ci/jenkins-emscripten.xml +++ b/package/ci/jenkins-emscripten.xml @@ -69,7 +69,6 @@ cmake .. \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ - -DBUILD_TESTS=ON \ -DBUILD_DEPRECATED=${deprecated_build_flag} \ `#-DWITH_AUDIO=ON` \ -DWITH_SDL2APPLICATION=ON \ @@ -81,7 +80,6 @@ cmake .. \ -G Ninja ninja -ctest --output-on-failure || true ninja install ]]> From f21f10c34400248cefad352023ed04cfd7bbb700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Jan 2014 16:22:02 +0100 Subject: [PATCH 79/79] package: initial Jenkins configuration for NaCl build. Fails on master, as it needs compatibility branch for x86 builds (GCC 4.4). --- package/ci/jenkins-nacl.xml | 120 ++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 package/ci/jenkins-nacl.xml diff --git a/package/ci/jenkins-nacl.xml b/package/ci/jenkins-nacl.xml new file mode 100644 index 000000000..a975bd245 --- /dev/null +++ b/package/ci/jenkins-nacl.xml @@ -0,0 +1,120 @@ + + + + + + -1 + 10 + -1 + -1 + + false + + + 2 + + + git://github.com/mosra/magnum.git + + + + + */master + + + false + + + + true + + + + + true + false + false + false + + false + Magnum + + + toolchain + + newlib-x86-32 + newlib-x86-64 + + + + compatibility + + + deprecated + + + + + + + + + + + + + Errors while running CTest + false + true + true + + + + + true + + + + + UNSTABLE + 1 + YELLOW + true + + + . +