From d27edb92fe37e185dad9862191cebe79e982e943 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:46:30 +0000 Subject: [PATCH 1/3] AirLabyrinth: Fix for gcc12 toolchain --- vgm/apps/air_labyrinth/game.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vgm/apps/air_labyrinth/game.c b/vgm/apps/air_labyrinth/game.c index 225615a..11da113 100644 --- a/vgm/apps/air_labyrinth/game.c +++ b/vgm/apps/air_labyrinth/game.c @@ -83,9 +83,9 @@ static void player_update(Entity* self, GameManager* manager, void* context) { player->trajectory = vector_add( player->trajectory, - (Vector){ + ((Vector){ player_x_from_pitch(-imu_pitch_get(game_context->imu)), - player_y_from_roll(-imu_roll_get(game_context->imu))}); + player_y_from_roll(-imu_roll_get(game_context->imu))})); } // Get game input @@ -93,19 +93,19 @@ static void player_update(Entity* self, GameManager* manager, void* context) { // Control player movement if(input.held & GameKeyUp) { - player->trajectory = vector_add(player->trajectory, (Vector){0, -0.8}); + player->trajectory = vector_add(player->trajectory, ((Vector){0, -0.8})); } if(input.held & GameKeyDown) { - player->trajectory = vector_add(player->trajectory, (Vector){0, +0.8}); + player->trajectory = vector_add(player->trajectory, ((Vector){0, +0.8})); } if(input.held & GameKeyLeft) { - player->trajectory = vector_add(player->trajectory, (Vector){-0.8, 0}); + player->trajectory = vector_add(player->trajectory, ((Vector){-0.8, 0})); } if(input.held & GameKeyRight) { - player->trajectory = vector_add(player->trajectory, (Vector){0.8, 0}); + player->trajectory = vector_add(player->trajectory, ((Vector){0.8, 0})); } // Get player position From b17c15ac07235ef0e6ed82755f002bf7cf852b69 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:48:01 +0000 Subject: [PATCH 2/3] AirLabyrinth: Fix sprites on windows (still precompiled tho) --- vgm/apps/air_labyrinth/application.fam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vgm/apps/air_labyrinth/application.fam b/vgm/apps/air_labyrinth/application.fam index 609dded..fbbf4b3 100644 --- a/vgm/apps/air_labyrinth/application.fam +++ b/vgm/apps/air_labyrinth/application.fam @@ -14,7 +14,8 @@ App( # fap_extbuild=( # ExtFile( # path="${FAP_SRC_DIR}/assets", -# command="python3 ${FAP_SRC_DIR}/engine/scripts/sprite_builder.py ${FAP_SRC_DIR.abspath}/sprites ${TARGET.abspath}/sprites", +# command=("python" if __import__("sys").platform == "win32" else "python3") +# + " ${FAP_SRC_DIR}/engine/scripts/sprite_builder.py ${FAP_SRC_DIR.abspath}/sprites ${TARGET.abspath}/sprites", # ), # ), ) From 4c228ffddf58cab16202115d16509ce45c8f90cd Mon Sep 17 00:00:00 2001 From: WillyJL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 6 Mar 2024 19:35:01 +0000 Subject: [PATCH 3/3] Air Labyrinth: Use PYTHON3 var --- vgm/apps/air_labyrinth/application.fam | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vgm/apps/air_labyrinth/application.fam b/vgm/apps/air_labyrinth/application.fam index fbbf4b3..a0dcf9d 100644 --- a/vgm/apps/air_labyrinth/application.fam +++ b/vgm/apps/air_labyrinth/application.fam @@ -14,8 +14,7 @@ App( # fap_extbuild=( # ExtFile( # path="${FAP_SRC_DIR}/assets", -# command=("python" if __import__("sys").platform == "win32" else "python3") -# + " ${FAP_SRC_DIR}/engine/scripts/sprite_builder.py ${FAP_SRC_DIR.abspath}/sprites ${TARGET.abspath}/sprites", +# command="${PYTHON3} ${FAP_SRC_DIR}/engine/scripts/sprite_builder.py ${FAP_SRC_DIR.abspath}/sprites ${TARGET.abspath}/sprites", # ), # ), )