aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjaroWMR <jarorutjes07@gmail.com>2024-10-23 18:42:44 +0200
committerjaroWMR <jarorutjes07@gmail.com>2024-10-23 18:42:44 +0200
commit0d2491e8619ec9012381ed3e39e85e37e0cb7765 (patch)
tree67bcbd12d655acce8eb6677cf97c07edb2f1d93f /src
parent5558d2d0530cc01fd8e3c8ce18cc38ce9c6f8057 (diff)
moved particleEmitter
Diffstat (limited to 'src')
-rw-r--r--src/crepe/CMakeLists.txt2
-rw-r--r--src/crepe/ParticleSystem.cpp2
-rw-r--r--src/crepe/ParticleSystem.h2
-rw-r--r--src/crepe/SDLApp.cpp2
-rw-r--r--src/crepe/SDLApp.h2
-rw-r--r--src/crepe/api/CMakeLists.txt2
-rw-r--r--src/crepe/api/ParticleEmitter.cpp (renamed from src/crepe/ParticleEmitter.cpp)0
-rw-r--r--src/crepe/api/ParticleEmitter.h (renamed from src/crepe/ParticleEmitter.h)0
-rw-r--r--src/example/particle.cpp5
9 files changed, 9 insertions, 8 deletions
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 57c77be..2ad20a7 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -4,7 +4,6 @@ target_sources(crepe PUBLIC
Sound.cpp
SoundContext.cpp
Particle.cpp
- ParticleEmitter.cpp
ParticleSystem.cpp
SDLApp.cpp
ComponentManager.cpp
@@ -20,7 +19,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
Asset.h
Sound.h
SoundContext.h
- ParticleEmitter.h
ParticleSystem.h
Particle.h
SDLApp.h
diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/ParticleSystem.cpp
index 0dad4cd..bf7f8fc 100644
--- a/src/crepe/ParticleSystem.cpp
+++ b/src/crepe/ParticleSystem.cpp
@@ -1,7 +1,7 @@
#include "ParticleSystem.h"
#include <cmath>
#include <ctime>
-#include "ParticleEmitter.h"
+#include "api/ParticleEmitter.h"
#include "Particle.h"
#include "ComponentManager.h"
diff --git a/src/crepe/ParticleSystem.h b/src/crepe/ParticleSystem.h
index c8777f5..313e1dd 100644
--- a/src/crepe/ParticleSystem.h
+++ b/src/crepe/ParticleSystem.h
@@ -1,7 +1,7 @@
#pragma once
#include <vector>
-#include "ParticleEmitter.h"
+#include "api/ParticleEmitter.h"
namespace crepe {
diff --git a/src/crepe/SDLApp.cpp b/src/crepe/SDLApp.cpp
index 715dd6f..ca7e819 100644
--- a/src/crepe/SDLApp.cpp
+++ b/src/crepe/SDLApp.cpp
@@ -2,7 +2,7 @@
#include <iostream>
#include <vector>
#include "Particle.h"
-#include "ParticleEmitter.h"
+#include "api/ParticleEmitter.h"
SDLApp::SDLApp(int windowWidth, int windowHeight)
: windowWidth(windowWidth), windowHeight(windowHeight), window(nullptr), renderer(nullptr) {}
diff --git a/src/crepe/SDLApp.h b/src/crepe/SDLApp.h
index 8915d30..b536ac8 100644
--- a/src/crepe/SDLApp.h
+++ b/src/crepe/SDLApp.h
@@ -3,7 +3,7 @@
#include <SDL2/SDL.h>
#include "Particle.h"
-#include "ParticleEmitter.h"
+#include "api/ParticleEmitter.h"
class SDLApp {
public:
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index c97423d..465ba46 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -6,6 +6,7 @@ target_sources(crepe PUBLIC
Rigidbody.cpp
Sprite.cpp
Force.cpp
+ ParticleEmitter.cpp
)
target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -17,5 +18,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
Rigidbody.h
Sprite.h
Force.h
+ ParticleEmitter.h
)
diff --git a/src/crepe/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp
index 318c6db..318c6db 100644
--- a/src/crepe/ParticleEmitter.cpp
+++ b/src/crepe/api/ParticleEmitter.cpp
diff --git a/src/crepe/ParticleEmitter.h b/src/crepe/api/ParticleEmitter.h
index 8cd78a9..8cd78a9 100644
--- a/src/crepe/ParticleEmitter.h
+++ b/src/crepe/api/ParticleEmitter.h
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index df1dbfd..fb89a3d 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -2,14 +2,15 @@
#include <thread>
#include <chrono>
#include "SDLApp.h"
-#include "ParticleEmitter.h"
+#include "api/ParticleEmitter.h"
#include "ParticleSystem.h"
#include "Particle.h"
#include <crepe/Component.h>
#include <crepe/ComponentManager.h>
-#include <crepe/GameObject.h>
+#include <crepe/api/GameObject.h>
#include <chrono>
+using namespace crepe::api;
using namespace crepe;
using namespace std;