Merge pull request #7 from borgesdan/develop

Develop

CMakeLists.txt

@@ -9,14 +9,17 @@ if (POLICY CMP0141)
   set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
 endif()
 
-# CMAKE_TOOLCHAIN_FILE
+# VCPKG source directory
 set(PROJECT_VCPKG_DIRECTORY "C:/vcpkg")
-set(PROJECT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/inc")
+# Includes directory
+set(PROJECT_INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/inc")
+# CMAKE_TOOLCHAIN_FILE
 include("${PROJECT_VCPKG_DIRECTORY}/scripts/buildsystems/vcpkg.cmake")
+
 project ("xna")
 
 # Include sub-projects.
-include_directories(${PROJECT_INCLUDE_DIR})
+include_directories(${PROJECT_INCLUDES_DIR})
 add_subdirectory ("framework")
 add_subdirectory ("samples")
 

README.md

@@ -6,8 +6,9 @@
 
 The project is still under development and the next updates will focus on the following tasks:
 - [x] Finish basic classes
-- [ ] Code refactoring and cleaning
+- [x] Code refactoring and cleaning
 - [ ] 3D support
+- [ ] Implementation of missing classes and functions
 - [ ] Content Pipeline
 - [ ] Multiplatform support
 
@@ -24,10 +25,10 @@ Use the following command in vcpkg to install DirectXTK:
 .\vcpkg install directxtk[tools,spectre,xaudio2-9]
 ```
 
-In the root CMakeLists.txt set the vcpkg CMAKE_TOOLCHAIN_FILE path
+In the root CMakeLists.txt set the vcpkg path
 
 ```
-include("C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
+set(PROJECT_VCPKG_DIRECTORY "C:/vcpkg")
 ```
 
 ## 📝 License

framework/CMakeLists.txt

@@ -53,5 +53,5 @@ find_package(directxtk CONFIG REQUIRED)
 
 target_link_libraries(
 	Xn65 D3d11.lib dxgi.lib dxguid.lib d3dcompiler.lib Microsoft::DirectXTK
-	"${PROJECT_INCLUDE_DIR}/libmspack/mspack.lib"
+	"${PROJECT_INCLUDES_DIR}/libmspack/mspack.lib"
 )

framework/platform-dx/soundeffect.cpp

@@ -10,11 +10,7 @@ namespace xna {
 
 	SoundEffectInstance::~SoundEffectInstance() {
 		impl = nullptr;
-	}
+	}	
-
-	//Remover posteriormente
-	SoundEffect::SoundEffect() {
-	}
 
 	SoundEffect::SoundEffect(String const& fileName) {
 		if (!AudioEngine::impl || !AudioEngine::impl->_dxAudioEngine)

inc/xna/audio/soundeffect.hpp

@@ -25,8 +25,6 @@ namespace xna {
 
 	class SoundEffect {
 	public:
-		//Remover posteriormente ou implementar funções de carregamento dos dados
-		SoundEffect();
 		SoundEffect(String const& fileName);
 		SoundEffect(
 			std::vector<Byte> const& format,

inc/xna/enums.hpp

@@ -2,6 +2,12 @@
 #define XNA_ENUMS_HPP
 
 namespace xna {
+    enum class AudioChannels
+    {
+        Mono = 1,
+        Stereo = 2,
+    };
+
     enum  class AudioReverb {
         Off,
         Default,