diff --git a/CMakeLists.txt b/CMakeLists.txt index a9cb44e..d47c6d4 100644 --- a/CMakeLists.txt +++ b/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 - WallpaperEngine/Render/Shaders/Compiler.cpp - WallpaperEngine/project.cpp - WallpaperEngine/project.h - WallpaperEngine/scene.cpp - WallpaperEngine/scene.h - WallpaperEngine/object.cpp - WallpaperEngine/object.h - WallpaperEngine/camera.cpp - WallpaperEngine/camera.h - WallpaperEngine/Core/Core.cpp - WallpaperEngine/Core/Core.h - WallpaperEngine/image.cpp - WallpaperEngine/image.h - WallpaperEngine/object3d.cpp - WallpaperEngine/object3d.h - WallpaperEngine/effect.cpp - WallpaperEngine/effect.h - WallpaperEngine/FileSystem/utils.cpp - WallpaperEngine/FileSystem/utils.h - WallpaperEngine/video/renderer.cpp - WallpaperEngine/video/renderer.h - WallpaperEngine/video/node.cpp - WallpaperEngine/video/node.h - WallpaperEngine/video/material.cpp - WallpaperEngine/video/material.h - WallpaperEngine/texture.cpp - WallpaperEngine/texture.h - WallpaperEngine/Irrlicht/CImageLoaderTEX.h - WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp - WallpaperEngine/Irrlicht/CPkgReader.h - WallpaperEngine/Irrlicht/CPkgReader.cpp - WallpaperEngine/Irrlicht/CFileList.h - WallpaperEngine/Irrlicht/CFileList.cpp - WallpaperEngine/Irrlicht/Irrlicht.cpp - WallpaperEngine/Irrlicht/Irrlicht.h - WallpaperEngine/sound.cpp - WallpaperEngine/sound.h + src/WallpaperEngine/Render/Shaders/Compiler.h + src/WallpaperEngine/Render/Shaders/Compiler.cpp + src/WallpaperEngine/project.cpp + src/WallpaperEngine/project.h + src/WallpaperEngine/scene.cpp + src/WallpaperEngine/scene.h + src/WallpaperEngine/object.cpp + src/WallpaperEngine/object.h + src/WallpaperEngine/camera.cpp + src/WallpaperEngine/camera.h + src/WallpaperEngine/Core/Core.cpp + src/WallpaperEngine/Core/Core.h + src/WallpaperEngine/image.cpp + src/WallpaperEngine/image.h + src/WallpaperEngine/object3d.cpp + src/WallpaperEngine/object3d.h + src/WallpaperEngine/effect.cpp + src/WallpaperEngine/effect.h + src/WallpaperEngine/FileSystem/FileSystem.cpp + src/WallpaperEngine/FileSystem/FileSystem.h + src/WallpaperEngine/video/renderer.cpp + src/WallpaperEngine/video/renderer.h + src/WallpaperEngine/video/node.cpp + src/WallpaperEngine/video/node.h + src/WallpaperEngine/video/material.cpp + src/WallpaperEngine/video/material.h + src/WallpaperEngine/texture.cpp + src/WallpaperEngine/texture.h + src/WallpaperEngine/Irrlicht/CImageLoaderTEX.h + src/WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp + src/WallpaperEngine/Irrlicht/CPkgReader.h + src/WallpaperEngine/Irrlicht/CPkgReader.cpp + src/WallpaperEngine/Irrlicht/CFileList.h + src/WallpaperEngine/Irrlicht/CFileList.cpp + src/WallpaperEngine/Irrlicht/Irrlicht.cpp + src/WallpaperEngine/Irrlicht/Irrlicht.h + src/WallpaperEngine/sound.cpp + src/WallpaperEngine/sound.h - WallpaperEngine/Core/CProject.cpp - WallpaperEngine/Core/CProject.h - WallpaperEngine/Core/CScene.cpp - WallpaperEngine/Core/CScene.h - WallpaperEngine/Core/CObject.cpp - WallpaperEngine/Core/CObject.h + src/WallpaperEngine/Core/CProject.cpp + src/WallpaperEngine/Core/CProject.h + src/WallpaperEngine/Core/CScene.cpp + src/WallpaperEngine/Core/CScene.h + src/WallpaperEngine/Core/CObject.cpp + src/WallpaperEngine/Core/CObject.h - WallpaperEngine/Core/Projects/CProperty.h - WallpaperEngine/Core/Projects/CProperty.cpp - WallpaperEngine/Core/Projects/CPropertyColor.h - WallpaperEngine/Core/Projects/CPropertyColor.cpp + src/WallpaperEngine/Core/Projects/CProperty.h + src/WallpaperEngine/Core/Projects/CProperty.cpp + src/WallpaperEngine/Core/Projects/CPropertyColor.h + src/WallpaperEngine/Core/Projects/CPropertyColor.cpp - WallpaperEngine/Core/Scenes/CCamera.cpp - WallpaperEngine/Core/Scenes/CCamera.h - WallpaperEngine/Core/Scenes/CProjection.cpp - WallpaperEngine/Core/Scenes/CProjection.h + src/WallpaperEngine/Core/Scenes/CCamera.cpp + src/WallpaperEngine/Core/Scenes/CCamera.h + src/WallpaperEngine/Core/Scenes/CProjection.cpp + src/WallpaperEngine/Core/Scenes/CProjection.h - WallpaperEngine/Core/Objects/CImage.cpp - WallpaperEngine/Core/Objects/CImage.h - WallpaperEngine/Core/Objects/CSound.cpp - WallpaperEngine/Core/Objects/CSound.h - WallpaperEngine/Core/Objects/CEffect.cpp - WallpaperEngine/Core/Objects/CEffect.h - WallpaperEngine/Core/Objects/Particles/CParticle.cpp - WallpaperEngine/Core/Objects/Particles/CParticle.h + src/WallpaperEngine/Core/Objects/CImage.cpp + src/WallpaperEngine/Core/Objects/CImage.h + src/WallpaperEngine/Core/Objects/CSound.cpp + src/WallpaperEngine/Core/Objects/CSound.h + src/WallpaperEngine/Core/Objects/CEffect.cpp + src/WallpaperEngine/Core/Objects/CEffect.h + src/WallpaperEngine/Core/Objects/Particles/CParticle.cpp + src/WallpaperEngine/Core/Objects/Particles/CParticle.h - WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp - WallpaperEngine/Core/Objects/Particles/CControlPoint.h - WallpaperEngine/Core/Objects/Particles/CEmitter.cpp - WallpaperEngine/Core/Objects/Particles/CEmitter.h - WallpaperEngine/Core/Objects/Particles/CInitializer.cpp - WallpaperEngine/Core/Objects/Particles/CInitializer.h + src/WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp + src/WallpaperEngine/Core/Objects/Particles/CControlPoint.h + src/WallpaperEngine/Core/Objects/Particles/CEmitter.cpp + src/WallpaperEngine/Core/Objects/Particles/CEmitter.h + src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp + src/WallpaperEngine/Core/Objects/Particles/CInitializer.h - WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h - WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h - WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h - WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h - WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h - WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h - WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp - WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h + src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp + src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h - WallpaperEngine/Core/Objects/Images/CMaterial.cpp - WallpaperEngine/Core/Objects/Images/CMaterial.h + src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp + src/WallpaperEngine/Core/Objects/Images/CMaterial.h - WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp - WallpaperEngine/Core/Objects/Images/Materials/CPassess.h + src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp + 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}) \ No newline at end of file diff --git a/nlohmann/adl_serializer.hpp b/include/nlohmann/adl_serializer.hpp similarity index 100% rename from nlohmann/adl_serializer.hpp rename to include/nlohmann/adl_serializer.hpp diff --git a/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp similarity index 100% rename from nlohmann/detail/conversions/from_json.hpp rename to include/nlohmann/detail/conversions/from_json.hpp diff --git a/nlohmann/detail/conversions/to_chars.hpp b/include/nlohmann/detail/conversions/to_chars.hpp similarity index 100% rename from nlohmann/detail/conversions/to_chars.hpp rename to include/nlohmann/detail/conversions/to_chars.hpp diff --git a/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp similarity index 100% rename from nlohmann/detail/conversions/to_json.hpp rename to include/nlohmann/detail/conversions/to_json.hpp diff --git a/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp similarity index 100% rename from nlohmann/detail/exceptions.hpp rename to include/nlohmann/detail/exceptions.hpp diff --git a/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp similarity index 100% rename from nlohmann/detail/input/binary_reader.hpp rename to include/nlohmann/detail/input/binary_reader.hpp diff --git a/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp similarity index 100% rename from nlohmann/detail/input/input_adapters.hpp rename to include/nlohmann/detail/input/input_adapters.hpp diff --git a/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp similarity index 100% rename from nlohmann/detail/input/json_sax.hpp rename to include/nlohmann/detail/input/json_sax.hpp diff --git a/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp similarity index 100% rename from nlohmann/detail/input/lexer.hpp rename to include/nlohmann/detail/input/lexer.hpp diff --git a/nlohmann/detail/input/parser.hpp b/include/nlohmann/detail/input/parser.hpp similarity index 100% rename from nlohmann/detail/input/parser.hpp rename to include/nlohmann/detail/input/parser.hpp diff --git a/nlohmann/detail/iterators/internal_iterator.hpp b/include/nlohmann/detail/iterators/internal_iterator.hpp similarity index 100% rename from nlohmann/detail/iterators/internal_iterator.hpp rename to include/nlohmann/detail/iterators/internal_iterator.hpp diff --git a/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp similarity index 100% rename from nlohmann/detail/iterators/iter_impl.hpp rename to include/nlohmann/detail/iterators/iter_impl.hpp diff --git a/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp similarity index 100% rename from nlohmann/detail/iterators/iteration_proxy.hpp rename to include/nlohmann/detail/iterators/iteration_proxy.hpp diff --git a/nlohmann/detail/iterators/json_reverse_iterator.hpp b/include/nlohmann/detail/iterators/json_reverse_iterator.hpp similarity index 100% rename from nlohmann/detail/iterators/json_reverse_iterator.hpp rename to include/nlohmann/detail/iterators/json_reverse_iterator.hpp diff --git a/nlohmann/detail/iterators/primitive_iterator.hpp b/include/nlohmann/detail/iterators/primitive_iterator.hpp similarity index 100% rename from nlohmann/detail/iterators/primitive_iterator.hpp rename to include/nlohmann/detail/iterators/primitive_iterator.hpp diff --git a/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp similarity index 100% rename from nlohmann/detail/json_pointer.hpp rename to include/nlohmann/detail/json_pointer.hpp diff --git a/nlohmann/detail/json_ref.hpp b/include/nlohmann/detail/json_ref.hpp similarity index 100% rename from nlohmann/detail/json_ref.hpp rename to include/nlohmann/detail/json_ref.hpp diff --git a/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp similarity index 100% rename from nlohmann/detail/macro_scope.hpp rename to include/nlohmann/detail/macro_scope.hpp diff --git a/nlohmann/detail/macro_unscope.hpp b/include/nlohmann/detail/macro_unscope.hpp similarity index 100% rename from nlohmann/detail/macro_unscope.hpp rename to include/nlohmann/detail/macro_unscope.hpp diff --git a/nlohmann/detail/meta.hpp b/include/nlohmann/detail/meta.hpp similarity index 100% rename from nlohmann/detail/meta.hpp rename to include/nlohmann/detail/meta.hpp diff --git a/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp similarity index 100% rename from nlohmann/detail/output/binary_writer.hpp rename to include/nlohmann/detail/output/binary_writer.hpp diff --git a/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp similarity index 100% rename from nlohmann/detail/output/output_adapters.hpp rename to include/nlohmann/detail/output/output_adapters.hpp diff --git a/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp similarity index 100% rename from nlohmann/detail/output/serializer.hpp rename to include/nlohmann/detail/output/serializer.hpp diff --git a/nlohmann/detail/value_t.hpp b/include/nlohmann/detail/value_t.hpp similarity index 100% rename from nlohmann/detail/value_t.hpp rename to include/nlohmann/detail/value_t.hpp diff --git a/nlohmann/json.hpp b/include/nlohmann/json.hpp similarity index 100% rename from nlohmann/json.hpp rename to include/nlohmann/json.hpp diff --git a/nlohmann/json_fwd.hpp b/include/nlohmann/json_fwd.hpp similarity index 100% rename from nlohmann/json_fwd.hpp rename to include/nlohmann/json_fwd.hpp diff --git a/WallpaperEngine/Core/CObject.cpp b/src/WallpaperEngine/Core/CObject.cpp similarity index 95% rename from WallpaperEngine/Core/CObject.cpp rename to src/WallpaperEngine/Core/CObject.cpp index 2145281..ad86e88 100644 --- a/WallpaperEngine/Core/CObject.cpp +++ b/src/WallpaperEngine/Core/CObject.cpp @@ -1,9 +1,9 @@ #include "CObject.h" #include -#include "Objects/CImage.h" -#include "Objects/CSound.h" -#include "Objects/Particles/CParticle.h" +#include "WallpaperEngine/Core/Objects/CImage.h" +#include "WallpaperEngine/Core/Objects/CSound.h" +#include "WallpaperEngine/Core/Objects/Particles/CParticle.h" #include "Core.h" diff --git a/WallpaperEngine/Core/CObject.h b/src/WallpaperEngine/Core/CObject.h similarity index 94% rename from WallpaperEngine/Core/CObject.h rename to src/WallpaperEngine/Core/CObject.h index 4d27980..a79e42b 100644 --- a/WallpaperEngine/Core/CObject.h +++ b/src/WallpaperEngine/Core/CObject.h @@ -3,7 +3,7 @@ #include #include -#include "Objects/CEffect.h" +#include "WallpaperEngine/Core/Objects/CEffect.h" namespace WallpaperEngine::Core { diff --git a/WallpaperEngine/Core/CProject.cpp b/src/WallpaperEngine/Core/CProject.cpp similarity index 100% rename from WallpaperEngine/Core/CProject.cpp rename to src/WallpaperEngine/Core/CProject.cpp diff --git a/WallpaperEngine/Core/CProject.h b/src/WallpaperEngine/Core/CProject.h similarity index 93% rename from WallpaperEngine/Core/CProject.h rename to src/WallpaperEngine/Core/CProject.h index 369290d..a806ec5 100644 --- a/WallpaperEngine/Core/CProject.h +++ b/src/WallpaperEngine/Core/CProject.h @@ -4,7 +4,7 @@ #include #include "CScene.h" -#include "Projects/CProperty.h" +#include "WallpaperEngine/Core/Projects/CProperty.h" namespace WallpaperEngine::Core { diff --git a/WallpaperEngine/Core/CScene.cpp b/src/WallpaperEngine/Core/CScene.cpp similarity index 100% rename from WallpaperEngine/Core/CScene.cpp rename to src/WallpaperEngine/Core/CScene.cpp diff --git a/WallpaperEngine/Core/CScene.h b/src/WallpaperEngine/Core/CScene.h similarity index 96% rename from WallpaperEngine/Core/CScene.h rename to src/WallpaperEngine/Core/CScene.h index a987a17..87b86b1 100644 --- a/WallpaperEngine/Core/CScene.h +++ b/src/WallpaperEngine/Core/CScene.h @@ -6,8 +6,8 @@ #include "CProject.h" #include "CObject.h" -#include "Scenes/CCamera.h" -#include "Scenes/CProjection.h" +#include "WallpaperEngine/Core/Scenes/CCamera.h" +#include "WallpaperEngine/Core/Scenes/CProjection.h" namespace WallpaperEngine::Core { diff --git a/WallpaperEngine/Core/Core.cpp b/src/WallpaperEngine/Core/Core.cpp similarity index 100% rename from WallpaperEngine/Core/Core.cpp rename to src/WallpaperEngine/Core/Core.cpp diff --git a/WallpaperEngine/Core/Core.h b/src/WallpaperEngine/Core/Core.h similarity index 99% rename from WallpaperEngine/Core/Core.h rename to src/WallpaperEngine/Core/Core.h index edba328..1918580 100644 --- a/WallpaperEngine/Core/Core.h +++ b/src/WallpaperEngine/Core/Core.h @@ -1,7 +1,6 @@ #pragma once #include - #include namespace WallpaperEngine::Core diff --git a/WallpaperEngine/Core/Objects/CEffect.cpp b/src/WallpaperEngine/Core/Objects/CEffect.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/CEffect.cpp rename to src/WallpaperEngine/Core/Objects/CEffect.cpp diff --git a/WallpaperEngine/Core/Objects/CEffect.h b/src/WallpaperEngine/Core/Objects/CEffect.h similarity index 93% rename from WallpaperEngine/Core/Objects/CEffect.h rename to src/WallpaperEngine/Core/Objects/CEffect.h index 5f88383..d026522 100644 --- a/WallpaperEngine/Core/Objects/CEffect.h +++ b/src/WallpaperEngine/Core/Objects/CEffect.h @@ -3,7 +3,7 @@ #include #include -#include "Images/CMaterial.h" +#include "WallpaperEngine/Core/Objects/Images/CMaterial.h" namespace WallpaperEngine::Core::Objects { diff --git a/WallpaperEngine/Core/Objects/CImage.cpp b/src/WallpaperEngine/Core/Objects/CImage.cpp similarity index 96% rename from WallpaperEngine/Core/Objects/CImage.cpp rename to src/WallpaperEngine/Core/Objects/CImage.cpp index 854aa69..9d31344 100644 --- a/WallpaperEngine/Core/Objects/CImage.cpp +++ b/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" diff --git a/WallpaperEngine/Core/Objects/CImage.h b/src/WallpaperEngine/Core/Objects/CImage.h similarity index 90% rename from WallpaperEngine/Core/Objects/CImage.h rename to src/WallpaperEngine/Core/Objects/CImage.h index 3bb88b9..1ee550e 100644 --- a/WallpaperEngine/Core/Objects/CImage.h +++ b/src/WallpaperEngine/Core/Objects/CImage.h @@ -3,9 +3,9 @@ #include #include -#include "Images/CMaterial.h" +#include "WallpaperEngine/Core/Objects/Images/CMaterial.h" -#include "../CObject.h" +#include "WallpaperEngine/Core/CObject.h" namespace WallpaperEngine::Core::Objects { diff --git a/WallpaperEngine/Core/Objects/CSound.cpp b/src/WallpaperEngine/Core/Objects/CSound.cpp similarity index 97% rename from WallpaperEngine/Core/Objects/CSound.cpp rename to src/WallpaperEngine/Core/Objects/CSound.cpp index d447199..8608bd5 100644 --- a/WallpaperEngine/Core/Objects/CSound.cpp +++ b/src/WallpaperEngine/Core/Objects/CSound.cpp @@ -1,6 +1,6 @@ #include -#include "../CObject.h" +#include "WallpaperEngine/Core/CObject.h" #include "CSound.h" using namespace WallpaperEngine::Core::Objects; diff --git a/WallpaperEngine/Core/Objects/CSound.h b/src/WallpaperEngine/Core/Objects/CSound.h similarity index 95% rename from WallpaperEngine/Core/Objects/CSound.h rename to src/WallpaperEngine/Core/Objects/CSound.h index 208f14c..3728c95 100644 --- a/WallpaperEngine/Core/Objects/CSound.h +++ b/src/WallpaperEngine/Core/Objects/CSound.h @@ -3,7 +3,7 @@ #include #include -#include "../CObject.h" +#include "WallpaperEngine/Core/CObject.h" namespace WallpaperEngine::Core::Objects { diff --git a/WallpaperEngine/Core/Objects/Images/CMaterial.cpp b/src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Images/CMaterial.cpp rename to src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp diff --git a/WallpaperEngine/Core/Objects/Images/CMaterial.h b/src/WallpaperEngine/Core/Objects/Images/CMaterial.h similarity index 88% rename from WallpaperEngine/Core/Objects/Images/CMaterial.h rename to src/WallpaperEngine/Core/Objects/Images/CMaterial.h index 87143e4..bc2ba04 100644 --- a/WallpaperEngine/Core/Objects/Images/CMaterial.h +++ b/src/WallpaperEngine/Core/Objects/Images/CMaterial.h @@ -3,7 +3,7 @@ #include #include -#include "Materials/CPassess.h" +#include "WallpaperEngine/Core/Objects/Images/Materials/CPassess.h" namespace WallpaperEngine::Core::Objects::Images { diff --git a/WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp b/src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp rename to src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.cpp diff --git a/WallpaperEngine/Core/Objects/Images/Materials/CPassess.h b/src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.h similarity index 100% rename from WallpaperEngine/Core/Objects/Images/Materials/CPassess.h rename to src/WallpaperEngine/Core/Objects/Images/Materials/CPassess.h diff --git a/WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp b/src/WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp rename to src/WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/CControlPoint.h b/src/WallpaperEngine/Core/Objects/Particles/CControlPoint.h similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/CControlPoint.h rename to src/WallpaperEngine/Core/Objects/Particles/CControlPoint.h diff --git a/WallpaperEngine/Core/Objects/Particles/CEmitter.cpp b/src/WallpaperEngine/Core/Objects/Particles/CEmitter.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/CEmitter.cpp rename to src/WallpaperEngine/Core/Objects/Particles/CEmitter.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/CEmitter.h b/src/WallpaperEngine/Core/Objects/Particles/CEmitter.h similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/CEmitter.h rename to src/WallpaperEngine/Core/Objects/Particles/CEmitter.h diff --git a/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp b/src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp similarity index 74% rename from WallpaperEngine/Core/Objects/Particles/CInitializer.cpp rename to src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp index 620a62c..7d1f506 100644 --- a/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp +++ b/src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp @@ -1,12 +1,12 @@ #include "CInitializer.h" -#include "Initializers/CLifeTimeRandom.h" -#include "Initializers/CSizeRandom.h" -#include "Initializers/CRotationRandom.h" -#include "Initializers/CVelocityRandom.h" -#include "Initializers/CColorRandom.h" -#include "Initializers/CAlphaRandom.h" -#include "Initializers/CAngularVelocityRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h" +#include "WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h" using namespace WallpaperEngine::Core::Objects::Particles; diff --git a/WallpaperEngine/Core/Objects/Particles/CInitializer.h b/src/WallpaperEngine/Core/Objects/Particles/CInitializer.h similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/CInitializer.h rename to src/WallpaperEngine/Core/Objects/Particles/CInitializer.h diff --git a/WallpaperEngine/Core/Objects/Particles/CParticle.cpp b/src/WallpaperEngine/Core/Objects/Particles/CParticle.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/CParticle.cpp rename to src/WallpaperEngine/Core/Objects/Particles/CParticle.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/CParticle.h b/src/WallpaperEngine/Core/Objects/Particles/CParticle.h similarity index 97% rename from WallpaperEngine/Core/Objects/Particles/CParticle.h rename to src/WallpaperEngine/Core/Objects/Particles/CParticle.h index 238db00..ab5a562 100644 --- a/WallpaperEngine/Core/Objects/Particles/CParticle.h +++ b/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 { diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h similarity index 88% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h index 2442627..6f5845a 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h similarity index 90% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h index 8a96840..fda06f2 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h similarity index 89% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h index fd1176f..4b19128 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h similarity index 88% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h index b05b0ea..8acef3e 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h similarity index 88% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h index e7f7d99..8b0c104 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CRotationRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h similarity index 88% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h index 6e21af5..693d5a5 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp similarity index 100% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp diff --git a/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h b/src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h similarity index 90% rename from WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h rename to src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h index c56600b..56b6c9c 100644 --- a/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.h +++ b/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 #include diff --git a/WallpaperEngine/Core/Projects/CProperty.cpp b/src/WallpaperEngine/Core/Projects/CProperty.cpp similarity index 98% rename from WallpaperEngine/Core/Projects/CProperty.cpp rename to src/WallpaperEngine/Core/Projects/CProperty.cpp index 964120b..1055b20 100644 --- a/WallpaperEngine/Core/Projects/CProperty.cpp +++ b/src/WallpaperEngine/Core/Projects/CProperty.cpp @@ -1,6 +1,4 @@ #include "CProperty.h" - -#include #include "CPropertyColor.h" namespace WallpaperEngine::Core::Projects diff --git a/WallpaperEngine/Core/Projects/CProperty.h b/src/WallpaperEngine/Core/Projects/CProperty.h similarity index 100% rename from WallpaperEngine/Core/Projects/CProperty.h rename to src/WallpaperEngine/Core/Projects/CProperty.h diff --git a/WallpaperEngine/Core/Projects/CPropertyColor.cpp b/src/WallpaperEngine/Core/Projects/CPropertyColor.cpp similarity index 95% rename from WallpaperEngine/Core/Projects/CPropertyColor.cpp rename to src/WallpaperEngine/Core/Projects/CPropertyColor.cpp index 9d1dc47..bea9f66 100644 --- a/WallpaperEngine/Core/Projects/CPropertyColor.cpp +++ b/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 { diff --git a/WallpaperEngine/Core/Projects/CPropertyColor.h b/src/WallpaperEngine/Core/Projects/CPropertyColor.h similarity index 100% rename from WallpaperEngine/Core/Projects/CPropertyColor.h rename to src/WallpaperEngine/Core/Projects/CPropertyColor.h diff --git a/WallpaperEngine/Core/Scenes/CCamera.cpp b/src/WallpaperEngine/Core/Scenes/CCamera.cpp similarity index 100% rename from WallpaperEngine/Core/Scenes/CCamera.cpp rename to src/WallpaperEngine/Core/Scenes/CCamera.cpp diff --git a/WallpaperEngine/Core/Scenes/CCamera.h b/src/WallpaperEngine/Core/Scenes/CCamera.h similarity index 100% rename from WallpaperEngine/Core/Scenes/CCamera.h rename to src/WallpaperEngine/Core/Scenes/CCamera.h diff --git a/WallpaperEngine/Core/Scenes/CProjection.cpp b/src/WallpaperEngine/Core/Scenes/CProjection.cpp similarity index 100% rename from WallpaperEngine/Core/Scenes/CProjection.cpp rename to src/WallpaperEngine/Core/Scenes/CProjection.cpp diff --git a/WallpaperEngine/Core/Scenes/CProjection.h b/src/WallpaperEngine/Core/Scenes/CProjection.h similarity index 100% rename from WallpaperEngine/Core/Scenes/CProjection.h rename to src/WallpaperEngine/Core/Scenes/CProjection.h diff --git a/WallpaperEngine/FileSystem/FileSystem.cpp b/src/WallpaperEngine/FileSystem/FileSystem.cpp similarity index 93% rename from WallpaperEngine/FileSystem/FileSystem.cpp rename to src/WallpaperEngine/FileSystem/FileSystem.cpp index bef3922..0f4156c 100644 --- a/WallpaperEngine/FileSystem/FileSystem.cpp +++ b/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 { diff --git a/WallpaperEngine/FileSystem/FileSystem.h b/src/WallpaperEngine/FileSystem/FileSystem.h similarity index 79% rename from WallpaperEngine/FileSystem/FileSystem.h rename to src/WallpaperEngine/FileSystem/FileSystem.h index b73040b..7b63879 100644 --- a/WallpaperEngine/FileSystem/FileSystem.h +++ b/src/WallpaperEngine/FileSystem/FileSystem.h @@ -1,8 +1,7 @@ /** * @author Alexis Maiquez Murcia */ -#ifndef WALLENGINE_RESOLVER_H -#define WALLENGINE_RESOLVER_H +#pragma once #include #include @@ -19,6 +18,3 @@ namespace WallpaperEngine::FileSystem */ std::string loadFullFile (irr::io::path file); } - - -#endif //WALLENGINE_RESOLVER_H diff --git a/WallpaperEngine/Irrlicht/CFileList.cpp b/src/WallpaperEngine/Irrlicht/CFileList.cpp similarity index 100% rename from WallpaperEngine/Irrlicht/CFileList.cpp rename to src/WallpaperEngine/Irrlicht/CFileList.cpp diff --git a/WallpaperEngine/Irrlicht/CFileList.h b/src/WallpaperEngine/Irrlicht/CFileList.h similarity index 100% rename from WallpaperEngine/Irrlicht/CFileList.h rename to src/WallpaperEngine/Irrlicht/CFileList.h diff --git a/WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp b/src/WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp similarity index 100% rename from WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp rename to src/WallpaperEngine/Irrlicht/CImageLoaderTEX.cpp diff --git a/WallpaperEngine/Irrlicht/CImageLoaderTEX.h b/src/WallpaperEngine/Irrlicht/CImageLoaderTEX.h similarity index 100% rename from WallpaperEngine/Irrlicht/CImageLoaderTEX.h rename to src/WallpaperEngine/Irrlicht/CImageLoaderTEX.h diff --git a/WallpaperEngine/Irrlicht/CPkgReader.cpp b/src/WallpaperEngine/Irrlicht/CPkgReader.cpp similarity index 100% rename from WallpaperEngine/Irrlicht/CPkgReader.cpp rename to src/WallpaperEngine/Irrlicht/CPkgReader.cpp diff --git a/WallpaperEngine/Irrlicht/CPkgReader.h b/src/WallpaperEngine/Irrlicht/CPkgReader.h similarity index 100% rename from WallpaperEngine/Irrlicht/CPkgReader.h rename to src/WallpaperEngine/Irrlicht/CPkgReader.h diff --git a/WallpaperEngine/Irrlicht/Irrlicht.cpp b/src/WallpaperEngine/Irrlicht/Irrlicht.cpp similarity index 100% rename from WallpaperEngine/Irrlicht/Irrlicht.cpp rename to src/WallpaperEngine/Irrlicht/Irrlicht.cpp diff --git a/WallpaperEngine/Irrlicht/Irrlicht.h b/src/WallpaperEngine/Irrlicht/Irrlicht.h similarity index 100% rename from WallpaperEngine/Irrlicht/Irrlicht.h rename to src/WallpaperEngine/Irrlicht/Irrlicht.h diff --git a/WallpaperEngine/Render/Shaders/Compiler.cpp b/src/WallpaperEngine/Render/Shaders/Compiler.cpp similarity index 100% rename from WallpaperEngine/Render/Shaders/Compiler.cpp rename to src/WallpaperEngine/Render/Shaders/Compiler.cpp diff --git a/WallpaperEngine/Render/Shaders/Compiler.h b/src/WallpaperEngine/Render/Shaders/Compiler.h similarity index 100% rename from WallpaperEngine/Render/Shaders/Compiler.h rename to src/WallpaperEngine/Render/Shaders/Compiler.h diff --git a/WallpaperEngine/camera.cpp b/src/WallpaperEngine/camera.cpp similarity index 100% rename from WallpaperEngine/camera.cpp rename to src/WallpaperEngine/camera.cpp diff --git a/WallpaperEngine/camera.h b/src/WallpaperEngine/camera.h similarity index 100% rename from WallpaperEngine/camera.h rename to src/WallpaperEngine/camera.h diff --git a/WallpaperEngine/effect.cpp b/src/WallpaperEngine/effect.cpp similarity index 100% rename from WallpaperEngine/effect.cpp rename to src/WallpaperEngine/effect.cpp diff --git a/WallpaperEngine/effect.h b/src/WallpaperEngine/effect.h similarity index 100% rename from WallpaperEngine/effect.h rename to src/WallpaperEngine/effect.h diff --git a/WallpaperEngine/image.cpp b/src/WallpaperEngine/image.cpp similarity index 100% rename from WallpaperEngine/image.cpp rename to src/WallpaperEngine/image.cpp diff --git a/WallpaperEngine/image.h b/src/WallpaperEngine/image.h similarity index 100% rename from WallpaperEngine/image.h rename to src/WallpaperEngine/image.h diff --git a/WallpaperEngine/object.cpp b/src/WallpaperEngine/object.cpp similarity index 100% rename from WallpaperEngine/object.cpp rename to src/WallpaperEngine/object.cpp diff --git a/WallpaperEngine/object.h b/src/WallpaperEngine/object.h similarity index 100% rename from WallpaperEngine/object.h rename to src/WallpaperEngine/object.h diff --git a/WallpaperEngine/object3d.cpp b/src/WallpaperEngine/object3d.cpp similarity index 100% rename from WallpaperEngine/object3d.cpp rename to src/WallpaperEngine/object3d.cpp diff --git a/WallpaperEngine/object3d.h b/src/WallpaperEngine/object3d.h similarity index 100% rename from WallpaperEngine/object3d.h rename to src/WallpaperEngine/object3d.h diff --git a/WallpaperEngine/project.cpp b/src/WallpaperEngine/project.cpp similarity index 100% rename from WallpaperEngine/project.cpp rename to src/WallpaperEngine/project.cpp diff --git a/WallpaperEngine/project.h b/src/WallpaperEngine/project.h similarity index 100% rename from WallpaperEngine/project.h rename to src/WallpaperEngine/project.h diff --git a/WallpaperEngine/scene.cpp b/src/WallpaperEngine/scene.cpp similarity index 100% rename from WallpaperEngine/scene.cpp rename to src/WallpaperEngine/scene.cpp diff --git a/WallpaperEngine/scene.h b/src/WallpaperEngine/scene.h similarity index 100% rename from WallpaperEngine/scene.h rename to src/WallpaperEngine/scene.h diff --git a/WallpaperEngine/sound.cpp b/src/WallpaperEngine/sound.cpp similarity index 100% rename from WallpaperEngine/sound.cpp rename to src/WallpaperEngine/sound.cpp diff --git a/WallpaperEngine/sound.h b/src/WallpaperEngine/sound.h similarity index 100% rename from WallpaperEngine/sound.h rename to src/WallpaperEngine/sound.h diff --git a/WallpaperEngine/texture.cpp b/src/WallpaperEngine/texture.cpp similarity index 100% rename from WallpaperEngine/texture.cpp rename to src/WallpaperEngine/texture.cpp diff --git a/WallpaperEngine/texture.h b/src/WallpaperEngine/texture.h similarity index 100% rename from WallpaperEngine/texture.h rename to src/WallpaperEngine/texture.h diff --git a/WallpaperEngine/video/material.cpp b/src/WallpaperEngine/video/material.cpp similarity index 100% rename from WallpaperEngine/video/material.cpp rename to src/WallpaperEngine/video/material.cpp diff --git a/WallpaperEngine/video/material.h b/src/WallpaperEngine/video/material.h similarity index 100% rename from WallpaperEngine/video/material.h rename to src/WallpaperEngine/video/material.h diff --git a/WallpaperEngine/video/node.cpp b/src/WallpaperEngine/video/node.cpp similarity index 100% rename from WallpaperEngine/video/node.cpp rename to src/WallpaperEngine/video/node.cpp diff --git a/WallpaperEngine/video/node.h b/src/WallpaperEngine/video/node.h similarity index 100% rename from WallpaperEngine/video/node.h rename to src/WallpaperEngine/video/node.h diff --git a/WallpaperEngine/video/renderer.cpp b/src/WallpaperEngine/video/renderer.cpp similarity index 100% rename from WallpaperEngine/video/renderer.cpp rename to src/WallpaperEngine/video/renderer.cpp diff --git a/WallpaperEngine/video/renderer.h b/src/WallpaperEngine/video/renderer.h similarity index 100% rename from WallpaperEngine/video/renderer.h rename to src/WallpaperEngine/video/renderer.h