8 files changed, 48 insertions, 29 deletions

diff --git a/src/crepe/api/BoxCollider.cpp b/src/crepe/api/BoxCollider.cpp
index c097a24..a893d41 100644
--- a/src/crepe/api/BoxCollider.cpp
+++ b/src/crepe/api/BoxCollider.cpp
@@ -4,7 +4,7 @@
 
 using namespace crepe;
 
-BoxCollider::BoxCollider(game_object_id_t game_object_id, const vec2 & offset,
-						 const vec2 & dimensions)
+BoxCollider::BoxCollider(game_object_id_t game_object_id, const vec2 & dimensions,
+						 const vec2 & offset)
 	: Collider(game_object_id, offset),
 	  dimensions(dimensions) {}
diff --git a/src/crepe/api/BoxCollider.h b/src/crepe/api/BoxCollider.h
index 1ac4d46..d643e7f 100644
--- a/src/crepe/api/BoxCollider.h
+++ b/src/crepe/api/BoxCollider.h
@@ -13,7 +13,8 @@ namespace crepe {
  */
 class BoxCollider : public Collider {
 public:
-	BoxCollider(game_object_id_t game_object_id, const vec2 & offset, const vec2 & dimensions);
+	BoxCollider(game_object_id_t game_object_id, const vec2 & dimensions,
+				const vec2 & offset = {0, 0});
 
 	//! Width and height of the box collider
 	vec2 dimensions;
diff --git a/src/crepe/api/CircleCollider.cpp b/src/crepe/api/CircleCollider.cpp
index a4271e9..90ab5e7 100644
--- a/src/crepe/api/CircleCollider.cpp
+++ b/src/crepe/api/CircleCollider.cpp
@@ -2,7 +2,7 @@
 
 using namespace crepe;
 
-CircleCollider::CircleCollider(game_object_id_t game_object_id, const vec2 & offset,
-							   float radius)
+CircleCollider::CircleCollider(game_object_id_t game_object_id, float radius,
+							   const vec2 & offset)
 	: Collider(game_object_id, offset),
 	  radius(radius) {}
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h
index c7bf66e..22da836 100644
--- a/src/crepe/api/CircleCollider.h
+++ b/src/crepe/api/CircleCollider.h
@@ -13,7 +13,8 @@ namespace crepe {
  */
 class CircleCollider : public Collider {
 public:
-	CircleCollider(game_object_id_t game_object_id, const vec2 & offset, float radius);
+	CircleCollider(game_object_id_t game_object_id, float radius,
+				   const vec2 & offset = {0, 0});
 
 	//! Radius of the circle collider.
 	float radius;
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index b5e5ff7..7a78019 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -65,6 +65,7 @@ void LoopManager::fixed_update() {
 	this->get_system<InputSystem>().update();
 	this->event_manager.dispatch_events();
 	this->get_system<ScriptSystem>().update();
+	this->get_system<ParticleSystem>().update();
 	this->get_system<AISystem>().update();
 	this->get_system<PhysicsSystem>().update();
 	this->get_system<CollisionSystem>().update();
diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp
index 90b77a0..4f54bbd 100644
--- a/src/crepe/api/ParticleEmitter.cpp
+++ b/src/crepe/api/ParticleEmitter.cpp
@@ -1,11 +1,14 @@
 #include "ParticleEmitter.h"
+#include "api/Sprite.h"
 
 using namespace crepe;
 
-ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id, const Data & data)
+ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id, const Sprite & sprite,
+								 const Data & data)
 	: Component(game_object_id),
+	  sprite(sprite),
 	  data(data) {
 	for (size_t i = 0; i < this->data.max_particles; i++) {
-		this->data.particles.emplace_back();
+		this->particles.emplace_back();
 	}
 }
diff --git a/src/crepe/api/ParticleEmitter.h b/src/crepe/api/ParticleEmitter.h
index b83fd61..8ac2e72 100644
--- a/src/crepe/api/ParticleEmitter.h
+++ b/src/crepe/api/ParticleEmitter.h
@@ -1,7 +1,11 @@
 #pragma once
 
+#include <cmath>
 #include <vector>
 
+#include "system/ParticleSystem.h"
+#include "system/RenderSystem.h"
+
 #include "Component.h"
 #include "Particle.h"
 #include "types.h"
@@ -26,15 +30,18 @@ public:
 	 */
 	struct Boundary {
 		//! boundary width (midpoint is emitter location)
-		double width = 0.0;
+		float width = INFINITY;
 		//! boundary height (midpoint is emitter location)
-		double height = 0.0;
+		float height = INFINITY;
 		//! boundary offset from particle emitter location
 		vec2 offset;
 		//! reset on exit or stop velocity and set max postion
 		bool reset_on_exit = false;
 	};
 
+	//! sprite reference of displayed sprite
+	const Sprite & sprite;
+
 	/**
 	 * \brief Holds parameters that control particle emission.
 	 *
@@ -42,32 +49,28 @@ public:
 	 * and the sprite used for rendering particles.
 	 */
 	struct Data {
-		//! position of the emitter
-		vec2 position;
+		//! offset of the emitter relative to transform
+		vec2 offset;
 		//! maximum number of particles
-		const unsigned int max_particles = 0;
-		//! rate of particle emission per update (Lowest value = 0.001 any lower is ignored)
-		double emission_rate = 0;
+		const unsigned int max_particles = 256;
+		//! rate of particle emission per second
+		float emission_rate = 50;
 		//! min speed of the particles
-		double min_speed = 0;
+		float min_speed = 100;
 		//! min speed of the particles
-		double max_speed = 0;
+		float max_speed = 100;
 		//! min angle of particle emission
-		double min_angle = 0;
+		float min_angle = 0;
 		//! max angle of particle emission
-		double max_angle = 0;
-		//! begin Lifespan of particle (only visual)
-		double begin_lifespan = 0.0;
-		//! end Lifespan of particle
-		double end_lifespan = 0.0;
+		float max_angle = 0;
+		//! begin Lifespan of particle in seconds (only visual)
+		float begin_lifespan = 0.0;
+		//! end Lifespan of particle in seconds
+		float end_lifespan = 10.0;
 		//! force over time (physics)
 		vec2 force_over_time;
 		//! particle boundary
 		Boundary boundary;
-		//! collection of particles
-		std::vector<Particle> particles;
-		//! sprite reference
-		const Sprite & sprite;
 	};
 
 public:
@@ -75,11 +78,21 @@ public:
 	 * \param game_object_id  Identifier for the game object using this emitter.
 	 * \param data            Configuration data defining particle properties.
 	 */
-	ParticleEmitter(game_object_id_t game_object_id, const Data & data);
+	ParticleEmitter(game_object_id_t game_object_id, const Sprite & sprite, const Data & data);
 
 public:
 	//! Configuration data for particle emission settings.
 	Data data;
+
+private:
+	//! Only ParticleSystem can move and read particles
+	friend ParticleSystem;
+	//! Only RenderSystem can read particles
+	friend RenderSystem;
+	//! Saves time left over from last update event.
+	float spawn_accumulator = 0;
+	//! collection of particles
+	std::vector<Particle> particles;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index b08c8db..6900295 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -139,7 +139,7 @@ public:
 		 * Each element represents a layer ID, and the GameObject will only detect
 		 * collisions with other GameObjects that belong to these layers.
 		 */
-		std::set<int> collision_layers;
+		std::set<int> collision_layers = {0};
 	};
 
 public: