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

29
collisions.cc
View File

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

8
game.h
View File

@ -6,16 +6,16 @@
/* simulation/game framework
*/
extern double delta; /* simulation time delta in seconds */
extern double delta; /* simulation time delta in seconds */
#define DEFAULT_DELTA 0.01
extern int width; /* game canvas width */
extern int height; /* game canvas height */
extern int width; /* game canvas width */
extern int height; /* game canvas height */
#define DEFAULT_WIDTH 800
#define DEFAULT_HEIGHT 800
extern GtkWidget * canvas; /* game canvas object */
extern GtkWidget* canvas; /* game canvas object */
#endif