Corrige includes

framework/common/collision.cpp

@@ -1,4 +1,4 @@
-#include "common/collision.hpp"
+#include "xna/common/collision.hpp"
 
 namespace xna {
 	Plane::Plane(Vector3 const& point1, Vector3 const& point2, Vector3 const& point3) {

framework/common/color.cpp

@@ -1,4 +1,4 @@
-#include "common/color.hpp"
+#include "xna/common/color.hpp"
 
 namespace xna {
 	Color::Color(float r, float g, float b, float a) :

framework/common/gjk.cpp

@@ -1,4 +1,4 @@
-#include "common/gjk.hpp"
+#include "xna/common/gjk.hpp"
 
 namespace xna {
 	Vector3 Gjk::ComputeClosestPoint() {

framework/common/numerics.cpp

@@ -1,4 +1,4 @@
-#include "common/numerics.hpp"
+#include "xna/common/numerics.hpp"
 
 namespace xna {
     bool Vector2::Transform(Vector2 const* sourceArray, size_t sourceArrayLength, Matrix const& matrix, Vector2* destinationArray, size_t destinationArrayLength) {

framework/common/packedvalue.cpp

@@ -1,4 +1,4 @@
-#include "common/packedvalue.hpp"
+#include "xna/common/packedvalue.hpp"
 
 namespace xna {
 	Uint PackUtils::PackUnsigned(float bitmask, float value) {

framework/content/lzx/decoder.cpp

@@ -1,4 +1,4 @@
-#include "content/lzx/decoder.hpp"
+#include "xna/content/lzx/decoder.hpp"
 
 namespace xna {
 

framework/content/lzx/decoderstream.cpp

@@ -1,4 +1,4 @@
-#include "content/lzx/decoderstream.hpp"
+#include "xna/content/lzx/decoderstream.hpp"
 
 namespace xna {
 	Int LzxDecoderStream::Length()

framework/content/manager.cpp

@@ -1,4 +1,4 @@
-#include "content/manager.hpp"
+#include "xna/content/manager.hpp"
 
 namespace xna {
 	sptr<Stream> ContentManager::OpenStream(String const& assetName) const {

framework/content/reader.cpp

@@ -1,7 +1,7 @@
-#include "content/reader.hpp"
+#include "xna/content/reader.hpp"
-#include "content/manager.hpp"
+#include "xna/content/manager.hpp"
-#include "content/lzx/decoderstream.hpp"
+#include "xna/content/lzx/decoderstream.hpp"
-#include "content/typereadermanager.hpp"
+#include "xna/content/typereadermanager.hpp"
 
 namespace xna {
 	sptr<ContentReader> ContentReader::Create(sptr<xna::ContentManager> const& contentManager, sptr<Stream>& input, String const& assetName)

framework/content/typereadermanager.cpp

@@ -1,6 +1,6 @@
-#include "content/typereadermanager.hpp"
+#include "xna/content/typereadermanager.hpp"
-#include "content/reader.hpp"
+#include "xna/content/reader.hpp"
-#include "content/readers/default.hpp"
+#include "xna/content/readers/default.hpp"
 
 namespace xna {
 

framework/csharp/binary.cpp

@@ -1,5 +1,5 @@
-#include "csharp/binary.hpp"
+#include "xna/csharp/binary.hpp"
-#include "csharp/buffer.hpp"
+#include "xna/csharp/buffer.hpp"
 
 namespace xna {
 	Int BinaryReader::PeekChar()

framework/csharp/object.cpp

@@ -1,5 +1,5 @@
-#include "csharp/object.hpp"
+#include "xna/csharp/object.hpp"
-#include "csharp/type.hpp"
+#include "xna/csharp/type.hpp"
 
 namespace xna {
 	size_t Object::GetHashCode() const

framework/csharp/stream.cpp

@@ -1,5 +1,5 @@
-#include "csharp/stream.hpp"
+#include "xna/csharp/stream.hpp"
-#include "csharp/buffer.hpp"
+#include "xna/csharp/buffer.hpp"
 
 namespace xna {
 	Long MemoryStream::Seek(Long offset, SeekOrigin const& origin) {

framework/csharp/type.cpp

@@ -1,4 +1,4 @@
-#include "csharp/type.hpp"
+#include "xna/csharp/type.hpp"
 
 namespace xna {
 	size_t Type::GetHashCode() const

framework/game/component.cpp

@@ -1,4 +1,4 @@
-#include "game/component.hpp"
+#include "xna/game/component.hpp"
 
 namespace xna {
 	sptr<IGameComponent> GameComponentCollection::operator[](size_t index) const

framework/game/servicecontainer.cpp

@@ -1,4 +1,4 @@
-#include "game/servicecontainer.hpp"
+#include "xna/game/servicecontainer.hpp"
 
 namespace xna {
 	void GameServiceContainer::AddService(Type& type, std::any& provider)

framework/platform-dx/adapter.cpp

@@ -1,9 +1,9 @@
-#include "graphics/adapter.hpp"
+#include "xna/graphics/adapter.hpp"
-#include "graphics/displaymode.hpp"
+#include "xna/graphics/displaymode.hpp"
-#include "platform-dx/headers.hpp"
+#include "xna/platform-dx/headers.hpp"
-#include "platform-dx/helpers.hpp"
+#include "xna/platform-dx/helpers.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "game/gdevicemanager.hpp"
+#include "xna/game/gdevicemanager.hpp"
 
 namespace xna {
 	static size_t getDisplayModesCount(IDXGIAdapter* adapter);

framework/platform-dx/audioengine.cpp

@@ -1,4 +1,4 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	void AudioEngine::Initialize() {

framework/platform-dx/blendstate.cpp

@@ -1,9 +1,9 @@
-#include "graphics/blendstate.hpp"
+#include "xna/graphics/blendstate.hpp"
-#include "graphics/gresource.hpp"
+#include "xna/graphics/gresource.hpp"
-#include "platform-dx/headers.hpp"
+#include "xna/platform-dx/headers.hpp"
-#include "platform-dx/helpers.hpp"
+#include "xna/platform-dx/helpers.hpp"
-#include "graphics/blendstate.hpp"
+#include "xna/graphics/blendstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	BlendState::BlendState() : GraphicsResource(nullptr) {

framework/platform-dx/buffer.cpp

@@ -1,7 +1,7 @@
-#include "graphics/buffer.hpp"
+#include "xna/graphics/buffer.hpp"
-#include "common/numerics.hpp"
+#include "xna/common/numerics.hpp"
-#include "platform-dx/headers.hpp"
+#include "xna/platform-dx/headers.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	ConstantBuffer::ConstantBuffer() : GraphicsResource(nullptr){

framework/platform-dx/depthstencilstate.cpp

@@ -1,6 +1,6 @@
-#include "graphics/depthstencilstate.hpp"
+#include "xna/graphics/depthstencilstate.hpp"
-#include "platform-dx/headers.hpp"
+#include "xna/platform-dx/headers.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	static D3D11_DEPTH_STENCIL_DESC defaultDesc() {

framework/platform-dx/device.cpp

@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "game/gdevicemanager.hpp"
+#include "xna/game/gdevicemanager.hpp"
 
 namespace xna {
 	void reset(GraphicsDevice::PlatformImplementation& impl)

framework/platform-dx/displaymode.cpp

@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "graphics/displaymode.hpp"
+#include "xna/graphics/displaymode.hpp"
 
 namespace xna {
 	DisplayMode::DisplayMode() {

framework/platform-dx/game.cpp

@@ -1,10 +1,10 @@
-#include "csharp/type.hpp"
+#include "xna/csharp/type.hpp"
-#include "game/time.hpp"
+#include "xna/game/time.hpp"
-#include "game/component.hpp"
+#include "xna/game/component.hpp"
-#include "game/servicecontainer.hpp"
+#include "xna/game/servicecontainer.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "game/gdevicemanager.hpp"
+#include "xna/game/gdevicemanager.hpp"
-#include "content/manager.hpp"
+#include "xna/content/manager.hpp"
 
 namespace xna {
 	Game::Game() {

framework/platform-dx/gamepad.cpp

@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "input/gamepad.hpp"
+#include "xna/input/gamepad.hpp"
 
 namespace xna {
 	void GamePad::Initialize() {

framework/platform-dx/gdevicemanager.cpp

@@ -1,7 +1,7 @@
-#include "game/gdevicemanager.hpp"
+#include "xna/game/gdevicemanager.hpp"
-#include "graphics/presentparams.hpp"
+#include "xna/graphics/presentparams.hpp"
-#include "graphics/swapchain.hpp"
+#include "xna/graphics/swapchain.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	GraphicsDeviceManager::GraphicsDeviceManager(sptr<Game> const& game) : _game(game)

framework/platform-dx/init.cpp

@@ -1,10 +1,10 @@
-#include "platform-dx/init.hpp"
+#include "xna/platform-dx/init.hpp"
-#include "csharp/type.hpp"
+#include "xna/csharp/type.hpp"
-#include "content/readers/graphics.hpp"
+#include "xna/content/readers/graphics.hpp"
-#include "content/readers/audio.hpp"
+#include "xna/content/readers/audio.hpp"
-#include "content/typereadermanager.hpp"
+#include "xna/content/typereadermanager.hpp"
-#include "content/readers/default.hpp"
+#include "xna/content/readers/default.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	void Platform::Init() {		

framework/platform-dx/keyboard.cpp

@@ -1,5 +1,5 @@
-#include "input/keyboard.hpp"
+#include "xna/input/keyboard.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	KeyboardState Keyboard::GetState() {

framework/platform-dx/mouse.cpp

@@ -1,5 +1,5 @@
-#include "input/mouse.hpp"
+#include "xna/input/mouse.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	MouseState Mouse::GetState() {

framework/platform-dx/rasterizerstate.cpp

@@ -1,5 +1,5 @@
-#include "graphics/rasterizerstate.hpp"
+#include "xna/graphics/rasterizerstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 

framework/platform-dx/rendertarget.cpp

@@ -1,4 +1,4 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	RenderTarget2D::RenderTarget2D() : Texture2D() {

framework/platform-dx/samplerstate.cpp

@@ -1,7 +1,7 @@
-#include "graphics/samplerstate.hpp"
+#include "xna/graphics/samplerstate.hpp"
-#include "graphics/samplerstate.hpp"
+#include "xna/graphics/samplerstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "platform-dx/helpers.hpp"
+#include "xna/platform-dx/helpers.hpp"
 
 namespace xna {
 	SamplerState::SamplerState() : GraphicsResource(nullptr) {

framework/platform-dx/shader.cpp

@@ -1,6 +1,6 @@
-#include "graphics/buffer.hpp"
+#include "xna/graphics/buffer.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "graphics/shader.hpp"
+#include "xna/graphics/shader.hpp"
 
 namespace xna {
     static HRESULT shaderCompileFromFile(_In_ LPCWSTR srcFile, _In_ LPCSTR entryPoint, _In_ LPCSTR profile, _Outptr_ ID3DBlob** blob)

framework/platform-dx/soundeffect.cpp

@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "csharp/stream.hpp"
+#include "xna/csharp/stream.hpp"
 
 using DxSoundEffect = DirectX::SoundEffect;
 

framework/platform-dx/sprite.cpp

@@ -1,12 +1,12 @@
-#include "graphics/rasterizerstate.hpp"
+#include "xna/graphics/rasterizerstate.hpp"
-#include "graphics/samplerstate.hpp"
+#include "xna/graphics/samplerstate.hpp"
-#include "common/color.hpp"
+#include "xna/common/color.hpp"
-#include "common/numerics.hpp"
+#include "xna/common/numerics.hpp"
-#include "graphics/sprite.hpp"
+#include "xna/graphics/sprite.hpp"
-#include "graphics/viewport.hpp"
+#include "xna/graphics/viewport.hpp"
-#include "graphics/blendstate.hpp"
+#include "xna/graphics/blendstate.hpp"
-#include "graphics/depthstencilstate.hpp"
+#include "xna/graphics/depthstencilstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 #include <stdexcept>
 
 using DxSpriteBatch = DirectX::SpriteBatch;

framework/platform-dx/swapchain.cpp

@@ -1,8 +1,8 @@
-#include "platform-dx/helpers.hpp"
+#include "xna/platform-dx/helpers.hpp"
-#include "graphics/adapter.hpp"
+#include "xna/graphics/adapter.hpp"
-#include "graphics/swapchain.hpp"
+#include "xna/graphics/swapchain.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "graphics/device.hpp"
+#include "xna/graphics/device.hpp"
 
 namespace xna {
     SwapChain::SwapChain() : GraphicsResource(nullptr) {

framework/platform-dx/texture.cpp

@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
-#include "platform-dx/helpers.hpp"
+#include "xna/platform-dx/helpers.hpp"
 
 namespace xna {	
 	Texture2D::~Texture2D() {

framework/platform-dx/window.cpp

@@ -1,4 +1,4 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	GameWindow::GameWindow() {

inc/xna/common/collision.hpp

@@ -1,7 +1,7 @@
 #ifndef XNA_COMMON_SHAPES_HPP
 #define XNA_COMMON_SHAPES_HPP
 
-#include "default.hpp"
+#include "../default.hpp"
 #include "numerics.hpp"
 #include "gjk.hpp"
 #include <optional>

inc/xna/common/gjk.hpp

@@ -1,7 +1,7 @@
 #ifndef XNA_COMMON_GDK_HPP
 #define XNA_COMMON_GDK_HPP
 
-#include "default.hpp"
+#include "../default.hpp"
 #include "numerics.hpp"
 #include "math.hpp"
 

inc/xna/content/manager.hpp

@@ -1,9 +1,9 @@
 #ifndef XNA_CONTENT_MANAGER_HPP
 #define XNA_CONTENT_MANAGER_HPP
 
-#include "csharp/stream.hpp"
+#include "../csharp/service.hpp"
-#include "default.hpp"
+#include "../csharp/stream.hpp"
-#include "csharp/service.hpp"
+#include "../default.hpp"
 #include "reader.hpp"
 #include <map>
 

inc/xna/content/reader.hpp

@@ -1,11 +1,11 @@
 #ifndef XNA_CONTENT_READER_HPP
 #define XNA_CONTENT_READER_HPP
 
-#include "common/color.hpp"
+#include "../common/color.hpp"
-#include "common/numerics.hpp"
+#include "../common/numerics.hpp"
-#include "csharp/binary.hpp"
+#include "../csharp/binary.hpp"
-#include "csharp/type.hpp"
+#include "../csharp/type.hpp"
-#include "default.hpp"
+#include "../default.hpp"
 #include "typereadermanager.hpp"
 #include <any>
 

inc/xna/content/readers/audio.hpp

@@ -1,11 +1,11 @@
 #ifndef XNA_CONTENT_READERS_AUDIO_HPP
 #define XNA_CONTENT_READERS_AUDIO_HPP
 
-#include "content/manager.hpp"
+#include "../../audio/soundeffect.hpp"
-#include "content/reader.hpp"
+#include "../../csharp/timespan.hpp"
-#include "csharp/type.hpp"
+#include "../../csharp/type.hpp"
-#include "audio/soundeffect.hpp"
+#include "../manager.hpp"
-#include "csharp/timespan.hpp"
+#include "../reader.hpp"
 
 namespace xna {
 	class SoundEffectReader : public ContentTypeReaderT<PSoundEffect> {

inc/xna/content/readers/default.hpp

@@ -1,11 +1,11 @@
 #ifndef XNA_CONTENT_READERS_DEFAULT_HPP
 #define XNA_CONTENT_READERS_DEFAULT_HPP
 
-#include "content/reader.hpp"
+#include "../../common/color.hpp"
-#include "default.hpp"
+#include "../../common/numerics.hpp"
-#include "common/color.hpp"
+#include "../../csharp/timespan.hpp"
-#include "common/numerics.hpp"
+#include "../../default.hpp"
-#include "csharp/timespan.hpp"
+#include "../reader.hpp"
 
 namespace xna {
 	class ObjectReader : public ContentTypeReaderT<Object> {

inc/xna/content/readers/graphics.hpp

@@ -1,13 +1,13 @@
 #ifndef XNA_CONTENT_READERS_GRAPHICS_HPP
 #define XNA_CONTENT_READERS_GRAPHICS_HPP
 
-#include "content/manager.hpp"
+#include "../../common/numerics.hpp"
-#include "content/reader.hpp"
+#include "../../csharp/timespan.hpp"
-#include "csharp/type.hpp"
+#include "../../csharp/type.hpp"
-#include "graphics/texture.hpp"
+#include "../../graphics/sprite.hpp"
-#include "common/numerics.hpp"
+#include "../../graphics/texture.hpp"
-#include "csharp/timespan.hpp"
+#include "../manager.hpp"
-#include "graphics/sprite.hpp"
+#include "../reader.hpp"
 
 namespace xna {
 	class Texture2DReader : public ContentTypeReaderT<PTexture2D> {

inc/xna/game/game.hpp

@@ -2,7 +2,7 @@
 #define XNA_GAME_GAME_HPP
 
 #include "../default.hpp"
-#include "game/time.hpp"
+#include "time.hpp"
 
 namespace xna {
 	class Game : public std::enable_shared_from_this<Game> {

inc/xna/graphics/sprite.hpp

@@ -2,8 +2,8 @@
 #define XNA_GRAPHICS_SPRITE_HPP
 
 #include "../default.hpp"
-#include "common/numerics.hpp"
+#include "../common/numerics.hpp"
-#include "common/color.hpp"
+#include "../common/color.hpp"
 #include <optional>
 
 namespace xna {

inc/xna/graphics/viewport.hpp

@@ -1,7 +1,7 @@
 #ifndef XNA_GRAPHICS_VIEWPORT
 #define XNA_GRAPHICS_VIEWPORT
 
-#include "common/numerics.hpp"
+#include "../common/numerics.hpp"
 
 namespace xna {
 	struct Viewport {

inc/xna/platform-dx/helpers.hpp

@@ -1,6 +1,6 @@
 #include "headers.hpp"
-#include "graphics/blendstate.hpp"
+#include "../graphics/blendstate.hpp"
-#include "graphics/adapter.hpp"
+#include "../graphics/adapter.hpp"
 
 namespace xna {
 	struct DxHelpers {

inc/xna/platform-dx/implementations.hpp

@@ -3,29 +3,29 @@
 
 #include "headers.hpp"
 #include "stepTimer.hpp"
-#include "graphics/device.hpp"
+#include "../graphics/device.hpp"
-#include "graphics/adapter.hpp"
+#include "../graphics/adapter.hpp"
-#include "graphics/blendstate.hpp"
+#include "../graphics/blendstate.hpp"
-#include "graphics/buffer.hpp"
+#include "../graphics/buffer.hpp"
-#include "graphics/depthstencilstate.hpp"
+#include "../graphics/depthstencilstate.hpp"
-#include "graphics/displaymode.hpp"
+#include "../graphics/displaymode.hpp"
-#include "graphics/sprite.hpp"
+#include "../graphics/sprite.hpp"
-#include "graphics/samplerstate.hpp"
+#include "../graphics/samplerstate.hpp"
-#include "input/gamepad.hpp"
+#include "../input/gamepad.hpp"
-#include "input/keyboard.hpp"
+#include "../input/keyboard.hpp"
-#include "input/mouse.hpp"
+#include "../input/mouse.hpp"
-#include "graphics/rasterizerstate.hpp"
+#include "../graphics/rasterizerstate.hpp"
-#include "graphics/presentparams.hpp"
+#include "../graphics/presentparams.hpp"
-#include "graphics/shader.hpp"
+#include "../graphics/shader.hpp"
-#include "graphics/swapchain.hpp"
+#include "../graphics/swapchain.hpp"
-#include "graphics/texture.hpp"
+#include "../graphics/texture.hpp"
-#include "graphics/rendertarget.hpp"
+#include "../graphics/rendertarget.hpp"
-#include "game/window.hpp"
+#include "../game/window.hpp"
-#include "audio/audioengine.hpp"
+#include "../audio/audioengine.hpp"
-#include "audio/soundeffect.hpp"
+#include "../audio/soundeffect.hpp"
-#include "graphics/viewport.hpp"
+#include "../graphics/viewport.hpp"
-#include "common/color.hpp"
+#include "../common/color.hpp"
-#include "game/game.hpp"
+#include "../game/game.hpp"
 
 namespace xna {
 	struct SpriteFont::PlatformImplementation {