COLLISION AFTER YEARS IS FIXED. THANKS AI

include/data.hpp

@@ -40,9 +40,10 @@ struct PlayerData
 	const float max_vertical_acceleration { 0.0f };
 };
 
-struct LevelData
+struct MapData
 {
 	const char data[MAX_ROWS][MAX_COLS + 1];
+	// const char data[MAX_ROWS * MAX_COLS + 1];
 };
 
 struct TimerData
@@ -53,7 +54,7 @@ struct TimerData
 
 extern const std::vector<ObjectData> object_data;
 extern const std::vector<EntityData> entity_data;
-extern const std::vector<LevelData> level_data;
+extern const std::vector<MapData> map_data;
 extern const std::vector<TimerData> timer_data;
 extern const PlayerData player_data;
 

include/globals.hpp

@@ -7,5 +7,7 @@
 #define HEIGHT TILESIZE * MAX_ROWS
 #define FPS 60
 #define GRAVITY 1
+#define FRICTION 1
+#define INVALID_NUMBER -1
 
 #endif

include/graphics.hpp

@@ -13,12 +13,6 @@
 #include "globals.hpp"
 #include "scheduler.hpp"
 
-float
-total_distance(int k);
-
-float const
-distance_to_acceleration(int target);
-
 struct Object;
 class Entity;
 class Player;
@@ -40,7 +34,8 @@ struct Object
 class Entity : public Object
 {
     public:
-	Entity(EntityData data) : Object(data.object), _velocity(data.velocity) {};
+	Entity(EntityData data)
+	    : Object(data.object), _velocity(data.velocity) {};
 	void set_velocity(sf::Vector2f velocity);
 	void set_velocity_x(int velocity);
 	void set_velocity_y(int velocity);
@@ -56,24 +51,16 @@ class Player : public Entity
 	Player(PlayerData data)
 	    : Entity(data.entity),
 	      max_dash_acceleration(data.max_dash_acceleration),
-	      max_vertical_acceleration(data.max_vertical_acceleration)
-	{
-		bounding_box.rect.setSize(
-		    { total_distance(max_dash_acceleration),
-		      data.entity.object.size.y });
-	};
+	      max_vertical_acceleration(data.max_vertical_acceleration) {};
 
-	Object bounding_box { object_data[1] };
 	float max_vertical_acceleration;
 	float max_dash_acceleration;
 	bool m_jumping { false };
-	void handle_bounding_box(std::array<std::array<std::unique_ptr<Object>, MAX_COLS>, MAX_ROWS>& tilemap);
 	void handle_movment(std::optional<Timer*> dash);
 	void handle_gravity();
-	bool get_horizontal_collision(
-	    std::array<std::array<std::unique_ptr<Object>, MAX_COLS>, MAX_ROWS>& tilemap);
-	bool get_vertical_collision(
-	    std::array<std::array<std::unique_ptr<Object>, MAX_COLS>, MAX_ROWS>& tilemap);
+	void handle_collision(
+	    std::array<std::array<std::unique_ptr<Object>, MAX_COLS>, MAX_ROWS>&
+		tilemap);
 
     private:
 	std::string direction { "left" };

include/renderer.hpp

@@ -6,23 +6,24 @@
 #include <memory>
 
 #include "data.hpp"
-#include "elements.hpp"
 #include "globals.hpp"
+#include "graphics.hpp"
 
-class Manager
+class Renderer
 {
-       public:
+    public:
 	void clear();
-	void load(LevelData level);
+	int load(MapData level);
 	const void draw(sf::RenderWindow& window);
 	void set_next();
 	void set_previous();
-	void set_active(int level);
-	const int get_active();
-	std::array<std::array<std::unique_ptr<Object>, MAX_COLS>, MAX_ROWS> tilemap = {};
+	void set_map(int level);
+	const int get_map();
+	std::array<std::array<std::unique_ptr<Object>, MAX_COLS>, MAX_ROWS>
+	    tilemap = {};
 
-       private:
-	int _active = 1;
+    private:
+	int _map = 1;
 };
 
 #endif