From 9577aa09371f35f6bd567d4c583df3052a3a1dac Mon Sep 17 00:00:00 2001 From: Danilo Date: Sat, 13 Jul 2024 22:55:36 -0300 Subject: [PATCH] Renomeia dx.hpp para xna-dx.hpp --- framework/platform-dx/adapter.cpp | 2 +- framework/platform-dx/audioengine.cpp | 2 +- framework/platform-dx/blendstate.cpp | 2 +- framework/platform-dx/depthstencilstate.cpp | 2 +- framework/platform-dx/device.cpp | 2 +- framework/platform-dx/displaymode.cpp | 2 +- framework/platform-dx/effect.cpp | 2 +- framework/platform-dx/game.cpp | 2 +- framework/platform-dx/gamepad.cpp | 2 +- framework/platform-dx/gdevicemanager.cpp | 2 +- framework/platform-dx/init.cpp | 2 +- framework/platform-dx/keyboard.cpp | 2 +- framework/platform-dx/mouse.cpp | 2 +- framework/platform-dx/rasterizerstate.cpp | 2 +- framework/platform-dx/rendertarget.cpp | 2 +- framework/platform-dx/samplerstate.cpp | 2 +- framework/platform-dx/soundeffect.cpp | 2 +- framework/platform-dx/sprite.cpp | 2 +- framework/platform-dx/swapchain.cpp | 2 +- framework/platform-dx/texture.cpp | 2 +- framework/platform-dx/window.cpp | 2 +- inc/xna/{platform/dx.hpp => xna-dx.hpp} | 2 +- samples/01_blank/xna.cpp | 2 +- samples/02_PlatfformerStarterKit/headers.hpp | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) rename inc/xna/{platform/dx.hpp => xna-dx.hpp} (99%) diff --git a/framework/platform-dx/adapter.cpp b/framework/platform-dx/adapter.cpp index 035a995..a5e4132 100644 --- a/framework/platform-dx/adapter.cpp +++ b/framework/platform-dx/adapter.cpp @@ -1,7 +1,7 @@ #include "xna/graphics/adapter.hpp" #include "xna/graphics/displaymode.hpp" #include "xna/game/gdevicemanager.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { static size_t getDisplayModesCount(IDXGIAdapter* adapter); diff --git a/framework/platform-dx/audioengine.cpp b/framework/platform-dx/audioengine.cpp index 90fd9a3..56f8226 100644 --- a/framework/platform-dx/audioengine.cpp +++ b/framework/platform-dx/audioengine.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { void AudioEngine::Initialize() { diff --git a/framework/platform-dx/blendstate.cpp b/framework/platform-dx/blendstate.cpp index 3bedd5d..74ffe21 100644 --- a/framework/platform-dx/blendstate.cpp +++ b/framework/platform-dx/blendstate.cpp @@ -1,6 +1,6 @@ #include "xna/graphics/blendstate.hpp" #include "xna/graphics/gresource.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { BlendState::BlendState() : BlendState(nullptr) {} diff --git a/framework/platform-dx/depthstencilstate.cpp b/framework/platform-dx/depthstencilstate.cpp index 39349fb..2aa4e6b 100644 --- a/framework/platform-dx/depthstencilstate.cpp +++ b/framework/platform-dx/depthstencilstate.cpp @@ -1,5 +1,5 @@ #include "xna/graphics/depthstencilstate.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { static D3D11_DEPTH_STENCIL_DESC defaultDesc() { diff --git a/framework/platform-dx/device.cpp b/framework/platform-dx/device.cpp index 81cac36..2ee9001 100644 --- a/framework/platform-dx/device.cpp +++ b/framework/platform-dx/device.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include "xna/game/gdevicemanager.hpp" namespace xna { diff --git a/framework/platform-dx/displaymode.cpp b/framework/platform-dx/displaymode.cpp index 1a8642b..fbebf57 100644 --- a/framework/platform-dx/displaymode.cpp +++ b/framework/platform-dx/displaymode.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include "xna/graphics/displaymode.hpp" namespace xna { diff --git a/framework/platform-dx/effect.cpp b/framework/platform-dx/effect.cpp index 385e263..28c3311 100644 --- a/framework/platform-dx/effect.cpp +++ b/framework/platform-dx/effect.cpp @@ -1,5 +1,5 @@ #include "xna/graphics/effect.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include "xna/common/math.hpp" using DxBasicEffect = DirectX::BasicEffect; diff --git a/framework/platform-dx/game.cpp b/framework/platform-dx/game.cpp index 2c20d82..6892f0b 100644 --- a/framework/platform-dx/game.cpp +++ b/framework/platform-dx/game.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { Game::Game() { diff --git a/framework/platform-dx/gamepad.cpp b/framework/platform-dx/gamepad.cpp index 62be6b7..23bf0d1 100644 --- a/framework/platform-dx/gamepad.cpp +++ b/framework/platform-dx/gamepad.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include "xna/input/gamepad.hpp" namespace xna { diff --git a/framework/platform-dx/gdevicemanager.cpp b/framework/platform-dx/gdevicemanager.cpp index c54efb4..0c0f447 100644 --- a/framework/platform-dx/gdevicemanager.cpp +++ b/framework/platform-dx/gdevicemanager.cpp @@ -1,7 +1,7 @@ #include "xna/game/gdevicemanager.hpp" #include "xna/graphics/presentparams.hpp" #include "xna/graphics/swapchain.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { GraphicsDeviceManager::GraphicsDeviceManager(sptr const& game) : _game(game) diff --git a/framework/platform-dx/init.cpp b/framework/platform-dx/init.cpp index 80eb404..7f69ee8 100644 --- a/framework/platform-dx/init.cpp +++ b/framework/platform-dx/init.cpp @@ -3,7 +3,7 @@ #include "xna/content/readers/audio.hpp" #include "xna/content/typereadermanager.hpp" #include "xna/content/readers/default.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { void Platform::Init() { diff --git a/framework/platform-dx/keyboard.cpp b/framework/platform-dx/keyboard.cpp index 0b1194f..867ca54 100644 --- a/framework/platform-dx/keyboard.cpp +++ b/framework/platform-dx/keyboard.cpp @@ -1,5 +1,5 @@ #include "xna/input/keyboard.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { KeyboardState Keyboard::GetState() { diff --git a/framework/platform-dx/mouse.cpp b/framework/platform-dx/mouse.cpp index 6a11b5b..039a37d 100644 --- a/framework/platform-dx/mouse.cpp +++ b/framework/platform-dx/mouse.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { MouseState Mouse::GetState() { diff --git a/framework/platform-dx/rasterizerstate.cpp b/framework/platform-dx/rasterizerstate.cpp index 291bf5b..039ae67 100644 --- a/framework/platform-dx/rasterizerstate.cpp +++ b/framework/platform-dx/rasterizerstate.cpp @@ -1,5 +1,5 @@ #include "xna/graphics/rasterizerstate.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { diff --git a/framework/platform-dx/rendertarget.cpp b/framework/platform-dx/rendertarget.cpp index 3857b52..d154417 100644 --- a/framework/platform-dx/rendertarget.cpp +++ b/framework/platform-dx/rendertarget.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { RenderTarget2D::RenderTarget2D() : Texture2D() { diff --git a/framework/platform-dx/samplerstate.cpp b/framework/platform-dx/samplerstate.cpp index c8b546e..f624144 100644 --- a/framework/platform-dx/samplerstate.cpp +++ b/framework/platform-dx/samplerstate.cpp @@ -1,6 +1,6 @@ #include "xna/graphics/samplerstate.hpp" #include "xna/graphics/samplerstate.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { SamplerState::SamplerState() : SamplerState(nullptr){} diff --git a/framework/platform-dx/soundeffect.cpp b/framework/platform-dx/soundeffect.cpp index 829d605..82c19e6 100644 --- a/framework/platform-dx/soundeffect.cpp +++ b/framework/platform-dx/soundeffect.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include "xna/csharp/stream.hpp" using DxSoundEffect = DirectX::SoundEffect; diff --git a/framework/platform-dx/sprite.cpp b/framework/platform-dx/sprite.cpp index 31bb2ff..5bae260 100644 --- a/framework/platform-dx/sprite.cpp +++ b/framework/platform-dx/sprite.cpp @@ -6,7 +6,7 @@ #include "xna/graphics/viewport.hpp" #include "xna/graphics/blendstate.hpp" #include "xna/graphics/depthstencilstate.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include using DxSpriteBatch = DirectX::SpriteBatch; diff --git a/framework/platform-dx/swapchain.cpp b/framework/platform-dx/swapchain.cpp index 6757a8e..19aacb3 100644 --- a/framework/platform-dx/swapchain.cpp +++ b/framework/platform-dx/swapchain.cpp @@ -1,6 +1,6 @@ #include "xna/graphics/adapter.hpp" #include "xna/graphics/swapchain.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" #include "xna/graphics/device.hpp" namespace xna { diff --git a/framework/platform-dx/texture.cpp b/framework/platform-dx/texture.cpp index 28923f3..3f54d5a 100644 --- a/framework/platform-dx/texture.cpp +++ b/framework/platform-dx/texture.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { Texture2D::~Texture2D() { diff --git a/framework/platform-dx/window.cpp b/framework/platform-dx/window.cpp index 0c0fa48..99ea44f 100644 --- a/framework/platform-dx/window.cpp +++ b/framework/platform-dx/window.cpp @@ -1,4 +1,4 @@ -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" namespace xna { GameWindow::GameWindow() { diff --git a/inc/xna/platform/dx.hpp b/inc/xna/xna-dx.hpp similarity index 99% rename from inc/xna/platform/dx.hpp rename to inc/xna/xna-dx.hpp index 0a0752a..75944f6 100644 --- a/inc/xna/platform/dx.hpp +++ b/inc/xna/xna-dx.hpp @@ -53,7 +53,7 @@ using comptr = Microsoft::WRL::ComPtr; //---------------- INCLUDES ----------------// -#include "../xna.hpp" +#include "xna.hpp" //---------------- CLASSES ----------------// diff --git a/samples/01_blank/xna.cpp b/samples/01_blank/xna.cpp index 9f8727a..dc97e81 100644 --- a/samples/01_blank/xna.cpp +++ b/samples/01_blank/xna.cpp @@ -2,7 +2,7 @@ // #include "xna/xna.hpp" -#include "xna/platform/dx.hpp" +#include "xna/xna-dx.hpp" using namespace std; using namespace xna; diff --git a/samples/02_PlatfformerStarterKit/headers.hpp b/samples/02_PlatfformerStarterKit/headers.hpp index dac1e61..951642e 100644 --- a/samples/02_PlatfformerStarterKit/headers.hpp +++ b/samples/02_PlatfformerStarterKit/headers.hpp @@ -1,2 +1,2 @@ #include "xna/xna.hpp" -#include "xna/platform/dx.hpp" \ No newline at end of file +#include "xna/xna-dx.hpp" \ No newline at end of file