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

data driving walls

Browse Source
This commit is contained in:
Andrew Haynes Macbook
2026-01-14 16:05:17 -05:00
parent 1fa3293df0
commit ad2d01ab05
12 changed files with 319 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+50 -53
View File
@@ -1,3 +1,4 @@
#include "data.hpp"
#include <SFML/Audio.hpp>
#include <SFML/Graphics.hpp>
#include <SFML/Graphics/RectangleShape.hpp>
@@ -7,6 +8,7 @@
#include <SFML/Window/Mouse.hpp>
#include <cstdlib>
#include <iostream>
#include <string>
#include <thread>
#ifdef __APPLE__
@@ -24,17 +26,18 @@ namespace rv = std::views;
#include "scheduler.hpp"
int main() {
Timer time;
std::array<std::array<Entity*, MAX_COLS>, MAX_ROWS> wall_list = {};
bool dragging = false;
bool prev_dragging = false;
int current_level = 0;
Scheduler time;
Manager map_manager;
std::vector<Timer> timers = {
Timer("dash", .5),
Timer("level_switch", 1),
};
load_map(wall_list, levels[3].data);
map_manager.load_map(levels[1].data);
player_data player_data;
Player player { player_data.size, player_data.pos, player_data.velocity,
player_data.border_size, GRAVITY, player_data.max_velocity_y,
Player player { player_data.size, player_data.pos, player_data.velocity,
player_data.border_size, GRAVITY, player_data.max_velocity_y,
player_data.dash_distance, sf::Color::Black, sf::Color::White };
sf::RenderWindow window(sf::VideoMode({ WIDTH, HEIGHT }), "engine", sf::Style::Default);
@@ -46,10 +49,10 @@ int main() {
text.setPosition({ WIDTH - (TILESIZE * 11.5), HEIGHT - (int)(TILESIZE / 1.5) });
bool running = true;
std::thread player_dash_cooldown([&] { time.update_timers(running, player.timers); });
std::thread scheduler([&] { time.update(running, timers); });
while (window.isOpen()) {
window.clear(sf::Color::Black);
text.setString("Test");
text.setString(std::to_string(timers.at(0).get_time()));
while (const std::optional event = window.pollEvent()) {
if (event->is<sf::Event::Closed>()) {
running = false;
@@ -62,64 +65,58 @@ int main() {
window.close();
}
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::B)) {
clear_map(wall_list);
}
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::A)) {
dragging = false;
map_manager.clear_map();
}
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Enter) && player.timers.level_switch_cooldown <= 0) {
clear_map(wall_list);
if (current_level == 0) {
load_map(wall_list, levels[1].data);
current_level = 1;
player.timers.level_switch_cooldown = player.timers.level_switch_cooldown_max;
} else if (current_level == 1) {
load_map(wall_list, levels[2].data);
current_level = 2;
player.timers.level_switch_cooldown = player.timers.level_switch_cooldown_max;
} else if (current_level == 2) {
load_map(wall_list, levels[3].data);
current_level = 0;
player.timers.level_switch_cooldown = player.timers.level_switch_cooldown_max;
}
}
player.handle_movment();
if (!player.get_horizontal_collision(wall_list)) {
std::cout << "\n";
} else {
std::cout << "Yes horizontal collision\n";
}
player.handle_gravity();
if (player.get_velocity().y > ((float)TILESIZE / 2 - GRAVITY)) {
player.set_velocity_y((TILESIZE / 2) - GRAVITY);
}
if (!player.get_vertical_bottom_collision(wall_list)) {
std::cout << "\n";
if (!player.get_vertical_top_collision(wall_list)) {
std::cout << "\n";
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Enter) && timers.at(1).below_or_zero()) {
map_manager.clear_map();
if (map_manager.get_current_level() == 1) {
map_manager.load_map(levels[1].data);
map_manager.set_current_level(2);
} else if (map_manager.get_current_level() == 2) {
map_manager.load_map(levels[2].data);
map_manager.set_current_level(3);
} else if (map_manager.get_current_level() == 3) {
map_manager.load_map(levels[3].data);
map_manager.set_current_level(1);
} else {
std::cout << "Yes vertical top collision\n";
map_manager.load_map(levels[1].data);
map_manager.set_current_level(1);
}
} else {
std::cout << "Yes vertical bottom collision\n";
timers.at(1).reset();
}
// player.handle_movment(timers.at(time.pull(timers, "dash")));
// if (!player.get_horizontal_collision(map_manager.wall_list)) {
// std::cout << "\n";
// } else { std::cout << "Yes horizontal collision\n"; }
//
// player.handle_gravity();
// if (player.get_velocity().y > ((float)TILESIZE / 2 - GRAVITY)) {
// player.set_velocity_y((TILESIZE / 2) - GRAVITY);
// }
// if (!player.get_vertical_bottom_collision(map_manager.wall_list)) {
// std::cout << "\n";
// if (!player.get_vertical_top_collision(map_manager.wall_list)) {
// std::cout << "\n";
// } else {
// std::cout << "Yes vertical top collision\n";
// }
// } else { std::cout << "Yes vertical bottom collision\n"; }
//
for (auto [i, j] : rv::cartesian_product(rv::iota(0, MAX_ROWS), rv::iota(0, MAX_COLS))) {
if (wall_list[i][j] == nullptr) {
if (map_manager.wall_list[i][j] == nullptr) {
continue;
}
window.draw(wall_list[i][j]->rect);
window.draw(map_manager.wall_list[i][j]->rect);
}
window.draw(player.rect);
window.draw(text);
window.display();
}
scheduler.join();
clear_map(wall_list);
player_dash_cooldown.join();
map_manager.clear_map();
return 0;
}