From 5bb71fef0e63780f95f403fb14b824778cecbe9b Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Thu, 18 Apr 2024 22:06:59 +0100
Subject: [PATCH] Add some challenges to the world map

---
 input.h                        |   4 +-
 maps_src/dev_tutorial/main.mdl | Bin 4325056 -> 4325192 bytes
 menu.c                         | 149 ++++++++++++++++++++++++++++++---
 menu.h                         |  48 -----------
 world_map.c                    |   7 ++
 world_routes_ui.c              |   2 +
 6 files changed, 147 insertions(+), 63 deletions(-)

diff --git a/input.h b/input.h
index dc89f8b..131ab8c 100644
--- a/input.h
+++ b/input.h
@@ -88,13 +88,11 @@ static vg_input_op *input_button_list[] = {
                    INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_world_right] =
                    INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
-[k_srbind_home]  = INPUT_BASIC( SDLK_h, SDL_CONTROLLER_BUTTON_Y ),
 [k_srbind_mup]   = INPUT_BASIC( SDLK_UP, SDL_CONTROLLER_BUTTON_DPAD_UP ),
 [k_srbind_mdown] = INPUT_BASIC( SDLK_DOWN, SDL_CONTROLLER_BUTTON_DPAD_DOWN ),
 [k_srbind_mback] = INPUT_BASIC( SDLK_ESCAPE, SDL_CONTROLLER_BUTTON_B ),
 [k_srbind_mopen] = INPUT_BASIC( SDLK_ESCAPE, SDL_CONTROLLER_BUTTON_START ),
-[k_srbind_mhub]  = (vg_input_op[]){ vg_joy_button, SDL_CONTROLLER_BUTTON_Y, 
-                                    vg_end },
+[k_srbind_mhub]  = INPUT_BASIC( SDLK_h, SDL_CONTROLLER_BUTTON_Y ),
 [k_srbind_maccept] = (vg_input_op[]){
    vg_keyboard, SDLK_e, vg_gui_visible, 0,
       vg_keyboard, SDLK_RETURN, vg_keyboard, SDLK_RETURN2,
diff --git a/maps_src/dev_tutorial/main.mdl b/maps_src/dev_tutorial/main.mdl
index 4539d9ff2266c82dd032a91e2a57b7dedd64e414..9a24db8a1a43ea4d5405799d3cea38b399aae48b 100644
GIT binary patch
delta 12909
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
R2nquQK?!EdTSA;W{y&Lce1QM}

delta 10827
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
Y=tm%!KnMX10fvB`x0V&$)CG3_Kc%_^wEzGB

diff --git a/menu.c b/menu.c
index daeb61a..eaec907 100644
--- a/menu.c
+++ b/menu.c
@@ -219,7 +219,7 @@ static bool menu_checkbox( ui_rect inout_panel, bool select,
    return changed;
 }
 
-static void menu_heading( ui_rect inout_panel, const char *label )
+static void menu_heading( ui_rect inout_panel, const char *label, u32 colour )
 {
    ui_rect rect;
    menu_standard_widget( inout_panel, rect, 1 );
@@ -239,10 +239,19 @@ static void menu_heading( ui_rect inout_panel, const char *label )
    ui_text( rect, label, 1, k_ui_align_middle_center, 1 );
    rect[0] += 1;
    rect[1] -= 1;
-   ui_text( rect, label, 1, k_ui_align_middle_center, 
+   ui_text( rect, label, 1, k_ui_align_middle_center, colour? colour:
             ui_colour(k_ui_blue+k_ui_brighter) );
 }
 
+static u32 medal_colour( u32 flags )
+{
+   if( flags & k_ent_route_flag_achieve_gold ) 
+      return ui_colour( k_ui_yellow );
+   else if( flags & k_ent_route_flag_achieve_silver )
+      return ui_colour( k_ui_fg );
+   else return 0;
+}
+
 void menu_gui(void)
 {
    if( button_down( k_srbind_mopen ) )
@@ -461,12 +470,13 @@ void menu_gui(void)
       vg_strnull( &str, buf, sizeof(buf) );
       vg_strcat( &str, "Hub World" );
       
-      if( world_static.active_instance &&
-            (vg_input.display_input_method == k_input_method_controller) )
+      if( world_static.active_instance )
       {
          vg_strcat( &str, " (" );
          vg_input_string( &str, input_button_list[k_srbind_mhub], 1 );
-         vg_strcat( &str, ")" );
+         vg_strcatch( &str, '\x06' );
+         vg_strcatch( &str, '\x00' );
+         vg_strcat( &str, "\x1B[0m)" );
       }
       
       ui_px w = ui_text( (ui_rect){ x+8, y, 1000, height }, buf, 1,
@@ -493,7 +503,9 @@ void menu_gui(void)
          {
             vg_strcat( &str, " (" );
             vg_input_string( &str, input_button_list[k_srbind_mhub], 1 );
-            vg_strcat( &str, ")" );
+            vg_strcatch( &str, '\x06' );
+            vg_strcatch( &str, '\x00' );
+            vg_strcat( &str, "\x1B[0m)" );
          }
 
          vs = ui_fill( (ui_rect){ x,y, 1000,height }, 
@@ -516,6 +528,119 @@ void menu_gui(void)
          vs[1].co[0] = x + 8;
          vs[2].co[0] = x;
       }
+
+      x = 8;
+      y += 8 + height;
+
+      if( world_static.active_instance )
+      {
+         ui_rect stat_panel = { x,y, 256,vg.window_y-y };
+         u32 c0 = ui_opacity( GUI_COL_DARK, 0.36f );
+         struct ui_vert *vs = ui_fill( stat_panel, c0 );
+
+         ui_rect_pad( stat_panel, (ui_px[2]){8,0} );
+
+         for( u32 i=0; i<mdl_arrcount( &world->ent_region ); i ++ )
+         {
+            ent_region *region = mdl_arritm( &world->ent_region, i );
+
+            if( !region->zone_volume )
+               continue;
+
+            const char *title = mdl_pstr( &world->meta, region->pstr_title );
+            ui_font_face( &vgf_default_large );
+
+            ui_rect title_box;
+            menu_standard_widget( stat_panel, title_box, 1 );
+            
+            stat_panel[0] += 16;
+            stat_panel[2] -= 16;
+            ui_font_face( &vgf_default_small );
+
+            ent_volume *volume = mdl_arritm(&world->ent_volume,
+                  mdl_entity_id_id(region->zone_volume));
+
+            u32 combined = k_ent_route_flag_achieve_gold | 
+                           k_ent_route_flag_achieve_silver;
+
+            char buf[128];
+            vg_str str;
+
+            for( u32 j=0; j<mdl_arrcount(&world->ent_route); j ++ )
+            {
+               ent_route *route = mdl_arritm(&world->ent_route, j );
+
+               v3f local;
+               m4x3_mulv( volume->to_local, route->board_transform[3], local );
+               if( !((fabsf(local[0]) <= 1.0f) &&
+                     (fabsf(local[1]) <= 1.0f) &&
+                     (fabsf(local[2]) <= 1.0f)) )
+               {
+                  continue;
+               }
+
+               combined &= route->flags;
+
+               vg_strnull( &str, buf, sizeof(buf) );
+               vg_strcat( &str, mdl_pstr(&world->meta, route->pstr_name));
+
+               if( route->flags & k_ent_route_flag_achieve_silver )
+                  vg_strcat( &str, " \xb3");
+               if( route->flags & k_ent_route_flag_achieve_gold )
+                  vg_strcat( &str, "\xb3");
+
+               ui_rect r;
+               ui_standard_widget( stat_panel, r, 1 );
+               ui_text( r, buf, 1, k_ui_align_middle_left, 
+                        medal_colour(route->flags) );
+            }
+
+            for( u32 j=0; j<mdl_arrcount(&world->ent_challenge); j ++ )
+            {
+               ent_challenge *challenge = mdl_arritm( &world->ent_challenge, j );
+
+               v3f local;
+               m4x3_mulv( volume->to_local, challenge->transform.co, local );
+               if( !((fabsf(local[0]) <= 1.0f) &&
+                     (fabsf(local[1]) <= 1.0f) &&
+                     (fabsf(local[2]) <= 1.0f)) )
+               {
+                  continue;
+               }
+
+               vg_strnull( &str, buf, sizeof(buf) );
+               vg_strcat( &str, mdl_pstr(&world->meta, challenge->pstr_alias));
+
+               u32 flags = 0x00;
+               if( challenge->status )
+               {
+                  flags |= k_ent_route_flag_achieve_gold;
+                  flags |= k_ent_route_flag_achieve_silver;
+                  vg_strcat( &str, " \xb3\xb3" );
+               }
+
+               combined &= flags;
+
+               ui_rect r;
+               ui_standard_widget( stat_panel, r, 1 );
+               ui_text( r, buf, 1, k_ui_align_middle_left, medal_colour(flags) );
+            }
+
+            stat_panel[0] -= 16;
+            stat_panel[2] += 16;
+
+            u32 title_col = 0;
+            if( combined & k_ent_route_flag_achieve_gold ) 
+               title_col = ui_colour( k_ui_yellow );
+            else if( combined & k_ent_route_flag_achieve_silver )
+               title_col = ui_colour( k_ui_fg );
+
+            menu_heading( title_box, title, title_col );
+         }
+
+         vs[2].co[1] = stat_panel[1];
+         vs[3].co[1] = stat_panel[1];
+      }
    }
    else
    {
@@ -573,20 +698,20 @@ void menu_gui(void)
 
          ui_font_face( &vgf_default_large );
          list[1] -= 8;
-         menu_heading( list, "Game" );
+         menu_heading( list, "Game", 0 );
          menu_checkbox( list, *row == 0, "Show controls overlay",
                &control_overlay.enabled );
          menu_checkbox( list, *row == 1, "Auto connect to global server",
                &network_client.auto_connect );
 
-         menu_heading( list, "Audio/Video" );
+         menu_heading( list, "Audio/Video", 0 );
          menu_slider( list, *row == 2, "Volume", 0, 100, 
                       &vg_audio.external_global_volume, "%.f%%" );
          menu_slider( list, *row == 3, "Resolution", 0, 100,
                       &k_render_scale, "%.f%%" );
          menu_checkbox( list, *row == 4, "Motion Blur", &k_blur_effect );
 
-         menu_heading( list, "Camera" );
+         menu_heading( list, "Camera", 0 );
          menu_slider( list, *row == 5, "Fov", 97, 135,
                       &k_fov, "%.1f\xb0" );
          menu_slider( list, *row == 6, "Cam Height", -0.4f, +1.4f,
@@ -597,7 +722,7 @@ void menu_gui(void)
 
          ui_rect end = { list[0], list[1]+list[3]-64, list[2], 72 };
          ui_font_face( &vgf_default_small );
-         menu_heading( end, "Advanced" );
+         menu_heading( end, "Advanced", 0 );
          if( menu_button( end, *row == 8, "Open Engine Settings" ) )
          {
             vg_settings_open();
@@ -611,7 +736,7 @@ void menu_gui(void)
 
          ui_font_face( &vgf_default_large );
          list[1] -= 8;
-         menu_heading( list, "Controls" );
+         menu_heading( list, "Controls", 0 );
          if( menu_button( list, *row == 0, "Skating \xb2" ) )
          {
          }
@@ -619,7 +744,7 @@ void menu_gui(void)
          {
          }
 
-         menu_heading( list, "Workshop" );
+         menu_heading( list, "Workshop", 0 );
          if( menu_button( list, *row == 2, "Create a Board \xb2" ) )
          {
          }
diff --git a/menu.h b/menu.h
index 6cbe297..237a82a 100644
--- a/menu.h
+++ b/menu.h
@@ -42,51 +42,3 @@ void menu_at_begin(void);
 void menu_gui(void);
 void menu_open( enum menu_page page );
 bool menu_viewing_map(void);
-
-#if 0
-#define MENU_STACK_SIZE 8
-
-#include "vg/vg_engine.h"
-#include "entity.h"
-
-struct global_menu
-{
-   int credits_open;
-   int disable_open;
-   i32 skip_starter;
-
-   u32 page, /* current page index */
-       page_depth,
-       controls_page_id;
-
-   ent_menuitem *ctr_kbm,
-                *ctr_deck,
-                *ctr_ps,
-                *ctr_steam,
-                *ctr_xbox;
-   f32 slider_offset;
-
-   struct page_stack_frame {
-      u32 page;
-      ent_menuitem *loc;
-      ent_camera *cam;
-   }
-   page_stack[ MENU_STACK_SIZE ];
-   
-   ent_menuitem *loc;
-   ent_camera   *cam;
-   vg_camera     view;
-
-   mdl_context model;
-   GLuint *textures;
-   glmesh mesh;
-
-   mdl_array_ptr items, markers, cameras;
-}
-extern menu;
-void menu_close(void);
-void menu_open_page( const char *name, 
-                     enum ent_menuitem_stack_behaviour stackmode );
-void menu_link(void);
-void menu_render(void);
-#endif
diff --git a/world_map.c b/world_map.c
index 13de85c..2799428 100644
--- a/world_map.c
+++ b/world_map.c
@@ -84,6 +84,13 @@ static void world_map_help_normal(void)
 
    if( gui_new_helper( input_button_list[k_srbind_mback], &text ) )
       vg_strcat( &text, "Exit" );
+
+   if( world_static.instances[1].status == k_world_status_loaded )
+   {
+      if( gui_new_helper( input_button_list[k_srbind_mhub], &text ) )
+         vg_strcat( &text, world_static.active_instance? 
+                              "Go to Hub": "Go to Active World" );
+   }
 }
 
 void world_map_pre_update(void)
diff --git a/world_routes_ui.c b/world_routes_ui.c
index a4e2f10..e367e66 100644
--- a/world_routes_ui.c
+++ b/world_routes_ui.c
@@ -151,6 +151,8 @@ static void ent_route_imgui( world_instance *world, ent_route *route,
 
 void world_routes_imgui( world_instance *world )
 {
+   if( skaterift.activity == k_skaterift_menu ) return;
+
    ui_point cursor = { 4, 4 };
    for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
       ent_route_imgui( world, mdl_arritm( &world->ent_route, i ), cursor );
-- 
2.25.1