X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=workshop.c;h=6cb6b6fade73050d2aeb45e6170a9aafa5e5fd64;hb=d5f400a06400d5322330cfdbb97a661707b3d150;hp=1414fc634b8864b5d2297ab5541a67704f8d8e46;hpb=f252ecb6f870260e0e944579ef732b94d1ed0ebe;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/workshop.c b/workshop.c index 1414fc6..6cb6b6f 100644 --- a/workshop.c +++ b/workshop.c @@ -32,7 +32,7 @@ static struct ui_enum_opt workshop_form_type_opts[] = { /* * Close the form and discard UGC query result */ -VG_STATIC void workshop_quit_form(void){ +static void workshop_quit_form(void){ player_board_unload( &workshop_form.board_model ); workshop_form.file_intent = k_workshop_form_file_intent_none; @@ -51,7 +51,7 @@ VG_STATIC void workshop_quit_form(void){ /* * Delete all information about the submission */ -VG_STATIC void workshop_reset_submission_data(void) +static void workshop_reset_submission_data(void) { workshop_form.submission.file_id = 0; /* assuming id of 0 is none/invalid */ workshop_form.submission.description[0] = '\0'; @@ -73,7 +73,7 @@ VG_STATIC void workshop_reset_submission_data(void) /* * Mostly copies of what it sais on the Steam API documentation */ -VG_STATIC const char *workshop_EResult_user_string( EResult result ) +static const char *workshop_EResult_user_string( EResult result ) { switch( result ){ case k_EResultInsufficientPrivilege: @@ -125,7 +125,7 @@ VG_STATIC const char *workshop_EResult_user_string( EResult result ) /* * The endpoint of this operation */ -VG_STATIC void on_workshop_update_result( void *data, void *user ) +static void on_workshop_update_result( void *data, void *user ) { vg_info( "Recieved workshop update result\n" ); SubmitItemUpdateResult_t *result = data; @@ -150,7 +150,7 @@ VG_STATIC void on_workshop_update_result( void *data, void *user ) workshop_form.op = k_workshop_op_none; } -VG_STATIC const char *workshop_filetype_folder(void){ +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/"; @@ -163,7 +163,7 @@ VG_STATIC const char *workshop_filetype_folder(void){ * reciever on completion of packaging the files, it will then start the item * update with Steam API */ -VG_STATIC void workshop_form_upload_submission( PublishedFileId_t file_id, +static void workshop_form_upload_submission( PublishedFileId_t file_id, char *metadata ) { ISteamUGC *hSteamUGC = SteamAPI_SteamUGC(); @@ -221,7 +221,7 @@ VG_STATIC void workshop_form_upload_submission( PublishedFileId_t file_id, * Steam API call result for when we've created a new item on their network, or * not, if it has failed */ -VG_STATIC void on_workshop_createitem( void *data, void *user ) +static void on_workshop_createitem( void *data, void *user ) { CreateItemResult_t *result = data; @@ -251,7 +251,7 @@ VG_STATIC void on_workshop_createitem( void *data, void *user ) /* * Starts the workshop upload process through Steam API */ -VG_STATIC void workshop_form_async_submit_begin( void *payload, u32 size ) +static void workshop_form_async_submit_begin( void *payload, u32 size ) { /* use existing file */ @@ -272,7 +272,7 @@ VG_STATIC void workshop_form_async_submit_begin( void *payload, u32 size ) /* * Downloads the framebuffer into scratch memory */ -VG_STATIC void workshop_form_async_download_image( void *payload, u32 size ) +static void workshop_form_async_download_image( void *payload, u32 size ) { int w, h; render_fb_get_current_res( gpipeline.fb_workshop_preview, &w, &h ); @@ -292,7 +292,7 @@ VG_STATIC void workshop_form_async_download_image( void *payload, u32 size ) /* * Thread which kicks off the upload process */ -VG_STATIC void _workshop_form_submit_thread( void *data ) +static void _workshop_form_submit_thread( void *data ) { vg_async_call( workshop_form_async_download_image, NULL, 0 ); vg_async_stall(); @@ -404,7 +404,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) /* * Entry point for the publishing submission operation */ -VG_STATIC void workshop_op_submit(void){ +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] ){ @@ -448,7 +448,7 @@ VG_STATIC void workshop_op_submit(void){ /* * Reciever for completion of the model file load */ -VG_STATIC void workshop_form_loadmodel_async_complete( void *payload, u32 size ) +static void workshop_form_loadmodel_async_complete( void *payload, u32 size ) { v2_zero( workshop_form.view_angles ); v3_zero( workshop_form.view_offset ); @@ -463,13 +463,13 @@ VG_STATIC void workshop_form_loadmodel_async_complete( void *payload, u32 size ) /* * Reciever for failure to load */ -VG_STATIC void workshop_form_loadmodel_async_error( void *payload, u32 size ){ +static void workshop_form_loadmodel_async_error( void *payload, u32 size ){ } /* * Thread which loads the model from the disk */ -VG_STATIC void _workshop_form_load_thread( void *data ) +static void _workshop_form_load_thread( void *data ) { char path_buf[4096]; vg_str folder; @@ -533,7 +533,7 @@ VG_STATIC void _workshop_form_load_thread( void *data ) /* * Entry point for load model operation */ -VG_STATIC void workshop_op_load_model(void){ +static void workshop_op_load_model(void){ world_instance *world = world_current_instance(); workshop_form.view_world = world; @@ -569,7 +569,7 @@ VG_STATIC void workshop_op_load_model(void){ /* * The image has been decoded and is ready to slap into the framebuffer */ -VG_STATIC void workshop_form_async_imageload( void *data, u32 len ) +static void workshop_form_async_imageload( void *data, u32 len ) { if( data ){ struct framebuffer_attachment *a = @@ -594,7 +594,7 @@ VG_STATIC void workshop_form_async_imageload( void *data, u32 len ) /* * Load the image located at ./workshop_preview.jpg into our framebuffer */ -VG_STATIC void _workshop_load_preview_thread( void *data ){ +static void _workshop_load_preview_thread( void *data ){ char path_buf[ 4096 ]; vg_str path; vg_strnull( &path, path_buf, 4096 ); @@ -630,7 +630,7 @@ VG_STATIC void _workshop_load_preview_thread( void *data ){ /* * Entry point to view operation */ -VG_STATIC void workshop_op_download_and_view_submission( int result_index ) +static void workshop_op_download_and_view_submission( int result_index ) { workshop_form.op = k_workshop_op_downloading_submission; ISteamUGC *hSteamUGC = SteamAPI_SteamUGC(); @@ -724,7 +724,7 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) /* * View a page of results on the sidebar */ -VG_STATIC void workshop_view_page( int req ) +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" ); @@ -775,7 +775,7 @@ VG_STATIC void workshop_view_page( int req ) /* * Steam API result for when we recieve submitted UGC information about the user */ -VG_STATIC void on_workshop_UGCQueryComplete( void *data, void *userdata ) +static void on_workshop_UGCQueryComplete( void *data, void *userdata ) { SteamUGCQueryCompleted_t *query = data; workshop_form.ugc_query.result = query->m_eResult; @@ -813,7 +813,7 @@ VG_STATIC void on_workshop_UGCQueryComplete( void *data, void *userdata ) /* * Console command to open the workshop publisher */ -VG_STATIC int workshop_submit_command( int argc, const char *argv[] ) +static int workshop_submit_command( int argc, const char *argv[] ) { if( !steam_ready ){ ui_start_modal( "Steam API is not initialized\n", UI_MODAL_BAD ); @@ -849,12 +849,12 @@ VG_STATIC int workshop_submit_command( int argc, const char *argv[] ) return 0; } -VG_STATIC void workshop_init(void) +static void workshop_init(void) { vg_console_reg_cmd( "workshop_submit", workshop_submit_command, NULL ); } -VG_STATIC void workshop_render_world_preview(void){ +static void workshop_render_world_preview(void){ render_fb_bind( gpipeline.fb_workshop_preview, 0 ); glClearColor( 0.0f, 0.0f, 0.3f, 1.0f ); @@ -871,7 +871,7 @@ VG_STATIC void workshop_render_world_preview(void){ /* * Redraw the playermodel into the workshop framebuffer */ -VG_STATIC void workshop_render_player_preview(void){ +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 ); @@ -894,11 +894,13 @@ VG_STATIC void workshop_render_player_preview(void){ 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 ); + skeleton_apply_pose( sk, res.keyframes, k_anim_apply_defer_ik, + localplayer.final_mtx ); + skeleton_apply_ik_pass( sk, localplayer.final_mtx ); + skeleton_apply_pose( sk, res.keyframes, k_anim_apply_deffered_only, + localplayer.final_mtx ); + skeleton_apply_inverses( sk, localplayer.final_mtx ); + skeleton_apply_transform( sk, transform, localplayer.final_mtx ); camera cam; v3_copy( (v3f){ 0.0f, 201.7f, 1.2f }, cam.pos ); @@ -914,7 +916,8 @@ VG_STATIC void workshop_render_player_preview(void){ camera_finalize( &cam ); world_instance *world = localplayer.viewable_world; - render_playermodel( &cam, world, 0, &workshop_form.player_model, sk ); + render_playermodel( &cam, world, 0, &workshop_form.player_model, sk, + localplayer.final_mtx ); glBindFramebuffer( GL_FRAMEBUFFER, 0 ); glViewport( 0,0, vg.window_x, vg.window_y ); @@ -923,7 +926,7 @@ VG_STATIC void workshop_render_player_preview(void){ /* * Redraw the model file into the workshop framebuffer */ -VG_STATIC void workshop_render_board_preview(void){ +static void workshop_render_board_preview(void){ if( !workshop_form.ptr_ent ){ return; } @@ -1017,19 +1020,19 @@ VG_STATIC void workshop_render_board_preview(void){ * ----------------------------------------------------------------------------- */ -VG_STATIC void workshop_changed_model_path( char *buf, u32 len ){ +static void workshop_changed_model_path( char *buf, u32 len ){ workshop_form.submission.submit_file_and_image = 1; } -VG_STATIC void workshop_changed_title( char *buf, u32 len ){ +static void workshop_changed_title( char *buf, u32 len ){ workshop_form.submission.submit_title = 1; } -VG_STATIC void workshop_changed_description( char *buf, u32 len ){ +static void workshop_changed_description( char *buf, u32 len ){ workshop_form.submission.submit_description = 1; } -VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ +static void workshop_form_gui_page_undecided( ui_rect content ){ ui_rect box; rect_copy( content, box ); box[3] = 128; @@ -1074,7 +1077,7 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ } } -VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){ +static void workshop_form_gui_draw_preview( ui_rect img_box ){ 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 ); @@ -1141,7 +1144,7 @@ VG_STATIC void workshop_form_gui_draw_preview( ui_rect img_box ){ } } -VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ +static void workshop_form_gui_edit_page( ui_rect content ){ enum addon_type type = workshop_form.submission.type; if( type == k_addon_type_none ){ @@ -1283,7 +1286,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_colour( k_ui_fg+4 ) ); } -VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) +static void workshop_form_gui_sidebar( ui_rect sidebar ) { ui_fill( sidebar, ui_colour( k_ui_bg+2 ) ); @@ -1379,7 +1382,7 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) } } -VG_STATIC void workshop_form_gui(void) +static void workshop_form_gui(void) { enum workshop_form_page stable_page = workshop_form.page; if( stable_page == k_workshop_form_hidden ) return; @@ -1507,7 +1510,7 @@ VG_STATIC void workshop_form_gui(void) * ----------------------------------------------------------------------------- */ -VG_STATIC void async_workshop_get_filepath( void *data, u32 len ) +static void async_workshop_get_filepath( void *data, u32 len ) { struct async_workshop_filepath_info *info = data; @@ -1523,7 +1526,7 @@ VG_STATIC void async_workshop_get_filepath( void *data, u32 len ) } } -VG_STATIC void async_workshop_get_installed_files( void *data, u32 len ) +static void async_workshop_get_installed_files( void *data, u32 len ) { struct async_workshop_installed_files_info *info = data;