DarthMooMancer/engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes and optimizations

Browse Source
This commit is contained in:
Andrew Haynes Macbook
2026-01-09 14:56:59 -05:00
parent b5a79de6c0
commit 1fa3293df0
11 changed files with 163 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/elements.hpp
+21 -15
View File
@@ -1,24 +1,27 @@
#ifndef PLAYER_HPP
#define PLAYER_HPP
#include "globals.hpp"
#include "scheduler.hpp"
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/RectangleShape.hpp>
#include <SFML/System/Vector2.hpp>
#include "scheduler.hpp"
#include "globals.hpp"
enum class CollisionDir { None, Left, Right, Top, Bottom };
class Entity {
public:
Entity(sf::Vector2<float> size, sf::Vector2<float> pos, sf::Vector2f velocity, float border_thickness, sf::Color inside_color = sf::Color::Black, sf::Color border_color = sf::Color::White);
CollisionDir find_intersection(Entity &entity);
public:
Entity(sf::Vector2<float> size, sf::Vector2<float> pos, sf::Vector2f velocity, float border_thickness,
sf::Color inside_color = sf::Color::Black, sf::Color border_color = sf::Color::White);
CollisionDir find_intersection(Entity& entity);
void set_velocity(sf::Vector2f velocity);
void set_velocity_x(int velocity);
void set_velocity_y(int velocity);
sf::Vector2<float> get_velocity();
sf::RectangleShape rect;
protected:
protected:
sf::Vector2f _velocity;
sf::Color _inside_color;
sf::Color _border_color;
@@ -26,8 +29,10 @@ protected:
};
class Player : public Entity {
public:
Player(sf::Vector2<float> size, sf::Vector2<float> pos, sf::Vector2f velocity, float border_thickness, float gravity, float max_acceleration, float dash_distance, sf::Color inside_color, sf::Color border_color);
public:
Player(sf::Vector2<float> size, sf::Vector2<float> pos, sf::Vector2f velocity, float border_thickness,
float gravity, float max_acceleration, float dash_distance, sf::Color inside_color,
sf::Color border_color);
float m_acceleration;
float m_jump_strength;
float m_dash_distance;
@@ -37,13 +42,14 @@ public:
void handle_movment();
void handle_gravity();
bool get_jumping();
void horizontal_no_out_of_bounds(Entity &base);
void vertical_no_out_of_bounds(Entity &base);
bool get_horizontal_collision(Entity *wall_list[MAX_ROWS][MAX_COLS]);
bool get_vertical_top_collision(Entity *wall_list[MAX_ROWS][MAX_COLS]);
bool get_vertical_bottom_collision(Entity *wall_list[MAX_ROWS][MAX_COLS]);
private:
bool get_vertical_bottom_collision_by_offset(Entity *wall_list[MAX_ROWS][MAX_COLS]);
void horizontal_no_out_of_bounds(Entity& base);
void vertical_no_out_of_bounds(Entity& base);
bool get_horizontal_collision(std::array<std::array<Entity*, MAX_COLS>, MAX_ROWS>);
bool get_vertical_top_collision(std::array<std::array<Entity*, MAX_COLS>, MAX_ROWS>);
bool get_vertical_bottom_collision(std::array<std::array<Entity*, MAX_COLS>, MAX_ROWS>);
private:
bool get_vertical_bottom_collision_by_offset(std::array<std::array<Entity*, MAX_COLS>, MAX_ROWS>);
sf::Vector2f _min_velocity;
};