Mercurial > molko
changeset 449:f2f0e73ea9da
core: drawable -> mlk_drawable
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sat, 18 Feb 2023 13:16:40 +0100 |
| parents | 0c4cd552879d |
| children | b26dd49f69ff |
| files | libmlk-core/mlk/core/animation.c libmlk-core/mlk/core/animation.h libmlk-core/mlk/core/drawable-stack.c libmlk-core/mlk/core/drawable-stack.h libmlk-core/mlk/core/drawable.c libmlk-core/mlk/core/drawable.h libmlk-rpg/mlk/rpg/battle-state-check.c libmlk-rpg/mlk/rpg/battle-state-rendering.c libmlk-rpg/mlk/rpg/battle-state-rendering.h libmlk-rpg/mlk/rpg/battle.c libmlk-rpg/mlk/rpg/battle.h |
| diffstat | 11 files changed, 67 insertions(+), 67 deletions(-) [+] |
line wrap: on
line diff
--- a/libmlk-core/mlk/core/animation.c Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-core/mlk/core/animation.c Sat Feb 18 13:16:40 2023 +0100 @@ -24,13 +24,13 @@ #include "sprite.h" static int -update(struct drawable *dw, unsigned int ticks) +update(struct mlk_drawable *dw, unsigned int ticks) { return mlk_animation_update(dw->data, ticks); } static void -draw(struct drawable *dw) +draw(struct mlk_drawable *dw) { mlk_animation_draw(dw->data, dw->x, dw->y); } @@ -103,7 +103,7 @@ } void -mlk_animation_drawable(struct mlk_animation *an, struct drawable *dw, int x, int y) +mlk_animation_drawable(struct mlk_animation *an, struct mlk_drawable *dw, int x, int y) { assert(an); assert(dw);
--- a/libmlk-core/mlk/core/animation.h Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-core/mlk/core/animation.h Sat Feb 18 13:16:40 2023 +0100 @@ -21,7 +21,7 @@ #include "core.h" -struct drawable; +struct mlk_drawable; struct sprite; struct mlk_animation { @@ -50,7 +50,7 @@ mlk_animation_draw(const struct mlk_animation *, int, int); void -mlk_animation_drawable(struct mlk_animation *, struct drawable *, int, int); +mlk_animation_drawable(struct mlk_animation *, struct mlk_drawable *, int, int); CORE_END_DECLS
--- a/libmlk-core/mlk/core/drawable-stack.c Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-core/mlk/core/drawable-stack.c Sat Feb 18 13:16:40 2023 +0100 @@ -27,7 +27,7 @@ for (size_t i = 0; i < (st)->objectsz && ((iter) = (st)->objects[i], 1); ++i) void -drawable_stack_init(struct drawable_stack *st, struct drawable **objects, size_t objectsz) +mlk_drawable_stack_init(struct mlk_drawable_stack *st, struct mlk_drawable **objects, size_t objectsz) { assert(st); @@ -39,7 +39,7 @@ } int -drawable_stack_add(struct drawable_stack *st, struct drawable *dw) +mlk_drawable_stack_add(struct mlk_drawable_stack *st, struct mlk_drawable *dw) { assert(st); assert(dw); @@ -55,18 +55,18 @@ } int -drawable_stack_update(struct drawable_stack *st, unsigned int ticks) +mlk_drawable_stack_update(struct mlk_drawable_stack *st, unsigned int ticks) { assert(st); - struct drawable *dw; + struct mlk_drawable *dw; for (size_t i = 0; i < st->objectsz; ++i) { dw = st->objects[i]; - if (dw && drawable_update(dw, ticks)) { - drawable_end(dw); - drawable_finish(dw); + if (dw && mlk_drawable_update(dw, ticks)) { + mlk_drawable_end(dw); + mlk_drawable_finish(dw); st->objects[i] = NULL; } } @@ -75,27 +75,27 @@ * We process the array again in case a drawable added a new drawable * within the update function. */ - return drawable_stack_completed(st); + return mlk_drawable_stack_completed(st); } void -drawable_stack_draw(struct drawable_stack *st) +mlk_drawable_stack_draw(struct mlk_drawable_stack *st) { assert(st); - struct drawable *dw; + struct mlk_drawable *dw; DRAWABLE_FOREACH(st, dw) if (dw) - drawable_draw(dw); + mlk_drawable_draw(dw); } int -drawable_stack_completed(const struct drawable_stack *st) +mlk_drawable_stack_completed(const struct mlk_drawable_stack *st) { assert(st); - struct drawable *dw; + struct mlk_drawable *dw; DRAWABLE_FOREACH(st, dw) if (dw) @@ -105,16 +105,16 @@ } void -drawable_stack_finish(struct drawable_stack *st) +mlk_drawable_stack_finish(struct mlk_drawable_stack *st) { assert(st); - struct drawable *dw; + struct mlk_drawable *dw; DRAWABLE_FOREACH(st, dw) { if (dw) { - drawable_end(dw); - drawable_finish(dw); + mlk_drawable_end(dw); + mlk_drawable_finish(dw); } }
--- a/libmlk-core/mlk/core/drawable-stack.h Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-core/mlk/core/drawable-stack.h Sat Feb 18 13:16:40 2023 +0100 @@ -23,30 +23,30 @@ #include "core.h" -struct drawable_stack { - struct drawable **objects; +struct mlk_drawable_stack { + struct mlk_drawable **objects; size_t objectsz; }; CORE_BEGIN_DECLS void -drawable_stack_init(struct drawable_stack *, struct drawable **, size_t); +mlk_drawable_stack_init(struct mlk_drawable_stack *, struct mlk_drawable **, size_t); int -drawable_stack_add(struct drawable_stack *, struct drawable *); +mlk_drawable_stack_add(struct mlk_drawable_stack *, struct mlk_drawable *); int -drawable_stack_update(struct drawable_stack *, unsigned int); +mlk_drawable_stack_update(struct mlk_drawable_stack *, unsigned int); void -drawable_stack_draw(struct drawable_stack *); +mlk_drawable_stack_draw(struct mlk_drawable_stack *); int -drawable_stack_completed(const struct drawable_stack *); +mlk_drawable_stack_completed(const struct mlk_drawable_stack *); void -drawable_stack_finish(struct drawable_stack *); +mlk_drawable_stack_finish(struct mlk_drawable_stack *); CORE_END_DECLS
--- a/libmlk-core/mlk/core/drawable.c Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-core/mlk/core/drawable.c Sat Feb 18 13:16:40 2023 +0100 @@ -21,7 +21,7 @@ #include "drawable.h" int -drawable_update(struct drawable *dw, unsigned int ticks) +mlk_drawable_update(struct mlk_drawable *dw, unsigned int ticks) { assert(dw); @@ -29,7 +29,7 @@ } void -drawable_draw(struct drawable *dw) +mlk_drawable_draw(struct mlk_drawable *dw) { assert(dw); @@ -37,7 +37,7 @@ } void -drawable_end(struct drawable *dw) +mlk_drawable_end(struct mlk_drawable *dw) { assert(dw); @@ -46,7 +46,7 @@ } void -drawable_finish(struct drawable *dw) +mlk_drawable_finish(struct mlk_drawable *dw) { assert(dw);
--- a/libmlk-core/mlk/core/drawable.h Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-core/mlk/core/drawable.h Sat Feb 18 13:16:40 2023 +0100 @@ -21,29 +21,29 @@ #include "core.h" -struct drawable { +struct mlk_drawable { void *data; int x; int y; - int (*update)(struct drawable *, unsigned int); - void (*draw)(struct drawable *); - void (*end)(struct drawable *); - void (*finish)(struct drawable *); + int (*update)(struct mlk_drawable *, unsigned int); + void (*draw)(struct mlk_drawable *); + void (*end)(struct mlk_drawable *); + void (*finish)(struct mlk_drawable *); }; CORE_BEGIN_DECLS int -drawable_update(struct drawable *, unsigned int); +mlk_drawable_update(struct mlk_drawable *, unsigned int); void -drawable_draw(struct drawable *); +mlk_drawable_draw(struct mlk_drawable *); void -drawable_end(struct drawable *); +mlk_drawable_end(struct mlk_drawable *); void -drawable_finish(struct drawable *); +mlk_drawable_finish(struct mlk_drawable *); CORE_END_DECLS
--- a/libmlk-rpg/mlk/rpg/battle-state-check.c Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle-state-check.c Sat Feb 18 13:16:40 2023 +0100 @@ -37,13 +37,13 @@ struct character *ch; int x; int y; - struct drawable dw; + struct mlk_drawable dw; unsigned int alpha; unsigned int elapsed; }; static int -fadeout_update(struct drawable *dw, unsigned int ticks) +fadeout_update(struct mlk_drawable *dw, unsigned int ticks) { struct fadeout *fade = dw->data; @@ -62,7 +62,7 @@ } static void -fadeout_draw(struct drawable *dw) +fadeout_draw(struct mlk_drawable *dw) { const struct fadeout *fade = dw->data; struct sprite *sprite = fade->ch->sprites[CHARACTER_SPRITE_NORMAL]; @@ -73,7 +73,7 @@ } static void -fadeout_finish(struct drawable *dw) +fadeout_finish(struct mlk_drawable *dw) { free(dw->data); } @@ -98,7 +98,7 @@ fade->dw.update = fadeout_update; fade->dw.finish = fadeout_finish; - if (drawable_stack_add(bt->effects, &fade->dw) < 0) + if (mlk_drawable_stack_add(bt->effects, &fade->dw) < 0) mlk_alloc_free(fade); }
--- a/libmlk-rpg/mlk/rpg/battle-state-rendering.c Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle-state-rendering.c Sat Feb 18 13:16:40 2023 +0100 @@ -54,7 +54,7 @@ } void -battle_state_rendering_init(struct battle_state_rendering *rdr, struct drawable *dw) +battle_state_rendering_init(struct battle_state_rendering *rdr, struct mlk_drawable *dw) { assert(rdr); assert(dw); @@ -70,8 +70,8 @@ battle_update_component(bt, BATTLE_COMPONENT_ALL, ticks); - if (drawable_update(rdr->drawable, ticks)) { - drawable_end(rdr->drawable); + if (mlk_drawable_update(rdr->drawable, ticks)) { + mlk_drawable_end(rdr->drawable); return 1; } @@ -84,7 +84,7 @@ assert(rdr); battle_draw_component(bt, BATTLE_COMPONENT_ALL); - drawable_draw(rdr->drawable); + mlk_drawable_draw(rdr->drawable); } void @@ -92,11 +92,11 @@ { assert(rdr); - drawable_finish(rdr->drawable); + mlk_drawable_finish(rdr->drawable); } void -battle_state_rendering(struct battle *bt, struct drawable *dw) +battle_state_rendering(struct battle *bt, struct mlk_drawable *dw) { assert(bt); assert(dw);
--- a/libmlk-rpg/mlk/rpg/battle-state-rendering.h Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle-state-rendering.h Sat Feb 18 13:16:40 2023 +0100 @@ -20,14 +20,14 @@ #define MLK_RPG_BATTLE_STATE_RENDERING_H struct battle; -struct drawable; +struct mlk_drawable; struct battle_state_rendering { - struct drawable *drawable; + struct mlk_drawable *drawable; }; void -battle_state_rendering_init(struct battle_state_rendering *, struct drawable *); +battle_state_rendering_init(struct battle_state_rendering *, struct mlk_drawable *); int battle_state_rendering_update(struct battle_state_rendering *, struct battle *, unsigned int); @@ -39,6 +39,6 @@ battle_state_rendering_finish(struct battle_state_rendering *); void -battle_state_rendering(struct battle *, struct drawable *); +battle_state_rendering(struct battle *, struct mlk_drawable *); #endif /* !MLK_RPG_BATTLE_STATE_RENDERING_H */
--- a/libmlk-rpg/mlk/rpg/battle.c Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle.c Sat Feb 18 13:16:40 2023 +0100 @@ -51,12 +51,12 @@ #include "spell.h" struct indicator { - struct drawable dw; + struct mlk_drawable dw; struct battle_indicator bti; }; static int -indicator_update(struct drawable *dw, unsigned int ticks) +indicator_update(struct mlk_drawable *dw, unsigned int ticks) { struct indicator *id = dw->data; @@ -64,7 +64,7 @@ } static void -indicator_draw(struct drawable *dw) +indicator_draw(struct mlk_drawable *dw) { const struct indicator *id = dw->data; @@ -72,7 +72,7 @@ } static void -indicator_free(struct drawable *dw) +indicator_free(struct mlk_drawable *dw) { struct indicator *id = dw->data; @@ -408,8 +408,8 @@ battle_indicator_start(&id->bti); - if (drawable_stack_add(bt->effects, &id->dw) < 0) - drawable_finish(&id->dw); + if (mlk_drawable_stack_add(bt->effects, &id->dw) < 0) + mlk_drawable_finish(&id->dw); } void @@ -447,7 +447,7 @@ if ((comp & BATTLE_COMPONENT_ACTIONS) && bt->actions) mlk_action_stack_update(bt->actions, ticks); if ((comp & BATTLE_COMPONENT_DRAWABLES) && bt->effects) - drawable_stack_update(bt->effects, ticks); + mlk_drawable_stack_update(bt->effects, ticks); } int @@ -477,7 +477,7 @@ if ((comp & BATTLE_COMPONENT_ACTIONS) && bt->actions) mlk_action_stack_draw(bt->actions); if ((comp & BATTLE_COMPONENT_DRAWABLES) && bt->effects) - drawable_stack_draw(bt->effects); + mlk_drawable_stack_draw(bt->effects); } void
--- a/libmlk-rpg/mlk/rpg/battle.h Sat Feb 18 13:06:04 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle.h Sat Feb 18 13:16:40 2023 +0100 @@ -80,7 +80,7 @@ struct texture *background; struct music *music[3]; struct theme *theme; - struct drawable_stack *effects; + struct mlk_drawable_stack *effects; struct mlk_action_stack *actions; struct inventory *inventory; struct battle_bar *bar;