From acd354e84ce4bc729384e342b08ca2b1c2150567 Mon Sep 17 00:00:00 2001 From: Danilo Date: Thu, 9 May 2024 11:37:56 -0300 Subject: [PATCH] =?UTF-8?q?Move=20arquivos=20de=20cabe=C3=A7alhos=20para?= =?UTF-8?q?=20pasta=20Inc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++ framework/CMakeLists.txt | 11 +++- framework/common/color.cpp | 2 +- framework/common/matrix.cpp | 2 +- framework/common/vectors.cpp | 6 +- framework/content/lzx/decoder.cpp | 2 +- framework/content/lzx/decoderstream.cpp | 2 +- framework/content/manager.cpp | 2 +- framework/content/reader.cpp | 10 +-- framework/content/typereadermanager.cpp | 6 +- framework/csharp/binary.cpp | 4 +- framework/csharp/object.cpp | 4 +- framework/csharp/stream.cpp | 4 +- framework/csharp/type.cpp | 2 +- framework/game/component.cpp | 2 +- framework/game/servicecontainer.cpp | 2 +- framework/platform/adapter-dx.cpp | 4 +- framework/platform/audioengine.dx.cpp | 2 +- framework/platform/blendstate-dx.cpp | 4 +- framework/platform/clock-dx.cpp | 2 +- framework/platform/constbuffer-dx.cpp | 4 +- framework/platform/databuffer-dx.cpp | 2 +- framework/platform/depthstencilstate-dx.cpp | 4 +- framework/platform/device-dx.cpp | 18 +++--- framework/platform/displaymode-dx.cpp | 2 +- framework/platform/game-dx.cpp | 20 +++--- framework/platform/gamepad-dx.cpp | 2 +- framework/platform/gdevicemanager-dx.cpp | 14 ++-- framework/platform/indexbuffer-dx.cpp | 4 +- framework/platform/init-dx.cpp | 12 ++-- framework/platform/keyboard-dx.cpp | 2 +- framework/platform/mouse-dx.cpp | 2 +- framework/platform/presentparameters-dx.cpp | 4 +- framework/platform/rasterizerstate-dx.cpp | 4 +- framework/platform/rendertarget-dx.cpp | 8 +-- framework/platform/samplerstate-dx.cpp | 4 +- framework/platform/shader-dx.cpp | 6 +- framework/platform/soundeffect-dx.cpp | 4 +- framework/platform/spritebatch-dx.cpp | 14 ++-- framework/platform/spritefont-dx.cpp | 2 +- framework/platform/swapchain-dx.cpp | 6 +- framework/platform/texture-dx.cpp | 6 +- framework/platform/vertexbuffer-dx.cpp | 2 +- framework/platform/vertexinput-dx.cpp | 10 ++- framework/platform/window-dx.cpp | 8 +-- framework/xna.cpp | 2 +- framework/xna.h | 30 --------- {framework => inc}/audio/audioengine.hpp | 0 {framework => inc}/audio/soundeffect.hpp | 0 {framework => inc}/common/color.hpp | 0 {framework => inc}/common/math.hpp | 0 {framework => inc}/common/matrix.hpp | 0 {framework => inc}/common/packedvalue.hpp | 0 {framework => inc}/common/point.hpp | 0 {framework => inc}/common/quaternion.hpp | 0 {framework => inc}/common/rectangle.hpp | 0 {framework => inc}/common/vectors.hpp | 0 {framework => inc}/content/defaultreaders.hpp | 0 {framework => inc}/content/lzx/decoder.hpp | 0 .../content/lzx/decoderstream.hpp | 0 {framework => inc}/content/manager.hpp | 0 {framework => inc}/content/reader.hpp | 0 .../content/typereadermanager.hpp | 0 {framework => inc}/csharp/binary.hpp | 0 {framework => inc}/csharp/buffer.hpp | 0 {framework => inc}/csharp/object.hpp | 0 {framework => inc}/csharp/service.hpp | 0 {framework => inc}/csharp/stream.hpp | 0 {framework => inc}/csharp/timespan.hpp | 0 {framework => inc}/csharp/type.hpp | 0 {framework => inc}/default.hpp | 4 +- {framework => inc}/enums.hpp | 0 {framework => inc}/forward.hpp | 0 {framework => inc}/game/clock.hpp | 0 {framework => inc}/game/component.hpp | 0 {framework => inc}/game/game.hpp | 0 {framework => inc}/game/gdeviceinfo.hpp | 0 {framework => inc}/game/gdevicemanager.hpp | 0 {framework => inc}/game/servicecontainer.hpp | 0 {framework => inc}/game/time.hpp | 0 {framework => inc}/game/window.hpp | 0 {framework => inc}/graphics/adapter.hpp | 0 {framework => inc}/graphics/blendstate.hpp | 0 {framework => inc}/graphics/constbuffer.hpp | 0 {framework => inc}/graphics/databuffer.hpp | 0 .../graphics/depthstencilstate.hpp | 0 {framework => inc}/graphics/device.hpp | 0 {framework => inc}/graphics/displaymode.hpp | 0 {framework => inc}/graphics/gresource.hpp | 0 {framework => inc}/graphics/indexbuffer.hpp | 0 {framework => inc}/graphics/presentparams.hpp | 0 .../graphics/rasterizerstate.hpp | 0 {framework => inc}/graphics/rendertarget.hpp | 0 {framework => inc}/graphics/samplerstate.hpp | 0 {framework => inc}/graphics/shader.hpp | 0 {framework => inc}/graphics/spritebatch.hpp | 0 {framework => inc}/graphics/spritefont.hpp | 0 {framework => inc}/graphics/swapchain.hpp | 0 {framework => inc}/graphics/texture.hpp | 0 {framework => inc}/graphics/vertexbuffer.hpp | 0 {framework => inc}/graphics/vertexinput.hpp | 0 .../graphics/vertexposition.hpp | 0 {framework => inc}/graphics/viewport.hpp | 0 {framework => inc}/helpers.hpp | 0 {framework => inc}/input/gamepad.hpp | 0 {framework => inc}/input/keyboard.hpp | 0 {framework => inc}/input/mouse.hpp | 0 .../platform-dx}/adapter-dx.hpp | 0 .../platform-dx}/audioengine-dx.hpp | 0 .../platform-dx}/blendstate-dx.hpp | 0 .../platform => inc/platform-dx}/clock-dx.hpp | 0 .../platform-dx}/constbuffer-dx.hpp | 0 .../content-readers/texture2Dreader-dx.hpp | 0 .../platform-dx}/databuffer-dx.hpp | 0 .../platform-dx}/depthstencilstate-dx.hpp | 0 .../platform-dx}/device-dx.hpp | 0 .../platform-dx}/displaymode-dx.hpp | 0 .../platform-dx}/dx/StepTimer.hpp | 0 .../platform-dx}/dxheaders.hpp | 0 .../platform => inc/platform-dx}/game-dx.hpp | 0 .../platform-dx}/gamepad-dx.hpp | 0 .../platform-dx}/gdeviceinfo-dx.hpp | 0 .../platform-dx}/gdevicemanager-dx.hpp | 0 .../platform-dx}/indexbuffer-dx.hpp | 0 .../platform => inc/platform-dx}/init-dx.hpp | 0 .../platform-dx}/keyboard-dx.hpp | 0 .../platform => inc/platform-dx}/mouse-dx.hpp | 0 .../platform-dx}/presentparameters-dx.hpp | 0 .../platform-dx}/rasterizerstate-dx.hpp | 0 .../platform-dx}/rendertarget-dx.hpp | 0 .../platform-dx}/samplerstate-dx.hpp | 0 .../platform-dx}/shader-dx.hpp | 0 .../platform-dx}/shaders/pixel.hlsl | 0 .../platform-dx}/shaders/vertex.hlsl | 0 .../platform-dx}/soundeffect-dx.hpp | 0 .../platform-dx}/spritebatch-dx.hpp | 6 +- .../platform-dx}/spritefont-dx.hpp | 0 .../platform-dx}/swapchain-dx.hpp | 0 .../platform-dx}/texture-dx.hpp | 0 .../platform-dx}/vertexbuffer-dx.hpp | 0 .../platform-dx}/vertexinput-dx.hpp | 0 .../platform-dx}/window-dx.hpp | 0 inc/platform-dx/xna-dx.hpp | 33 ++++++++++ {framework => inc}/types.hpp | 0 inc/xna.hpp | 64 +++++++++++++++++++ {framework => inc}/xnaerror.hpp | 0 146 files changed, 227 insertions(+), 153 deletions(-) delete mode 100644 framework/xna.h rename {framework => inc}/audio/audioengine.hpp (100%) rename {framework => inc}/audio/soundeffect.hpp (100%) rename {framework => inc}/common/color.hpp (100%) rename {framework => inc}/common/math.hpp (100%) rename {framework => inc}/common/matrix.hpp (100%) rename {framework => inc}/common/packedvalue.hpp (100%) rename {framework => inc}/common/point.hpp (100%) rename {framework => inc}/common/quaternion.hpp (100%) rename {framework => inc}/common/rectangle.hpp (100%) rename {framework => inc}/common/vectors.hpp (100%) rename {framework => inc}/content/defaultreaders.hpp (100%) rename {framework => inc}/content/lzx/decoder.hpp (100%) rename {framework => inc}/content/lzx/decoderstream.hpp (100%) rename {framework => inc}/content/manager.hpp (100%) rename {framework => inc}/content/reader.hpp (100%) rename {framework => inc}/content/typereadermanager.hpp (100%) rename {framework => inc}/csharp/binary.hpp (100%) rename {framework => inc}/csharp/buffer.hpp (100%) rename {framework => inc}/csharp/object.hpp (100%) rename {framework => inc}/csharp/service.hpp (100%) rename {framework => inc}/csharp/stream.hpp (100%) rename {framework => inc}/csharp/timespan.hpp (100%) rename {framework => inc}/csharp/type.hpp (100%) rename {framework => inc}/default.hpp (58%) rename {framework => inc}/enums.hpp (100%) rename {framework => inc}/forward.hpp (100%) rename {framework => inc}/game/clock.hpp (100%) rename {framework => inc}/game/component.hpp (100%) rename {framework => inc}/game/game.hpp (100%) rename {framework => inc}/game/gdeviceinfo.hpp (100%) rename {framework => inc}/game/gdevicemanager.hpp (100%) rename {framework => inc}/game/servicecontainer.hpp (100%) rename {framework => inc}/game/time.hpp (100%) rename {framework => inc}/game/window.hpp (100%) rename {framework => inc}/graphics/adapter.hpp (100%) rename {framework => inc}/graphics/blendstate.hpp (100%) rename {framework => inc}/graphics/constbuffer.hpp (100%) rename {framework => inc}/graphics/databuffer.hpp (100%) rename {framework => inc}/graphics/depthstencilstate.hpp (100%) rename {framework => inc}/graphics/device.hpp (100%) rename {framework => inc}/graphics/displaymode.hpp (100%) rename {framework => inc}/graphics/gresource.hpp (100%) rename {framework => inc}/graphics/indexbuffer.hpp (100%) rename {framework => inc}/graphics/presentparams.hpp (100%) rename {framework => inc}/graphics/rasterizerstate.hpp (100%) rename {framework => inc}/graphics/rendertarget.hpp (100%) rename {framework => inc}/graphics/samplerstate.hpp (100%) rename {framework => inc}/graphics/shader.hpp (100%) rename {framework => inc}/graphics/spritebatch.hpp (100%) rename {framework => inc}/graphics/spritefont.hpp (100%) rename {framework => inc}/graphics/swapchain.hpp (100%) rename {framework => inc}/graphics/texture.hpp (100%) rename {framework => inc}/graphics/vertexbuffer.hpp (100%) rename {framework => inc}/graphics/vertexinput.hpp (100%) rename {framework => inc}/graphics/vertexposition.hpp (100%) rename {framework => inc}/graphics/viewport.hpp (100%) rename {framework => inc}/helpers.hpp (100%) rename {framework => inc}/input/gamepad.hpp (100%) rename {framework => inc}/input/keyboard.hpp (100%) rename {framework => inc}/input/mouse.hpp (100%) rename {framework/platform => inc/platform-dx}/adapter-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/audioengine-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/blendstate-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/clock-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/constbuffer-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/content-readers/texture2Dreader-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/databuffer-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/depthstencilstate-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/device-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/displaymode-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/dx/StepTimer.hpp (100%) rename {framework/platform => inc/platform-dx}/dxheaders.hpp (100%) rename {framework/platform => inc/platform-dx}/game-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/gamepad-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/gdeviceinfo-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/gdevicemanager-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/indexbuffer-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/init-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/keyboard-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/mouse-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/presentparameters-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/rasterizerstate-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/rendertarget-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/samplerstate-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/shader-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/shaders/pixel.hlsl (100%) rename {framework/platform => inc/platform-dx}/shaders/vertex.hlsl (100%) rename {framework/platform => inc/platform-dx}/soundeffect-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/spritebatch-dx.hpp (92%) rename {framework/platform => inc/platform-dx}/spritefont-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/swapchain-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/texture-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/vertexbuffer-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/vertexinput-dx.hpp (100%) rename {framework/platform => inc/platform-dx}/window-dx.hpp (100%) create mode 100644 inc/platform-dx/xna-dx.hpp rename {framework => inc}/types.hpp (100%) create mode 100644 inc/xna.hpp rename {framework => inc}/xnaerror.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f9f0f0..b0bc70f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,12 @@ if (POLICY CMP0141) endif() set(ENV{VCPKG_ROOT} C:\\vcpkg) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc) +MESSAGE(${CMAKE_CURRENT_SOURCE_DIR}/inc) project ("xna") # Include sub-projects. add_subdirectory ("framework") + + diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 5eb9432..86bba27 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -39,7 +39,14 @@ add_executable (xna WIN32 "content/manager.cpp" "content/reader.cpp" "csharp/binary.cpp" - "content/lzx/decoder.cpp" "content/lzx/decoderstream.cpp" "content/typereadermanager.cpp" "csharp/object.cpp" "csharp/type.cpp" "platform/init-dx.cpp" "game/servicecontainer.cpp" "common/color.cpp") + "content/lzx/decoder.cpp" + "content/lzx/decoderstream.cpp" + "content/typereadermanager.cpp" + "csharp/object.cpp" + "csharp/type.cpp" + "platform/init-dx.cpp" + "game/servicecontainer.cpp" + "common/color.cpp") if (CMAKE_VERSION VERSION_GREATER 3.12) set_property(TARGET xna PROPERTY CXX_STANDARD 20) @@ -70,9 +77,7 @@ endif() # find_package(directxtk CONFIG REQUIRED) -include_directories($ENV{VCPKG_ROOT}\\packages\\libmspack_x64-windows\\include) target_link_libraries(${PROJECT_NAME} D3d11.lib dxgi.lib dxguid.lib d3dcompiler.lib Microsoft::DirectXTK - $ENV{VCPKG_ROOT}\\packages\\libmspack_x64-windows\\lib\\libmspack.lib ) diff --git a/framework/common/color.cpp b/framework/common/color.cpp index c25e283..0081cae 100644 --- a/framework/common/color.cpp +++ b/framework/common/color.cpp @@ -1,4 +1,4 @@ -#include "color.hpp" +#include "common/color.hpp" namespace xna { diff --git a/framework/common/matrix.cpp b/framework/common/matrix.cpp index bcd2621..929c77c 100644 --- a/framework/common/matrix.cpp +++ b/framework/common/matrix.cpp @@ -1,4 +1,4 @@ -#include "matrix.hpp" +#include "common/matrix.hpp" namespace xna { Matrix Matrix::CreateBillboard(Vector3 const& objectPosition, Vector3 const& cameraPosition, Vector3 const& cameraUpVector, Vector3* cameraForwardVector) diff --git a/framework/common/vectors.cpp b/framework/common/vectors.cpp index 67c4034..f7b5ffc 100644 --- a/framework/common/vectors.cpp +++ b/framework/common/vectors.cpp @@ -1,6 +1,6 @@ -#include "vectors.hpp" -#include "matrix.hpp" -#include "quaternion.hpp" +#include "common/vectors.hpp" +#include "common/matrix.hpp" +#include "common/quaternion.hpp" namespace xna { bool Vector2::Transform(Vector2 const* sourceArray, size_t sourceArrayLength, Matrix const& matrix, Vector2* destinationArray, size_t destinationArrayLength) { diff --git a/framework/content/lzx/decoder.cpp b/framework/content/lzx/decoder.cpp index 4639276..1929a4b 100644 --- a/framework/content/lzx/decoder.cpp +++ b/framework/content/lzx/decoder.cpp @@ -1,4 +1,4 @@ -#include "decoder.hpp" +#include "content/lzx/decoder.hpp" namespace xna { diff --git a/framework/content/lzx/decoderstream.cpp b/framework/content/lzx/decoderstream.cpp index b9276f9..610eb2c 100644 --- a/framework/content/lzx/decoderstream.cpp +++ b/framework/content/lzx/decoderstream.cpp @@ -1,4 +1,4 @@ -#include "decoderstream.hpp" +#include "content/lzx/decoderstream.hpp" namespace xna { Int LzxDecoderStream::Length() diff --git a/framework/content/manager.cpp b/framework/content/manager.cpp index c421f25..28a523e 100644 --- a/framework/content/manager.cpp +++ b/framework/content/manager.cpp @@ -1 +1 @@ -#include "manager.hpp" \ No newline at end of file +#include "content/manager.hpp" \ No newline at end of file diff --git a/framework/content/reader.cpp b/framework/content/reader.cpp index 69cded6..36cbc50 100644 --- a/framework/content/reader.cpp +++ b/framework/content/reader.cpp @@ -1,8 +1,8 @@ -#include "reader.hpp" -#include "manager.hpp" -#include "lzx/decoderstream.hpp" -#include "typereadermanager.hpp" -#include "manager.hpp" +#include "content/reader.hpp" +#include "content/manager.hpp" +#include "content/lzx/decoderstream.hpp" +#include "content/typereadermanager.hpp" +#include "content/manager.hpp" namespace xna { sptr ContentReader::Create(ContentManager* contentManager, sptr& input, String const& assetName) diff --git a/framework/content/typereadermanager.cpp b/framework/content/typereadermanager.cpp index 488f5da..a39521c 100644 --- a/framework/content/typereadermanager.cpp +++ b/framework/content/typereadermanager.cpp @@ -1,6 +1,6 @@ -#include "typereadermanager.hpp" -#include "reader.hpp" -#include "defaultreaders.hpp" +#include "content/typereadermanager.hpp" +#include "content/reader.hpp" +#include "content/defaultreaders.hpp" namespace xna { std::vector ContentTypeReaderManager::ReadTypeManifest(Int typeCount, sptr& contentReader, xna_error_ptr_arg) diff --git a/framework/csharp/binary.cpp b/framework/csharp/binary.cpp index b419b2a..970f5c0 100644 --- a/framework/csharp/binary.cpp +++ b/framework/csharp/binary.cpp @@ -1,5 +1,5 @@ -#include "binary.hpp" -#include "../csharp/buffer.hpp" +#include "csharp/binary.hpp" +#include "csharp/buffer.hpp" namespace xna { Int BinaryReader::PeekChar(xna_error_ptr_arg) diff --git a/framework/csharp/object.cpp b/framework/csharp/object.cpp index 6b61c37..5b41ccc 100644 --- a/framework/csharp/object.cpp +++ b/framework/csharp/object.cpp @@ -1,5 +1,5 @@ -#include "object.hpp" -#include "type.hpp" +#include "csharp/object.hpp" +#include "csharp/type.hpp" namespace xna { size_t Object::GetHashCode() const diff --git a/framework/csharp/stream.cpp b/framework/csharp/stream.cpp index 39277df..3e414b6 100644 --- a/framework/csharp/stream.cpp +++ b/framework/csharp/stream.cpp @@ -1,5 +1,5 @@ -#include "stream.hpp" -#include "buffer.hpp" +#include "csharp/stream.hpp" +#include "csharp/buffer.hpp" namespace xna { Long MemoryStream::Seek(Long offset, SeekOrigin const& origin, xna_error_ptr_arg) { diff --git a/framework/csharp/type.cpp b/framework/csharp/type.cpp index 28e0123..266ac6b 100644 --- a/framework/csharp/type.cpp +++ b/framework/csharp/type.cpp @@ -1,4 +1,4 @@ -#include "type.hpp" +#include "csharp/type.hpp" namespace xna { size_t Type::GetHashCode() const diff --git a/framework/game/component.cpp b/framework/game/component.cpp index f3efee3..d386dbf 100644 --- a/framework/game/component.cpp +++ b/framework/game/component.cpp @@ -1,4 +1,4 @@ -#include "component.hpp" +#include "game/component.hpp" namespace xna { sptr GameComponentCollection::operator[](size_t index) const diff --git a/framework/game/servicecontainer.cpp b/framework/game/servicecontainer.cpp index 20c2689..d63e3db 100644 --- a/framework/game/servicecontainer.cpp +++ b/framework/game/servicecontainer.cpp @@ -1,4 +1,4 @@ -#include "servicecontainer.hpp" +#include "game/servicecontainer.hpp" namespace xna { void GameServiceContainer::AddService(Type& type, std::any& provider) diff --git a/framework/platform/adapter-dx.cpp b/framework/platform/adapter-dx.cpp index e909b28..fef1133 100644 --- a/framework/platform/adapter-dx.cpp +++ b/framework/platform/adapter-dx.cpp @@ -1,5 +1,5 @@ -#include "adapter-dx.hpp" -#include "gdevicemanager-dx.hpp" +#include "platform-dx/adapter-dx.hpp" +#include "platform-dx/gdevicemanager-dx.hpp" namespace xna { static size_t getDisplayModesCount(IDXGIAdapter* adapter); diff --git a/framework/platform/audioengine.dx.cpp b/framework/platform/audioengine.dx.cpp index 865c570..dea214f 100644 --- a/framework/platform/audioengine.dx.cpp +++ b/framework/platform/audioengine.dx.cpp @@ -1,4 +1,4 @@ -#include "audioengine-dx.hpp" +#include "platform-dx/audioengine-dx.hpp" namespace xna { diff --git a/framework/platform/blendstate-dx.cpp b/framework/platform/blendstate-dx.cpp index f2b1a5e..59167d0 100644 --- a/framework/platform/blendstate-dx.cpp +++ b/framework/platform/blendstate-dx.cpp @@ -1,5 +1,5 @@ -#include "blendstate-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/blendstate-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { bool BlendState::Initialize(xna_error_ptr_arg) diff --git a/framework/platform/clock-dx.cpp b/framework/platform/clock-dx.cpp index 9258429..40dab2d 100644 --- a/framework/platform/clock-dx.cpp +++ b/framework/platform/clock-dx.cpp @@ -1,4 +1,4 @@ -#include "clock-dx.hpp" +#include "platform-dx/clock-dx.hpp" #include namespace xna { diff --git a/framework/platform/constbuffer-dx.cpp b/framework/platform/constbuffer-dx.cpp index ab2a7a6..0329e3f 100644 --- a/framework/platform/constbuffer-dx.cpp +++ b/framework/platform/constbuffer-dx.cpp @@ -1,5 +1,5 @@ -#include "constbuffer-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/constbuffer-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { bool ConstantBuffer::Initialize(GraphicsDevice& device, xna_error_ptr_arg) diff --git a/framework/platform/databuffer-dx.cpp b/framework/platform/databuffer-dx.cpp index 6dd3b24..b8705b1 100644 --- a/framework/platform/databuffer-dx.cpp +++ b/framework/platform/databuffer-dx.cpp @@ -1,4 +1,4 @@ -#include "databuffer-dx.hpp" +#include "platform-dx/databuffer-dx.hpp" namespace xna { diff --git a/framework/platform/depthstencilstate-dx.cpp b/framework/platform/depthstencilstate-dx.cpp index 4471777..92c2d7a 100644 --- a/framework/platform/depthstencilstate-dx.cpp +++ b/framework/platform/depthstencilstate-dx.cpp @@ -1,5 +1,5 @@ -#include "depthstencilstate-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/depthstencilstate-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { bool DepthStencilState::Initialize(xna_error_ptr_arg) diff --git a/framework/platform/device-dx.cpp b/framework/platform/device-dx.cpp index d068eb0..9a65133 100644 --- a/framework/platform/device-dx.cpp +++ b/framework/platform/device-dx.cpp @@ -1,12 +1,12 @@ -#include "device-dx.hpp" -#include "window-dx.hpp" -#include "swapchain-dx.hpp" -#include "rendertarget-dx.hpp" -#include "adapter-dx.hpp" -#include "blendstate-dx.hpp" -#include "gdeviceinfo-dx.hpp" -#include "../common/color.hpp" -#include "gdevicemanager-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/window-dx.hpp" +#include "platform-dx/swapchain-dx.hpp" +#include "platform-dx/rendertarget-dx.hpp" +#include "platform-dx/adapter-dx.hpp" +#include "platform-dx/blendstate-dx.hpp" +#include "platform-dx/gdeviceinfo-dx.hpp" +#include "common/color.hpp" +#include "platform-dx/gdevicemanager-dx.hpp" namespace xna { GraphicsDevice::GraphicsDevice() { diff --git a/framework/platform/displaymode-dx.cpp b/framework/platform/displaymode-dx.cpp index bd39f86..2e09fac 100644 --- a/framework/platform/displaymode-dx.cpp +++ b/framework/platform/displaymode-dx.cpp @@ -1,4 +1,4 @@ -#include "displaymode-dx.hpp" +#include "platform-dx/displaymode-dx.hpp" namespace xna { size_t DisplayModeCollection::SurfaceCount(SurfaceFormat format) const diff --git a/framework/platform/game-dx.cpp b/framework/platform/game-dx.cpp index de5ff30..0e18d76 100644 --- a/framework/platform/game-dx.cpp +++ b/framework/platform/game-dx.cpp @@ -1,13 +1,13 @@ -#include "../csharp/type.hpp" -#include "../game/time.hpp" -#include "audioengine-dx.hpp" -#include "device-dx.hpp" -#include "game-dx.hpp" -#include "gamepad-dx.hpp" -#include "gdevicemanager-dx.hpp" -#include "keyboard-dx.hpp" -#include "mouse-dx.hpp" -#include "window-dx.hpp" +#include "csharp/type.hpp" +#include "game/time.hpp" +#include "platform-dx/audioengine-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/game-dx.hpp" +#include "platform-dx/gamepad-dx.hpp" +#include "platform-dx/gdevicemanager-dx.hpp" +#include "platform-dx/keyboard-dx.hpp" +#include "platform-dx/mouse-dx.hpp" +#include "platform-dx/window-dx.hpp" namespace xna { Game::Game() { diff --git a/framework/platform/gamepad-dx.cpp b/framework/platform/gamepad-dx.cpp index ea55d66..f3da6cb 100644 --- a/framework/platform/gamepad-dx.cpp +++ b/framework/platform/gamepad-dx.cpp @@ -1,4 +1,4 @@ -#include "gamepad-dx.hpp" +#include "platform-dx/gamepad-dx.hpp" namespace xna { GamePadState _GamePad::GetState(PlayerIndex index) { diff --git a/framework/platform/gdevicemanager-dx.cpp b/framework/platform/gdevicemanager-dx.cpp index 8226f68..2af7494 100644 --- a/framework/platform/gdevicemanager-dx.cpp +++ b/framework/platform/gdevicemanager-dx.cpp @@ -1,10 +1,10 @@ -#include "gdevicemanager-dx.hpp" -#include "device-dx.hpp" -#include "game-dx.hpp" -#include "window-dx.hpp" -#include "gdeviceinfo-dx.hpp" -#include "adapter-dx.hpp" -#include "presentparameters-dx.hpp" +#include "platform-dx/gdevicemanager-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/game-dx.hpp" +#include "platform-dx/window-dx.hpp" +#include "platform-dx/gdeviceinfo-dx.hpp" +#include "platform-dx/adapter-dx.hpp" +#include "platform-dx/presentparameters-dx.hpp" namespace xna { GraphicsDeviceManager::GraphicsDeviceManager(Game*& game) : _game(game) { diff --git a/framework/platform/indexbuffer-dx.cpp b/framework/platform/indexbuffer-dx.cpp index 0c6a893..59d6db1 100644 --- a/framework/platform/indexbuffer-dx.cpp +++ b/framework/platform/indexbuffer-dx.cpp @@ -1,5 +1,5 @@ -#include "indexbuffer-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/indexbuffer-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { } \ No newline at end of file diff --git a/framework/platform/init-dx.cpp b/framework/platform/init-dx.cpp index 077d162..a41a5fc 100644 --- a/framework/platform/init-dx.cpp +++ b/framework/platform/init-dx.cpp @@ -1,9 +1,9 @@ -#include "init-dx.hpp" -#include "../csharp/type.hpp" -#include "texture-dx.hpp" -#include "content-readers/texture2Dreader-dx.hpp" -#include "../content/typereadermanager.hpp" -#include "../content/defaultreaders.hpp" +#include "platform-dx/init-dx.hpp" +#include "csharp/type.hpp" +#include "platform-dx/texture-dx.hpp" +#include "platform-dx/content-readers/texture2Dreader-dx.hpp" +#include "content/typereadermanager.hpp" +#include "content/defaultreaders.hpp" namespace xna { diff --git a/framework/platform/keyboard-dx.cpp b/framework/platform/keyboard-dx.cpp index dade6e9..a594347 100644 --- a/framework/platform/keyboard-dx.cpp +++ b/framework/platform/keyboard-dx.cpp @@ -1,4 +1,4 @@ -#include "keyboard-dx.hpp" +#include "platform-dx/keyboard-dx.hpp" namespace xna { diff --git a/framework/platform/mouse-dx.cpp b/framework/platform/mouse-dx.cpp index f745909..ef92172 100644 --- a/framework/platform/mouse-dx.cpp +++ b/framework/platform/mouse-dx.cpp @@ -1,4 +1,4 @@ -#include "mouse-dx.hpp" +#include "platform-dx/mouse-dx.hpp" namespace xna { diff --git a/framework/platform/presentparameters-dx.cpp b/framework/platform/presentparameters-dx.cpp index c0fef17..683d7df 100644 --- a/framework/platform/presentparameters-dx.cpp +++ b/framework/platform/presentparameters-dx.cpp @@ -1,5 +1,5 @@ -#include "presentparameters-dx.hpp" -#include "gdevicemanager-dx.hpp" +#include "platform-dx/presentparameters-dx.hpp" +#include "platform-dx/gdevicemanager-dx.hpp" namespace xna { PresentationParameters::PresentationParameters() : diff --git a/framework/platform/rasterizerstate-dx.cpp b/framework/platform/rasterizerstate-dx.cpp index 3bb2dec..a3f84b9 100644 --- a/framework/platform/rasterizerstate-dx.cpp +++ b/framework/platform/rasterizerstate-dx.cpp @@ -1,5 +1,5 @@ -#include "rasterizerstate-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/rasterizerstate-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { bool RasterizerState::Initialize(xna_error_ptr_arg) diff --git a/framework/platform/rendertarget-dx.cpp b/framework/platform/rendertarget-dx.cpp index 32820ac..7c40a7c 100644 --- a/framework/platform/rendertarget-dx.cpp +++ b/framework/platform/rendertarget-dx.cpp @@ -1,7 +1,7 @@ -#include "rendertarget-dx.hpp" -#include "../graphics/device.hpp" -#include "swapchain-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/rendertarget-dx.hpp" +#include "graphics/device.hpp" +#include "platform-dx/swapchain-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { bool RenderTarget2D::Initialize(xna_error_ptr_arg) { diff --git a/framework/platform/samplerstate-dx.cpp b/framework/platform/samplerstate-dx.cpp index c5c91d7..1a73cfe 100644 --- a/framework/platform/samplerstate-dx.cpp +++ b/framework/platform/samplerstate-dx.cpp @@ -1,5 +1,5 @@ -#include "samplerstate-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/samplerstate-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { bool SamplerState::Apply(xna_error_ptr_arg) diff --git a/framework/platform/shader-dx.cpp b/framework/platform/shader-dx.cpp index d60595a..546b5be 100644 --- a/framework/platform/shader-dx.cpp +++ b/framework/platform/shader-dx.cpp @@ -1,6 +1,6 @@ -#include "shader-dx.hpp" -#include "device-dx.hpp" -#include "databuffer-dx.hpp" +#include "platform-dx/shader-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/databuffer-dx.hpp" namespace xna { HRESULT Shader::CompileFromFile(_In_ LPCWSTR srcFile, _In_ LPCSTR entryPoint, _In_ LPCSTR profile, _Outptr_ ID3DBlob** blob) diff --git a/framework/platform/soundeffect-dx.cpp b/framework/platform/soundeffect-dx.cpp index 8189480..141e165 100644 --- a/framework/platform/soundeffect-dx.cpp +++ b/framework/platform/soundeffect-dx.cpp @@ -1,5 +1,5 @@ -#include "soundeffect-dx.hpp" -#include "audioengine-dx.hpp" +#include "platform-dx/soundeffect-dx.hpp" +#include "platform-dx/audioengine-dx.hpp" using DxSoundEffect = DirectX::SoundEffect; diff --git a/framework/platform/spritebatch-dx.cpp b/framework/platform/spritebatch-dx.cpp index 0345150..a563d91 100644 --- a/framework/platform/spritebatch-dx.cpp +++ b/framework/platform/spritebatch-dx.cpp @@ -1,10 +1,10 @@ -#include "blendstate-dx.hpp" -#include "device-dx.hpp" -#include "rasterizerstate-dx.hpp" -#include "depthstencilstate-dx.hpp" -#include "samplerstate-dx.hpp" -#include "spritebatch-dx.hpp" -#include "texture-dx.hpp" +#include "platform-dx/blendstate-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/rasterizerstate-dx.hpp" +#include "platform-dx/depthstencilstate-dx.hpp" +#include "platform-dx/samplerstate-dx.hpp" +#include "platform-dx/spritebatch-dx.hpp" +#include "platform-dx/texture-dx.hpp" using DxSpriteBatch = DirectX::SpriteBatch; using DxSpriteSortMode = DirectX::SpriteSortMode; diff --git a/framework/platform/spritefont-dx.cpp b/framework/platform/spritefont-dx.cpp index 1ab2643..aeb2354 100644 --- a/framework/platform/spritefont-dx.cpp +++ b/framework/platform/spritefont-dx.cpp @@ -1,4 +1,4 @@ -#include "spritefont-dx.hpp" +#include "platform-dx/spritefont-dx.hpp" using DxSpriteFont = DirectX::SpriteFont; diff --git a/framework/platform/swapchain-dx.cpp b/framework/platform/swapchain-dx.cpp index 2538c3d..f977aa5 100644 --- a/framework/platform/swapchain-dx.cpp +++ b/framework/platform/swapchain-dx.cpp @@ -1,6 +1,6 @@ -#include "swapchain-dx.hpp" -#include "adapter-dx.hpp" -#include "device-dx.hpp" +#include "platform-dx/swapchain-dx.hpp" +#include "platform-dx/adapter-dx.hpp" +#include "platform-dx/device-dx.hpp" namespace xna { static bool internalInit(GraphicsDevice& device, HWND windowHandle, IDXGISwapChain1*& swapChain, DXGI_SWAP_CHAIN_DESC1 const& desc, DXGI_SWAP_CHAIN_FULLSCREEN_DESC const& fdesc) { diff --git a/framework/platform/texture-dx.cpp b/framework/platform/texture-dx.cpp index ff3c847..f253a8f 100644 --- a/framework/platform/texture-dx.cpp +++ b/framework/platform/texture-dx.cpp @@ -1,6 +1,6 @@ -#include "texture-dx.hpp" -#include "device-dx.hpp" -#include "adapter-dx.hpp" +#include "platform-dx/texture-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/adapter-dx.hpp" namespace xna { sptr Texture2D::FromStream(GraphicsDevice& device, String const& fileName, xna_error_ptr_arg) diff --git a/framework/platform/vertexbuffer-dx.cpp b/framework/platform/vertexbuffer-dx.cpp index f866aa2..7b9df78 100644 --- a/framework/platform/vertexbuffer-dx.cpp +++ b/framework/platform/vertexbuffer-dx.cpp @@ -1,4 +1,4 @@ -#include "vertexbuffer-dx.hpp" +#include "platform-dx/vertexbuffer-dx.hpp" namespace xna { } \ No newline at end of file diff --git a/framework/platform/vertexinput-dx.cpp b/framework/platform/vertexinput-dx.cpp index b570fb9..245fa6d 100644 --- a/framework/platform/vertexinput-dx.cpp +++ b/framework/platform/vertexinput-dx.cpp @@ -1,9 +1,7 @@ -#include "vertexinput-dx.hpp" -#include "device-dx.hpp" -#include -#include "dxgi.h" -#include "d3d11.h" -#include "databuffer-dx.hpp" +#include "platform-dx/vertexinput-dx.hpp" +#include "platform-dx/device-dx.hpp" +#include "platform-dx/dxheaders.hpp" +#include "platform-dx/databuffer-dx.hpp" namespace xna { bool VertexInputLayout::Initialize(GraphicsDevice& device, DataBuffer& blob, xna_error_ptr_arg){ diff --git a/framework/platform/window-dx.cpp b/framework/platform/window-dx.cpp index 194e8ad..bb37459 100644 --- a/framework/platform/window-dx.cpp +++ b/framework/platform/window-dx.cpp @@ -1,7 +1,7 @@ -#include "window-dx.hpp" -#include "keyboard-dx.hpp" -#include "mouse-dx.hpp" -#include "gamepad-dx.hpp" +#include "platform-dx/window-dx.hpp" +#include "platform-dx/keyboard-dx.hpp" +#include "platform-dx/mouse-dx.hpp" +#include "platform-dx/gamepad-dx.hpp" namespace xna { GameWindow::GameWindow() { diff --git a/framework/xna.cpp b/framework/xna.cpp index 86e6e80..c879256 100644 --- a/framework/xna.cpp +++ b/framework/xna.cpp @@ -1,7 +1,7 @@ // xna.cpp : Defines the entry point for the application. // -#include "xna.h" +#include "xna.hpp" using namespace std; using namespace xna; diff --git a/framework/xna.h b/framework/xna.h deleted file mode 100644 index 1a82cc9..0000000 --- a/framework/xna.h +++ /dev/null @@ -1,30 +0,0 @@ -// xna.h : Include file for standard system include files, -// or project specific include files. - -#pragma once -#define NOMINMAX - -#include "common/color.hpp" -#include "csharp/stream.hpp" -#include "game/window.hpp" -#include "platform/adapter-dx.hpp" -#include "platform/audioengine-dx.hpp" -#include "platform/device-dx.hpp" -#include "platform/game-dx.hpp" -#include "platform/gamepad-dx.hpp" -#include "platform/gdevicemanager-dx.hpp" -#include "platform/keyboard-dx.hpp" -#include "platform/mouse-dx.hpp" -#include "platform/spritebatch-dx.hpp" -#include "platform/texture-dx.hpp" -#include "platform/window-dx.hpp" -#include "graphics/vertexposition.hpp" -#include "platform/vertexbuffer-dx.hpp" -#include "game/component.hpp" -#include "Windows.h" -#include -#include "content/manager.hpp" -#include "platform/init-dx.hpp" -#include "csharp/type.hpp" - -// TODO: Reference additional headers your program requires here. diff --git a/framework/audio/audioengine.hpp b/inc/audio/audioengine.hpp similarity index 100% rename from framework/audio/audioengine.hpp rename to inc/audio/audioengine.hpp diff --git a/framework/audio/soundeffect.hpp b/inc/audio/soundeffect.hpp similarity index 100% rename from framework/audio/soundeffect.hpp rename to inc/audio/soundeffect.hpp diff --git a/framework/common/color.hpp b/inc/common/color.hpp similarity index 100% rename from framework/common/color.hpp rename to inc/common/color.hpp diff --git a/framework/common/math.hpp b/inc/common/math.hpp similarity index 100% rename from framework/common/math.hpp rename to inc/common/math.hpp diff --git a/framework/common/matrix.hpp b/inc/common/matrix.hpp similarity index 100% rename from framework/common/matrix.hpp rename to inc/common/matrix.hpp diff --git a/framework/common/packedvalue.hpp b/inc/common/packedvalue.hpp similarity index 100% rename from framework/common/packedvalue.hpp rename to inc/common/packedvalue.hpp diff --git a/framework/common/point.hpp b/inc/common/point.hpp similarity index 100% rename from framework/common/point.hpp rename to inc/common/point.hpp diff --git a/framework/common/quaternion.hpp b/inc/common/quaternion.hpp similarity index 100% rename from framework/common/quaternion.hpp rename to inc/common/quaternion.hpp diff --git a/framework/common/rectangle.hpp b/inc/common/rectangle.hpp similarity index 100% rename from framework/common/rectangle.hpp rename to inc/common/rectangle.hpp diff --git a/framework/common/vectors.hpp b/inc/common/vectors.hpp similarity index 100% rename from framework/common/vectors.hpp rename to inc/common/vectors.hpp diff --git a/framework/content/defaultreaders.hpp b/inc/content/defaultreaders.hpp similarity index 100% rename from framework/content/defaultreaders.hpp rename to inc/content/defaultreaders.hpp diff --git a/framework/content/lzx/decoder.hpp b/inc/content/lzx/decoder.hpp similarity index 100% rename from framework/content/lzx/decoder.hpp rename to inc/content/lzx/decoder.hpp diff --git a/framework/content/lzx/decoderstream.hpp b/inc/content/lzx/decoderstream.hpp similarity index 100% rename from framework/content/lzx/decoderstream.hpp rename to inc/content/lzx/decoderstream.hpp diff --git a/framework/content/manager.hpp b/inc/content/manager.hpp similarity index 100% rename from framework/content/manager.hpp rename to inc/content/manager.hpp diff --git a/framework/content/reader.hpp b/inc/content/reader.hpp similarity index 100% rename from framework/content/reader.hpp rename to inc/content/reader.hpp diff --git a/framework/content/typereadermanager.hpp b/inc/content/typereadermanager.hpp similarity index 100% rename from framework/content/typereadermanager.hpp rename to inc/content/typereadermanager.hpp diff --git a/framework/csharp/binary.hpp b/inc/csharp/binary.hpp similarity index 100% rename from framework/csharp/binary.hpp rename to inc/csharp/binary.hpp diff --git a/framework/csharp/buffer.hpp b/inc/csharp/buffer.hpp similarity index 100% rename from framework/csharp/buffer.hpp rename to inc/csharp/buffer.hpp diff --git a/framework/csharp/object.hpp b/inc/csharp/object.hpp similarity index 100% rename from framework/csharp/object.hpp rename to inc/csharp/object.hpp diff --git a/framework/csharp/service.hpp b/inc/csharp/service.hpp similarity index 100% rename from framework/csharp/service.hpp rename to inc/csharp/service.hpp diff --git a/framework/csharp/stream.hpp b/inc/csharp/stream.hpp similarity index 100% rename from framework/csharp/stream.hpp rename to inc/csharp/stream.hpp diff --git a/framework/csharp/timespan.hpp b/inc/csharp/timespan.hpp similarity index 100% rename from framework/csharp/timespan.hpp rename to inc/csharp/timespan.hpp diff --git a/framework/csharp/type.hpp b/inc/csharp/type.hpp similarity index 100% rename from framework/csharp/type.hpp rename to inc/csharp/type.hpp diff --git a/framework/default.hpp b/inc/default.hpp similarity index 58% rename from framework/default.hpp rename to inc/default.hpp index fa6b06c..ee10054 100644 --- a/framework/default.hpp +++ b/inc/default.hpp @@ -1,5 +1,5 @@ #include "types.hpp" #include "forward.hpp" -#include "xnaerror.hpp" #include "enums.hpp" -#include "helpers.hpp" \ No newline at end of file +#include "helpers.hpp" +#include "xnaerror.hpp" \ No newline at end of file diff --git a/framework/enums.hpp b/inc/enums.hpp similarity index 100% rename from framework/enums.hpp rename to inc/enums.hpp diff --git a/framework/forward.hpp b/inc/forward.hpp similarity index 100% rename from framework/forward.hpp rename to inc/forward.hpp diff --git a/framework/game/clock.hpp b/inc/game/clock.hpp similarity index 100% rename from framework/game/clock.hpp rename to inc/game/clock.hpp diff --git a/framework/game/component.hpp b/inc/game/component.hpp similarity index 100% rename from framework/game/component.hpp rename to inc/game/component.hpp diff --git a/framework/game/game.hpp b/inc/game/game.hpp similarity index 100% rename from framework/game/game.hpp rename to inc/game/game.hpp diff --git a/framework/game/gdeviceinfo.hpp b/inc/game/gdeviceinfo.hpp similarity index 100% rename from framework/game/gdeviceinfo.hpp rename to inc/game/gdeviceinfo.hpp diff --git a/framework/game/gdevicemanager.hpp b/inc/game/gdevicemanager.hpp similarity index 100% rename from framework/game/gdevicemanager.hpp rename to inc/game/gdevicemanager.hpp diff --git a/framework/game/servicecontainer.hpp b/inc/game/servicecontainer.hpp similarity index 100% rename from framework/game/servicecontainer.hpp rename to inc/game/servicecontainer.hpp diff --git a/framework/game/time.hpp b/inc/game/time.hpp similarity index 100% rename from framework/game/time.hpp rename to inc/game/time.hpp diff --git a/framework/game/window.hpp b/inc/game/window.hpp similarity index 100% rename from framework/game/window.hpp rename to inc/game/window.hpp diff --git a/framework/graphics/adapter.hpp b/inc/graphics/adapter.hpp similarity index 100% rename from framework/graphics/adapter.hpp rename to inc/graphics/adapter.hpp diff --git a/framework/graphics/blendstate.hpp b/inc/graphics/blendstate.hpp similarity index 100% rename from framework/graphics/blendstate.hpp rename to inc/graphics/blendstate.hpp diff --git a/framework/graphics/constbuffer.hpp b/inc/graphics/constbuffer.hpp similarity index 100% rename from framework/graphics/constbuffer.hpp rename to inc/graphics/constbuffer.hpp diff --git a/framework/graphics/databuffer.hpp b/inc/graphics/databuffer.hpp similarity index 100% rename from framework/graphics/databuffer.hpp rename to inc/graphics/databuffer.hpp diff --git a/framework/graphics/depthstencilstate.hpp b/inc/graphics/depthstencilstate.hpp similarity index 100% rename from framework/graphics/depthstencilstate.hpp rename to inc/graphics/depthstencilstate.hpp diff --git a/framework/graphics/device.hpp b/inc/graphics/device.hpp similarity index 100% rename from framework/graphics/device.hpp rename to inc/graphics/device.hpp diff --git a/framework/graphics/displaymode.hpp b/inc/graphics/displaymode.hpp similarity index 100% rename from framework/graphics/displaymode.hpp rename to inc/graphics/displaymode.hpp diff --git a/framework/graphics/gresource.hpp b/inc/graphics/gresource.hpp similarity index 100% rename from framework/graphics/gresource.hpp rename to inc/graphics/gresource.hpp diff --git a/framework/graphics/indexbuffer.hpp b/inc/graphics/indexbuffer.hpp similarity index 100% rename from framework/graphics/indexbuffer.hpp rename to inc/graphics/indexbuffer.hpp diff --git a/framework/graphics/presentparams.hpp b/inc/graphics/presentparams.hpp similarity index 100% rename from framework/graphics/presentparams.hpp rename to inc/graphics/presentparams.hpp diff --git a/framework/graphics/rasterizerstate.hpp b/inc/graphics/rasterizerstate.hpp similarity index 100% rename from framework/graphics/rasterizerstate.hpp rename to inc/graphics/rasterizerstate.hpp diff --git a/framework/graphics/rendertarget.hpp b/inc/graphics/rendertarget.hpp similarity index 100% rename from framework/graphics/rendertarget.hpp rename to inc/graphics/rendertarget.hpp diff --git a/framework/graphics/samplerstate.hpp b/inc/graphics/samplerstate.hpp similarity index 100% rename from framework/graphics/samplerstate.hpp rename to inc/graphics/samplerstate.hpp diff --git a/framework/graphics/shader.hpp b/inc/graphics/shader.hpp similarity index 100% rename from framework/graphics/shader.hpp rename to inc/graphics/shader.hpp diff --git a/framework/graphics/spritebatch.hpp b/inc/graphics/spritebatch.hpp similarity index 100% rename from framework/graphics/spritebatch.hpp rename to inc/graphics/spritebatch.hpp diff --git a/framework/graphics/spritefont.hpp b/inc/graphics/spritefont.hpp similarity index 100% rename from framework/graphics/spritefont.hpp rename to inc/graphics/spritefont.hpp diff --git a/framework/graphics/swapchain.hpp b/inc/graphics/swapchain.hpp similarity index 100% rename from framework/graphics/swapchain.hpp rename to inc/graphics/swapchain.hpp diff --git a/framework/graphics/texture.hpp b/inc/graphics/texture.hpp similarity index 100% rename from framework/graphics/texture.hpp rename to inc/graphics/texture.hpp diff --git a/framework/graphics/vertexbuffer.hpp b/inc/graphics/vertexbuffer.hpp similarity index 100% rename from framework/graphics/vertexbuffer.hpp rename to inc/graphics/vertexbuffer.hpp diff --git a/framework/graphics/vertexinput.hpp b/inc/graphics/vertexinput.hpp similarity index 100% rename from framework/graphics/vertexinput.hpp rename to inc/graphics/vertexinput.hpp diff --git a/framework/graphics/vertexposition.hpp b/inc/graphics/vertexposition.hpp similarity index 100% rename from framework/graphics/vertexposition.hpp rename to inc/graphics/vertexposition.hpp diff --git a/framework/graphics/viewport.hpp b/inc/graphics/viewport.hpp similarity index 100% rename from framework/graphics/viewport.hpp rename to inc/graphics/viewport.hpp diff --git a/framework/helpers.hpp b/inc/helpers.hpp similarity index 100% rename from framework/helpers.hpp rename to inc/helpers.hpp diff --git a/framework/input/gamepad.hpp b/inc/input/gamepad.hpp similarity index 100% rename from framework/input/gamepad.hpp rename to inc/input/gamepad.hpp diff --git a/framework/input/keyboard.hpp b/inc/input/keyboard.hpp similarity index 100% rename from framework/input/keyboard.hpp rename to inc/input/keyboard.hpp diff --git a/framework/input/mouse.hpp b/inc/input/mouse.hpp similarity index 100% rename from framework/input/mouse.hpp rename to inc/input/mouse.hpp diff --git a/framework/platform/adapter-dx.hpp b/inc/platform-dx/adapter-dx.hpp similarity index 100% rename from framework/platform/adapter-dx.hpp rename to inc/platform-dx/adapter-dx.hpp diff --git a/framework/platform/audioengine-dx.hpp b/inc/platform-dx/audioengine-dx.hpp similarity index 100% rename from framework/platform/audioengine-dx.hpp rename to inc/platform-dx/audioengine-dx.hpp diff --git a/framework/platform/blendstate-dx.hpp b/inc/platform-dx/blendstate-dx.hpp similarity index 100% rename from framework/platform/blendstate-dx.hpp rename to inc/platform-dx/blendstate-dx.hpp diff --git a/framework/platform/clock-dx.hpp b/inc/platform-dx/clock-dx.hpp similarity index 100% rename from framework/platform/clock-dx.hpp rename to inc/platform-dx/clock-dx.hpp diff --git a/framework/platform/constbuffer-dx.hpp b/inc/platform-dx/constbuffer-dx.hpp similarity index 100% rename from framework/platform/constbuffer-dx.hpp rename to inc/platform-dx/constbuffer-dx.hpp diff --git a/framework/platform/content-readers/texture2Dreader-dx.hpp b/inc/platform-dx/content-readers/texture2Dreader-dx.hpp similarity index 100% rename from framework/platform/content-readers/texture2Dreader-dx.hpp rename to inc/platform-dx/content-readers/texture2Dreader-dx.hpp diff --git a/framework/platform/databuffer-dx.hpp b/inc/platform-dx/databuffer-dx.hpp similarity index 100% rename from framework/platform/databuffer-dx.hpp rename to inc/platform-dx/databuffer-dx.hpp diff --git a/framework/platform/depthstencilstate-dx.hpp b/inc/platform-dx/depthstencilstate-dx.hpp similarity index 100% rename from framework/platform/depthstencilstate-dx.hpp rename to inc/platform-dx/depthstencilstate-dx.hpp diff --git a/framework/platform/device-dx.hpp b/inc/platform-dx/device-dx.hpp similarity index 100% rename from framework/platform/device-dx.hpp rename to inc/platform-dx/device-dx.hpp diff --git a/framework/platform/displaymode-dx.hpp b/inc/platform-dx/displaymode-dx.hpp similarity index 100% rename from framework/platform/displaymode-dx.hpp rename to inc/platform-dx/displaymode-dx.hpp diff --git a/framework/platform/dx/StepTimer.hpp b/inc/platform-dx/dx/StepTimer.hpp similarity index 100% rename from framework/platform/dx/StepTimer.hpp rename to inc/platform-dx/dx/StepTimer.hpp diff --git a/framework/platform/dxheaders.hpp b/inc/platform-dx/dxheaders.hpp similarity index 100% rename from framework/platform/dxheaders.hpp rename to inc/platform-dx/dxheaders.hpp diff --git a/framework/platform/game-dx.hpp b/inc/platform-dx/game-dx.hpp similarity index 100% rename from framework/platform/game-dx.hpp rename to inc/platform-dx/game-dx.hpp diff --git a/framework/platform/gamepad-dx.hpp b/inc/platform-dx/gamepad-dx.hpp similarity index 100% rename from framework/platform/gamepad-dx.hpp rename to inc/platform-dx/gamepad-dx.hpp diff --git a/framework/platform/gdeviceinfo-dx.hpp b/inc/platform-dx/gdeviceinfo-dx.hpp similarity index 100% rename from framework/platform/gdeviceinfo-dx.hpp rename to inc/platform-dx/gdeviceinfo-dx.hpp diff --git a/framework/platform/gdevicemanager-dx.hpp b/inc/platform-dx/gdevicemanager-dx.hpp similarity index 100% rename from framework/platform/gdevicemanager-dx.hpp rename to inc/platform-dx/gdevicemanager-dx.hpp diff --git a/framework/platform/indexbuffer-dx.hpp b/inc/platform-dx/indexbuffer-dx.hpp similarity index 100% rename from framework/platform/indexbuffer-dx.hpp rename to inc/platform-dx/indexbuffer-dx.hpp diff --git a/framework/platform/init-dx.hpp b/inc/platform-dx/init-dx.hpp similarity index 100% rename from framework/platform/init-dx.hpp rename to inc/platform-dx/init-dx.hpp diff --git a/framework/platform/keyboard-dx.hpp b/inc/platform-dx/keyboard-dx.hpp similarity index 100% rename from framework/platform/keyboard-dx.hpp rename to inc/platform-dx/keyboard-dx.hpp diff --git a/framework/platform/mouse-dx.hpp b/inc/platform-dx/mouse-dx.hpp similarity index 100% rename from framework/platform/mouse-dx.hpp rename to inc/platform-dx/mouse-dx.hpp diff --git a/framework/platform/presentparameters-dx.hpp b/inc/platform-dx/presentparameters-dx.hpp similarity index 100% rename from framework/platform/presentparameters-dx.hpp rename to inc/platform-dx/presentparameters-dx.hpp diff --git a/framework/platform/rasterizerstate-dx.hpp b/inc/platform-dx/rasterizerstate-dx.hpp similarity index 100% rename from framework/platform/rasterizerstate-dx.hpp rename to inc/platform-dx/rasterizerstate-dx.hpp diff --git a/framework/platform/rendertarget-dx.hpp b/inc/platform-dx/rendertarget-dx.hpp similarity index 100% rename from framework/platform/rendertarget-dx.hpp rename to inc/platform-dx/rendertarget-dx.hpp diff --git a/framework/platform/samplerstate-dx.hpp b/inc/platform-dx/samplerstate-dx.hpp similarity index 100% rename from framework/platform/samplerstate-dx.hpp rename to inc/platform-dx/samplerstate-dx.hpp diff --git a/framework/platform/shader-dx.hpp b/inc/platform-dx/shader-dx.hpp similarity index 100% rename from framework/platform/shader-dx.hpp rename to inc/platform-dx/shader-dx.hpp diff --git a/framework/platform/shaders/pixel.hlsl b/inc/platform-dx/shaders/pixel.hlsl similarity index 100% rename from framework/platform/shaders/pixel.hlsl rename to inc/platform-dx/shaders/pixel.hlsl diff --git a/framework/platform/shaders/vertex.hlsl b/inc/platform-dx/shaders/vertex.hlsl similarity index 100% rename from framework/platform/shaders/vertex.hlsl rename to inc/platform-dx/shaders/vertex.hlsl diff --git a/framework/platform/soundeffect-dx.hpp b/inc/platform-dx/soundeffect-dx.hpp similarity index 100% rename from framework/platform/soundeffect-dx.hpp rename to inc/platform-dx/soundeffect-dx.hpp diff --git a/framework/platform/spritebatch-dx.hpp b/inc/platform-dx/spritebatch-dx.hpp similarity index 92% rename from framework/platform/spritebatch-dx.hpp rename to inc/platform-dx/spritebatch-dx.hpp index 767ebee..7404df5 100644 --- a/framework/platform/spritebatch-dx.hpp +++ b/inc/platform-dx/spritebatch-dx.hpp @@ -28,7 +28,7 @@ namespace xna { virtual void End() override; virtual void Draw(Texture2D& texture, Vector2 const& position, Color const& color) override; - virtual void Draw(Texture2D& texture, Vector2 const& position, Rectangle const * sourceRectangle, Color const& color) override; + virtual void Draw(Texture2D& texture, Vector2 const& position, Rectangle const* sourceRectangle, Color const& color) override; virtual void Draw(Texture2D& texture, Vector2 const& position, Rectangle const* sourceRectangle, Color const& color, float rotation, Vector2 const& origin, float scale, SpriteEffects effects, float layerDepth) override; virtual void Draw(Texture2D& texture, Vector2 const& position, Rectangle const* sourceRectangle, Color const& color, @@ -37,7 +37,7 @@ namespace xna { virtual void Draw(Texture2D& texture, Rectangle const& destinationRectangle, Rectangle const* sourceRectangle, Color const& color) override; virtual void Draw(Texture2D& texture, Rectangle const& destinationRectangle, Rectangle const* sourceRectangle, Color const& color, float rotation, Vector2 const& origin, SpriteEffects effects, float layerDepth) override; - virtual void Viewport(xna::Viewport const& value) override; + virtual void Viewport(xna::Viewport const& value) override; virtual void DrawString(SpriteFont& spriteFont, String const& text, Vector2 const& position, Color const& color) override; virtual void DrawString(SpriteFont& spriteFont, String const& text, Vector2 const& position, Color const& color, float rotation, Vector2 const& origin, float scale, SpriteEffects effects, float layerDepth) override; @@ -48,7 +48,7 @@ namespace xna { } public: - sptr _dxspriteBatch = nullptr; + sptr _dxspriteBatch = nullptr; }; } diff --git a/framework/platform/spritefont-dx.hpp b/inc/platform-dx/spritefont-dx.hpp similarity index 100% rename from framework/platform/spritefont-dx.hpp rename to inc/platform-dx/spritefont-dx.hpp diff --git a/framework/platform/swapchain-dx.hpp b/inc/platform-dx/swapchain-dx.hpp similarity index 100% rename from framework/platform/swapchain-dx.hpp rename to inc/platform-dx/swapchain-dx.hpp diff --git a/framework/platform/texture-dx.hpp b/inc/platform-dx/texture-dx.hpp similarity index 100% rename from framework/platform/texture-dx.hpp rename to inc/platform-dx/texture-dx.hpp diff --git a/framework/platform/vertexbuffer-dx.hpp b/inc/platform-dx/vertexbuffer-dx.hpp similarity index 100% rename from framework/platform/vertexbuffer-dx.hpp rename to inc/platform-dx/vertexbuffer-dx.hpp diff --git a/framework/platform/vertexinput-dx.hpp b/inc/platform-dx/vertexinput-dx.hpp similarity index 100% rename from framework/platform/vertexinput-dx.hpp rename to inc/platform-dx/vertexinput-dx.hpp diff --git a/framework/platform/window-dx.hpp b/inc/platform-dx/window-dx.hpp similarity index 100% rename from framework/platform/window-dx.hpp rename to inc/platform-dx/window-dx.hpp diff --git a/inc/platform-dx/xna-dx.hpp b/inc/platform-dx/xna-dx.hpp new file mode 100644 index 0000000..014150d --- /dev/null +++ b/inc/platform-dx/xna-dx.hpp @@ -0,0 +1,33 @@ +#include "adapter-dx.hpp" +#include "audioengine-dx.hpp" +#include "blendstate-dx.hpp" +#include "clock-dx.hpp" +#include "constbuffer-dx.hpp" +#include "databuffer-dx.hpp" +#include "depthstencilstate-dx.hpp" +#include "device-dx.hpp" +#include "displaymode-dx.hpp" +#include "dxheaders.hpp" +#include "game-dx.hpp" +#include "gamepad-dx.hpp" +#include "gdeviceinfo-dx.hpp" +#include "gdevicemanager-dx.hpp" +#include "indexbuffer-dx.hpp" +#include "init-dx.hpp" +#include "keyboard-dx.hpp" +#include "mouse-dx.hpp" +#include "presentparameters-dx.hpp" +#include "rasterizerstate-dx.hpp" +#include "rendertarget-dx.hpp" +#include "samplerstate-dx.hpp" +#include "shader-dx.hpp" +#include "soundeffect-dx.hpp" +#include "spritebatch-dx.hpp" +#include "spritefont-dx.hpp" +#include "swapchain-dx.hpp" +#include "texture-dx.hpp" +#include "vertexbuffer-dx.hpp" +#include "vertexinput-dx.hpp" +#include "window-dx.hpp" +#include "content-readers/texture2Dreader-dx.hpp" +#include "dx/StepTimer.hpp" \ No newline at end of file diff --git a/framework/types.hpp b/inc/types.hpp similarity index 100% rename from framework/types.hpp rename to inc/types.hpp diff --git a/inc/xna.hpp b/inc/xna.hpp new file mode 100644 index 0000000..d85cfbc --- /dev/null +++ b/inc/xna.hpp @@ -0,0 +1,64 @@ +#include "xnaerror.hpp" +#include "types.hpp" +#include "helpers.hpp" +#include "forward.hpp" +#include "enums.hpp" +#include "default.hpp" +#include "audio/audioengine.hpp" +#include "audio/soundeffect.hpp" +#include "common/color.hpp" +#include "common/math.hpp" +#include "common/matrix.hpp" +#include "common/packedvalue.hpp" +#include "common/point.hpp" +#include "common/quaternion.hpp" +#include "common/rectangle.hpp" +#include "common/vectors.hpp" +#include "content/defaultreaders.hpp" +#include "content/manager.hpp" +#include "content/reader.hpp" +#include "content/typereadermanager.hpp" +#include "content/lzx/decoder.hpp" +#include "content/lzx/decoderstream.hpp" +#include "csharp/binary.hpp" +#include "csharp/buffer.hpp" +#include "csharp/object.hpp" +#include "csharp/service.hpp" +#include "csharp/stream.hpp" +#include "csharp/timespan.hpp" +#include "csharp/type.hpp" +#include "game/clock.hpp" +#include "game/component.hpp" +#include "game/game.hpp" +#include "game/gdeviceinfo.hpp" +#include "game/gdevicemanager.hpp" +#include "game/servicecontainer.hpp" +#include "game/time.hpp" +#include "game/window.hpp" +#include "graphics/adapter.hpp" +#include "graphics/blendstate.hpp" +#include "graphics/constbuffer.hpp" +#include "graphics/databuffer.hpp" +#include "graphics/depthstencilstate.hpp" +#include "graphics/device.hpp" +#include "graphics/displaymode.hpp" +#include "graphics/gresource.hpp" +#include "graphics/indexbuffer.hpp" +#include "graphics/presentparams.hpp" +#include "graphics/rasterizerstate.hpp" +#include "graphics/rendertarget.hpp" +#include "graphics/samplerstate.hpp" +#include "graphics/shader.hpp" +#include "graphics/spritebatch.hpp" +#include "graphics/spritefont.hpp" +#include "graphics/swapchain.hpp" +#include "graphics/texture.hpp" +#include "graphics/vertexbuffer.hpp" +#include "graphics/vertexinput.hpp" +#include "graphics/vertexposition.hpp" +#include "graphics/viewport.hpp" +#include "input/gamepad.hpp" +#include "input/keyboard.hpp" +#include "input/mouse.hpp" + +#include "platform-dx/xna-dx.hpp" \ No newline at end of file diff --git a/framework/xnaerror.hpp b/inc/xnaerror.hpp similarity index 100% rename from framework/xnaerror.hpp rename to inc/xnaerror.hpp