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

os specifc locations for fonts

Browse Source
This commit is contained in:
DarthMooMancer
2025-10-22 20:51:30 -04:00
parent 701cd7cdef
commit 5a19d993ed
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+23 -5
View File
@@ -120,21 +120,39 @@ int main() {
for(int i = 0; i < MAX_ROWS; i++) { for(int i = 0; i < MAX_ROWS; i++) {
for(int j = 0; j < MAX_COLS; j++) { for(int j = 0; j < MAX_COLS; j++) {
if(wall_list[i][j] == nullptr) continue; if(wall_list[i][j] == nullptr) continue;
auto collision = wall_list[i][j]->find_intersection(player); auto collision = player.find_intersection(*wall_list[i][j]);
if(collision == CollisionDir::None) continue; if(collision == CollisionDir::None) continue;
switch (collision) { switch (collision) {
case CollisionDir::Bottom: case CollisionDir::Bottom:
player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y - player.rect.getSize().y }); player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y - player.rect.getSize().y });
player.set_velocity_y(0); player.set_velocity_y(0);
break; break;
case CollisionDir::Top:
player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y + player.rect.getSize().y });
player.set_velocity_y(0);
break;
default: break; default: break;
} }
} }
} }
// for(int i = 0; i < MAX_ROWS; i++) {
// for(int j = 0; j < MAX_COLS; j++) {
// if(wall_list[i][j] == nullptr) continue;
// auto collision = player.find_intersection(*wall_list[i][j]);
// // auto collision = wall_list[i][j]->find_intersection(player);
// if(collision == CollisionDir::None) continue;
// switch (collision) {
// case CollisionDir::Bottom:
// player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y - player.rect.getSize().y });
// player.set_velocity_y(0);
// break;
// // case CollisionDir::Top:
// // player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y + player.rect.getOutlineThickness()});
// // player.set_velocity_y(0);
// // std::cout << "Collision top\n";
// // player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y + player.rect.getSize().y });
// // player.set_velocity_y(0);
// break;
// default: break;
// }
// }
// }
float groundY = line.rect.getPosition().y - line.rect.getSize().y - player.rect.getSize().y - line_data.border_size - player_data.border_size; float groundY = line.rect.getPosition().y - line.rect.getSize().y - player.rect.getSize().y - line_data.border_size - player_data.border_size;
if (player.rect.getPosition().y >= groundY) { if (player.rect.getPosition().y >= groundY) {