summaryrefslogtreecommitdiff
path: root/src/game.c
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-11-26 18:59:46 -0800
committerVito Caputo <vcaputo@pengaru.com>2022-11-26 19:10:24 -0800
commit51c39102ea1f51bbabb7a1e50246158fbb7f09f9 (patch)
tree522ab89ea7b60fc6190bfb79225d011bbd1f0358 /src/game.c
parent7aa592e7fb8eceed8ca4373eee5d38aa6eebf7cd (diff)
game: fix teepee icons grid offset to center
The icons grid was shifted left slightly...
Diffstat (limited to 'src/game.c')
-rw-r--r--src/game.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/game.c b/src/game.c
index 04e9494..b070c84 100644
--- a/src/game.c
+++ b/src/game.c
@@ -391,7 +391,12 @@ static void more_teepee(game_t *game, teepee_t *teepee)
* we'd have convenient scalars for the _SCALE defines and not these v3fs... This works fine for now.
*/
tp->entity.node = teepee_node_new(&(stage_conf_t){ .parent = game->game_node, .name = "tp-icon", .layer = 8, .alpha = 1.f, .active = 1 }, &game->sars->projection_x, &tp->entity.model_x);
- tp->entity.model_x = m4f_translate(NULL, &(v3f_t){ .x = ((game->teepee_cnt % 16) * 0.0625f) * 1.9375f + -.9375f, .y = (.9687f - ((game->teepee_cnt / 16) * 0.0625f)) * 1.9375f + -.9375f, .z = 0.f });
+ tp->entity.model_x = m4f_translate(NULL,
+ &(v3f_t){
+ .x = ((game->teepee_cnt % 16) * 0.0625f) * 2.f - .9375f,
+ .y = (.9687f - ((game->teepee_cnt / 16) * 0.0625f)) * 1.9375f + -.9375f,
+ .z = 0.f
+ });
tp->entity.model_x = m4f_scale(&tp->entity.model_x, &tp->entity.scale);
tp->next = game->teepee_head;
@@ -1045,7 +1050,12 @@ static void game_update(play_t *play, void *context)
/* explode the hoarded TP */
for (size_t i = 0; tp != NULL; tp = tp->next, i++) {
- tp->entity.model_x = m4f_translate(NULL, &(v3f_t){ .x = (((i % 16) * 0.0625f) * 1.9375f + -.9375f) * (1.f + t * 32.f), .y = ((.9687f - ((i / 16) * 0.0625f)) * 1.9375f + -.9375f) * (1.f + t * 32.f), .z = 0.f });
+ tp->entity.model_x = m4f_translate(NULL,
+ &(v3f_t){
+ .x = (((i % 16) * 0.0625f) * 2.f - .9375f) * (1.f + t * 32.f),
+ .y = ((.9687f - ((i / 16) * 0.0625f)) * 1.9375f + -.9375f) * (1.f + t * 32.f),
+ .z = 0.f
+ });
tp->entity.model_x = m4f_scale(&tp->entity.model_x, &tp->entity.scale);
}
break;
@@ -1060,7 +1070,7 @@ static void game_update(play_t *play, void *context)
for (size_t i = 0; tp != NULL; tp = tp->next, i++) {
tp->entity.model_x = m4f_translate(NULL,
&(v3f_t){
- .x = ((i % 16) * 0.0625f) * 1.9375f + -.9375f,
+ .x = ((i % 16) * 0.0625f) * 2.f - .9375f,
.y = ((1.f - fmod((i / 16 * 0.0625f) + (float)(play_ticks(play, GAME_OVER_TIMER) % 10000) * .0001f, 1.f))) * 3.f - 1.5f,
.z = 0.f
});
© All Rights Reserved