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

feat: move with collision but doesnt work

Browse Source
This commit is contained in:
DarthMooMancer
2025-09-16 20:24:53 -04:00
parent bdeb8d9fc7
commit 3091026d95
7 changed files with 123 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+28 -13
View File
@@ -11,13 +11,29 @@ bool _check_collision(Point &a, Point &b) {
return false;
}
void _increment_point(Point &p) {
p.m_symbol *= 2;
}
void _handle_point(PointCollection &collection, int index, Point &a, Point &b) {
if(a.m_symbol == b.m_symbol && !b.m_collide) {
collection.m_point_list.erase(collection.m_point_list.begin() + index);
_increment_point(b);
b.m_collide = true;
}
if(!b.m_collide) {
// set a to be one behind
else if(b.m_collide) {
if(a.m_symbol == 'u' && b.m_symbol == 'u') {
a.assign(b.m_row - 1, a.m_col);
}
if(a.m_symbol == 'd' && b.m_symbol == 'd') {
a.assign(b.m_row + 1, a.m_col);
}
if(a.m_symbol == 'l' && b.m_symbol == 'l') {
a.assign(b.m_row, a.m_col + 1);
}
if(a.m_symbol == 'r' && b.m_symbol == 'r') {
a.assign(b.m_row, a.m_col - 1);
}
}
}
@@ -26,24 +42,23 @@ int main() {
Window window;
PointCollection collection;
bool running = true;
std::thread input_thread(&Input::get_input, &input, std::ref(running), std::ref(collection));
std::thread input_thread(&Input::get_input, &input, std::ref(running), std::ref(collection), std::ref(window.m_board));
collection.m_point_list.push_back(Point());
collection.m_point_list.back().assign();
while (running) {
// collection.check_collision();
collection.move();
collection.move(window.m_board);
window.draw_window(collection);
for(int i = collection.m_point_list.size() - 1; i >= 0; i--) {
for(int a = collection.m_point_list.size() - 1; a >= 0; a--) {
if (i == a) continue;
if(_check_collision(collection.m_point_list[i], collection.m_point_list[a])) {
_handle_point(collection, i, collection.m_point_list[i], collection.m_point_list[a]);
}
}
}
std::cout << collection.m_point_list.size() << "\n";
// for(int i = collection.m_point_list.size() - 1; i >= 0; i--) {
// for(int a = collection.m_point_list.size() - 1; a >= 0; a--) {
// if (i == a) break;
// if(_check_collision(collection.m_point_list[i], collection.m_point_list[a])) {
// _handle_point(collection, i, collection.m_point_list[i], collection.m_point_list[a]);
// }
// }
// }
}
input_thread.join();