aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contributing.md1
-rw-r--r--src/crepe/CMakeLists.txt11
-rw-r--r--src/crepe/api/AudioSource.cpp2
-rw-r--r--src/crepe/api/Texture.cpp2
-rw-r--r--src/crepe/facade/CMakeLists.txt14
-rw-r--r--src/crepe/facade/SDLApp.cpp (renamed from src/crepe/SDLApp.cpp)0
-rw-r--r--src/crepe/facade/SDLApp.h (renamed from src/crepe/SDLApp.h)2
-rw-r--r--src/crepe/facade/SDLContext.cpp (renamed from src/crepe/SDLContext.cpp)8
-rw-r--r--src/crepe/facade/SDLContext.h (renamed from src/crepe/SDLContext.h)7
-rw-r--r--src/crepe/facade/Sound.cpp (renamed from src/crepe/Sound.cpp)2
-rw-r--r--src/crepe/facade/Sound.h (renamed from src/crepe/Sound.h)2
-rw-r--r--src/crepe/facade/SoundContext.cpp (renamed from src/crepe/SoundContext.cpp)2
-rw-r--r--src/crepe/facade/SoundContext.h (renamed from src/crepe/SoundContext.h)0
-rw-r--r--src/crepe/system/RenderSystem.cpp2
-rw-r--r--src/example/asset_manager.cpp2
-rw-r--r--src/example/audio_internal.cpp2
-rw-r--r--src/example/particle.cpp2
17 files changed, 34 insertions, 27 deletions
diff --git a/contributing.md b/contributing.md
index 35d777d..2fe46f7 100644
--- a/contributing.md
+++ b/contributing.md
@@ -403,6 +403,7 @@ that you can click on to open them.
|`crepe/api/`|User-facing APIs|
|`crepe/util/`|Standalone utilities and helper functions|
|`crepe/system/`|(ECS) system classes|
+ |`crepe/facade/`|Library façades|
- Do not (indirectly) include private *dependency* headers in API header files,
as these are no longer accessible when the engine is installed
- All code is implemented under the `crepe` namespace.
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 7f976db..8830e05 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,28 +1,21 @@
target_sources(crepe PUBLIC
Asset.cpp
- Sound.cpp
- SoundContext.cpp
Particle.cpp
- SDLApp.cpp
ComponentManager.cpp
Component.cpp
Collider.cpp
- SDLContext.cpp
)
target_sources(crepe PUBLIC FILE_SET HEADERS FILES
Asset.h
- Sound.h
- SoundContext.h
- SDLContext.h
ComponentManager.h
ComponentManager.hpp
Component.h
Collider.h
- SDLContext.h
)
add_subdirectory(api)
-add_subdirectory(util)
+add_subdirectory(facade)
add_subdirectory(system)
+add_subdirectory(util)
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index 2bacc75..63fd0d7 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -1,6 +1,6 @@
#include <memory>
-#include "../Sound.h"
+#include "../facade/Sound.h"
#include "AudioSource.h"
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index b5001a6..8fc5c13 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -1,6 +1,6 @@
#include <SDL2/SDL_render.h>
-#include "../SDLContext.h"
+#include "../facade/SDLContext.h"
#include "../util/log.h"
#include "Asset.h"
diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
new file mode 100644
index 0000000..dbddcc6
--- /dev/null
+++ b/src/crepe/facade/CMakeLists.txt
@@ -0,0 +1,14 @@
+target_sources(crepe PUBLIC
+ Sound.cpp
+ SoundContext.cpp
+ SDLApp.cpp
+ SDLContext.cpp
+)
+
+target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+ Sound.h
+ SoundContext.h
+ SDLContext.h
+ SDLContext.h
+)
+
diff --git a/src/crepe/SDLApp.cpp b/src/crepe/facade/SDLApp.cpp
index c6ddeaa..c6ddeaa 100644
--- a/src/crepe/SDLApp.cpp
+++ b/src/crepe/facade/SDLApp.cpp
diff --git a/src/crepe/SDLApp.h b/src/crepe/facade/SDLApp.h
index e67947b..6d8f3f4 100644
--- a/src/crepe/SDLApp.h
+++ b/src/crepe/facade/SDLApp.h
@@ -2,7 +2,7 @@
#include <SDL2/SDL.h>
-#include "api/ParticleEmitter.h"
+#include "../api/ParticleEmitter.h"
class SDLApp {
public:
diff --git a/src/crepe/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index e61faa3..8da93e9 100644
--- a/src/crepe/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -7,10 +7,10 @@
#include <cstddef>
#include <iostream>
-#include "api/Sprite.h"
-#include "api/Texture.h"
-#include "api/Transform.h"
-#include "util/log.h"
+#include "../api/Sprite.h"
+#include "../api/Texture.h"
+#include "../api/Transform.h"
+#include "../util/log.h"
#include "SDLContext.h"
diff --git a/src/crepe/SDLContext.h b/src/crepe/facade/SDLContext.h
index 94fc549..f1ba8a6 100644
--- a/src/crepe/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -3,10 +3,9 @@
#include <SDL2/SDL_render.h>
#include <SDL2/SDL_video.h>
-#include "api/Sprite.h"
-#include "api/Transform.h"
-
-#include "system/RenderSystem.h"
+#include "../api/Sprite.h"
+#include "../api/Transform.h"
+#include "../system/RenderSystem.h"
namespace crepe {
diff --git a/src/crepe/Sound.cpp b/src/crepe/facade/Sound.cpp
index 64fa281..648ec81 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -1,4 +1,4 @@
-#include "util/log.h"
+#include "../util/log.h"
#include "Sound.h"
#include "SoundContext.h"
diff --git a/src/crepe/Sound.h b/src/crepe/facade/Sound.h
index 917b57e..183bd7c 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -4,7 +4,7 @@
#include <soloud/soloud.h>
#include <soloud/soloud_wav.h>
-#include "Asset.h"
+#include "../Asset.h"
namespace crepe {
diff --git a/src/crepe/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index 72047d2..5e5a3a9 100644
--- a/src/crepe/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -1,4 +1,4 @@
-#include "util/log.h"
+#include "../util/log.h"
#include "SoundContext.h"
diff --git a/src/crepe/SoundContext.h b/src/crepe/facade/SoundContext.h
index d3123d2..d3123d2 100644
--- a/src/crepe/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index ee3cdf2..96c94e9 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,7 +2,7 @@
#include <vector>
#include "../ComponentManager.h"
-#include "../SDLContext.h"
+#include "../facade/SDLContext.h"
#include "../api/Sprite.h"
#include "../api/Transform.h"
#include "../util/log.h"
diff --git a/src/example/asset_manager.cpp b/src/example/asset_manager.cpp
index f0d4575..ba18b62 100644
--- a/src/example/asset_manager.cpp
+++ b/src/example/asset_manager.cpp
@@ -1,4 +1,4 @@
-#include <crepe/Sound.h>
+#include <crepe/facade/Sound.h>
#include <crepe/api/AssetManager.h>
#include <crepe/api/Texture.h>
diff --git a/src/example/audio_internal.cpp b/src/example/audio_internal.cpp
index 7586441..0b36daa 100644
--- a/src/example/audio_internal.cpp
+++ b/src/example/audio_internal.cpp
@@ -3,7 +3,7 @@
* Standalone example for usage of the internal \c Sound class.
*/
-#include <crepe/Sound.h>
+#include <crepe/facade/Sound.h>
#include <crepe/api/Config.h>
#include <crepe/util/log.h>
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index 38cff25..83b1e8a 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -5,7 +5,7 @@
#include <crepe/Component.h>
#include <crepe/ComponentManager.h>
#include <crepe/Particle.h>
-#include <crepe/SDLApp.h>
+#include <crepe/facade/SDLApp.h>
#include <crepe/api/GameObject.h>
#include <crepe/api/ParticleEmitter.h>
#include <crepe/system/ParticleSystem.h>