karma/flying-balls
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick refactoring and reformating

Browse Source
This commit is contained in:
Karma Riuk 2023-04-21 09:01:35 +02:00
parent 1c58530e98
commit 4a7e5834d3
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
collisions.cc
View File

@ -43,7 +43,9 @@ static bool separating_axis(
max_q = std::max(max_q, projection); max_q = std::max(max_q, projection);
} }
if (max_p >= min_q && max_q >= min_p) { if (max_p < min_q || max_q < min_p)
return true;
double d; double d;
if (max_q - min_p < max_p - min_q) { if (max_q - min_p < max_p - min_q) {
d = max_q - min_p; d = max_q - min_p;
@ -52,12 +54,11 @@ static bool separating_axis(
d = max_p - min_q; d = max_p - min_q;
*impact_point = max_p_point; *impact_point = max_p_point;
} }
// push a bit more than needed so the shapes do not overlap in future // push a bit more than needed so the shapes do not overlap in
// tests due to float precision // future tests due to float precision
double d_over_o_squared = d / vec2d::dot(axis, axis) + 1e-10; double d_over_o_squared = d / vec2d::dot(axis, axis) + 1e-10;
*pv = d_over_o_squared * axis; *pv = d_over_o_squared * axis;
return false; return false;
}
return true; return true;
} }

2
game.h
View File

@ -16,6 +16,6 @@ extern int height; /* game canvas height */
#define DEFAULT_WIDTH 800 #define DEFAULT_WIDTH 800
#define DEFAULT_HEIGHT 800 #define DEFAULT_HEIGHT 800
extern GtkWidget * canvas; /* game canvas object */ extern GtkWidget* canvas; /* game canvas object */
#endif #endif