From b1d230f1f0a13adfa472598bce3d04b92f93d7f7 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sun, 1 Dec 2024 18:18:03 +0100 Subject: close #43 --- src/include/scenes/loading_scene.h | 5 +++++ src/scenes/loading_scene.c | 23 +++++++++++++---------- src/scenes/menu_scene.c | 12 ++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/include/scenes/loading_scene.h b/src/include/scenes/loading_scene.h index 3e49a9a..93e41f3 100644 --- a/src/include/scenes/loading_scene.h +++ b/src/include/scenes/loading_scene.h @@ -7,6 +7,11 @@ #ifndef INCLUDE_LOADING_SCENE #define INCLUDE_LOADING_SCENE +#define MAX_CREDITED_NAMES 5 +#define MAX_CREDIT_NAME_LENGTH 30 +#define COMPLETE_CREDIT_LENGTH (MAX_CREDIT_NAME_LENGTH*MAX_CREDITED_NAMES)+20 +char complete_credit_text[COMPLETE_CREDIT_LENGTH]; + void loading_scene_init(); void loading_scene_render(platform_window* window); void loading_scene_update(platform_window* window); diff --git a/src/scenes/loading_scene.c b/src/scenes/loading_scene.c index 2240aa8..b65a464 100644 --- a/src/scenes/loading_scene.c +++ b/src/scenes/loading_scene.c @@ -1,8 +1,4 @@ -#define MAX_CREDITED_NAMES 5 -#define MAX_CREDIT_NAME_LENGTH 30 -#define COMPLETE_CREDIT_LENGTH (MAX_CREDIT_NAME_LENGTH*MAX_CREDITED_NAMES)+20 -char complete_credit_text[COMPLETE_CREDIT_LENGTH]; void loading_scene_init() { @@ -55,19 +51,26 @@ void loading_scene_render(platform_window* window) s32 screen_center_y = area.y + (area.h/2); s32 logo_x = screen_center_x - (target_size/2); s32 logo_y = screen_center_y - (total_height/2); - renderer->render_image(img_logo, logo_x, logo_y, target_size, target_size); + //renderer->render_image(img_logo, logo_x, logo_y, target_size, target_size); - s32 text_y = logo_y + target_size + logo_text_pad; - char* company_name = "Tar Software"; - s32 company_name_width = renderer->calculate_text_width(font_reg, company_name); - s32 text_x = screen_center_x - (company_name_width/2); + s32 carwheel_size = area.w/4; - renderer->render_text(font_reg, text_x, text_y, company_name, COLOR_TITLE); + static float rotation = 0.0f; + rotation -= 0.5f*frame_delta; + gl_render_set_rotation(rotation); + renderer->render_image_tint(img_carwheel, screen_center_x - (carwheel_size/2), + screen_center_y - (carwheel_size/2), carwheel_size, carwheel_size, COLOR_PANEL_BACKGROUND); + gl_render_set_rotation(0.0f); // Credits font* font_s = FONT_REGULAR(SIZE_RD(area.w, 20)); s32 credit_pad = 30*scale; renderer->render_text(font_s, area.x + credit_pad, area.y+area.h-credit_pad-font_s->px_h, complete_credit_text, COLOR_TITLE); + + s32 text_y = area.y+area.h-credit_pad-font_s->px_h; + char* company_name = "Developed by Aldrik Ramaekers"; + s32 company_name_width = renderer->calculate_text_width(font_s, company_name); + renderer->render_text(font_s, area.x + area.w - company_name_width - credit_pad, text_y, company_name, COLOR_TITLE); } void loading_scene_update(platform_window* window) diff --git a/src/scenes/menu_scene.c b/src/scenes/menu_scene.c index 3061f92..ac32e43 100644 --- a/src/scenes/menu_scene.c +++ b/src/scenes/menu_scene.c @@ -75,6 +75,18 @@ static void menu_draw_title(platform_window* window) renderer->render_text(font_sml, 10*scale + text_x+2,font_reg->px_h + text_pad + text_y+2, game_version, COLOR_TEXT_SHADOW); renderer->render_text(font_sml, 10*scale + text_x, font_reg->px_h + text_pad + text_y, game_version, COLOR_TEXT); + + // Music credits + { + font* font_s = FONT_REGULAR(SIZE_RD(area.w, 20)); + s32 credit_pad = 30*scale; + s32 text_y = area.y+area.h-credit_pad-font_s->px_h; + renderer->render_text(font_s, area.x + credit_pad, text_y, complete_credit_text, COLOR_TITLE); + + char* company_name = "Developed by Aldrik Ramaekers"; + s32 company_name_width = renderer->calculate_text_width(font_s, company_name); + renderer->render_text(font_s, area.x + area.w - company_name_width - credit_pad, text_y, company_name, COLOR_TITLE); + } } void menu_scene_render(platform_window* window) -- cgit v1.2.3-70-g09d2