X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=workshop.c;h=30ddb5647528410b5cfdbf8debd7c982480fbea0;hb=9eb3de757a997becb8406417a4bf613f4cb04900;hp=6f715790a56555e73a9eddbd4c08f5b743712168;hpb=7b1e8a237acc3121c86fab9b5946da6a8d3bf6c4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/workshop.c b/workshop.c index 6f71579..30ddb56 100644 --- a/workshop.c +++ b/workshop.c @@ -12,7 +12,6 @@ #include "vg/vg_steam_auth.h" #include "vg/vg_steam_ugc.h" #include "vg/vg_steam_friends.h" -#include "conf.h" #include "steam.h" #include "highscores.h" @@ -24,17 +23,15 @@ static struct ui_dropdown_opt workshop_form_visibility_opts[] = { }; static struct ui_dropdown_opt workshop_form_type_opts[] = { - { "None", k_workshop_file_type_none }, - { "Board", k_workshop_file_type_board }, - { "World", k_workshop_file_type_world }, + { "None", k_addon_type_none }, + { "Board", k_addon_type_board }, + { "World", k_addon_type_world }, }; /* * Close the form and discard UGC query result */ -VG_STATIC void workshop_quit_form(void) -{ - skaterift_begin_op( k_async_op_none ); /* safeguard */ +VG_STATIC void workshop_quit_form(void){ player_board_unload( &workshop_form.board_model ); workshop_form.file_intent = k_workshop_form_file_intent_none; @@ -47,7 +44,7 @@ VG_STATIC void workshop_quit_form(void) } workshop_form.page = k_workshop_form_hidden; - skaterift_end_op(); + workshop_form.op = k_workshop_op_none; } /* @@ -60,9 +57,9 @@ VG_STATIC void workshop_reset_submission_data(void) workshop_form.submission.title[0] = '\0'; workshop_form.submission.author[0] = '\0'; workshop_form.submission.submission_type_selection.value = - k_workshop_file_type_none; + k_addon_type_none; workshop_form.submission.submission_type_selection.index = 0; - workshop_form.submission.type = k_workshop_file_type_none; + workshop_form.submission.type = k_addon_type_none; workshop_form.submission.visibility.value = k_ERemoteStoragePublishedFileVisibilityPublic; @@ -151,8 +148,6 @@ VG_STATIC void on_workshop_update_result( void *data, void *user ) vg_error( "Error with the submitted file (%d)\n", result->m_eResult ); } - - skaterift_end_op(); } /* @@ -189,10 +184,10 @@ VG_STATIC void workshop_form_upload_submission( PublishedFileId_t file_id, vg_strnull( &folder, path_buf, 4096 ); vg_strcat( &folder, vg.base_path ); - if( workshop_form.submission.type == k_workshop_file_type_board ){ + if( workshop_form.submission.type == k_addon_type_board ){ vg_strcat( &folder, "boards/" ); } - else if( workshop_form.submission.type == k_workshop_file_type_world ){ + else if( workshop_form.submission.type == k_addon_type_world ){ vg_strcat( &folder, "maps/" ); } vg_strcat( &folder, workshop_form.addon_folder ); @@ -246,7 +241,6 @@ VG_STATIC void on_workshop_createitem( void *data, void *user ) workshop_form.page = k_workshop_form_closing_bad; workshop_form.failure_or_success_string = errstr; - skaterift_end_op(); } } @@ -303,17 +297,16 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( workshop_form.submission.type == k_workshop_file_type_board ){ + if( workshop_form.submission.type == k_addon_type_board ){ vg_strcat( &folder, "boards/" ); } - else if( workshop_form.submission.type == k_workshop_file_type_world ){ + else if( workshop_form.submission.type == k_addon_type_world ){ vg_strcat( &folder, "maps/" ); } vg_strcat( &folder, workshop_form.addon_folder ); if( !vg_strgood(&folder) ){ vg_error( "addon folder path too long\n" ); - vg_async_call( workshop_async_any_complete, NULL, 0 ); return; } @@ -321,28 +314,30 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) * Create the metadata file * -----------------------------------------------------------------------*/ u8 descriptor_buf[ 512 ]; - vg_msg descriptor; - vg_msg_init( &descriptor, descriptor_buf, 512 ); + vg_msg descriptor = {0}; + descriptor.buf = descriptor_buf; + descriptor.max = sizeof(descriptor_buf); + + vg_linear_clear( vg_mem.scratch ); + + /* short description */ vg_msg_frame( &descriptor, "workshop" ); vg_msg_wkvstr( &descriptor, "title", workshop_form.submission.title ); //vg_msg_wkvstr( &descriptor, "author", "unknown" ); - vg_msg_wkvuint( &descriptor, "type", - u32 value=workshop_form.submission.type); + vg_msg_wkvu32( &descriptor, "type", workshop_form.submission.type ); vg_msg_wkvstr( &descriptor, "folder", workshop_form.addon_folder ); vg_msg_end_frame( &descriptor ); //vg_msg_wkvstr( &descriptor, "location", "USA" ); - // - vg_linear_clear( vg_mem.scratch ); - char *descriptor_str = vg_linear_alloc( vg_mem.scratch, - vg_align8(descriptor.cur*2+1) ); - vg_bin_str( descriptor_buf, descriptor_str, descriptor.cur ); - descriptor_str[descriptor.cur*2] = '\0'; - vg_info( "binstr: %s\n", descriptor_str ); + + char *short_descriptor_str = vg_linear_alloc( vg_mem.scratch, + vg_align8(descriptor.cur*2+1)); + vg_bin_str( descriptor_buf, short_descriptor_str, descriptor.cur ); + short_descriptor_str[descriptor.cur*2] = '\0'; + vg_info( "binstr: %s\n", short_descriptor_str ); vg_dir dir; if( !vg_dir_open( &dir, folder.buffer ) ){ vg_error( "could not open addon folder '%s'\n", folder.buffer ); - vg_async_call( workshop_async_any_complete, NULL, 0 ); return; } @@ -370,7 +365,6 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_strcat( &descriptor_file, "/addon.inf" ); if( !vg_strgood(&descriptor_file) ){ vg_error( "Addon info path too long\n" ); - vg_async_call( workshop_async_any_complete, NULL, 0 ); return; } @@ -378,7 +372,6 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) if( !fp ){ vg_error( "Could not open addon info file '%s'\n", descriptor_file.buffer ); - vg_async_call( workshop_async_any_complete, NULL, 0 ); return; } fwrite( descriptor_buf, descriptor.cur, 1, fp ); @@ -391,7 +384,6 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) if( !vg_strgood(&preview) ){ vg_error( "preview image path too long\n" ); - vg_async_call( workshop_async_any_complete, NULL, 0 ); return; } @@ -402,40 +394,41 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) stbi_flip_vertically_on_write(1); stbi_write_jpg( preview.buffer, w,h, 3, workshop_form.img_buffer, 90 ); - vg_async_call( workshop_form_async_submit_begin, descriptor_str, 0 ); + vg_async_call( workshop_form_async_submit_begin, short_descriptor_str, 0 ); } /* * Entry point for the publishing submission operation */ -VG_STATIC void workshop_op_submit(void) -{ +VG_STATIC void workshop_op_submit(void){ /* TODO: Show these errors to the user */ if( workshop_form.submission.submit_title ){ if( !workshop_form.submission.title[0] ){ - vg_error( "Cannot submit because a title is required\n" ); + ui_start_modal( "Cannot submit because a title is required\n", + UI_MODAL_WARN); return; } } if( workshop_form.submission.submit_description ){ if( !workshop_form.submission.description[0] ){ - vg_error( "Cannot submit because a description is required\n" ); + ui_start_modal( "Cannot submit because a description is required\n", + UI_MODAL_WARN ); return; } } if( workshop_form.submission.submit_file_and_image ){ if( workshop_form.file_intent == k_workshop_form_file_intent_none ){ - vg_error( "Cannot submit because the file is empty or unspecified\n" ); + ui_start_modal( "Cannot submit because the file is " + "empty or unspecified\n", UI_MODAL_WARN ); return; } } - skaterift_begin_op( k_workshop_form_op_publishing_update ); - player_board_unload( &workshop_form.board_model ); workshop_form.file_intent = k_workshop_form_file_intent_none; + workshop_form.op = k_workshop_op_publishing_update; vg_loader_start( _workshop_form_submit_thread, NULL ); } @@ -457,15 +450,12 @@ VG_STATIC void workshop_form_loadmodel_async_complete( void *payload, u32 size ) workshop_form.file_intent = k_workshop_form_file_intent_new; vg_success( "workshop async load complete\n" ); - skaterift_end_op(); } /* * Reciever for failure to load */ -VG_STATIC void workshop_form_loadmodel_async_error( void *payload, u32 size ) -{ - skaterift_end_op(); +VG_STATIC void workshop_form_loadmodel_async_error( void *payload, u32 size ){ } /* @@ -477,7 +467,7 @@ VG_STATIC void _workshop_form_load_thread( void *data ) vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( workshop_form.submission.type == k_workshop_file_type_world ) + if( workshop_form.submission.type == k_addon_type_world ) vg_strcat( &folder, "maps/" ); else vg_strcat( &folder, "boards/" ); @@ -531,9 +521,8 @@ VG_STATIC void _workshop_form_load_thread( void *data ) /* * Entry point for load model operation */ -VG_STATIC void workshop_op_load_model(void) -{ - if( workshop_form.submission.type == k_workshop_file_type_world ){ +VG_STATIC void workshop_op_load_model(void){ + if( workshop_form.submission.type == k_addon_type_world ){ vg_warn( "WORLD LOAD INFO Currently unsupported\n" ); return; } @@ -545,12 +534,12 @@ VG_STATIC void workshop_op_load_model(void) mdl_arritm( &workshop_form.view_world->ent_swspreview, 0 ); } else{ - vg_error( "There is no ent_swspreview in the level. " - "Cannot publish here\n" ); + ui_start_modal( "There is no ent_swspreview in the level. \n" + "Cannot publish here\n", UI_MODAL_BAD ); return; } - skaterift_begin_op( k_workshop_form_op_loading_model ); + workshop_form.op = k_workshop_op_loading_model; vg_loader_start( _workshop_form_load_thread, NULL ); } @@ -575,8 +564,12 @@ VG_STATIC void workshop_form_async_imageload( void *data, u32 len ) stbi_image_free( data ); vg_success( "Loaded workshop preview image\n" ); } - - skaterift_end_op(); + else{ + snprintf( workshop_form.error_msg, sizeof(workshop_form.error_msg), + "Preview image could not be loaded. Reason: %s\n", + stbi_failure_reason() ); + ui_start_modal( workshop_form.error_msg, UI_MODAL_BAD ); + } } /* @@ -608,8 +601,6 @@ VG_STATIC void _workshop_load_preview_thread( void *data ) } } else{ - vg_error( "Failed to load workshop_preview.jpg: '%s'\n", - stbi_failure_reason() ); vg_async_call( workshop_form_async_imageload, NULL, 0 ); } } @@ -644,6 +635,7 @@ VG_STATIC void on_workshop_download_ugcpreview( void *data, void *user ) */ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) { + workshop_form.op = k_workshop_op_downloading_submission; ISteamUGC *hSteamUGC = SteamAPI_SteamUGC(); ISteamRemoteStorage *hSteamRemoteStorage = SteamAPI_SteamRemoteStorage(); SteamUGCDetails_t details; @@ -652,7 +644,6 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) result_index, &details ) ) { - skaterift_begin_op( k_workshop_form_op_downloading_submission ); workshop_reset_submission_data(); workshop_form.submission.submit_description = 0; workshop_form.submission.submit_file_and_image = 0; @@ -683,27 +674,25 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) workshop_form.file_intent = k_workshop_form_file_intent_keep_old; workshop_form.page = k_workshop_form_edit; workshop_form.submission.visibility.value = details.m_eVisibility; - workshop_form.submission.type = k_workshop_file_type_none; + workshop_form.submission.type = k_addon_type_none; workshop_form.submission.submission_type_selection.index = 0; workshop_form.submission.submission_type_selection.value = - k_workshop_file_type_none; + k_addon_type_none; if( have_meta ){ u32 len = strlen(metadata_str); vg_info( "Metadata: %s\n", metadata_str ); vg_str_bin( metadata_str, metadata_buf, len ); - vg_msg root; - vg_msg_init( &root, metadata_buf, len/2 ); + vg_msg root = {0}; + root.buf = metadata_buf; + root.len = len/2; + root.max = len/2; vg_msg workshop = root; if( vg_msg_seekframe( &workshop, "workshop", k_vg_msg_first )){ - vg_msg_cmd kv_type = vg_msg_seekkv( &workshop, "type", - k_vg_msg_first ); - if( kv_type.code & k_vg_msg_code_integer ){ - u32 u = kv_type.value._u32; - workshop_form.submission.type = u; - workshop_form.submission.submission_type_selection.value = u; - } + u32 type = vg_msg_seekkvu32( &workshop, "type", k_vg_msg_first ); + workshop_form.submission.type = type; + workshop_form.submission.submission_type_selection.value = type; const char *kv_folder = vg_msg_seekkvstr( &workshop, "folder", k_vg_msg_first ); @@ -771,7 +760,6 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) } else{ vg_error( "GetQueryUGCResult: Index out of range\n" ); - skaterift_end_op(); } } @@ -874,7 +862,7 @@ VG_STATIC void on_workshop_UGCQueryComplete( void *data, void *userdata ) VG_STATIC int workshop_submit_command( int argc, const char *argv[] ) { if( !steam_ready ){ - vg_error( "Steam API is not ready or loaded\n" ); + ui_start_modal( "Steam API is not initialized\n", UI_MODAL_BAD ); return 0; } @@ -1010,8 +998,9 @@ VG_STATIC void workshop_render_board_preview(void){ sizeof(struct ub_world_lighting), &world->ub_lighting ); render_world( world, &cam, 1 ); - render_board( &cam, world, board, mmdl, k_board_shader_entity ); - render_board( &cam, world, board, mmdl1, k_board_shader_entity ); + struct board_pose pose = {0}; + render_board( &cam, world, board, mmdl, &pose, k_board_shader_entity ); + render_board( &cam, world, board, mmdl1, &pose, k_board_shader_entity ); glBindFramebuffer( GL_FRAMEBUFFER, 0 ); glViewport( 0,0, vg.window_x, vg.window_y ); @@ -1057,13 +1046,13 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ ui_split_ratio( button_l, k_ui_axis_v, 0.5f, 2, button_l, button_r ); if( workshop_form.submission.submission_type_selection.value != - k_workshop_file_type_none ){ + k_addon_type_none ){ if( ui_button_text( button_l, "OK", 1 ) ){ - enum workshop_file_type type = + enum addon_type type = workshop_form.submission.submission_type_selection.value; workshop_form.submission.type = type; - if( type == k_workshop_file_type_world ){ + if( type == k_addon_type_world ){ workshop_form.view_changed = 1; workshop_form.file_intent = k_workshop_form_file_intent_new; } @@ -1082,14 +1071,14 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ } VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){ - enum workshop_file_type type = workshop_form.submission.type; + enum addon_type type = workshop_form.submission.type; if( workshop_form.file_intent == k_workshop_form_file_intent_keep_old ){ ui_image( img_box, gpipeline.fb_workshop_preview->attachments[0].id ); } else if( workshop_form.file_intent == k_workshop_form_file_intent_new ){ ui_image( img_box, gpipeline.fb_workshop_preview->attachments[0].id ); - if( type == k_workshop_file_type_world ){ + if( type == k_addon_type_world ){ return; } @@ -1149,9 +1138,9 @@ VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){ } VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ - enum workshop_file_type type = workshop_form.submission.type; + enum addon_type type = workshop_form.submission.type; - if( type == k_workshop_file_type_none ){ + if( type == k_addon_type_none ){ workshop_form_gui_page_undecided( content ); return; } @@ -1169,7 +1158,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_split( content, k_ui_axis_h, 8, 0, null, content ); ui_split( content, k_ui_axis_h, 28, 0, file_entry, content ); - if( workshop_form.submission.type == k_workshop_file_type_board ){ + if( workshop_form.submission.type == k_addon_type_board ){ ui_label( file_entry, "Addon folder: skaterift/boards/", 1, 8, file_entry ); } @@ -1178,7 +1167,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ 1, 8, file_entry ); } - if( type == k_workshop_file_type_world ){ + if( type == k_addon_type_world ){ struct ui_textbox_callbacks callbacks = { .change = workshop_changed_model_path }; @@ -1318,7 +1307,7 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) ui_text( title, "Editing", 1, k_ui_align_middle_center, 0 ); ui_split( sidebar, k_ui_axis_h, 28, 0, title, sidebar ); - if( workshop_form.submission.type != k_workshop_file_type_none ){ + if( workshop_form.submission.type != k_addon_type_none ){ char buf[512]; vg_str str; vg_strnull( &str, buf, 512 ); @@ -1328,9 +1317,9 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) else vg_strcat( &str, "Creating a new " ); - if( workshop_form.submission.type == k_workshop_file_type_board ) + if( workshop_form.submission.type == k_addon_type_board ) vg_strcat( &str, "skateboard." ); - else if( workshop_form.submission.type == k_workshop_file_type_world ) + else if( workshop_form.submission.type == k_addon_type_world ) vg_strcat( &str, "world." ); else vg_strcat( &str, "???." ); @@ -1424,7 +1413,7 @@ VG_STATIC void workshop_form_gui(void) ui_rect quit_button; ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button ); - if( skaterift.async_op == k_async_op_none ){ + if( vg_loader_availible() ){ if( ui_button_text( quit_button, "X", 1 ) ){ workshop_quit_form(); return; @@ -1437,19 +1426,19 @@ VG_STATIC void workshop_form_gui(void) * escapes here and we show them a basic string */ - if( skaterift.async_op != k_async_op_none ){ + if( !vg_loader_availible() ){ const char *op_string = "The programmer has not bothered to describe " "the current operation that is running."; - switch( skaterift.async_op ){ - case k_workshop_form_op_loading_model: + switch( skaterift.op ){ + case k_workshop_op_loading_model: op_string = "Operation in progress: Loading model file."; break; - case k_workshop_form_op_publishing_update: + case k_workshop_op_publishing_update: op_string = "Operation in progress: publishing submission update " "to steam."; break; - case k_workshop_form_op_downloading_submission: + case k_workshop_op_downloading_submission: op_string = "Operation in progress: downloading existing submission" " from Steam services."; break; @@ -1465,11 +1454,11 @@ VG_STATIC void workshop_form_gui(void) workshop_form.view_changed && workshop_form.file_intent == k_workshop_form_file_intent_new ) { - enum workshop_file_type type = workshop_form.submission.type; - if( type == k_workshop_file_type_board ){ + enum addon_type type = workshop_form.submission.type; + if( type == k_addon_type_board ){ workshop_render_board_preview(); } - else if( type == k_workshop_file_type_world ){ + else if( type == k_addon_type_world ){ vg_success( "Renders world preview\n" ); workshop_render_world_preview(); } @@ -1562,34 +1551,4 @@ VG_STATIC void async_workshop_get_installed_files( void *data, u32 len ) *info->len = j; } -#if 0 -VG_STATIC void vg_strsan_ascii( char *buf, u32 len ) -{ - for( u32 i=0; i 126 ){ - buf[i] = '?'; - } - } - buf[len-1] = '\0'; -} - -#define VG_STRSAN_ASCII( X ) vg_strsan_ascii( X, vg_list_size(X) ) - -VG_STATIC void workshop_load_metadata( const char *path, - struct workshop_file_info *info ) -{ - FILE *fp = fopen( path, "rb" ); - - if( fp ){ - if( fread( info, sizeof( struct workshop_file_info ), 1, fp ) ){ - VG_STRSAN_ASCII( info->author_name ); - VG_STRSAN_ASCII( info->title ); - } - fclose( fp ); - } -} -#endif - #endif /* WORKSHOP_C */