projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops
[carveJwlIkooP6JGAAIwe30JlM.git]
/
workshop.c
diff --git
a/workshop.c
b/workshop.c
index 1967e7503e2b4bbc5d95257d3bf8592d569bdd01..9917359246784df82c73b52d97bd234f7df2b2fc 100644
(file)
--- 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 "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"
#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[] = {
};
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
*/
};
/*
* 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;
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;
}
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 =
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.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;
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 );
}
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 );
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/" );
}
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 );
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;
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 );
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/" );
}
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_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;
}
return;
}
@@
-345,7
+338,6
@@
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 );
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;
}
return;
}
@@
-373,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_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;
}
return;
}
@@
-381,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 );
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 );
return;
}
fwrite( descriptor_buf, descriptor.cur, 1, fp );
@@
-394,7
+384,6
@@
VG_STATIC void _workshop_form_submit_thread( void *data )
if( !vg_strgood(&preview) ){
vg_error( "preview image path too long\n" );
if( !vg_strgood(&preview) ){
vg_error( "preview image path too long\n" );
- vg_async_call( workshop_async_any_complete, NULL, 0 );
return;
}
return;
}
@@
-411,34
+400,35
@@
VG_STATIC void _workshop_form_submit_thread( void *data )
/*
* Entry point for the publishing submission operation
*/
/*
* 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] ){
/* 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] ){
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 ){
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;
}
}
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;
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 );
}
vg_loader_start( _workshop_form_submit_thread, NULL );
}
@@
-460,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" );
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
*/
}
/*
* 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 ){
}
/*
}
/*
@@
-480,7
+467,7
@@
VG_STATIC void _workshop_form_load_thread( void *data )
vg_str folder;
vg_strnull( &folder, path_buf, 4096 );
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/" );
vg_strcat( &folder, "maps/" );
else vg_strcat( &folder, "boards/" );
@@
-534,9
+521,8
@@
VG_STATIC void _workshop_form_load_thread( void *data )
/*
* Entry point for load model operation
*/
/*
* 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;
}
vg_warn( "WORLD LOAD INFO Currently unsupported\n" );
return;
}
@@
-548,12
+534,12
@@
VG_STATIC void workshop_op_load_model(void)
mdl_arritm( &workshop_form.view_world->ent_swspreview, 0 );
}
else{
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;
}
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 );
}
vg_loader_start( _workshop_form_load_thread, NULL );
}
@@
-584,8
+570,6
@@
VG_STATIC void workshop_form_async_imageload( void *data, u32 len )
stbi_failure_reason() );
ui_start_modal( workshop_form.error_msg, UI_MODAL_BAD );
}
stbi_failure_reason() );
ui_start_modal( workshop_form.error_msg, UI_MODAL_BAD );
}
-
- skaterift_end_op();
}
/*
}
/*
@@
-651,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 )
{
*/
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;
ISteamUGC *hSteamUGC = SteamAPI_SteamUGC();
ISteamRemoteStorage *hSteamRemoteStorage = SteamAPI_SteamRemoteStorage();
SteamUGCDetails_t details;
@@
-659,7
+644,6
@@
VG_STATIC void workshop_op_download_and_view_submission( int result_index )
result_index,
&details ) )
{
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;
workshop_reset_submission_data();
workshop_form.submission.submit_description = 0;
workshop_form.submission.submit_file_and_image = 0;
@@
-690,10
+674,10
@@
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.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 =
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);
if( have_meta ){
u32 len = strlen(metadata_str);
@@
-776,7
+760,6
@@
VG_STATIC void workshop_op_download_and_view_submission( int result_index )
}
else{
vg_error( "GetQueryUGCResult: Index out of range\n" );
}
else{
vg_error( "GetQueryUGCResult: Index out of range\n" );
- skaterift_end_op();
}
}
}
}
@@
-1062,13
+1045,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 !=
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 ) ){
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;
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;
}
workshop_form.view_changed = 1;
workshop_form.file_intent = k_workshop_form_file_intent_new;
}
@@
-1087,14
+1070,14
@@
VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){
}
VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){
}
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( 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;
}
return;
}
@@
-1154,9
+1137,9
@@
VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){
}
VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
}
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;
}
workshop_form_gui_page_undecided( content );
return;
}
@@
-1174,7
+1157,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 );
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 );
}
ui_label( file_entry, "Addon folder: skaterift/boards/",
1, 8, file_entry );
}
@@
-1183,7
+1166,7
@@
VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
1, 8, file_entry );
}
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
};
struct ui_textbox_callbacks callbacks = {
.change = workshop_changed_model_path
};
@@
-1323,7
+1306,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 );
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 );
char buf[512];
vg_str str;
vg_strnull( &str, buf, 512 );
@@
-1333,9
+1316,9
@@
VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar )
else
vg_strcat( &str, "Creating a new " );
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." );
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, "???." );
vg_strcat( &str, "world." );
else
vg_strcat( &str, "???." );
@@
-1429,7
+1412,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 );
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;
if( ui_button_text( quit_button, "X", 1 ) ){
workshop_quit_form();
return;
@@
-1442,19
+1425,19
@@
VG_STATIC void workshop_form_gui(void)
* escapes here and we show them a basic string
*/
* 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.";
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;
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;
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;
op_string = "Operation in progress: downloading existing submission"
" from Steam services.";
break;
@@
-1470,11
+1453,11
@@
VG_STATIC void workshop_form_gui(void)
workshop_form.view_changed &&
workshop_form.file_intent == k_workshop_form_file_intent_new )
{
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();
}
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();
}
vg_success( "Renders world preview\n" );
workshop_render_world_preview();
}