Move arquivos de cabeçalhos para pasta Inc

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

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	
 )

framework/common/color.cpp

@@ -1,4 +1,4 @@
-#include "color.hpp"
+#include "common/color.hpp"
 
 namespace xna {
 

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)

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

framework/content/lzx/decoder.cpp

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

framework/content/lzx/decoderstream.cpp

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

framework/content/manager.cpp

@@ -1 +1 @@
-#include "manager.hpp"
+#include "content/manager.hpp"

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> ContentReader::Create(ContentManager* contentManager, sptr<Stream>& input, String const& assetName)

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<PContentTypeReader> ContentTypeReaderManager::ReadTypeManifest(Int typeCount, sptr<ContentReader>& contentReader, xna_error_ptr_arg)

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)

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

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

framework/csharp/type.cpp

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

framework/game/component.cpp

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

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)

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

framework/platform/audioengine.dx.cpp

@@ -1,4 +1,4 @@
-#include "audioengine-dx.hpp"
+#include "platform-dx/audioengine-dx.hpp"
 
 namespace xna {
 

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)

framework/platform/clock-dx.cpp

@@ -1,4 +1,4 @@
-#include "clock-dx.hpp"
+#include "platform-dx/clock-dx.hpp"
 #include <Windows.h>
 
 namespace xna {

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)

framework/platform/databuffer-dx.cpp

@@ -1,4 +1,4 @@
-#include "databuffer-dx.hpp"
+#include "platform-dx/databuffer-dx.hpp"
 
 namespace xna {
 

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)

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() {		

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

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() {

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

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

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 {	
 }

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 {
 	

framework/platform/keyboard-dx.cpp

@@ -1,4 +1,4 @@
-#include "keyboard-dx.hpp"
+#include "platform-dx/keyboard-dx.hpp"
 
 namespace xna {
 

framework/platform/mouse-dx.cpp

@@ -1,4 +1,4 @@
-#include "mouse-dx.hpp"
+#include "platform-dx/mouse-dx.hpp"
 
 namespace xna {
 

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() :

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)

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

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)

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)

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;
 

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;

framework/platform/spritefont-dx.cpp

@@ -1,4 +1,4 @@
-#include "spritefont-dx.hpp"
+#include "platform-dx/spritefont-dx.hpp"
 
 using DxSpriteFont = DirectX::SpriteFont;
 

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

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> Texture2D::FromStream(GraphicsDevice& device, String const& fileName, xna_error_ptr_arg)

framework/platform/vertexbuffer-dx.cpp

@@ -1,4 +1,4 @@
-#include "vertexbuffer-dx.hpp"
+#include "platform-dx/vertexbuffer-dx.hpp"
 
 namespace xna {	
 }

framework/platform/vertexinput-dx.cpp

@@ -1,9 +1,7 @@
-#include "vertexinput-dx.hpp"
-#include "device-dx.hpp"
-#include <d3dcompiler.h>
-#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){

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() {

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;

framework/xna.h

@@ -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 <iostream>
-#include "content/manager.hpp"
-#include "platform/init-dx.hpp"
-#include "csharp/type.hpp"
-
-// TODO: Reference additional headers your program requires here.

inc/default.hpp

@@ -1,5 +1,5 @@
 #include "types.hpp"
 #include "forward.hpp"
-#include "xnaerror.hpp"
 #include "enums.hpp"
-#include "helpers.hpp"
+#include "helpers.hpp"
+#include "xnaerror.hpp"