Mercurial > molko
changeset 421:3edda1ce314c
core: remove mlk_ prefix for now
author | David Demelier <markand@malikania.fr> |
---|---|
date | Thu, 13 Oct 2022 20:56:42 +0200 |
parents | 7d2ebc334c8c |
children | b0579ae033ed |
files | src/libmlk-core/core/clock.c src/libmlk-core/core/clock.h src/libmlk-core/core/err.c src/libmlk-core/core/err.h src/libmlk-core/core/game.c src/libmlk-core/core/texture.c src/libmlk-core/core/texture.h tests/test-alloc.c tests/test-state.c |
diffstat | 9 files changed, 23 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libmlk-core/core/clock.c Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/clock.c Thu Oct 13 20:56:42 2022 +0200 @@ -21,13 +21,13 @@ #include "clock.h" void -clock_start(struct clock *clock) +mlk_clock_start(struct mlk_clock *clock) { clock->ticks = SDL_GetTicks(); } unsigned int -clock_elapsed(const struct clock *clock) +mlk_clock_elapsed(const struct mlk_clock *clock) { return SDL_GetTicks() - clock->ticks; }
--- a/src/libmlk-core/core/clock.h Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/clock.h Thu Oct 13 20:56:42 2022 +0200 @@ -21,17 +21,17 @@ #include "core.h" -struct clock { +struct mlk_clock { unsigned int ticks; }; CORE_BEGIN_DECLS void -clock_start(struct clock *); +mlk_clock_start(struct mlk_clock *); unsigned int -clock_elapsed(const struct clock *); +mlk_clock_elapsed(const struct mlk_clock *); CORE_END_DECLS
--- a/src/libmlk-core/core/err.c Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/err.c Thu Oct 13 20:56:42 2022 +0200 @@ -21,14 +21,14 @@ #include "err.h" const char * -mlk_err_string(enum mlk_err e) +err_string(int e) { switch (e) { - case MLK_ERR_INTERNAL: + case ERR_INTERNAL: return SDL_GetError(); - case MLK_ERR_NO_MEM: + case ERR_NO_MEM: return "out of memory"; - case MLK_ERR_NO_SUPPORT: + case ERR_NO_SUPPORT: return "operation not supported"; default: return "no error";
--- a/src/libmlk-core/core/err.h Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/err.h Thu Oct 13 20:56:42 2022 +0200 @@ -19,14 +19,12 @@ #ifndef MLK_ERR_H #define MLK_ERR_H -enum mlk_err { - MLK_ERR_NONE, - MLK_ERR_INTERNAL = -1, - MLK_ERR_NO_MEM = -2, - MLK_ERR_NO_SUPPORT = -3 -}; +#define ERR_NONE 0 +#define ERR_INTERNAL -1 +#define ERR_NO_MEM -2 +#define ERR_NO_SUPPORT -3 const char * -mlk_err_string(enum mlk_err); +err_string(int e); #endif /* !MLK_ERROR_H */
--- a/src/libmlk-core/core/game.c Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/game.c Thu Oct 13 20:56:42 2022 +0200 @@ -98,7 +98,7 @@ void game_loop(void) { - struct clock clock = {0}; + struct mlk_clock clock = {0}; unsigned int elapsed = 0; unsigned int frametime; @@ -109,7 +109,7 @@ frametime = 1000.0 / 50.0; while (*game.state) { - clock_start(&clock); + mlk_clock_start(&clock); for (union event ev; event_poll(&ev); ) game_handle(&ev); @@ -121,10 +121,10 @@ * If vsync is enabled, it should have wait, otherwise sleep * a little to save CPU cycles. */ - if ((elapsed = clock_elapsed(&clock)) < frametime) + if ((elapsed = mlk_clock_elapsed(&clock)) < frametime) util_delay(frametime - elapsed); - elapsed = clock_elapsed(&clock); + elapsed = mlk_clock_elapsed(&clock); } }
--- a/src/libmlk-core/core/texture.c Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/texture.c Thu Oct 13 20:56:42 2022 +0200 @@ -27,7 +27,7 @@ #include "window.h" #include "window_p.h" -enum mlk_err +int texture_new(struct texture *tex, unsigned int w, unsigned int h) { assert(tex); @@ -39,7 +39,7 @@ if (!tex->handle) { tex->w = tex->h = 0; - return MLK_ERR_INTERNAL; + return ERR_INTERNAL; } tex->w = w;
--- a/src/libmlk-core/core/texture.h Wed Oct 12 15:26:12 2022 +0200 +++ b/src/libmlk-core/core/texture.h Thu Oct 13 20:56:42 2022 +0200 @@ -38,7 +38,7 @@ CORE_BEGIN_DECLS -enum mlk_err +int texture_new(struct texture *, unsigned int, unsigned int); int