X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=workshop.c;h=1414fc634b8864b5d2297ab5541a67704f8d8e46;hb=f252ecb6f870260e0e944579ef732b94d1ed0ebe;hp=5f02caa4023b0e17c09bbce4f9c0384af2e41c85;hpb=a528498841a151efbd38cddcc9f09a5f39dbbd19;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/workshop.c b/workshop.c index 5f02caa..1414fc6 100644 --- a/workshop.c +++ b/workshop.c @@ -15,17 +15,18 @@ #include "steam.h" #include "highscores.h" -static struct ui_dropdown_opt workshop_form_visibility_opts[] = { - { "Public", k_ERemoteStoragePublishedFileVisibilityPublic }, - { "Unlisted", k_ERemoteStoragePublishedFileVisibilityUnlisted }, - { "Friends Only", k_ERemoteStoragePublishedFileVisibilityFriendsOnly }, - { "Private", k_ERemoteStoragePublishedFileVisibilityPrivate }, +static struct ui_enum_opt workshop_form_visibility_opts[] = { + { k_ERemoteStoragePublishedFileVisibilityPublic, "Public" }, + { k_ERemoteStoragePublishedFileVisibilityUnlisted, "Unlisted" }, + { k_ERemoteStoragePublishedFileVisibilityFriendsOnly, "Friends Only" }, + { k_ERemoteStoragePublishedFileVisibilityPrivate, "Private" }, }; -static struct ui_dropdown_opt workshop_form_type_opts[] = { - { "None", k_addon_type_none }, - { "Board", k_addon_type_board }, - { "World", k_addon_type_world }, +static struct ui_enum_opt workshop_form_type_opts[] = { + { k_addon_type_none, "None" }, + { k_addon_type_board, "Board" }, + { k_addon_type_world, "World" }, + { k_addon_type_player, "Player" }, }; /* @@ -56,14 +57,12 @@ VG_STATIC void workshop_reset_submission_data(void) workshop_form.submission.description[0] = '\0'; workshop_form.submission.title[0] = '\0'; workshop_form.submission.author[0] = '\0'; - workshop_form.submission.submission_type_selection.value = + workshop_form.submission.submission_type_selection = k_addon_type_none; - workshop_form.submission.submission_type_selection.index = 0; workshop_form.submission.type = k_addon_type_none; - workshop_form.submission.visibility.value = + workshop_form.submission.visibility = k_ERemoteStoragePublishedFileVisibilityPublic; - workshop_form.submission.visibility.index = 0; workshop_form.addon_folder[0] = '\0'; player_board_unload( &workshop_form.board_model ); @@ -148,6 +147,16 @@ VG_STATIC void on_workshop_update_result( void *data, void *user ) vg_error( "Error with the submitted file (%d)\n", result->m_eResult ); } + workshop_form.op = k_workshop_op_none; +} + +VG_STATIC const char *workshop_filetype_folder(void){ + enum addon_type type = workshop_form.submission.type; + if ( type == k_addon_type_board ) return "boards/"; + else if( type == k_addon_type_player ) return "playermodels/"; + else if( type == k_addon_type_world ) return "maps/"; + + return "unknown_addon_type/"; } /* @@ -184,12 +193,7 @@ 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_addon_type_board ){ - vg_strcat( &folder, "boards/" ); - } - else if( workshop_form.submission.type == k_addon_type_world ){ - vg_strcat( &folder, "maps/" ); - } + vg_strcat( &folder, workshop_filetype_folder() ); vg_strcat( &folder, workshop_form.addon_folder ); vg_info( "Setting item content\n" ); @@ -204,7 +208,7 @@ VG_STATIC void workshop_form_upload_submission( PublishedFileId_t file_id, vg_info( "Setting visibility\n" ); SteamAPI_ISteamUGC_SetItemVisibility( hSteamUGC, handle, - workshop_form.submission.visibility.value ); + workshop_form.submission.visibility ); vg_info( "Submitting updates\n" ); vg_steam_async_call *call = vg_alloc_async_steam_api_call(); @@ -297,16 +301,12 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( workshop_form.submission.type == k_addon_type_board ){ - vg_strcat( &folder, "boards/" ); - } - else if( workshop_form.submission.type == k_addon_type_world ){ - vg_strcat( &folder, "maps/" ); - } + vg_strcat( &folder, workshop_filetype_folder() ); vg_strcat( &folder, workshop_form.addon_folder ); if( !vg_strgood(&folder) ){ vg_error( "addon folder path too long\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -338,6 +338,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_dir dir; if( !vg_dir_open( &dir, folder.buffer ) ){ vg_error( "could not open addon folder '%s'\n", folder.buffer ); + workshop_form.op = k_workshop_op_none; return; } @@ -365,6 +366,7 @@ 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" ); + workshop_form.op = k_workshop_op_none; return; } @@ -372,6 +374,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) if( !fp ){ vg_error( "Could not open addon info file '%s'\n", descriptor_file.buffer ); + workshop_form.op = k_workshop_op_none; return; } fwrite( descriptor_buf, descriptor.cur, 1, fp ); @@ -384,6 +387,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) if( !vg_strgood(&preview) ){ vg_error( "preview image path too long\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -406,6 +410,7 @@ VG_STATIC void workshop_op_submit(void){ if( !workshop_form.submission.title[0] ){ ui_start_modal( "Cannot submit because a title is required\n", UI_MODAL_WARN); + workshop_form.op = k_workshop_op_none; return; } } @@ -414,6 +419,7 @@ VG_STATIC void workshop_op_submit(void){ if( !workshop_form.submission.description[0] ){ ui_start_modal( "Cannot submit because a description is required\n", UI_MODAL_WARN ); + workshop_form.op = k_workshop_op_none; return; } } @@ -422,6 +428,7 @@ VG_STATIC void workshop_op_submit(void){ if( workshop_form.file_intent == k_workshop_form_file_intent_none ){ ui_start_modal( "Cannot submit because the file is " "empty or unspecified\n", UI_MODAL_WARN ); + workshop_form.op = k_workshop_op_none; return; } } @@ -450,6 +457,7 @@ 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" ); + workshop_form.op = k_workshop_op_none; } /* @@ -467,15 +475,13 @@ VG_STATIC void _workshop_form_load_thread( void *data ) vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( workshop_form.submission.type == k_addon_type_world ) - vg_strcat( &folder, "maps/" ); - else vg_strcat( &folder, "boards/" ); - + vg_strcat( &folder, workshop_filetype_folder() ); vg_strcat( &folder, workshop_form.addon_folder ); if( !vg_strgood(&folder) ){ vg_error( "workshop async load failed: path too long\n" ); vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 ); + workshop_form.op = k_workshop_op_none; return; } @@ -483,6 +489,7 @@ VG_STATIC void _workshop_form_load_thread( void *data ) if( !vg_dir_open( &dir, folder.buffer ) ){ vg_error( "workshop async load failed: could not open folder\n" ); vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 ); + workshop_form.op = k_workshop_op_none; return; } @@ -511,10 +518,15 @@ VG_STATIC void _workshop_form_load_thread( void *data ) if( !found_mdl ){ vg_error( "workshop async load failed: no model files found\n" ); vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 ); + workshop_form.op = k_workshop_op_none; return; } - player_board_load( &workshop_form.board_model, path_buf ); + if( workshop_form.submission.type == k_addon_type_board ) + player_board_load( &workshop_form.board_model, path_buf ); + else if( workshop_form.submission.type == k_addon_type_player ) + player_model_load( &workshop_form.player_model, path_buf ); + vg_async_call( workshop_form_loadmodel_async_complete, NULL, 0 ); } @@ -522,20 +534,26 @@ 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_addon_type_world ){ - vg_warn( "WORLD LOAD INFO Currently unsupported\n" ); - return; - } - - workshop_form.view_world = world_current_instance(); + world_instance *world = world_current_instance(); + workshop_form.view_world = world; - if( mdl_arrcount( &workshop_form.view_world->ent_swspreview ) ){ - workshop_form.ptr_ent = - mdl_arritm( &workshop_form.view_world->ent_swspreview, 0 ); + if( workshop_form.submission.type == k_addon_type_board ){ + if( mdl_arrcount( &world->ent_swspreview ) ){ + workshop_form.ptr_ent = + mdl_arritm( &world->ent_swspreview, 0 ); + } + else{ + ui_start_modal( "There is no ent_swspreview in the level. \n" + "Cannot publish here\n", UI_MODAL_BAD ); + workshop_form.op = k_workshop_op_none; + return; + } } - else{ - ui_start_modal( "There is no ent_swspreview in the level. \n" - "Cannot publish here\n", UI_MODAL_BAD ); + else if( workshop_form.submission.type == k_addon_type_player ){} + else { + ui_start_modal( "Don't know how to prepare for this item type. \n" + "Please contact the developers.\n", UI_MODAL_BAD ); + workshop_form.op = k_workshop_op_none; return; } @@ -570,17 +588,17 @@ VG_STATIC void workshop_form_async_imageload( void *data, u32 len ) stbi_failure_reason() ); ui_start_modal( workshop_form.error_msg, UI_MODAL_BAD ); } + workshop_form.op = k_workshop_op_none; } /* * Load the image located at ./workshop_preview.jpg into our framebuffer */ -VG_STATIC void _workshop_load_preview_thread( void *data ) -{ +VG_STATIC void _workshop_load_preview_thread( void *data ){ char path_buf[ 4096 ]; vg_str path; vg_strnull( &path, path_buf, 4096 ); - vg_strcat( &path, "boards/" ); + vg_strcat( &path, workshop_filetype_folder() ); vg_strcat( &path, workshop_form.addon_folder ); vg_strcat( &path, "/preview.jpg" ); @@ -609,27 +627,6 @@ VG_STATIC void _workshop_load_preview_thread( void *data ) } } -#if 0 -/* - * Reciever for the preview download result - */ -VG_STATIC void on_workshop_download_ugcpreview( void *data, void *user ) -{ - struct workshop_loadpreview_info *info = user; - RemoteStorageDownloadUGCResult_t *result = data; - - if( result->m_eResult == k_EResultOK ){ - ISteamRemoteStorage *hSteamRemoteStorage = SteamAPI_SteamRemoteStorage(); - vg_loader_start( _workshop_load_preview_thread, info ); - } - else{ - vg_error( "Error while donwloading UGC preview( %d )\n", - result->m_eResult ); - skaterift_end_op(); - } -} -#endif - /* * Entry point to view operation */ @@ -673,11 +670,9 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) workshop_form.submission.file_id = details.m_nPublishedFileId; 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.visibility = details.m_eVisibility; workshop_form.submission.type = k_addon_type_none; - workshop_form.submission.submission_type_selection.index = 0; - workshop_form.submission.submission_type_selection.value = - k_addon_type_none; + workshop_form.submission.submission_type_selection = k_addon_type_none; if( have_meta ){ u32 len = strlen(metadata_str); @@ -692,7 +687,7 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) if( vg_msg_seekframe( &workshop, "workshop", k_vg_msg_first )){ u32 type = vg_msg_seekkvu32( &workshop, "type", k_vg_msg_first ); workshop_form.submission.type = type; - workshop_form.submission.submission_type_selection.value = type; + workshop_form.submission.submission_type_selection = type; const char *kv_folder = vg_msg_seekkvstr( &workshop, "folder", k_vg_msg_first ); @@ -707,21 +702,6 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) vg_error( "No metadata was returned with this item.\n" ); } - /* TODO.... */ - for( i32 i=0; iabs_preview_image, 1024, - "%smodels/boards/workshop/" PRINTF_U64 ".jpg", - vg.base_path, details.m_hPreviewFile ); - - call->p_handler = on_workshop_download_ugcpreview; - call->userdata = info; - call->id = SteamAPI_ISteamRemoteStorage_UGCDownloadToLocation( - hSteamRemoteStorage, - details.m_hPreviewFile, info->abs_preview_image, 1 ); - - vg_info( "preview file id: " PRINTF_U64 "\n", - details.m_hPreviewFile ); - } -#endif } else{ vg_error( "GetQueryUGCResult: Index out of range\n" ); + workshop_form.op = k_workshop_op_none; } } @@ -775,6 +728,7 @@ VG_STATIC void workshop_view_page( int req ) { if( workshop_form.ugc_query.result != k_EResultOK ){ vg_error( "Tried to change page without complete data\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -914,6 +868,58 @@ VG_STATIC void workshop_render_world_preview(void){ glViewport( 0,0, vg.window_x, vg.window_y ); } +/* + * Redraw the playermodel into the workshop framebuffer + */ +VG_STATIC void workshop_render_player_preview(void){ + render_fb_bind( gpipeline.fb_workshop_preview, 0 ); + glClearColor( 0.16f, 0.15f, 0.15f, 1.0f ); + glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); + glEnable( GL_DEPTH_TEST ); + glDisable( GL_BLEND ); + + struct skeleton *sk = &localplayer.playeravatar->sk; + + player_pose res; + res.type = k_player_pose_type_ik; + + struct skeleton_anim *anim = skeleton_get_anim( sk, "idle_cycle+y" ); + skeleton_sample_anim( sk, anim, vg.time*0.1f, res.keyframes ); + q_axis_angle( res.root_q, (v3f){0.0f,1.0f,0.0f}, VG_PIf ); + v3_zero( res.root_co ); + res.root_co[1] = 200.0f; + + m4x3f transform; + q_m3x3( res.root_q, transform ); + v3_copy( res.root_co, transform[3] ); + + /* TODO: Function. */ + skeleton_apply_pose( sk, res.keyframes, k_anim_apply_defer_ik ); + skeleton_apply_ik_pass( sk ); + skeleton_apply_pose( sk, res.keyframes, k_anim_apply_deffered_only ); + skeleton_apply_inverses( sk ); + skeleton_apply_transform( sk, transform ); + + camera cam; + v3_copy( (v3f){ 0.0f, 201.7f, 1.2f }, cam.pos ); + + cam.nearz = 0.01f; + cam.farz = 100.0f; + cam.fov = 57.0f; + v3_zero( cam.angles ); + + camera_update_transform( &cam ); + camera_update_view( &cam ); + camera_update_projection( &cam ); + camera_finalize( &cam ); + + world_instance *world = localplayer.viewable_world; + render_playermodel( &cam, world, 0, &workshop_form.player_model, sk ); + + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + glViewport( 0,0, vg.window_x, vg.window_y ); +} + /* * Redraw the model file into the workshop framebuffer */ @@ -998,7 +1004,7 @@ VG_STATIC void workshop_render_board_preview(void){ sizeof(struct ub_world_lighting), &world->ub_lighting ); render_world( world, &cam, 1 ); - struct board_pose pose = {0}; + struct player_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 ); @@ -1035,7 +1041,7 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ ui_text( row, "Select the type of item\n", 1, k_ui_align_middle_center,0); ui_split( box, k_ui_axis_h, 28, 0, row, box ); ui_enum( row, "Type:", workshop_form_type_opts, - 3, &workshop_form.submission.submission_type_selection ); + 4, &workshop_form.submission.submission_type_selection ); ui_split( box, k_ui_axis_h, 8, 0, row, box ); ui_split( box, k_ui_axis_h, 28, 0, row, box ); @@ -1045,11 +1051,9 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ ui_rect_center( row, button_l ); 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_addon_type_none ){ - if( ui_button_text( button_l, "OK", 1 ) ){ - enum addon_type type = - workshop_form.submission.submission_type_selection.value; + enum addon_type type = workshop_form.submission.submission_type_selection; + if( type != k_addon_type_none){ + if( ui_button_text( button_l, "OK", 1 ) == 1 ){ workshop_form.submission.type = type; if( type == k_addon_type_world ){ @@ -1064,7 +1068,7 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ ui_colour(k_ui_bg+4) ); } - if( ui_button_text( button_r, "Cancel", 1 ) ){ + if( ui_button_text( button_r, "Cancel", 1 ) == 1 ){ workshop_form.page = k_workshop_form_open; workshop_form.file_intent = k_workshop_form_file_intent_none; } @@ -1154,34 +1158,34 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ workshop_form_gui_draw_preview( img_box ); /* file path */ - ui_rect null, file_entry, file_button, file_label; - ui_split( content, k_ui_axis_h, 8, 0, null, content ); - ui_split( content, k_ui_axis_h, 28, 0, file_entry, content ); + ui_rect file_button, file_label; - if( workshop_form.submission.type == k_addon_type_board ){ - ui_label( file_entry, "Addon folder: skaterift/boards/", - 1, 8, file_entry ); - } - else{ - ui_label( file_entry, "Addon folder: skaterift/maps/", - 1, 8, file_entry ); - } + char buf[128]; + snprintf( buf, 128, + "Addon folder: skaterift/%s", workshop_filetype_folder() ); if( type == k_addon_type_world ){ struct ui_textbox_callbacks callbacks = { .change = workshop_changed_model_path }; - ui_textbox( file_entry, workshop_form.addon_folder, - vg_list_size(workshop_form.addon_folder), 0, &callbacks ); + ui_textbox( content, buf, workshop_form.addon_folder, + vg_list_size(workshop_form.addon_folder), 1, 0, &callbacks ); } else{ + ui_rect file_entry; + ui_standard_widget( content, file_entry, 1 ); ui_split( file_entry, k_ui_axis_v, -128, 0, file_entry, file_button ); + if( workshop_form.file_intent != k_workshop_form_file_intent_none ){ ui_text( file_entry, workshop_form.addon_folder, 1, k_ui_align_middle_left, ui_colour( k_ui_fg+4 ) ); - if( ui_button_text( file_button, "Remove", 1 ) ){ - player_board_unload( &workshop_form.board_model ); + if( ui_button_text( file_button, "Remove", 1 ) == 1 ){ + if( type == k_addon_type_board ) + player_board_unload( &workshop_form.board_model ); + else if( type == k_addon_type_player ) + player_model_unload( &workshop_form.player_model ); + workshop_form.file_intent = k_workshop_form_file_intent_none; workshop_form.addon_folder[0] = '\0'; } @@ -1191,40 +1195,31 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ .change = workshop_changed_model_path }; - ui_textbox( file_entry, workshop_form.addon_folder, - vg_list_size(workshop_form.addon_folder), 0, &callbacks ); + ui_textbox( file_entry, buf, workshop_form.addon_folder, + vg_list_size(workshop_form.addon_folder), 1, + 0, &callbacks ); - if( ui_button_text( file_button, "Load", 1 ) ){ + if( ui_button_text( file_button, "Load", 1 ) == 1 ){ workshop_op_load_model(); } } } - ui_rect title_entry, label; - ui_split( content, k_ui_axis_h, 8, 0, null, content ); - ui_split( content, k_ui_axis_h, 28, 0, title_entry, content ); - const char *str_title = "Title:", *str_desc = "Description:"; - ui_split( title_entry, k_ui_axis_v, - ui_text_line_width(str_title)+8, 0, label, title_entry ); - - ui_rect vis_dropdown; - ui_split_ratio( title_entry, k_ui_axis_v, 0.6f, 16, - title_entry, vis_dropdown ); /* title box */ { struct ui_textbox_callbacks callbacks = { .change = workshop_changed_title }; - ui_text( label, str_title, 1, k_ui_align_middle_left, 0 ); - ui_textbox( title_entry, workshop_form.submission.title, - vg_list_size(workshop_form.submission.title), 0, &callbacks ); + ui_textbox( content, str_title, workshop_form.submission.title, + vg_list_size(workshop_form.submission.title), 1, + 0, &callbacks ); } /* visibility option */ { - ui_enum( vis_dropdown, "Visibility:", workshop_form_visibility_opts, + ui_enum( content, "Visibility:", workshop_form_visibility_opts, 4, &workshop_form.submission.visibility ); } @@ -1233,35 +1228,28 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ struct ui_textbox_callbacks callbacks = { .change = workshop_changed_description }; - ui_rect desc_entry; - ui_split( content, k_ui_axis_h, 8, 0, null, content ); - ui_split( content, k_ui_axis_h, 28, 0, label, content ); - ui_split( content, k_ui_axis_h, 28*4, 0, desc_entry, content ); - ui_text( label, str_desc, 1, k_ui_align_middle_left, 0 ); - ui_textbox( desc_entry, workshop_form.submission.description, - vg_list_size(workshop_form.submission.description), - UI_TEXTBOX_MULTILINE|UI_TEXTBOX_WRAP, &callbacks ); + ui_textbox( content, str_desc, workshop_form.submission.description, + vg_list_size(workshop_form.submission.description), 4, + UI_TEXTBOX_MULTILINE|UI_TEXTBOX_WRAP, &callbacks ); } /* submissionable */ - ui_rect submission_row; - ui_split( content, k_ui_axis_h, 8, 0, null, content ); - ui_split( content, k_ui_axis_h, content[3]-32-8, 0, content, - submission_row ); + ui_rect final_row; + ui_split( content, k_ui_axis_h, content[3]-32-8, 0, content, final_row ); ui_rect submission_center; - rect_copy( submission_row, submission_center ); + rect_copy( final_row, submission_center ); submission_center[2] = 256; - ui_rect_center( submission_row, submission_center ); + ui_rect_center( final_row, submission_center ); ui_rect btn_left, btn_right; ui_split_ratio( submission_center, k_ui_axis_v, 0.5f, 8, btn_left, btn_right ); - if( ui_button_text( btn_left, "Publish", 1 ) ){ + if( ui_button_text( btn_left, "Publish", 1 ) == 1 ){ workshop_op_submit(); } - if( ui_button_text( btn_right, "Cancel", 1 ) ){ + if( ui_button_text( btn_right, "Cancel", 1 ) == 1 ){ workshop_form.page = k_workshop_form_open; player_board_unload( &workshop_form.board_model ); workshop_form.file_intent = k_workshop_form_file_intent_none; @@ -1272,20 +1260,19 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ "By submitting this item, you agree to the workshop terms of service"; ui_rect disclaimer_row, inner, link; - ui_split( content, k_ui_axis_h, 8, 0, null, content ); - ui_split( content, k_ui_axis_h, content[3]-32, 0, content, - disclaimer_row ); + ui_split( content, k_ui_axis_h, content[3]-32, 0, content, disclaimer_row ); ui_px btn_width = 32; rect_copy( disclaimer_row, inner ); inner[2] = ui_text_line_width( disclaimer_text ) + btn_width+8; + ui_rect label; ui_rect_center( disclaimer_row, inner ); ui_split( inner, k_ui_axis_v, inner[2]-btn_width, 0, label, btn_right); ui_rect_pad( btn_right, (ui_px[2]){2,2} ); - if( ui_button_text( btn_right, "\xbf", 2 ) ){ + if( ui_button_text( btn_right, "\xbf", 2 ) == 1 ){ ISteamFriends *hSteamFriends = SteamAPI_SteamFriends(); SteamAPI_ISteamFriends_ActivateGameOverlayToWebPage( hSteamFriends, "https://steamcommunity.com/sharedfiles/workshoplegalagreement", @@ -1321,6 +1308,8 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) vg_strcat( &str, "skateboard." ); else if( workshop_form.submission.type == k_addon_type_world ) vg_strcat( &str, "world." ); + else if( workshop_form.submission.type == k_addon_type_player ) + vg_strcat( &str, "playermodel." ); else vg_strcat( &str, "???." ); @@ -1356,15 +1345,15 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) ui_rect btn_left, btn_right; ui_split_ratio( controls, k_ui_axis_v, 0.5f, 2, btn_left, btn_right ); - if( ui_button_text( btn_left, "newer", 1 ) ){ + if( ui_button_text( btn_left, "newer", 1 ) == 1 ){ workshop_view_page( workshop_form.view_published_page_id-1 ); } - if( ui_button_text( btn_right, "older", 1 ) ){ + if( ui_button_text( btn_right, "older", 1 ) == 1 ){ workshop_view_page( workshop_form.view_published_page_count+1 ); } - if( ui_button_text( btn_create_new, "Create New Item", 1 ) ){ + if( ui_button_text( btn_create_new, "Create New Item", 1 ) == 1 ){ workshop_reset_submission_data(); workshop_form.submission.submit_title = 1; workshop_form.submission.submit_description = 1; @@ -1378,7 +1367,7 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) ui_rect_pad( item, (ui_px[2]){4,4} ); struct published_file *pfile = &workshop_form.published_files_list[i]; - if( ui_button_text( item, pfile->title, 1 ) ){ + if( ui_button_text( item, pfile->title, 1 ) == 1 ){ if( pfile->result == k_EResultOK ){ vg_info( "Select index: %d\n", pfile->result_index ); workshop_op_download_and_view_submission( pfile->result_index ); @@ -1402,7 +1391,7 @@ VG_STATIC void workshop_form_gui(void) vg_ui.wants_mouse = 1; ui_fill( window, ui_colour( k_ui_bg+1 ) ); - ui_outline( window, 1, ui_colour( k_ui_bg+7 ) ); + ui_outline( window, 1, ui_colour( k_ui_bg+7 ), 0 ); ui_rect title, panel; ui_split( window, k_ui_axis_h, 28, 0, title, panel ); @@ -1414,7 +1403,7 @@ VG_STATIC void workshop_form_gui(void) ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button ); if( vg_loader_availible() ){ - if( ui_button_text( quit_button, "X", 1 ) ){ + if( ui_button_text( quit_button, "X", 1 ) == 1 ){ workshop_quit_form(); return; } @@ -1426,11 +1415,11 @@ VG_STATIC void workshop_form_gui(void) * escapes here and we show them a basic string */ - if( !vg_loader_availible() ){ + if( workshop_form.op != k_workshop_op_none ){ const char *op_string = "The programmer has not bothered to describe " "the current operation that is running."; - switch( skaterift.op ){ + switch( workshop_form.op ){ case k_workshop_op_loading_model: op_string = "Operation in progress: Loading model file."; break; @@ -1462,6 +1451,10 @@ VG_STATIC void workshop_form_gui(void) vg_success( "Renders world preview\n" ); workshop_render_world_preview(); } + else if( type == k_addon_type_player ){ + workshop_render_player_preview(); + } + workshop_form.view_changed = 0; } @@ -1501,7 +1494,7 @@ VG_STATIC void workshop_form_gui(void) ui_rect_center( submission_row, submission_center ); ui_rect_pad( submission_center, (ui_px[2]){8,8} ); - if( ui_button_text( submission_center, "OK", 1 ) ){ + if( ui_button_text( submission_center, "OK", 1 ) == 1 ){ workshop_form.page = k_workshop_form_open; } }