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")