~ Changed FileSystem/utils.h to FileSystem/FileSystem.h following the same criteria used in Core namespace

~ Updated #include directives to include full paths to files
~ Re-organized folder structure for the project

Signed-off-by: Alexis Maiquez <almamu@almamu.com>

CMakeLists.txt

@@ -15,103 +15,103 @@ find_package(SDL REQUIRED)
 find_package(SDL_mixer REQUIRED)
 find_package(LZ4 REQUIRED)
 
-include_directories(${X11_INCLUDE_DIR} ${IRRLICHT_INCLUDE_DIR} ${LZ4_INCLUDE_DIR} ${SDL_INCLUDE_DIRS} ${SDL_MIXER_INCLUDE_DIRS} .)
+include_directories(${X11_INCLUDE_DIR} ${IRRLICHT_INCLUDE_DIR} ${LZ4_INCLUDE_DIR} ${SDL_INCLUDE_DIRS} ${SDL_MIXER_INCLUDE_DIRS} src include)
 
 add_executable(
         wallengine
         main.cpp
-        WallpaperEngine/Render/Shaders/Compiler.h
+        src/WallpaperEngine/Render/Shaders/Compiler.h
-        WallpaperEngine/Render/Shaders/Compiler.cpp
+        src/WallpaperEngine/Render/Shaders/Compiler.cpp
-        WallpaperEngine/project.cpp
+        src/WallpaperEngine/project.cpp
-        WallpaperEngine/project.h
+        src/WallpaperEngine/project.h
-        WallpaperEngine/scene.cpp
+        src/WallpaperEngine/scene.cpp
-        WallpaperEngine/scene.h
+        src/WallpaperEngine/scene.h
-        WallpaperEngine/object.cpp
+        src/WallpaperEngine/object.cpp
-        WallpaperEngine/object.h
+        src/WallpaperEngine/object.h
-        WallpaperEngine/camera.cpp
+        src/WallpaperEngine/camera.cpp
-        WallpaperEngine/camera.h
+        src/WallpaperEngine/camera.h
-        WallpaperEngine/Core/Core.cpp
+        src/WallpaperEngine/Core/Core.cpp
-        WallpaperEngine/Core/Core.h
+        src/WallpaperEngine/Core/Core.h
-        WallpaperEngine/image.cpp
+        src/WallpaperEngine/image.cpp
-        WallpaperEngine/image.h
+        src/WallpaperEngine/image.h
-        WallpaperEngine/object3d.cpp
+        src/WallpaperEngine/object3d.cpp
-        WallpaperEngine/object3d.h
+        src/WallpaperEngine/object3d.h
-        WallpaperEngine/effect.cpp
+        src/WallpaperEngine/effect.cpp
-        WallpaperEngine/effect.h
+        src/WallpaperEngine/effect.h
-        WallpaperEngine/FileSystem/utils.cpp
+        src/WallpaperEngine/FileSystem/FileSystem.cpp
-        WallpaperEngine/FileSystem/utils.h
+        src/WallpaperEngine/FileSystem/FileSystem.h
-        WallpaperEngine/video/renderer.cpp
+        src/WallpaperEngine/video/renderer.cpp
-        WallpaperEngine/video/renderer.h
+        src/WallpaperEngine/video/renderer.h
-        WallpaperEngine/video/node.cpp
+        src/WallpaperEngine/video/node.cpp
-        WallpaperEngine/video/node.h
+        src/WallpaperEngine/video/node.h
-        WallpaperEngine/video/material.cpp
+        src/WallpaperEngine/video/material.cpp
-        WallpaperEngine/video/material.h
+        src/WallpaperEngine/video/material.h
-        WallpaperEngine/texture.cpp
+        src/WallpaperEngine/texture.cpp
-        WallpaperEngine/texture.h
+        src/WallpaperEngine/texture.h
-        WallpaperEngine/Irrlicht/CImageLoaderTEX.h
+        src/WallpaperEngine/Irrlicht/CImageLoaderTEX.h
-        WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp
+        src/WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp
-        WallpaperEngine/Irrlicht/CPkgReader.h
+        src/WallpaperEngine/Irrlicht/CPkgReader.h
-        WallpaperEngine/Irrlicht/CPkgReader.cpp
+        src/WallpaperEngine/Irrlicht/CPkgReader.cpp
-        WallpaperEngine/Irrlicht/CFileList.h
+        src/WallpaperEngine/Irrlicht/CFileList.h
-        WallpaperEngine/Irrlicht/CFileList.cpp
+        src/WallpaperEngine/Irrlicht/CFileList.cpp
-        WallpaperEngine/Irrlicht/Irrlicht.cpp
+        src/WallpaperEngine/Irrlicht/Irrlicht.cpp
-        WallpaperEngine/Irrlicht/Irrlicht.h
+        src/WallpaperEngine/Irrlicht/Irrlicht.h
-        WallpaperEngine/sound.cpp
+        src/WallpaperEngine/sound.cpp
-        WallpaperEngine/sound.h
+        src/WallpaperEngine/sound.h
 
-        WallpaperEngine/Core/CProject.cpp
+        src/WallpaperEngine/Core/CProject.cpp
-        WallpaperEngine/Core/CProject.h
+        src/WallpaperEngine/Core/CProject.h
-        WallpaperEngine/Core/CScene.cpp
+        src/WallpaperEngine/Core/CScene.cpp
-        WallpaperEngine/Core/CScene.h
+        src/WallpaperEngine/Core/CScene.h
-        WallpaperEngine/Core/CObject.cpp
+        src/WallpaperEngine/Core/CObject.cpp
-        WallpaperEngine/Core/CObject.h
+        src/WallpaperEngine/Core/CObject.h
 
-        WallpaperEngine/Core/Projects/CProperty.h
+        src/WallpaperEngine/Core/Projects/CProperty.h
-        WallpaperEngine/Core/Projects/CProperty.cpp
+        src/WallpaperEngine/Core/Projects/CProperty.cpp
-        WallpaperEngine/Core/Projects/CPropertyColor.h
+        src/WallpaperEngine/Core/Projects/CPropertyColor.h
-        WallpaperEngine/Core/Projects/CPropertyColor.cpp
+        src/WallpaperEngine/Core/Projects/CPropertyColor.cpp
 
-        WallpaperEngine/Core/Scenes/CCamera.cpp
+        src/WallpaperEngine/Core/Scenes/CCamera.cpp
-        WallpaperEngine/Core/Scenes/CCamera.h
+        src/WallpaperEngine/Core/Scenes/CCamera.h
-        WallpaperEngine/Core/Scenes/CProjection.cpp
+        src/WallpaperEngine/Core/Scenes/CProjection.cpp
-        WallpaperEngine/Core/Scenes/CProjection.h
+        src/WallpaperEngine/Core/Scenes/CProjection.h
 
-        WallpaperEngine/Core/Objects/CImage.cpp
+        src/WallpaperEngine/Core/Objects/CImage.cpp
-        WallpaperEngine/Core/Objects/CImage.h
+        src/WallpaperEngine/Core/Objects/CImage.h
-        WallpaperEngine/Core/Objects/CSound.cpp
+        src/WallpaperEngine/Core/Objects/CSound.cpp
-        WallpaperEngine/Core/Objects/CSound.h
+        src/WallpaperEngine/Core/Objects/CSound.h
-        WallpaperEngine/Core/Objects/CEffect.cpp
+        src/WallpaperEngine/Core/Objects/CEffect.cpp
-        WallpaperEngine/Core/Objects/CEffect.h
+        src/WallpaperEngine/Core/Objects/CEffect.h
-        WallpaperEngine/Core/Objects/Particles/CParticle.cpp
+        src/WallpaperEngine/Core/Objects/Particles/CParticle.cpp
-        WallpaperEngine/Core/Objects/Particles/CParticle.h
+        src/WallpaperEngine/Core/Objects/Particles/CParticle.h
 
-        WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp
+        src/WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp
-        WallpaperEngine/Core/Objects/Particles/CControlPoint.h
+        src/WallpaperEngine/Core/Objects/Particles/CControlPoint.h
-        WallpaperEngine/Core/Objects/Particles/CEmitter.cpp
+        src/WallpaperEngine/Core/Objects/Particles/CEmitter.cpp
-        WallpaperEngine/Core/Objects/Particles/CEmitter.h
+        src/WallpaperEngine/Core/Objects/Particles/CEmitter.h
-        WallpaperEngine/Core/Objects/Particles/CInitializer.cpp
+        src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp
-        WallpaperEngine/Core/Objects/Particles/CInitializer.h
+        src/WallpaperEngine/Core/Objects/Particles/CInitializer.h
 
-        WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h
-        WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h
-        WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h
-        WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h
-        WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h
-        WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h
-        WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp
-        WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h
+        src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h
 
-        WallpaperEngine/Core/Objects/Images/CMaterial.cpp
+        src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp
-        WallpaperEngine/Core/Objects/Images/CMaterial.h
+        src/WallpaperEngine/Core/Objects/Images/CMaterial.h
 
-        WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp
+        src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp
-        WallpaperEngine/Core/Objects/Images/Materials/CPassess.h
+        src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.h
 )
 
 target_link_libraries(wallengine ${X11_LIBRARIES} ${X11_Xxf86vm_LIB} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${ZLIB_LIBRARIES} ${IRRLICHT_LIBRARY} ${LZ4_LIBRARY} ${SDL_LIBRARY} ${SDL_MIXER_LIBRARIES})

src/WallpaperEngine/Core/CObject.cpp

@@ -1,9 +1,9 @@
 #include "CObject.h"
 
 #include <utility>
-#include "Objects/CImage.h"
+#include "WallpaperEngine/Core/Objects/CImage.h"
-#include "Objects/CSound.h"
+#include "WallpaperEngine/Core/Objects/CSound.h"
-#include "Objects/Particles/CParticle.h"
+#include "WallpaperEngine/Core/Objects/Particles/CParticle.h"
 
 #include "Core.h"
 

src/WallpaperEngine/Core/CObject.h

@@ -3,7 +3,7 @@
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>
 
-#include "Objects/CEffect.h"
+#include "WallpaperEngine/Core/Objects/CEffect.h"
 
 namespace WallpaperEngine::Core
 {

src/WallpaperEngine/Core/CProject.h

@@ -4,7 +4,7 @@
 #include <nlohmann/json.hpp>
 
 #include "CScene.h"
-#include "Projects/CProperty.h"
+#include "WallpaperEngine/Core/Projects/CProperty.h"
 
 namespace WallpaperEngine::Core
 {

src/WallpaperEngine/Core/CScene.h

@@ -6,8 +6,8 @@
 #include "CProject.h"
 #include "CObject.h"
 
-#include "Scenes/CCamera.h"
+#include "WallpaperEngine/Core/Scenes/CCamera.h"
-#include "Scenes/CProjection.h"
+#include "WallpaperEngine/Core/Scenes/CProjection.h"
 
 namespace WallpaperEngine::Core
 {

src/WallpaperEngine/Core/Core.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-
 #include <irrlicht/irrlicht.h>
 
 namespace WallpaperEngine::Core

src/WallpaperEngine/Core/Objects/CEffect.h

@@ -3,7 +3,7 @@
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>
 
-#include "Images/CMaterial.h"
+#include "WallpaperEngine/Core/Objects/Images/CMaterial.h"
 
 namespace WallpaperEngine::Core::Objects
 {

src/WallpaperEngine/Core/Objects/CImage.cpp

@@ -1,5 +1,5 @@
 #include "CImage.h"
-#include "Images/CMaterial.h"
+#include "WallpaperEngine/Core/Objects/Images/CMaterial.h"
 
 #include "WallpaperEngine/Core/Core.h"
 #include "WallpaperEngine/FileSystem/FileSystem.h"

src/WallpaperEngine/Core/Objects/CImage.h

@@ -3,9 +3,9 @@
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>
 
-#include "Images/CMaterial.h"
+#include "WallpaperEngine/Core/Objects/Images/CMaterial.h"
 
-#include "../CObject.h"
+#include "WallpaperEngine/Core/CObject.h"
 
 namespace WallpaperEngine::Core::Objects
 {

src/WallpaperEngine/Core/Objects/CSound.cpp

@@ -1,6 +1,6 @@
 #include <irrlicht/irrlicht.h>
 
-#include "../CObject.h"
+#include "WallpaperEngine/Core/CObject.h"
 #include "CSound.h"
 
 using namespace WallpaperEngine::Core::Objects;

src/WallpaperEngine/Core/Objects/CSound.h

@@ -3,7 +3,7 @@
 #include <irrlicht/irrlicht.h>
 #include <nlohmann/json.hpp>
 
-#include "../CObject.h"
+#include "WallpaperEngine/Core/CObject.h"
 
 namespace WallpaperEngine::Core::Objects
 {

src/WallpaperEngine/Core/Objects/Images/CMaterial.h

@@ -3,7 +3,7 @@
 #include <irrlicht/irrlicht.h>
 #include <nlohmann/json.hpp>
 
-#include "Materials/CPassess.h"
+#include "WallpaperEngine/Core/Objects/Images/Materials/CPassess.h"
 
 namespace WallpaperEngine::Core::Objects::Images
 {

src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp

@@ -1,12 +1,12 @@
 #include "CInitializer.h"
 
-#include "Initializers/CLifeTimeRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h"
-#include "Initializers/CSizeRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h"
-#include "Initializers/CRotationRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h"
-#include "Initializers/CVelocityRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h"
-#include "Initializers/CColorRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h"
-#include "Initializers/CAlphaRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h"
-#include "Initializers/CAngularVelocityRandom.h"
+#include "WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h"
 
 using namespace WallpaperEngine::Core::Objects::Particles;
 

src/WallpaperEngine/Core/Objects/Particles/CParticle.h

@@ -7,7 +7,7 @@
 #include "CEmitter.h"
 #include "CInitializer.h"
 
-#include "../../CObject.h"
+#include "WallpaperEngine/Core/CObject.h"
 
 namespace WallpaperEngine::Core::Objects::Particles
 {

src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CInitializer.h"
+#include "WallpaperEngine/Core/Objects/Particles/CInitializer.h"
 
 #include <nlohmann/json.hpp>
 #include <irrlicht/irrlicht.h>

src/WallpaperEngine/Core/Projects/CProperty.cpp

@@ -1,6 +1,4 @@
 #include "CProperty.h"
-
-#include <utility>
 #include "CPropertyColor.h"
 
 namespace WallpaperEngine::Core::Projects

src/WallpaperEngine/Core/Projects/CPropertyColor.cpp

@@ -1,5 +1,5 @@
 #include "CPropertyColor.h"
-#include "../Core.h"
+#include "WallpaperEngine/Core/Core.h"
 
 namespace WallpaperEngine::Core::Projects
 {

src/WallpaperEngine/FileSystem/FileSystem.cpp

@@ -2,7 +2,7 @@
 #include "FileSystem.h"
 
 // engine includes
-#include "../Irrlicht/Irrlicht.h"
+#include "WallpaperEngine/Irrlicht/Irrlicht.h"
 
 namespace WallpaperEngine::FileSystem
 {

src/WallpaperEngine/FileSystem/FileSystem.h

@@ -1,8 +1,7 @@
 /**
  * @author Alexis Maiquez Murcia <almamu@almamu.com>
  */
-#ifndef WALLENGINE_RESOLVER_H
+#pragma once
-#define WALLENGINE_RESOLVER_H
 
 #include <string>
 #include <vector>
@@ -19,6 +18,3 @@ namespace WallpaperEngine::FileSystem
      */
     std::string loadFullFile (irr::io::path file);
 }
-
-
-#endif //WALLENGINE_RESOLVER_H