#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 },
- { "Player", k_addon_type_player },
+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" },
};
/*
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 );
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 "worlds/";
+ else if( type == k_addon_type_world ) return "maps/";
return "unknown_addon_type/";
}
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();
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);
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 );
vg_error( "No metadata was returned with this item.\n" );
}
- /* TODO.... */
- for( i32 i=0; i<vg_list_size(workshop_form_visibility_opts); i++ ){
- if( workshop_form_visibility_opts[i].value == details.m_eVisibility ){
- workshop_form.submission.visibility.index = i;
- break;
- }
- }
- for( i32 i=0; i<vg_list_size(workshop_form_type_opts); i++ ){
- if( workshop_form_type_opts[i].value ==
- workshop_form.submission.submission_type_selection.value ){
- workshop_form.submission.submission_type_selection.index = i;
- break;
- }
- }
-
render_fb_bind( gpipeline.fb_workshop_preview, 0 );
glClearColor( 0.2f, 0.0f, 0.0f, 1.0f );
glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
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 ){
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;
}
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;
char buf[128];
- snprintf( buf, 128, "Addon folder: skaterift/%s",
- workshop_filetype_folder() );
-
- ui_label( file_entry, buf, 1, 8, file_entry );
+ 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 ) ){
+ 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 )
.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 );
}
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;
"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",
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;
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 );
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 );
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;
}
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;
}
}