Mercurial > molko
changeset 368:15bdac29ba4b
core: split drawable and drawable_stack
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 24 Oct 2021 17:07:20 +0200 |
parents | 74f9cb70fc5d |
children | 1e06f871dc63 |
files | examples/example-drawable/main.c src/libmlk-core-js/core/js-drawable-stack.c src/libmlk-core/CMakeLists.txt src/libmlk-core/core/drawable-stack.c src/libmlk-core/core/drawable-stack.h src/libmlk-core/core/drawable.c src/libmlk-core/core/drawable.h src/libmlk-rpg/rpg/battle.h tests/test-drawable.c |
diffstat | 9 files changed, 173 insertions(+), 122 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/example-drawable/main.c Sun Oct 24 16:32:34 2021 +0200 +++ b/examples/example-drawable/main.c Sun Oct 24 17:07:20 2021 +0200 @@ -25,6 +25,7 @@ #include <core/event.h> #include <core/game.h> #include <core/drawable.h> +#include <core/drawable-stack.h> #include <core/key.h> #include <core/painter.h> #include <core/panic.h>
--- a/src/libmlk-core-js/core/js-drawable-stack.c Sun Oct 24 16:32:34 2021 +0200 +++ b/src/libmlk-core-js/core/js-drawable-stack.c Sun Oct 24 17:07:20 2021 +0200 @@ -20,6 +20,7 @@ #include <core/alloc.h> #include <core/drawable.h> +#include <core/drawable-stack.h> #include "js-drawable-stack.h" #include "js-drawable.h"
--- a/src/libmlk-core/CMakeLists.txt Sun Oct 24 16:32:34 2021 +0200 +++ b/src/libmlk-core/CMakeLists.txt Sun Oct 24 17:07:20 2021 +0200 @@ -36,6 +36,8 @@ ${libmlk-core_SOURCE_DIR}/core/core_p.h ${libmlk-core_SOURCE_DIR}/core/drawable.c ${libmlk-core_SOURCE_DIR}/core/drawable.h + ${libmlk-core_SOURCE_DIR}/core/drawable-stack.c + ${libmlk-core_SOURCE_DIR}/core/drawable-stack.h ${libmlk-core_SOURCE_DIR}/core/error.c ${libmlk-core_SOURCE_DIR}/core/error.h ${libmlk-core_SOURCE_DIR}/core/event.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmlk-core/core/drawable-stack.c Sun Oct 24 17:07:20 2021 +0200 @@ -0,0 +1,115 @@ +/* + * drawable-stack.c -- convenient stack of drawables + * + * Copyright (c) 2020-2021 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <assert.h> +#include <string.h> + +#include "drawable.h" +#include "drawable-stack.h" + +#define DRAWABLE_FOREACH(st, iter) \ + for (size_t i = 0; i < DRAWABLE_STACK_MAX && ((iter) = (st)->objects[i], 1); ++i) + +void +drawable_stack_init(struct drawable_stack *st) +{ + assert(st); + + memset(st, 0, sizeof (*st)); +} + +int +drawable_stack_add(struct drawable_stack *st, struct drawable *dw) +{ + assert(st); + assert(dw); + + for (size_t i = 0; i < DRAWABLE_STACK_MAX; ++i) { + if (!st->objects[i]) { + st->objects[i] = dw; + return 0; + } + } + + return -1; +} + +int +drawable_stack_update(struct drawable_stack *st, unsigned int ticks) +{ + assert(st); + + for (size_t i = 0; i < DRAWABLE_STACK_MAX; ++i) { + struct drawable *dw = st->objects[i]; + + if (dw && drawable_update(dw, ticks)) { + drawable_end(dw); + drawable_finish(dw); + st->objects[i] = NULL; + } + } + + /* + * We process the array again in case a drawable added a new drawable + * within the update function. + */ + return drawable_stack_completed(st); +} + +void +drawable_stack_draw(struct drawable_stack *st) +{ + assert(st); + + struct drawable *dw; + + DRAWABLE_FOREACH(st, dw) + if (dw) + drawable_draw(dw); +} + +int +drawable_stack_completed(const struct drawable_stack *st) +{ + assert(st); + + struct drawable *dw; + + DRAWABLE_FOREACH(st, dw) + if (dw) + return 0; + + return 1; +} + +void +drawable_stack_finish(struct drawable_stack *st) +{ + assert(st); + + struct drawable *dw; + + DRAWABLE_FOREACH(st, dw) { + if (dw) { + drawable_end(dw); + drawable_finish(dw); + } + } + + memset(st, 0, sizeof (*st)); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmlk-core/core/drawable-stack.h Sun Oct 24 17:07:20 2021 +0200 @@ -0,0 +1,52 @@ +/* + * drawable-stack.h -- convenient stack of drawables + * + * Copyright (c) 2020-2021 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef MLK_CORE_DRAWABLE_STACK_H +#define MLK_CORE_DRAWABLE_STACK_H + +#include "core.h" + +#define DRAWABLE_STACK_MAX (128) + +struct drawable_stack { + struct drawable *objects[DRAWABLE_STACK_MAX]; +}; + +CORE_BEGIN_DECLS + +void +drawable_stack_init(struct drawable_stack *); + +int +drawable_stack_add(struct drawable_stack *, struct drawable *); + +int +drawable_stack_update(struct drawable_stack *, unsigned int); + +void +drawable_stack_draw(struct drawable_stack *); + +int +drawable_stack_completed(const struct drawable_stack *); + +void +drawable_stack_finish(struct drawable_stack *); + +CORE_END_DECLS + +#endif /* !MLK_CORE_DRAWABLE_STACK_H */
--- a/src/libmlk-core/core/drawable.c Sun Oct 24 16:32:34 2021 +0200 +++ b/src/libmlk-core/core/drawable.c Sun Oct 24 17:07:20 2021 +0200 @@ -17,17 +17,8 @@ */ #include <assert.h> -#include <stddef.h> -#include <stdlib.h> -#include <string.h> -#include "animation.h" #include "drawable.h" -#include "util.h" -#include "sprite.h" - -#define DRAWABLE_FOREACH(st, iter) \ - for (size_t i = 0; i < DRAWABLE_STACK_MAX && ((iter) = (st)->objects[i], 1); ++i) int drawable_update(struct drawable *dw, unsigned int ticks) @@ -62,92 +53,3 @@ if (dw->finish) dw->finish(dw); } - -void -drawable_stack_init(struct drawable_stack *st) -{ - assert(st); - - memset(st, 0, sizeof (*st)); -} - -int -drawable_stack_add(struct drawable_stack *st, struct drawable *dw) -{ - assert(st); - assert(dw); - - for (size_t i = 0; i < DRAWABLE_STACK_MAX; ++i) { - if (!st->objects[i]) { - st->objects[i] = dw; - return 0; - } - } - - return -1; -} - -int -drawable_stack_update(struct drawable_stack *st, unsigned int ticks) -{ - assert(st); - - for (size_t i = 0; i < DRAWABLE_STACK_MAX; ++i) { - struct drawable *dw = st->objects[i]; - - if (dw && drawable_update(dw, ticks)) { - drawable_end(dw); - drawable_finish(dw); - st->objects[i] = NULL; - } - } - - /* - * We process the array again in case a drawable added a new drawable - * within the update function. - */ - return drawable_stack_completed(st); -} - -void -drawable_stack_draw(struct drawable_stack *st) -{ - assert(st); - - struct drawable *dw; - - DRAWABLE_FOREACH(st, dw) - if (dw) - drawable_draw(dw); -} - -int -drawable_stack_completed(const struct drawable_stack *st) -{ - assert(st); - - struct drawable *dw; - - DRAWABLE_FOREACH(st, dw) - if (dw) - return 0; - - return 1; -} - -void -drawable_stack_finish(struct drawable_stack *st) -{ - assert(st); - - struct drawable *dw; - - DRAWABLE_FOREACH(st, dw) { - if (dw) { - drawable_end(dw); - drawable_finish(dw); - } - } - - memset(st, 0, sizeof (*st)); -}
--- a/src/libmlk-core/core/drawable.h Sun Oct 24 16:32:34 2021 +0200 +++ b/src/libmlk-core/core/drawable.h Sun Oct 24 17:07:20 2021 +0200 @@ -21,8 +21,6 @@ #include "core.h" -#define DRAWABLE_STACK_MAX (128) - struct drawable { void *data; int x; @@ -33,10 +31,6 @@ void (*finish)(struct drawable *); }; -struct drawable_stack { - struct drawable *objects[DRAWABLE_STACK_MAX]; -}; - CORE_BEGIN_DECLS int @@ -51,24 +45,6 @@ void drawable_finish(struct drawable *); -void -drawable_stack_init(struct drawable_stack *); - -int -drawable_stack_add(struct drawable_stack *, struct drawable *); - -int -drawable_stack_update(struct drawable_stack *, unsigned int); - -void -drawable_stack_draw(struct drawable_stack *); - -int -drawable_stack_completed(const struct drawable_stack *); - -void -drawable_stack_finish(struct drawable_stack *); - CORE_END_DECLS #endif /* !MLK_CORE_DRAWABLE_H */
--- a/src/libmlk-rpg/rpg/battle.h Sun Oct 24 16:32:34 2021 +0200 +++ b/src/libmlk-rpg/rpg/battle.h Sun Oct 24 17:07:20 2021 +0200 @@ -22,6 +22,7 @@ #include <core/action.h> #include <core/core.h> #include <core/drawable.h> +#include <core/drawable-stack.h> #include <ui/frame.h> #include <ui/gridmenu.h>