From 163c9e3eea437daa8ef6007fbdf2f91470066cbf Mon Sep 17 00:00:00 2001
From: jaroWMR <jarorutjes07@gmail.com>
Date: Thu, 10 Oct 2024 07:49:38 +0200
Subject: fix for build

---
 src/example/CMakeLists.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/example')

diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index f66e08a..36ceba1 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -15,7 +15,5 @@ endfunction()
 add_example(audio_internal)
 add_example(components_internal)
 add_example(script)
-
-add_executable(particel EXCLUDE_FROM_ALL particel.cpp)
-target_link_libraries(particel PUBLIC crepe)
-
+add_example(particel)
+target_link_libraries(particel PUBLIC SDL2)
-- 
cgit v1.2.3


From d001c4ba95a72f13c942f1a24eb98fe1584d93a4 Mon Sep 17 00:00:00 2001
From: jaroWMR <jarorutjes07@gmail.com>
Date: Thu, 10 Oct 2024 08:38:40 +0200
Subject: Renamed files and Emitter is a component

---
 src/crepe/CMakeLists.txt      |  8 ++++----
 src/crepe/Particle.cpp        |  4 +++-
 src/crepe/Particle.h          | 24 ++++++++++++++++++++++++
 src/crepe/Particle.hpp        | 20 --------------------
 src/crepe/ParticleEmitter.cpp | 10 ++++++----
 src/crepe/ParticleEmitter.h   | 32 ++++++++++++++++++++++++++++++++
 src/crepe/ParticleEmitter.hpp | 25 -------------------------
 src/crepe/ParticleSystem.cpp  | 12 +++++++-----
 src/crepe/ParticleSystem.h    | 19 +++++++++++++++++++
 src/crepe/ParticleSystem.hpp  | 14 --------------
 src/crepe/SDLApp.cpp          |  6 +++---
 src/crepe/SDLApp.h            | 28 ++++++++++++++++++++++++++++
 src/crepe/SDLApp.hpp          | 28 ----------------------------
 src/example/particel.cpp      | 10 ++++++----
 14 files changed, 132 insertions(+), 108 deletions(-)
 create mode 100644 src/crepe/Particle.h
 delete mode 100644 src/crepe/Particle.hpp
 create mode 100644 src/crepe/ParticleEmitter.h
 delete mode 100644 src/crepe/ParticleEmitter.hpp
 create mode 100644 src/crepe/ParticleSystem.h
 delete mode 100644 src/crepe/ParticleSystem.hpp
 create mode 100644 src/crepe/SDLApp.h
 delete mode 100644 src/crepe/SDLApp.hpp

(limited to 'src/example')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 9c65e1e..399200b 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -21,10 +21,10 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Asset.h
 	Sound.h
 	SoundContext.h
-	ParticleEmitter.hpp
-	ParticleSystem.hpp
-	Particle.hpp
-	SDLApp.hpp
+	ParticleEmitter.h
+	ParticleSystem.h
+	Particle.h
+	SDLApp.h
 	ComponentManager.h
 	ComponentManager.hpp
 	Component.h
diff --git a/src/crepe/Particle.cpp b/src/crepe/Particle.cpp
index 8cf7f7e..aa33606 100644
--- a/src/crepe/Particle.cpp
+++ b/src/crepe/Particle.cpp
@@ -1,6 +1,8 @@
-#include "Particle.hpp"
+#include "Particle.h"
 #include <iostream>
 
+using namespace crepe;
+
 Particle::Particle()
 {
     this->active = false;
diff --git a/src/crepe/Particle.h b/src/crepe/Particle.h
new file mode 100644
index 0000000..c408ed9
--- /dev/null
+++ b/src/crepe/Particle.h
@@ -0,0 +1,24 @@
+#pragma once
+
+namespace crepe {
+
+struct Position {
+        float x;
+        float y;
+    };
+
+class Particle {
+public:
+
+    Position position;
+    Position velocity;
+    float lifespan;
+    bool active;
+
+    Particle();
+    void reset(float lifespan, Position position, Position velocity);
+    void update(float deltaTime);
+    float timeInLife;
+};
+
+}
diff --git a/src/crepe/Particle.hpp b/src/crepe/Particle.hpp
deleted file mode 100644
index 669a8ab..0000000
--- a/src/crepe/Particle.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-struct Position {
-        float x;
-        float y;
-    };
-
-class Particle {
-public:
-
-    Position position;
-    Position velocity;
-    float lifespan;
-    bool active;
-
-    Particle();
-    void reset(float lifespan, Position position, Position velocity);
-    void update(float deltaTime);
-    float timeInLife;
-};
diff --git a/src/crepe/ParticleEmitter.cpp b/src/crepe/ParticleEmitter.cpp
index 3c9cc4e..9ae5e76 100644
--- a/src/crepe/ParticleEmitter.cpp
+++ b/src/crepe/ParticleEmitter.cpp
@@ -1,11 +1,13 @@
-#include "ParticleEmitter.hpp"
+#include "ParticleEmitter.h"
 #include <ctime>
-#include "Particle.hpp"
+#include "Particle.h"
 #include <iostream>
 
-ParticleEmitter::ParticleEmitter(unsigned int maxParticles, unsigned int emissionRate, unsigned int speed, unsigned int speedOffset, unsigned int angle, unsigned int angleOffset, float m_beginLifespan, float m_endLifespan)
+using namespace crepe;
+
+ParticleEmitter::ParticleEmitter(uint32_t maxParticles, uint32_t emissionRate, uint32_t speed, uint32_t speedOffset, uint32_t angle, uint32_t angleOffset, float m_beginLifespan, float m_endLifespan)
     : m_maxParticles(maxParticles), m_emissionRate(emissionRate), m_speed(speed), m_speedOffset(speedOffset), m_position{0, 0}, m_beginLifespan(m_beginLifespan),m_endLifespan(m_endLifespan) {
-    std::srand(static_cast<unsigned int>(std::time(nullptr))); // initialize random seed
+    std::srand(static_cast<uint32_t>(std::time(nullptr))); // initialize random seed
     std::cout << "Create emitter" << std::endl;
     m_minAngle = (360 + angle - (angleOffset % 360)) % 360; // calculate minAngle
     m_maxAngle = (360 + angle + (angleOffset % 360)) % 360; // calculate maxAngle
diff --git a/src/crepe/ParticleEmitter.h b/src/crepe/ParticleEmitter.h
new file mode 100644
index 0000000..477f492
--- /dev/null
+++ b/src/crepe/ParticleEmitter.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <vector>
+#include "Particle.h"
+#include <cstdint>
+#include "Component.h"
+#
+
+namespace crepe {
+
+class ParticleEmitter : public Component {
+public:
+    ParticleEmitter(uint32_t maxParticles, uint32_t emissionRate, uint32_t speed, uint32_t speedOffset, uint32_t angle, uint32_t angleOffset,float m_beginLifespan,float m_endLifespan);
+    ~ParticleEmitter();
+
+    Position m_position; //position of the emitter
+	uint32_t m_maxParticles; //maximum number of particles
+	uint32_t m_emissionRate; //rate of particle emission
+	uint32_t m_speed; //base speed of the particles
+	uint32_t m_speedOffset; //offset for random speed variation
+	uint32_t m_minAngle; //min angle of particle emission
+	uint32_t m_maxAngle; //max angle of particle emission
+    float m_beginLifespan; //begin Lifespan of particle (only visual)
+    float m_endLifespan; //begin Lifespan of particle
+
+    std::vector<Particle> particles; //collection of particles
+
+};
+
+}
+
+
diff --git a/src/crepe/ParticleEmitter.hpp b/src/crepe/ParticleEmitter.hpp
deleted file mode 100644
index 5de5e1e..0000000
--- a/src/crepe/ParticleEmitter.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <vector>
-#include "Particle.hpp"
-
-
-
-class ParticleEmitter {
-public:
-    ParticleEmitter(unsigned int maxParticles, unsigned int emissionRate, unsigned int speed, unsigned int speedOffset, unsigned int angle, unsigned int angleOffset,float m_beginLifespan,float m_endLifespan);
-    ~ParticleEmitter();
-
-    Position m_position; //position of the emitter
-    unsigned int m_maxParticles; //maximum number of particles
-    unsigned int m_emissionRate; //rate of particle emission
-    unsigned int m_speed; //base speed of the particles
-    unsigned int m_speedOffset; //offset for random speed variation
-    unsigned int m_minAngle; //min angle of particle emission
-    unsigned int m_maxAngle; //max angle of particle emission
-    float m_beginLifespan; //begin Lifespan of particle (only visual)
-    float m_endLifespan; //begin Lifespan of particle
-
-    std::vector<Particle> particles; //collection of particles
-
-};
diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/ParticleSystem.cpp
index aff7a30..8891e2b 100644
--- a/src/crepe/ParticleSystem.cpp
+++ b/src/crepe/ParticleSystem.cpp
@@ -1,10 +1,12 @@
-#include "ParticleSystem.hpp"
+#include "ParticleSystem.h"
 #include <cmath>
 // #include <cstdlib>
 #include <ctime>
 #include <iostream>  // include iostream for std::cout
-#include "ParticleEmitter.hpp"
-#include "Particle.hpp"
+#include "ParticleEmitter.h"
+#include "Particle.h"
+
+using namespace crepe;
 
 ParticleSystem::ParticleSystem() : m_elapsedTime(0.0f) {}  // Initialize m_elapsedTime to 0
 
@@ -39,11 +41,11 @@ void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
     //check if value is overthe 360 degrees
     if(emitter.m_maxAngle < emitter.m_minAngle)
     {
-        randomAngle = ((emitter.m_minAngle + (std::rand() % (static_cast<int>(emitter.m_maxAngle + 360 - emitter.m_minAngle + 1))))%360);
+        randomAngle = ((emitter.m_minAngle + (std::rand() % (static_cast<uint32_t>(emitter.m_maxAngle + 360 - emitter.m_minAngle + 1))))%360);
     }
     else
     {
-        randomAngle = emitter.m_minAngle + (std::rand() % (static_cast<int>(emitter.m_maxAngle - emitter.m_minAngle + 1)));
+        randomAngle = emitter.m_minAngle + (std::rand() % (static_cast<uint32_t>(emitter.m_maxAngle - emitter.m_minAngle + 1)));
     }
     
 
diff --git a/src/crepe/ParticleSystem.h b/src/crepe/ParticleSystem.h
new file mode 100644
index 0000000..fd6d110
--- /dev/null
+++ b/src/crepe/ParticleSystem.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <vector>
+#include "ParticleEmitter.h"
+
+
+namespace crepe {
+
+class ParticleSystem {
+public:
+    ParticleSystem();
+    void update(float deltaTime, std::vector<ParticleEmitter>& emitters);
+private:
+    void emitParticle(ParticleEmitter &emitter); //emits a new particle
+
+    float m_elapsedTime; //elapsed time since the last emission
+};
+
+}
diff --git a/src/crepe/ParticleSystem.hpp b/src/crepe/ParticleSystem.hpp
deleted file mode 100644
index f670415..0000000
--- a/src/crepe/ParticleSystem.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <vector>
-#include "ParticleEmitter.hpp"
-
-class ParticleSystem {
-public:
-    ParticleSystem();
-    void update(float deltaTime, std::vector<ParticleEmitter>& emitters);
-private:
-    void emitParticle(ParticleEmitter &emitter); //emits a new particle
-
-    float m_elapsedTime; //elapsed time since the last emission
-};
diff --git a/src/crepe/SDLApp.cpp b/src/crepe/SDLApp.cpp
index 0779af1..715dd6f 100644
--- a/src/crepe/SDLApp.cpp
+++ b/src/crepe/SDLApp.cpp
@@ -1,8 +1,8 @@
-#include "SDLApp.hpp"
+#include "SDLApp.h"
 #include <iostream>
 #include <vector>
-#include "Particle.hpp"
-#include "ParticleEmitter.hpp"
+#include "Particle.h"
+#include "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
new file mode 100644
index 0000000..8915d30
--- /dev/null
+++ b/src/crepe/SDLApp.h
@@ -0,0 +1,28 @@
+#ifndef SDLAPP_HPP
+#define SDLAPP_HPP
+
+#include <SDL2/SDL.h>
+#include "Particle.h"
+#include "ParticleEmitter.h"
+
+class SDLApp {
+public:
+    SDLApp(int windowWidth, int windowHeight);
+    ~SDLApp();
+
+    bool initialize();
+    void handleEvents(bool& running);
+    void clearScreen();
+    void presentScreen();
+    void drawSquare(int x, int y, int size);
+    void cleanUp();
+    void drawParticles(const std::vector<crepe::ParticleEmitter>& emitters);
+    void drawMultipleSquares(const std::vector<SDL_Rect>& squares);
+private:
+    int windowWidth;
+    int windowHeight;
+    SDL_Window* window;
+    SDL_Renderer* renderer;
+};
+
+#endif
diff --git a/src/crepe/SDLApp.hpp b/src/crepe/SDLApp.hpp
deleted file mode 100644
index f95d4bc..0000000
--- a/src/crepe/SDLApp.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SDLAPP_HPP
-#define SDLAPP_HPP
-
-#include <SDL2/SDL.h>
-#include "Particle.hpp"
-#include "ParticleEmitter.hpp"
-
-class SDLApp {
-public:
-    SDLApp(int windowWidth, int windowHeight);
-    ~SDLApp();
-
-    bool initialize();
-    void handleEvents(bool& running);
-    void clearScreen();
-    void presentScreen();
-    void drawSquare(int x, int y, int size);
-    void cleanUp();
-    void drawParticles(const std::vector<ParticleEmitter>& emitters);
-    void drawMultipleSquares(const std::vector<SDL_Rect>& squares);
-private:
-    int windowWidth;
-    int windowHeight;
-    SDL_Window* window;
-    SDL_Renderer* renderer;
-};
-
-#endif
diff --git a/src/example/particel.cpp b/src/example/particel.cpp
index 58480a9..c66bbef 100644
--- a/src/example/particel.cpp
+++ b/src/example/particel.cpp
@@ -1,12 +1,14 @@
 #include <iostream>
 #include <thread>
 #include <chrono>
-#include "SDLApp.hpp"
-#include "ParticleEmitter.hpp"
-#include "ParticleSystem.hpp"
-#include "Particle.hpp"
+#include "SDLApp.h"
+#include "ParticleEmitter.h"
+#include "ParticleSystem.h"
+#include "Particle.h"
 #include <chrono>
 
+using namespace crepe;
+
 const int WINDOW_WIDTH = 800;
 const int WINDOW_HEIGHT = 600;
 
-- 
cgit v1.2.3


From 016070d47f2fff8cfdd49cc0bdf65c14ef922c94 Mon Sep 17 00:00:00 2001
From: jaroWMR <jarorutjes07@gmail.com>
Date: Thu, 10 Oct 2024 09:30:49 +0200
Subject: renamed particel to particle and example uses ecs for poc

---
 src/crepe/ParticleEmitter.cpp |  2 +
 src/crepe/ParticleSystem.cpp  | 27 ++----------
 src/crepe/ParticleSystem.h    |  2 +-
 src/example/CMakeLists.txt    |  4 +-
 src/example/particel.cpp      | 84 -------------------------------------
 src/example/particle.cpp      | 97 +++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 105 insertions(+), 111 deletions(-)
 delete mode 100644 src/example/particel.cpp
 create mode 100644 src/example/particle.cpp

(limited to 'src/example')

diff --git a/src/crepe/ParticleEmitter.cpp b/src/crepe/ParticleEmitter.cpp
index 9ae5e76..30cba7c 100644
--- a/src/crepe/ParticleEmitter.cpp
+++ b/src/crepe/ParticleEmitter.cpp
@@ -11,6 +11,8 @@ ParticleEmitter::ParticleEmitter(uint32_t maxParticles, uint32_t emissionRate, u
     std::cout << "Create emitter" << std::endl;
     m_minAngle = (360 + angle - (angleOffset % 360)) % 360; // calculate minAngle
     m_maxAngle = (360 + angle + (angleOffset % 360)) % 360; // calculate maxAngle
+	m_position.x = 400;
+	m_position.y = 400;
     for (size_t i = 0; i < m_maxParticles; i++)
     {
         this->particles.emplace_back();
diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/ParticleSystem.cpp
index 8891e2b..3a1f653 100644
--- a/src/crepe/ParticleSystem.cpp
+++ b/src/crepe/ParticleSystem.cpp
@@ -5,40 +5,32 @@
 #include <iostream>  // include iostream for std::cout
 #include "ParticleEmitter.h"
 #include "Particle.h"
+#include "ComponentManager.h"
 
 using namespace crepe;
 
 ParticleSystem::ParticleSystem() : m_elapsedTime(0.0f) {}  // Initialize m_elapsedTime to 0
 
-void ParticleSystem::update(float deltaTime, std::vector<ParticleEmitter>& emitters) {
-    // std::cout << "ParticleSystem update" << std::endl;
+void ParticleSystem::update(float deltaTime, std::vector<std::reference_wrapper<ParticleEmitter>>& emitters) {
     for (ParticleEmitter& emitter : emitters) {
         float updateAmount = 1/static_cast<float>(emitter.m_emissionRate);
         for (float i = 0; i < deltaTime; i += updateAmount)
         {
             emitParticle(emitter);
         }
-        //  std::cout << "after emit" << std::endl;
-        
-        //update/move particles afterwards delete if not alive.
         for (size_t j = 0; j <  emitter.particles.size(); j++)
         {
-            // std::cout << "update" << std::endl;
             if(emitter.particles[j].active)
             {
                 emitter.particles[j].update(deltaTime);
             }
         }     
-
-
     }
 }
 
 void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
-    // std::cout << "new emitter:" << std::endl;
-    Position initialPosition = { emitter.m_position.x, emitter.m_position.y };
+    Position initialPosition = { emitter.m_position.x, emitter.m_position.y};
     float randomAngle = 0.0f;
-    //check if value is overthe 360 degrees
     if(emitter.m_maxAngle < emitter.m_minAngle)
     {
         randomAngle = ((emitter.m_minAngle + (std::rand() % (static_cast<uint32_t>(emitter.m_maxAngle + 360 - emitter.m_minAngle + 1))))%360);
@@ -47,8 +39,6 @@ void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
     {
         randomAngle = emitter.m_minAngle + (std::rand() % (static_cast<uint32_t>(emitter.m_maxAngle - emitter.m_minAngle + 1)));
     }
-    
-
     float angleInRadians = randomAngle * (M_PI / 180.0f);
     float randomSpeedOffset = (static_cast<float>(std::rand()) / RAND_MAX) * (2 * emitter.m_speedOffset) - emitter.m_speedOffset;
     float velocityX = (emitter.m_speed + randomSpeedOffset) * std::cos(angleInRadians);
@@ -57,23 +47,12 @@ void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
         velocityX,
         velocityY
     };
-    // std::cout << "emitter.m_endLifespan:" << emitter.m_endLifespan << std::endl;
     for (size_t i = 0; i < emitter.particles.size(); i++)
     {
         if(!emitter.particles[i].active)
         {
-            // std::cout << "active " << emitter.particles[i].active << std::endl;
-            // std::cout << "lifespan " << emitter.particles[i].lifespan << std::endl;
-            // std::cout << "timeInLife " << emitter.particles[i].timeInLife << std::endl;
-            // std::cout << "emitter.m_endLifespan" << emitter.m_endLifespan << std::endl;
-            // std::cout << "initialPositionx" << initialPosition.x << std::endl;
-            // std::cout << "initialPositiony" << initialPosition.y << std::endl;
-            // std::cout << "initialVelocityx" << initialVelocity.x << std::endl;
-            // std::cout << "initialVelocityy" << initialVelocity.y << std::endl;
             emitter.particles[i].reset(emitter.m_endLifespan, initialPosition, initialVelocity);
             break;
         }
     }
-    
-    //emitter.particles.emplace_back(emitter.m_endLifespan, initialPosition, initialVelocity);
 }
diff --git a/src/crepe/ParticleSystem.h b/src/crepe/ParticleSystem.h
index fd6d110..7b14f71 100644
--- a/src/crepe/ParticleSystem.h
+++ b/src/crepe/ParticleSystem.h
@@ -9,7 +9,7 @@ namespace crepe {
 class ParticleSystem {
 public:
     ParticleSystem();
-    void update(float deltaTime, std::vector<ParticleEmitter>& emitters);
+    void update(float deltaTime, std::vector<std::reference_wrapper<ParticleEmitter>>& emitters);
 private:
     void emitParticle(ParticleEmitter &emitter); //emits a new particle
 
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 36ceba1..cbf8e31 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -15,5 +15,5 @@ endfunction()
 add_example(audio_internal)
 add_example(components_internal)
 add_example(script)
-add_example(particel)
-target_link_libraries(particel PUBLIC SDL2)
+add_example(particle)
+target_link_libraries(particle PUBLIC SDL2)
diff --git a/src/example/particel.cpp b/src/example/particel.cpp
deleted file mode 100644
index c66bbef..0000000
--- a/src/example/particel.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <iostream>
-#include <thread>
-#include <chrono>
-#include "SDLApp.h"
-#include "ParticleEmitter.h"
-#include "ParticleSystem.h"
-#include "Particle.h"
-#include <chrono>
-
-using namespace crepe;
-
-const int WINDOW_WIDTH = 800;
-const int WINDOW_HEIGHT = 600;
-
-int main(int argc, char* argv[]) {
-    SDLApp app(WINDOW_WIDTH, WINDOW_HEIGHT);
-
-    if (!app.initialize()) {
-        std::cerr << "Failed to initialize SDLApp." << std::endl;
-        return 1;
-    }
-
-    ParticleSystem particleSystem;
-
-    unsigned int maxParticles = 100;         // maximum number of particles
-    unsigned int emissionRate = 1;          // particles created per second
-    unsigned int speed = 50;                 // base speed of particles
-    unsigned int speedOffset = 10;           // random offset for particle speed
-    unsigned int angle = 90;                 // base angle of particle emission
-    unsigned int angleOffset = 30;           // random offset for particle angle
-    float beginLifespan = 0.0f;             // beginning lifespan of particles
-    float endLifespan = 2.0f;               // ending lifespan of particles
-
-    // Vector to hold all the emitters
-    std::vector<ParticleEmitter> emitters;
-
-    // Loop to create 1000 emitters
-    for (unsigned int i = 0; i < 1000; ++i) {
-        ParticleEmitter emitter(maxParticles, emissionRate, speed, speedOffset, angle, angleOffset, beginLifespan, endLifespan);
-        
-        // Set a position for each emitter, modifying the position for demonstration
-        emitter.m_position = {static_cast<float>(200 + (i % 100)), static_cast<float>(200 + (i / 100) * 10)}; // Adjust position for each emitter
-        
-        emitters.push_back(emitter); // Add the emitter to the vector
-    }
-    float deltaTime = 0.1f;
-    bool running = true;
-    std::cout << "start loop " << std::endl;
-    while (running) {
-        app.handleEvents(running);
-
-        // Start timing
-        auto start = std::chrono::high_resolution_clock::now();
-
-        particleSystem.update(deltaTime, emitters); // update particle system with delta time and emitters
-
-        // End timing
-        auto end = std::chrono::high_resolution_clock::now();
-        std::chrono::duration<float, std::milli> duration = end - start; // get duration in milliseconds
-
-        std::cout << "Update took " << duration.count() << " ms" << std::endl;
-        app.clearScreen();
-
-        start = std::chrono::high_resolution_clock::now();
-        // render particles using the drawSquare method from SDLApp
-        for (const ParticleEmitter& emitter : emitters) {
-            for (const Particle& particle : emitter.particles) {
-                if(particle.active)app.drawSquare(particle.position.x, particle.position.y, 5); // draw each particle
-            }
-        }
-        
-
-        app.presentScreen();
-        end = std::chrono::high_resolution_clock::now();
-         duration = end - start; // get duration in milliseconds
-
-        std::cout << "screen took " << duration.count() << " ms" << std::endl;
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(20)); // simulate ~50 FPS
-    }
-
-    app.cleanUp();
-    return 0;
-}
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
new file mode 100644
index 0000000..fc56230
--- /dev/null
+++ b/src/example/particle.cpp
@@ -0,0 +1,97 @@
+#include <iostream>
+#include <thread>
+#include <chrono>
+#include "SDLApp.h"
+#include "ParticleEmitter.h"
+#include "ParticleSystem.h"
+#include "Particle.h"
+#include <crepe/Component.h>
+#include <crepe/ComponentManager.h>
+#include <crepe/GameObject.h>
+#include <chrono>
+
+using namespace crepe;
+using namespace std;
+
+const int WINDOW_WIDTH = 800;
+const int WINDOW_HEIGHT = 600;
+
+int main(int argc, char* argv[]) {
+    SDLApp app(WINDOW_WIDTH, WINDOW_HEIGHT);
+
+    if (!app.initialize()) {
+        cerr << "Failed to initialize SDLApp." << endl;
+        return 1;
+    }
+
+	auto & mgr = ComponentManager::get_instance();
+	GameObject * game_object[1];
+	game_object[0] = new GameObject(0, "Name", "Tag", 0);
+	
+
+    ParticleSystem particleSystem;
+
+    unsigned int maxParticles = 100;         // maximum number of particles
+    unsigned int emissionRate = 1;          // particles created per second
+    unsigned int speed = 50;                 // base speed of particles
+    unsigned int speedOffset = 10;           // random offset for particle speed
+    unsigned int angle = 90;                 // base angle of particle emission
+    unsigned int angleOffset = 30;           // random offset for particle angle
+    float beginLifespan = 0.0f;             // beginning lifespan of particles
+    float endLifespan = 2.0f;               // ending lifespan of particles
+
+    // Vector to hold all the emitters
+    // vector<ParticleEmitter> emitters;
+	game_object[0]->add_component<ParticleEmitter>(maxParticles, emissionRate, speed, speedOffset, angle, angleOffset, beginLifespan, endLifespan);
+
+	std::vector<std::reference_wrapper<ParticleEmitter>> emitters = mgr.get_components_by_type<ParticleEmitter>();
+	
+
+    // Loop to create 1000 emitters
+    // for (unsigned int i = 0; i < 1000; ++i) {
+    //     ParticleEmitter emitter(maxParticles, emissionRate, speed, speedOffset, angle, angleOffset, beginLifespan, endLifespan);
+        
+    //     // Set a position for each emitter, modifying the position for demonstration
+    //     emitter.m_position = {static_cast<float>(200 + (i % 100)), static_cast<float>(200 + (i / 100) * 10)}; // Adjust position for each emitter
+        
+    //     emitters.push_back(emitter); // Add the emitter to the vector
+    // }
+    float deltaTime = 0.1f;
+    bool running = true;
+    cout << "start loop " << endl;
+    while (running) {
+        app.handleEvents(running);
+
+        // Start timing
+        auto start = chrono::high_resolution_clock::now();
+
+        particleSystem.update(deltaTime, emitters); // update particle system with delta time and emitters
+
+        // End timing
+        auto end = chrono::high_resolution_clock::now();
+        chrono::duration<float, milli> duration = end - start; // get duration in milliseconds
+
+        cout << "Update took " << duration.count() << " ms" << endl;
+        app.clearScreen();
+
+        start = chrono::high_resolution_clock::now();
+        // render particles using the drawSquare method from SDLApp
+        for (const ParticleEmitter& emitter : emitters) {
+            for (const Particle& particle : emitter.particles) {
+                if(particle.active)app.drawSquare(particle.position.x, particle.position.y, 5); // draw each particle
+            }
+        }
+        
+
+        app.presentScreen();
+        end = chrono::high_resolution_clock::now();
+         duration = end - start; // get duration in milliseconds
+
+        cout << "screen took " << duration.count() << " ms" << endl;
+
+        this_thread::sleep_for(chrono::milliseconds(20)); // simulate ~50 FPS
+    }
+
+    app.cleanUp();
+    return 0;
+}
-- 
cgit v1.2.3


From 0f03cdbf23f57116b7664a7c98c4605fd69bb961 Mon Sep 17 00:00:00 2001
From: jaroWMR <jarorutjes07@gmail.com>
Date: Sun, 20 Oct 2024 12:59:18 +0200
Subject: updated particle system

---
 src/crepe/ParticleSystem.cpp        |  7 ++++---
 src/crepe/ParticleSystem.h          |  2 +-
 src/crepe/Transform.cpp             |  6 ++++++
 src/crepe/Transform.h               | 16 ++++++++++++++++
 src/example/components_internal.cpp |  4 ++--
 src/example/particle.cpp            | 17 +++++++++++------
 6 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 src/crepe/Transform.cpp
 create mode 100644 src/crepe/Transform.h

(limited to 'src/example')

diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/ParticleSystem.cpp
index 3a1f653..0dad4cd 100644
--- a/src/crepe/ParticleSystem.cpp
+++ b/src/crepe/ParticleSystem.cpp
@@ -1,8 +1,6 @@
 #include "ParticleSystem.h"
 #include <cmath>
-// #include <cstdlib>
 #include <ctime>
-#include <iostream>  // include iostream for std::cout
 #include "ParticleEmitter.h"
 #include "Particle.h"
 #include "ComponentManager.h"
@@ -11,7 +9,10 @@ using namespace crepe;
 
 ParticleSystem::ParticleSystem() : m_elapsedTime(0.0f) {}  // Initialize m_elapsedTime to 0
 
-void ParticleSystem::update(float deltaTime, std::vector<std::reference_wrapper<ParticleEmitter>>& emitters) {
+void ParticleSystem::update() {
+	ComponentManager& mgr = ComponentManager::get_instance();
+	std::vector<std::reference_wrapper<ParticleEmitter>> emitters = mgr.get_components_by_type<ParticleEmitter>();
+	float deltaTime = 0.10;
     for (ParticleEmitter& emitter : emitters) {
         float updateAmount = 1/static_cast<float>(emitter.m_emissionRate);
         for (float i = 0; i < deltaTime; i += updateAmount)
diff --git a/src/crepe/ParticleSystem.h b/src/crepe/ParticleSystem.h
index 7b14f71..c8777f5 100644
--- a/src/crepe/ParticleSystem.h
+++ b/src/crepe/ParticleSystem.h
@@ -9,7 +9,7 @@ namespace crepe {
 class ParticleSystem {
 public:
     ParticleSystem();
-    void update(float deltaTime, std::vector<std::reference_wrapper<ParticleEmitter>>& emitters);
+    void update();
 private:
     void emitParticle(ParticleEmitter &emitter); //emits a new particle
 
diff --git a/src/crepe/Transform.cpp b/src/crepe/Transform.cpp
new file mode 100644
index 0000000..0e4b0cf
--- /dev/null
+++ b/src/crepe/Transform.cpp
@@ -0,0 +1,6 @@
+#include "Transform.h"
+
+using namespace crepe;
+
+Transform::Transform(int mass, int gravityScale, int bodyType)
+	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
diff --git a/src/crepe/Transform.h b/src/crepe/Transform.h
new file mode 100644
index 0000000..c72ebc4
--- /dev/null
+++ b/src/crepe/Transform.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Component.h"
+
+namespace crepe {
+
+class Transform : public Component {
+public:
+	Transform(int mass, int gravityScale, int bodyType);
+
+	int mass;
+	int gravity_scale;
+	int body_type;
+};
+
+} // namespace crepe
diff --git a/src/example/components_internal.cpp b/src/example/components_internal.cpp
index 54ce295..3ba5b5a 100644
--- a/src/example/components_internal.cpp
+++ b/src/example/components_internal.cpp
@@ -39,8 +39,8 @@ int main() {
 	auto stop_adding = chrono::high_resolution_clock::now();
 
 	auto sprites = mgr.get_components_by_type<Sprite>();
-	for (auto sprite : sprites) {
-		assert(sprite.get().path == "test");
+	for (auto & sprite : sprites) {
+		assert(sprite.path == "test");
 	}
 
 	auto stop_looping = chrono::high_resolution_clock::now();
diff --git a/src/example/particle.cpp b/src/example/particle.cpp
index fc56230..df1dbfd 100644
--- a/src/example/particle.cpp
+++ b/src/example/particle.cpp
@@ -24,7 +24,7 @@ int main(int argc, char* argv[]) {
         return 1;
     }
 
-	auto & mgr = ComponentManager::get_instance();
+	
 	GameObject * game_object[1];
 	game_object[0] = new GameObject(0, "Name", "Tag", 0);
 	
@@ -32,19 +32,19 @@ int main(int argc, char* argv[]) {
     ParticleSystem particleSystem;
 
     unsigned int maxParticles = 100;         // maximum number of particles
-    unsigned int emissionRate = 1;          // particles created per second
+    unsigned int emissionRate = 10;          // particles created per second
     unsigned int speed = 50;                 // base speed of particles
     unsigned int speedOffset = 10;           // random offset for particle speed
-    unsigned int angle = 90;                 // base angle of particle emission
+    unsigned int angle = 270;                 // base angle of particle emission
     unsigned int angleOffset = 30;           // random offset for particle angle
     float beginLifespan = 0.0f;             // beginning lifespan of particles
-    float endLifespan = 2.0f;               // ending lifespan of particles
+    float endLifespan = 6.0f;               // ending lifespan of particles
 
     // Vector to hold all the emitters
     // vector<ParticleEmitter> emitters;
 	game_object[0]->add_component<ParticleEmitter>(maxParticles, emissionRate, speed, speedOffset, angle, angleOffset, beginLifespan, endLifespan);
 
-	std::vector<std::reference_wrapper<ParticleEmitter>> emitters = mgr.get_components_by_type<ParticleEmitter>();
+	
 	
 
     // Loop to create 1000 emitters
@@ -65,7 +65,10 @@ int main(int argc, char* argv[]) {
         // Start timing
         auto start = chrono::high_resolution_clock::now();
 
-        particleSystem.update(deltaTime, emitters); // update particle system with delta time and emitters
+
+		// POC CODE
+        particleSystem.update(); 
+		// POC CODE
 
         // End timing
         auto end = chrono::high_resolution_clock::now();
@@ -76,6 +79,8 @@ int main(int argc, char* argv[]) {
 
         start = chrono::high_resolution_clock::now();
         // render particles using the drawSquare method from SDLApp
+		ComponentManager& mgr = ComponentManager::get_instance();
+		std::vector<std::reference_wrapper<ParticleEmitter>> emitters = mgr.get_components_by_type<ParticleEmitter>();
         for (const ParticleEmitter& emitter : emitters) {
             for (const Particle& particle : emitter.particles) {
                 if(particle.active)app.drawSquare(particle.position.x, particle.position.y, 5); // draw each particle
-- 
cgit v1.2.3


From d8483cfab70b5aca3baae6e0588924da8b54e090 Mon Sep 17 00:00:00 2001
From: jaroWMR <jarorutjes07@gmail.com>
Date: Sun, 20 Oct 2024 14:33:19 +0200
Subject: updated components to have an ID

---
 src/crepe/CMakeLists.txt         |  2 ++
 src/crepe/Collider.cpp           |  2 +-
 src/crepe/Collider.h             |  2 +-
 src/crepe/Component.cpp          |  2 +-
 src/crepe/Component.h            |  6 ++++--
 src/crepe/ComponentManager.hpp   |  2 +-
 src/crepe/ParticleEmitter.cpp    |  4 ++--
 src/crepe/ParticleEmitter.h      |  2 +-
 src/crepe/PhysicsSystem.cpp      | 20 ++++++++++++++++++++
 src/crepe/PhysicsSystem.h        | 17 +++++++++++++++++
 src/crepe/Rigidbody.cpp          |  5 +++--
 src/crepe/Rigidbody.h            | 11 +++++++++--
 src/crepe/Sprite.cpp             |  2 +-
 src/crepe/Sprite.h               |  2 +-
 src/crepe/Transform.cpp          |  4 ++--
 src/crepe/Transform.h            |  2 +-
 src/crepe/api/BehaviorScript.cpp |  2 +-
 src/example/CMakeLists.txt       |  2 ++
 src/example/Physics.cpp          | 21 +++++++++++++++++++++
 19 files changed, 91 insertions(+), 19 deletions(-)
 create mode 100644 src/crepe/PhysicsSystem.cpp
 create mode 100644 src/crepe/PhysicsSystem.h
 create mode 100644 src/example/Physics.cpp

(limited to 'src/example')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 399200b..ae9d51d 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(crepe PUBLIC
 	Sprite.cpp
 	ScriptSystem.cpp
 	Script.cpp
+	PhysicsSystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -35,6 +36,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Sprite.h
 	System.h
 	ScriptSystem.h
+	PhysicsSystem.h
 )
 
 add_subdirectory(api)
diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp
index 3f12afd..3d3f7cb 100644
--- a/src/crepe/Collider.cpp
+++ b/src/crepe/Collider.cpp
@@ -2,4 +2,4 @@
 
 using namespace crepe;
 
-Collider::Collider(int size) : size(size) {}
+Collider::Collider(uint32_t gameObjectId , int size) : Component(gameObjectId), size(size){}
diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h
index 120da05..69bb0c3 100644
--- a/src/crepe/Collider.h
+++ b/src/crepe/Collider.h
@@ -6,7 +6,7 @@ namespace crepe {
 
 class Collider : public Component {
 public:
-	Collider(int size);
+	Collider(uint32_t gameObjectId,int size);
 
 	int size;
 };
diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index d14159c..e2cd7e0 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -2,4 +2,4 @@
 
 using namespace crepe;
 
-Component::Component() : active(true) {}
+Component::Component(uint32_t id) : gameObjectId(id), active(true) {}
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 16a4ce5..c8fb6bc 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -1,13 +1,15 @@
 #pragma once
+#include <cstdint>
 
 namespace crepe {
 
 class Component {
 public:
-	Component();
+	Component(uint32_t id);
 	// TODO: shouldn't this constructor be deleted because this class will never
 	// directly be instantiated?
-
+	//changed so it sets the id (jaro)
+	uint32_t gameObjectId;
 	bool active;
 };
 
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 2ea0c70..f19fdcb 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -30,7 +30,7 @@ void ComponentManager::add_component(uint32_t id, Args &&... args) {
 
 	// Create a new component of type T (arguments directly forwarded). The
 	// constructor must be called by ComponentManager.
-	T * instance = new T(forward<Args>(args)...);
+	T * instance = new T(id,forward<Args>(args)...);
 	// store its unique_ptr in the vector<>
 	components[type][id].push_back(unique_ptr<T>(instance));
 }
diff --git a/src/crepe/ParticleEmitter.cpp b/src/crepe/ParticleEmitter.cpp
index 30cba7c..318c6db 100644
--- a/src/crepe/ParticleEmitter.cpp
+++ b/src/crepe/ParticleEmitter.cpp
@@ -5,8 +5,8 @@
 
 using namespace crepe;
 
-ParticleEmitter::ParticleEmitter(uint32_t maxParticles, uint32_t emissionRate, uint32_t speed, uint32_t speedOffset, uint32_t angle, uint32_t angleOffset, float m_beginLifespan, float m_endLifespan)
-    : m_maxParticles(maxParticles), m_emissionRate(emissionRate), m_speed(speed), m_speedOffset(speedOffset), m_position{0, 0}, m_beginLifespan(m_beginLifespan),m_endLifespan(m_endLifespan) {
+ParticleEmitter::ParticleEmitter(uint32_t gameObjectId ,uint32_t maxParticles, uint32_t emissionRate, uint32_t speed, uint32_t speedOffset, uint32_t angle, uint32_t angleOffset, float m_beginLifespan, float m_endLifespan)
+    : Component(gameObjectId), m_maxParticles(maxParticles), m_emissionRate(emissionRate), m_speed(speed), m_speedOffset(speedOffset), m_position{0, 0}, m_beginLifespan(m_beginLifespan),m_endLifespan(m_endLifespan) {
     std::srand(static_cast<uint32_t>(std::time(nullptr))); // initialize random seed
     std::cout << "Create emitter" << std::endl;
     m_minAngle = (360 + angle - (angleOffset % 360)) % 360; // calculate minAngle
diff --git a/src/crepe/ParticleEmitter.h b/src/crepe/ParticleEmitter.h
index 477f492..8cd78a9 100644
--- a/src/crepe/ParticleEmitter.h
+++ b/src/crepe/ParticleEmitter.h
@@ -10,7 +10,7 @@ namespace crepe {
 
 class ParticleEmitter : public Component {
 public:
-    ParticleEmitter(uint32_t maxParticles, uint32_t emissionRate, uint32_t speed, uint32_t speedOffset, uint32_t angle, uint32_t angleOffset,float m_beginLifespan,float m_endLifespan);
+    ParticleEmitter(uint32_t gameObjectId, uint32_t maxParticles, uint32_t emissionRate, uint32_t speed, uint32_t speedOffset, uint32_t angle, uint32_t angleOffset,float m_beginLifespan,float m_endLifespan);
     ~ParticleEmitter();
 
     Position m_position; //position of the emitter
diff --git a/src/crepe/PhysicsSystem.cpp b/src/crepe/PhysicsSystem.cpp
new file mode 100644
index 0000000..c24afa2
--- /dev/null
+++ b/src/crepe/PhysicsSystem.cpp
@@ -0,0 +1,20 @@
+#include "PhysicsSystem.h"
+#include "ComponentManager.h"
+#include "Rigidbody.h"
+#include "Transform.h"
+#include <iostream>
+
+using namespace crepe;
+
+PhysicsSystem::PhysicsSystem() {
+
+}
+
+void PhysicsSystem::update() {
+	ComponentManager& mgr = ComponentManager::get_instance();
+	std::vector<std::reference_wrapper<Rigidbody>> rigidbodies = mgr.get_components_by_type<Rigidbody>();
+	std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
+	for (Rigidbody& rigidbody : rigidbodies) {
+		std::cout << rigidbody.gameObjectId << std::endl;
+	}
+}
diff --git a/src/crepe/PhysicsSystem.h b/src/crepe/PhysicsSystem.h
new file mode 100644
index 0000000..1899089
--- /dev/null
+++ b/src/crepe/PhysicsSystem.h
@@ -0,0 +1,17 @@
+#pragma once
+
+namespace crepe {
+
+class PhysicsSystem
+{
+	private:
+		/* data */
+	public:
+		PhysicsSystem(/* args */);
+		void update();
+};
+
+}
+
+
+
diff --git a/src/crepe/Rigidbody.cpp b/src/crepe/Rigidbody.cpp
index 495d908..a610e55 100644
--- a/src/crepe/Rigidbody.cpp
+++ b/src/crepe/Rigidbody.cpp
@@ -2,5 +2,6 @@
 
 using namespace crepe;
 
-Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
+Rigidbody::Rigidbody(uint32_t gameObjectId,int mass, int gravityScale, BodyType bodyType)
+	: Component(gameObjectId), mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
+
diff --git a/src/crepe/Rigidbody.h b/src/crepe/Rigidbody.h
index 63a8877..7018e83 100644
--- a/src/crepe/Rigidbody.h
+++ b/src/crepe/Rigidbody.h
@@ -1,16 +1,23 @@
 #pragma once
 
 #include "Component.h"
+#include <cstdint>
 
 namespace crepe {
 
+enum class BodyType {
+    Static,     // Does not move (e.g. walls, ground ...)
+    Dynamic,    // Moves and responds to forces (e.g. player, physics objects ...)
+    Kinematic   // Moves but does not respond to forces (e.g. moving platforms ...)
+};
+
 class Rigidbody : public Component {
 public:
-	Rigidbody(int mass, int gravityScale, int bodyType);
+	Rigidbody(uint32_t gameObjectId,int mass, int gravityScale, BodyType bodyType);
 
 	int mass;
 	int gravity_scale;
-	int body_type;
+	BodyType body_type;
 };
 
 } // namespace crepe
diff --git a/src/crepe/Sprite.cpp b/src/crepe/Sprite.cpp
index a5a5e68..7f5bca7 100644
--- a/src/crepe/Sprite.cpp
+++ b/src/crepe/Sprite.cpp
@@ -5,4 +5,4 @@
 using namespace crepe;
 using namespace std;
 
-Sprite::Sprite(string path) : path(path) {}
+Sprite::Sprite(uint32_t gameObjectId, string path) : Component(gameObjectId), path(path) {}
diff --git a/src/crepe/Sprite.h b/src/crepe/Sprite.h
index 143e702..8c517ed 100644
--- a/src/crepe/Sprite.h
+++ b/src/crepe/Sprite.h
@@ -8,7 +8,7 @@ namespace crepe {
 
 class Sprite : public Component {
 public:
-	Sprite(std::string path);
+	Sprite(uint32_t gameObjectId,std::string path);
 
 	std::string path;
 };
diff --git a/src/crepe/Transform.cpp b/src/crepe/Transform.cpp
index 0e4b0cf..2fde448 100644
--- a/src/crepe/Transform.cpp
+++ b/src/crepe/Transform.cpp
@@ -2,5 +2,5 @@
 
 using namespace crepe;
 
-Transform::Transform(int mass, int gravityScale, int bodyType)
-	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
+Transform::Transform(uint32_t gameObjectId,int mass, int gravityScale, int bodyType)
+	: Component(gameObjectId), mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
diff --git a/src/crepe/Transform.h b/src/crepe/Transform.h
index c72ebc4..96da1a4 100644
--- a/src/crepe/Transform.h
+++ b/src/crepe/Transform.h
@@ -6,7 +6,7 @@ namespace crepe {
 
 class Transform : public Component {
 public:
-	Transform(int mass, int gravityScale, int bodyType);
+	Transform(uint32_t gameObjectId,int mass, int gravityScale, int bodyType);
 
 	int mass;
 	int gravity_scale;
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 84bfd4c..74788ec 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -4,4 +4,4 @@
 
 using namespace crepe::api;
 
-BehaviorScript::BehaviorScript() { dbg_trace(); }
+BehaviorScript::BehaviorScript() : Component(gameObjectId) { dbg_trace(); }
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index cbf8e31..256d87e 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -16,4 +16,6 @@ add_example(audio_internal)
 add_example(components_internal)
 add_example(script)
 add_example(particle)
+add_example(Physics)
 target_link_libraries(particle PUBLIC SDL2)
+target_link_libraries(Physics PUBLIC SDL2)
diff --git a/src/example/Physics.cpp b/src/example/Physics.cpp
new file mode 100644
index 0000000..61a3bf2
--- /dev/null
+++ b/src/example/Physics.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include <thread>
+#include <chrono>
+#include "Rigidbody.h"
+#include "PhysicsSystem.h"
+#include <crepe/Component.h>
+#include <crepe/ComponentManager.h>
+#include <crepe/GameObject.h>
+
+using namespace crepe;
+using namespace std;
+
+
+int main(int argc, char* argv[]) {
+	PhysicsSystem physicsSystem;
+	GameObject * game_object[1];
+	game_object[0] = new GameObject(5, "Name", "Tag", 0);
+	game_object[0]->add_component<Rigidbody>(10, 11 , BodyType::Dynamic);
+	physicsSystem.update(); 
+    return 0;
+}
-- 
cgit v1.2.3


From cead795b7ff7135e13caf9ad3b76628070391458 Mon Sep 17 00:00:00 2001
From: jaroWMR <jarorutjes07@gmail.com>
Date: Sun, 20 Oct 2024 16:58:13 +0200
Subject: added collision system and  circlecollider

---
 src/crepe/CMakeLists.txt      |  6 ++++++
 src/crepe/CircleCollider.h    | 12 ++++++++++++
 src/crepe/Collider.cpp        |  2 +-
 src/crepe/Collider.h          |  2 +-
 src/crepe/CollisionSystem.cpp | 13 +++++++++++++
 src/crepe/CollisionSystem.h   | 15 +++++++++++++++
 src/crepe/Component.h         |  1 +
 src/crepe/Force.cpp           | 14 ++++++++++++++
 src/crepe/Force.h             | 17 +++++++++++++++++
 src/crepe/GameObject.cpp      |  7 ++++++-
 src/crepe/PhysicsSystem.cpp   | 37 ++++++++++++++++++++++++++++++++++++-
 src/crepe/Rigidbody.h         |  3 ++-
 src/crepe/Transform.cpp       |  4 ++--
 src/crepe/Transform.h         | 16 +++++++++++-----
 src/example/Physics.cpp       |  8 ++++++--
 15 files changed, 143 insertions(+), 14 deletions(-)
 create mode 100644 src/crepe/CircleCollider.h
 create mode 100644 src/crepe/CollisionSystem.cpp
 create mode 100644 src/crepe/CollisionSystem.h
 create mode 100644 src/crepe/Force.cpp
 create mode 100644 src/crepe/Force.h

(limited to 'src/example')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index ae9d51d..cce25c4 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -16,6 +16,9 @@ target_sources(crepe PUBLIC
 	ScriptSystem.cpp
 	Script.cpp
 	PhysicsSystem.cpp
+	Transform.cpp
+	Force.cpp
+	CollisionSystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -37,6 +40,9 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	System.h
 	ScriptSystem.h
 	PhysicsSystem.h
+	Transform.h
+	Force.h
+	CollisionSystem.h
 )
 
 add_subdirectory(api)
diff --git a/src/crepe/CircleCollider.h b/src/crepe/CircleCollider.h
new file mode 100644
index 0000000..922477b
--- /dev/null
+++ b/src/crepe/CircleCollider.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "Collider.h"
+
+namespace crepe {
+
+class CircleCollider : public Collider {
+public:
+	CircleCollider(uint32_t gameObjectId,int radius) : Collider(gameObjectId), radius(radius) {}
+	int radius;
+};
+
+} // namespace crepe
diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp
index 3d3f7cb..311ffb3 100644
--- a/src/crepe/Collider.cpp
+++ b/src/crepe/Collider.cpp
@@ -2,4 +2,4 @@
 
 using namespace crepe;
 
-Collider::Collider(uint32_t gameObjectId , int size) : Component(gameObjectId), size(size){}
+Collider::Collider(uint32_t gameObjectId) : Component(gameObjectId){}
diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h
index 69bb0c3..cfc044c 100644
--- a/src/crepe/Collider.h
+++ b/src/crepe/Collider.h
@@ -6,7 +6,7 @@ namespace crepe {
 
 class Collider : public Component {
 public:
-	Collider(uint32_t gameObjectId,int size);
+	Collider(uint32_t gameObjectId);
 
 	int size;
 };
diff --git a/src/crepe/CollisionSystem.cpp b/src/crepe/CollisionSystem.cpp
new file mode 100644
index 0000000..a0c6dca
--- /dev/null
+++ b/src/crepe/CollisionSystem.cpp
@@ -0,0 +1,13 @@
+#include "CollisionSystem.h"
+#include "ComponentManager.h"
+#include <iostream>
+
+using namespace crepe;
+
+CollisionSystem::CollisionSystem() {
+
+}
+
+void CollisionSystem::update() {
+	
+}
diff --git a/src/crepe/CollisionSystem.h b/src/crepe/CollisionSystem.h
new file mode 100644
index 0000000..70d7237
--- /dev/null
+++ b/src/crepe/CollisionSystem.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace crepe {
+
+class CollisionSystem
+{
+	private:
+		/* data */
+	public:
+		CollisionSystem(/* args */);
+		void update();
+};
+
+}
+
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index c8fb6bc..a23de61 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -6,6 +6,7 @@ namespace crepe {
 class Component {
 public:
 	Component(uint32_t id);
+	virtual ~Component() {}
 	// TODO: shouldn't this constructor be deleted because this class will never
 	// directly be instantiated?
 	//changed so it sets the id (jaro)
diff --git a/src/crepe/Force.cpp b/src/crepe/Force.cpp
new file mode 100644
index 0000000..b314f49
--- /dev/null
+++ b/src/crepe/Force.cpp
@@ -0,0 +1,14 @@
+#include "Force.h"
+#include <cmath>
+
+namespace crepe {
+
+Force::Force(uint32_t gameObjectId, uint32_t forceMagnitude, uint32_t direction): Component(gameObjectId)
+{ 
+	// Convert direction from degrees to radians
+    float radian_direction = static_cast<float>(direction) * (M_PI / 180.0f);
+    force_x = static_cast<int32_t>(std::round(forceMagnitude * std::cos(radian_direction)));
+    force_y = static_cast<int32_t>(std::round(forceMagnitude * std::sin(radian_direction)));
+}
+
+} // namespace crepe
diff --git a/src/crepe/Force.h b/src/crepe/Force.h
new file mode 100644
index 0000000..a121ec2
--- /dev/null
+++ b/src/crepe/Force.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Component.h"
+#include <cstdint>
+#include <utility>
+
+namespace crepe {
+
+class Force : public Component {
+public:
+    Force(uint32_t gameObjectId, uint32_t forceMagnitude, uint32_t direction);
+
+    int32_t force_x;
+    int32_t force_y;
+};
+
+} // namespace crepe
diff --git a/src/crepe/GameObject.cpp b/src/crepe/GameObject.cpp
index de3beb6..36eb886 100644
--- a/src/crepe/GameObject.cpp
+++ b/src/crepe/GameObject.cpp
@@ -1,7 +1,12 @@
 #include "GameObject.h"
+#include "Transform.h"
 
 using namespace crepe;
 
 GameObject::GameObject(uint32_t id, std::string name, std::string tag,
 					   int layer)
-	: id(id), name(name), tag(tag), active(true), layer(layer) {}
+	: id(id), name(name), tag(tag), active(true), layer(layer) 
+{
+	Position pos = {0,0};
+	this->add_component<Transform>(pos, 0, 0);
+}
diff --git a/src/crepe/PhysicsSystem.cpp b/src/crepe/PhysicsSystem.cpp
index c24afa2..7d16044 100644
--- a/src/crepe/PhysicsSystem.cpp
+++ b/src/crepe/PhysicsSystem.cpp
@@ -2,6 +2,7 @@
 #include "ComponentManager.h"
 #include "Rigidbody.h"
 #include "Transform.h"
+#include "Force.h"
 #include <iostream>
 
 using namespace crepe;
@@ -14,7 +15,41 @@ void PhysicsSystem::update() {
 	ComponentManager& mgr = ComponentManager::get_instance();
 	std::vector<std::reference_wrapper<Rigidbody>> rigidbodies = mgr.get_components_by_type<Rigidbody>();
 	std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
+	
 	for (Rigidbody& rigidbody : rigidbodies) {
-		std::cout << rigidbody.gameObjectId << std::endl;
+
+		switch (rigidbody.body_type)
+		{
+		case BodyType::Dynamic :
+			for (Transform& transform : transforms) {
+				if(transform.gameObjectId == rigidbody.gameObjectId)
+				{
+					rigidbody.velocity_x = 0;
+					rigidbody.velocity_y = 0;
+					std::vector<std::reference_wrapper<Force>> Forces = mgr.get_components_by_id<Force>(rigidbody.gameObjectId);
+					rigidbody.velocity_y += rigidbody.gravity_scale * 1 * rigidbody.mass;
+
+					for (Force& force : Forces)
+					{
+						rigidbody.velocity_x += force.force_x;
+						rigidbody.velocity_y += force.force_y;	
+					}
+					
+					std::cout << "before transform.postion.x " << transform.postion.x << std::endl;
+					std::cout << "before transform.postion.y " << transform.postion.y << std::endl;
+					transform.postion.x += rigidbody.velocity_x;
+					transform.postion.y += rigidbody.velocity_y;
+					std::cout << "after transform.postion.x " << transform.postion.x << std::endl;
+					std::cout << "after transform.postion.y " << transform.postion.y << std::endl;
+				}
+			}	
+			break;
+		case BodyType::Kinematic :
+			break; //(scripts)
+		case BodyType::Static :
+			break; //(unmoveable objects)
+		default:
+			break;
+		}
 	}
 }
diff --git a/src/crepe/Rigidbody.h b/src/crepe/Rigidbody.h
index 7018e83..a03346f 100644
--- a/src/crepe/Rigidbody.h
+++ b/src/crepe/Rigidbody.h
@@ -14,7 +14,8 @@ enum class BodyType {
 class Rigidbody : public Component {
 public:
 	Rigidbody(uint32_t gameObjectId,int mass, int gravityScale, BodyType bodyType);
-
+	int32_t velocity_x;
+    int32_t velocity_y;
 	int mass;
 	int gravity_scale;
 	BodyType body_type;
diff --git a/src/crepe/Transform.cpp b/src/crepe/Transform.cpp
index 2fde448..2c39523 100644
--- a/src/crepe/Transform.cpp
+++ b/src/crepe/Transform.cpp
@@ -2,5 +2,5 @@
 
 using namespace crepe;
 
-Transform::Transform(uint32_t gameObjectId,int mass, int gravityScale, int bodyType)
-	: Component(gameObjectId), mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
+Transform::Transform(uint32_t gameObjectId,Position position, int rotation, int scale)
+	: Component(gameObjectId), postion(postion), rotation(rotation), scale(scale) {}
diff --git a/src/crepe/Transform.h b/src/crepe/Transform.h
index 96da1a4..3e8d142 100644
--- a/src/crepe/Transform.h
+++ b/src/crepe/Transform.h
@@ -4,13 +4,19 @@
 
 namespace crepe {
 
+struct Position
+{
+	int x;
+	int y;
+};
+
+
 class Transform : public Component {
 public:
-	Transform(uint32_t gameObjectId,int mass, int gravityScale, int bodyType);
-
-	int mass;
-	int gravity_scale;
-	int body_type;
+	Transform(uint32_t gameObjectId,Position position, int rotation, int scale);
+	Position postion;
+	int rotation;
+	int scale;
 };
 
 } // namespace crepe
diff --git a/src/example/Physics.cpp b/src/example/Physics.cpp
index 61a3bf2..9ad6da0 100644
--- a/src/example/Physics.cpp
+++ b/src/example/Physics.cpp
@@ -1,7 +1,9 @@
 #include <iostream>
 #include <thread>
 #include <chrono>
+#include "Transform.h"
 #include "Rigidbody.h"
+#include "Force.h"
 #include "PhysicsSystem.h"
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
@@ -13,9 +15,11 @@ using namespace std;
 
 int main(int argc, char* argv[]) {
 	PhysicsSystem physicsSystem;
-	GameObject * game_object[1];
+	GameObject * game_object[2];
+	game_object[1] = new GameObject(2, "Name", "Tag", 0); // not found not used
 	game_object[0] = new GameObject(5, "Name", "Tag", 0);
-	game_object[0]->add_component<Rigidbody>(10, 11 , BodyType::Dynamic);
+	game_object[0]->add_component<Rigidbody>(1, 1 , BodyType::Dynamic);
+	game_object[0]->add_component<Force>(1 , 0);
 	physicsSystem.update(); 
     return 0;
 }
-- 
cgit v1.2.3