diff options
author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-05 15:34:31 +0100 |
---|---|---|
committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-05 15:34:31 +0100 |
commit | 5f75bdbf3d38c94baeae52f4c4889f147ec6885e (patch) | |
tree | 5fc76975e41ae106df61a4d59559f0ab37fb52ac /src/crepe | |
parent | 9572c5b35de2d13dbe7f942e3ecc50d28b36e9b8 (diff) |
move systems + update contributing.md
Diffstat (limited to 'src/crepe')
-rw-r--r-- | src/crepe/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/crepe/SDLContext.h | 2 | ||||
-rw-r--r-- | src/crepe/system/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/crepe/system/CollisionSystem.cpp (renamed from src/crepe/CollisionSystem.cpp) | 0 | ||||
-rw-r--r-- | src/crepe/system/CollisionSystem.h (renamed from src/crepe/CollisionSystem.h) | 0 | ||||
-rw-r--r-- | src/crepe/system/ParticleSystem.cpp (renamed from src/crepe/ParticleSystem.cpp) | 4 | ||||
-rw-r--r-- | src/crepe/system/ParticleSystem.h (renamed from src/crepe/ParticleSystem.h) | 2 | ||||
-rw-r--r-- | src/crepe/system/PhysicsSystem.cpp (renamed from src/crepe/PhysicsSystem.cpp) | 8 | ||||
-rw-r--r-- | src/crepe/system/PhysicsSystem.h (renamed from src/crepe/PhysicsSystem.h) | 0 | ||||
-rw-r--r-- | src/crepe/system/RenderSystem.cpp (renamed from src/crepe/RenderSystem.cpp) | 10 | ||||
-rw-r--r-- | src/crepe/system/RenderSystem.h (renamed from src/crepe/RenderSystem.h) | 0 | ||||
-rw-r--r-- | src/crepe/system/ScriptSystem.cpp (renamed from src/crepe/ScriptSystem.cpp) | 8 | ||||
-rw-r--r-- | src/crepe/system/ScriptSystem.h (renamed from src/crepe/ScriptSystem.h) | 0 | ||||
-rw-r--r-- | src/crepe/system/System.h (renamed from src/crepe/System.h) | 0 |
14 files changed, 33 insertions, 28 deletions
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt index d938eb8..7f976db 100644 --- a/src/crepe/CMakeLists.txt +++ b/src/crepe/CMakeLists.txt @@ -3,17 +3,11 @@ target_sources(crepe PUBLIC Sound.cpp SoundContext.cpp Particle.cpp - ParticleSystem.cpp SDLApp.cpp ComponentManager.cpp Component.cpp - ScriptSystem.cpp - PhysicsSystem.cpp - CollisionSystem.cpp Collider.cpp SDLContext.cpp - - RenderSystem.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -24,15 +18,11 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES ComponentManager.h ComponentManager.hpp Component.h - System.h - ScriptSystem.h - PhysicsSystem.h - CollisionSystem.h Collider.h SDLContext.h - RenderSystem.h ) add_subdirectory(api) add_subdirectory(util) +add_subdirectory(system) diff --git a/src/crepe/SDLContext.h b/src/crepe/SDLContext.h index 4d9c1bc..ea05c7b 100644 --- a/src/crepe/SDLContext.h +++ b/src/crepe/SDLContext.h @@ -6,7 +6,7 @@ #include "api/Sprite.h" #include "api/Transform.h" -#include "RenderSystem.h" +#include "system/RenderSystem.h" namespace crepe::api { class Texture; diff --git a/src/crepe/system/CMakeLists.txt b/src/crepe/system/CMakeLists.txt new file mode 100644 index 0000000..ff6f66f --- /dev/null +++ b/src/crepe/system/CMakeLists.txt @@ -0,0 +1,15 @@ +target_sources(crepe PUBLIC + ParticleSystem.cpp + ScriptSystem.cpp + PhysicsSystem.cpp + CollisionSystem.cpp + RenderSystem.cpp +) + +target_sources(crepe PUBLIC FILE_SET HEADERS FILES + System.h + ScriptSystem.h + PhysicsSystem.h + CollisionSystem.h + RenderSystem.h +) diff --git a/src/crepe/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp index 55e0fdc..55e0fdc 100644 --- a/src/crepe/CollisionSystem.cpp +++ b/src/crepe/system/CollisionSystem.cpp diff --git a/src/crepe/CollisionSystem.h b/src/crepe/system/CollisionSystem.h index 1e9f1aa..1e9f1aa 100644 --- a/src/crepe/CollisionSystem.h +++ b/src/crepe/system/CollisionSystem.h diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp index af6c550..367c7d8 100644 --- a/src/crepe/ParticleSystem.cpp +++ b/src/crepe/system/ParticleSystem.cpp @@ -1,9 +1,9 @@ #include <cmath> #include <ctime> -#include "api/ParticleEmitter.h" +#include "../api/ParticleEmitter.h" +#include "../ComponentManager.h" -#include "ComponentManager.h" #include "ParticleSystem.h" using namespace crepe; diff --git a/src/crepe/ParticleSystem.h b/src/crepe/system/ParticleSystem.h index ad96eb0..3ac1d3f 100644 --- a/src/crepe/ParticleSystem.h +++ b/src/crepe/system/ParticleSystem.h @@ -1,6 +1,6 @@ #pragma once -#include "api/ParticleEmitter.h" +#include "../api/ParticleEmitter.h" namespace crepe { diff --git a/src/crepe/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index 16f4c10..6da714f 100644 --- a/src/crepe/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -1,10 +1,10 @@ #include <iostream> -#include "api/Force.h" -#include "api/Rigidbody.h" -#include "api/Transform.h" +#include "../api/Force.h" +#include "../api/Rigidbody.h" +#include "../api/Transform.h" +#include "../ComponentManager.h" -#include "ComponentManager.h" #include "PhysicsSystem.h" using namespace crepe; diff --git a/src/crepe/PhysicsSystem.h b/src/crepe/system/PhysicsSystem.h index 33b4072..33b4072 100644 --- a/src/crepe/PhysicsSystem.h +++ b/src/crepe/system/PhysicsSystem.h diff --git a/src/crepe/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp index fae93f0..599087a 100644 --- a/src/crepe/RenderSystem.cpp +++ b/src/crepe/system/RenderSystem.cpp @@ -1,13 +1,13 @@ #include <functional> #include <vector> -#include "api/Sprite.h" -#include "api/Transform.h" -#include "util/log.h" +#include "../api/Sprite.h" +#include "../api/Transform.h" +#include "../util/log.h" +#include "../SDLContext.h" +#include "../ComponentManager.h" -#include "ComponentManager.h" #include "RenderSystem.h" -#include "SDLContext.h" using namespace crepe; using namespace crepe::api; diff --git a/src/crepe/RenderSystem.h b/src/crepe/system/RenderSystem.h index 4b910a4..4b910a4 100644 --- a/src/crepe/RenderSystem.h +++ b/src/crepe/system/RenderSystem.h diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp index 171b490..277b29d 100644 --- a/src/crepe/ScriptSystem.cpp +++ b/src/crepe/system/ScriptSystem.cpp @@ -2,11 +2,11 @@ #include <functional> #include <vector> -#include "api/BehaviorScript.h" -#include "api/Script.h" -#include "util/log.h" +#include "../api/BehaviorScript.h" +#include "../api/Script.h" +#include "../util/log.h" +#include "../ComponentManager.h" -#include "ComponentManager.h" #include "ScriptSystem.h" using namespace std; diff --git a/src/crepe/ScriptSystem.h b/src/crepe/system/ScriptSystem.h index 1f472a0..1f472a0 100644 --- a/src/crepe/ScriptSystem.h +++ b/src/crepe/system/ScriptSystem.h diff --git a/src/crepe/System.h b/src/crepe/system/System.h index ecbb7f5..ecbb7f5 100644 --- a/src/crepe/System.h +++ b/src/crepe/system/System.h |