rendering particle

7 files changed, 98 insertions, 11 deletions

diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index 5ebd23d..8ce65c2 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -35,5 +35,5 @@ int Texture::get_width() const {
 }
 int Texture::get_height() const {
 	if (this->texture == nullptr) return 0;
-	return SDLContext::get_instance().get_width(*this);
+	return SDLContext::get_instance().get_height(*this);
 }
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index e87a2c5..cc2e2f8 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -181,12 +181,12 @@ SDLContext::texture_from_path(const std::string & path) {
 
 	return img_texture;
 }
-int SDLContext::get_width(const Texture & ctx) const {
+int SDLContext::get_width(const Texture & ctx) {
 	int w;
 	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, &w, NULL);
 	return w;
 }
-int SDLContext::get_height(const Texture & ctx) const {
+int SDLContext::get_height(const Texture & ctx) {
 	int h;
 	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, NULL, &h);
 	return h;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index e358c21..7329b74 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -10,6 +10,7 @@
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "api/Camera.h"
+#include "api/Vector2.h"
 
 // FIXME: this needs to be removed
 const int SCREEN_WIDTH = 640;
@@ -97,14 +98,14 @@ private:
 	 * \param texture Reference to the Texture object.
 	 * \return Width of the texture as an integer.
 	 */
-	int get_width(const Texture &) const;
+	int get_width(const Texture &) ;
 
 	/**
 	 * \brief Gets the height of a texture.
 	 * \param texture Reference to the Texture object.
 	 * \return Height of the texture as an integer.
 	 */
-	int get_height(const Texture &) const;
+	int get_height(const Texture &) ;
 
 private:
 	//! Will use draw,clear_screen, present_screen, camera.
@@ -119,6 +120,8 @@ private:
 	void draw(const Sprite & sprite, const Transform & transform,
 			  const Camera & camera);
 
+	void draw_particle(const Vector2 & pos, const Camera & camera);
+
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 3a1def5..3de8330 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include <functional>
 #include <vector>
 
@@ -6,7 +7,9 @@
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
 #include "../util/log.h"
+#include "Particle.h"
 #include "api/ParticleEmitter.h"
+#include "api/Vector2.h"
 
 #include "RenderSystem.h"
 
@@ -39,17 +42,32 @@ void RenderSystem::update_camera() {
 		this->curr_cam = &cam;
 	}
 }
-void RenderSystem::render_sprites() const {
+
+
+void RenderSystem::render_particle(const ParticleEmitter& em, Transform & tm){
+	if (!em.active) return;
+	
+	SDLContext & render = SDLContext::get_instance();
+	for (const Particle& p  : em.data.particles) {
+		tm.position = p.position;
+		render.draw(em.data.sprite, tm , *curr_cam);
+	}
+}
+void RenderSystem::render_sprites() {
 
 	ComponentManager & mgr = ComponentManager::get_instance();
 
-	auto sprites = mgr.get_components_by_type<Sprite>();
+	auto emitter = mgr.get_components_by_type<ParticleEmitter>();
 
 	SDLContext & render = SDLContext::get_instance();
-	for (const Sprite & sprite : sprites) {
+	Transform test(1, Vector2{0,0},0,0);
+
+	for (const ParticleEmitter & em : emitter) {
 		auto transforms
-			= mgr.get_components_by_id<Transform>(sprite.game_object_id);
-		render.draw(sprite, transforms[0], *curr_cam);
+			= mgr.get_components_by_id<Transform>(em.game_object_id);
+		test.scale = transforms[0].get().scale;
+		test.rotation = transforms[0].get().rotation;
+		this->render_particle(em, test);
 	}
 }
 
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 70db21a..8dd8b7e 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -3,6 +3,8 @@
 #include "api/Camera.h"
 
 #include "System.h"
+#include "api/ParticleEmitter.h"
+#include "api/Transform.h"
 
 namespace crepe {
 
@@ -44,7 +46,9 @@ private:
 	void update_camera();
 
 	//! Renders all active sprites to the screen.
-	void render_sprites() const;
+	void render_sprites() ;
+	
+	void render_particle(const ParticleEmitter& em, Transform & tm);
 
 	/**
 	 * \todo Include color handling for sprites.
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 722ffea..72dc172 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -29,4 +29,5 @@ add_example(db)
 add_example(ecs)
 add_example(scene_manager)
 add_example(particles)
+add_example(rendering_particle)
 
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
new file mode 100644
index 0000000..54a9c23
--- /dev/null
+++ b/src/example/rendering_particle.cpp
@@ -0,0 +1,61 @@
+#include "api/Camera.h"
+#include "system/ParticleSystem.h"
+#include <SDL2/SDL_timer.h>
+#include <crepe/ComponentManager.h>
+
+#include <crepe/Component.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/ParticleEmitter.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Texture.h>
+#include <crepe/api/Transform.h>
+#include <crepe/system/RenderSystem.h>
+#include <crepe/util/log.h>
+#include <crepe/api/Color.h>
+#include <crepe/api/Sprite.h>
+#include <crepe/api/Vector2.h>
+
+#include <chrono>
+
+using namespace crepe;
+using namespace std;
+
+int main(int argc, char * argv[]) {
+	GameObject game_object(0, "", "", Vector2{0, 0}, 0, 0.1);
+	Color color(0, 0, 0, 0);
+	Sprite test_sprite = game_object.add_component<Sprite>(
+		make_shared<Texture>("../asset/texture/img.png"), color,
+		FlipSettings{false, false});
+	game_object.add_component<ParticleEmitter>(ParticleEmitter::Data{
+		.position = {0, 0},
+		.max_particles = 100,
+		.emission_rate = 0.5,
+		.min_speed = 1,
+		.max_speed = 1,
+		.min_angle = 0,
+		.max_angle = 0,
+		.begin_lifespan = 0,
+		.end_lifespan = 60,
+		.force_over_time = Vector2{0, 0},
+		.boundary{
+			.width = 1000,
+			.height = 1000,
+			.offset = Vector2{0, 0},
+			.reset_on_exit = false,
+		},
+		.sprite = test_sprite,
+	});
+	game_object.add_component<Camera>(Color::get_white());
+
+	auto & sys = crepe::RenderSystem::get_instance();
+	auto sys_part = crepe::ParticleSystem();
+	auto start = std::chrono::steady_clock::now();
+	while (std::chrono::steady_clock::now() - start < std::chrono::seconds(5)) {
+		sys_part.update();
+		sys.update();
+		SDL_Delay(10 );
+	}
+
+	return 0;
+}
+