j
[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c
index d0a3883d1793732253b41d4e551fe94b8e4ea043..341d44a3f0d64bcd5b4e839b22f5e60c17ec1120 100644 (file)
 #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" },
 };
 
 /* 
  * 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;
 
@@ -46,7 +45,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;
 }
 
 /*
@@ -58,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 );
@@ -150,8 +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/";
 
-   skaterift_end_op();
+   return "unknown_addon_type/";
 }
 
 /*
@@ -188,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" );
@@ -208,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();
@@ -245,7 +245,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();
    }
 }
 
@@ -302,17 +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" );
-      vg_async_call( workshop_async_any_complete, NULL, 0 );
+      workshop_form.op = k_workshop_op_none;
       return;
    }
 
@@ -344,7 +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 );
-      vg_async_call( workshop_async_any_complete, NULL, 0 );
+      workshop_form.op = k_workshop_op_none;
       return;
    }
 
@@ -372,7 +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" );
-      vg_async_call( workshop_async_any_complete, NULL, 0 );
+      workshop_form.op = k_workshop_op_none;
       return;
    }
    
@@ -380,7 +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 );
-      vg_async_call( workshop_async_any_complete, NULL, 0 );
+      workshop_form.op = k_workshop_op_none;
       return;
    }
    fwrite( descriptor_buf, descriptor.cur, 1, fp );
@@ -393,7 +387,7 @@ 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 );
+      workshop_form.op = k_workshop_op_none;
       return;
    }
 
@@ -410,34 +404,38 @@ VG_STATIC void _workshop_form_submit_thread( void *data )
 /*
  * 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);
+         workshop_form.op = k_workshop_op_none;
          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 );
+         workshop_form.op = k_workshop_op_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 );
+         workshop_form.op = k_workshop_op_none;
          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 );
 }
@@ -459,15 +457,13 @@ 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();
+   workshop_form.op = k_workshop_op_none;
 }
 
 /*
  * 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 ){
 }
 
 /*
@@ -479,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;
    }
 
@@ -495,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;
    }
 
@@ -523,36 +518,46 @@ 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 );
 }
 
 /*
  * 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();
+VG_STATIC void workshop_op_load_model(void){
+   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{
-      vg_error( "There is no ent_swspreview in the level. "
-                "Cannot publish here\n" );
+   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;
    }
 
-   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 );
 }
 
@@ -583,19 +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 );
    }
-   
-   skaterift_end_op();
+   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" );
 
@@ -624,32 +627,12 @@ 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
  */
 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;
@@ -658,7 +641,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;
@@ -688,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);
@@ -707,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 );
@@ -722,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; 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 );
@@ -744,38 +709,10 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index )
       glViewport( 0,0, vg.window_x, vg.window_y );
 
       vg_loader_start( _workshop_load_preview_thread, NULL );
-
-#if 0
-      if( details.m_hPreviewFile == 0 ){
-         vg_error( "m_hPreviewFile is 0\n" );
-         skaterift_end_op();
-      }
-      else{
-         /* Now need to begin downloading the image so we can display it */
-         vg_steam_async_call *call = vg_alloc_async_steam_api_call();
-
-         struct workshop_loadpreview_info *info = 
-            vg_linear_alloc( vg_mem.scratch, 
-                             sizeof( struct workshop_loadpreview_info ) );
-
-         snprintf( info->abs_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" );
-      skaterift_end_op();
+      workshop_form.op = k_workshop_op_none;
    }
 }
 
@@ -791,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;
    }
 
@@ -924,7 +862,59 @@ VG_STATIC void workshop_render_world_preview(void){
    glEnable( GL_DEPTH_TEST );
    glDisable( GL_BLEND );
 
-   render_world( localplayer.viewable_world, &main_camera, 1 );
+   render_world( localplayer.viewable_world, &skaterift.cam, 1 );
+
+   glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+   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 );
@@ -1014,8 +1004,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 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 );
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
    glViewport( 0,0, vg.window_x, vg.window_y );
@@ -1050,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 );
 
@@ -1060,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 ){
@@ -1079,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;
    }
@@ -1173,14 +1162,11 @@ 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_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() );
+
+   ui_label( file_entry, buf, 1, 8, file_entry );
 
    if( type == k_addon_type_world ){
       struct ui_textbox_callbacks callbacks = {
@@ -1195,8 +1181,12 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
          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';
          }
@@ -1209,7 +1199,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
          ui_textbox( file_entry, workshop_form.addon_folder,
                      vg_list_size(workshop_form.addon_folder), 0, &callbacks );
 
-         if( ui_button_text( file_button, "Load", 1 ) ){
+         if( ui_button_text( file_button, "Load", 1 ) == 1 ){
             workshop_op_load_model();
          }
       }
@@ -1223,9 +1213,9 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
    ui_split( title_entry, k_ui_axis_v, 
                 ui_text_line_width(str_title)+8, 0, label, title_entry );
 
-   ui_rect vis_dropdown;
+   ui_rect vis_enum;
    ui_split_ratio( title_entry, k_ui_axis_v, 0.6f, 16, 
-                   title_entry, vis_dropdown );
+                   title_entry, vis_enum );
 
    /* title box */
    {
@@ -1239,7 +1229,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
 
    /* visibility option */
    {
-      ui_enum( vis_dropdown, "Visibility:", workshop_form_visibility_opts,
+      ui_enum( vis_enum, "Visibility:", workshop_form_visibility_opts,
                4, &workshop_form.submission.visibility );
    }
 
@@ -1273,10 +1263,10 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
    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;
@@ -1300,7 +1290,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
    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, "\x91", 2 ) ){
+   if( ui_button_text( btn_right, "\xbf", 2 ) == 1 ){
       ISteamFriends *hSteamFriends = SteamAPI_SteamFriends();
       SteamAPI_ISteamFriends_ActivateGameOverlayToWebPage( hSteamFriends,
             "https://steamcommunity.com/sharedfiles/workshoplegalagreement",
@@ -1336,6 +1326,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, "???." );
 
@@ -1371,15 +1363,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;
@@ -1393,7 +1385,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 );
@@ -1428,8 +1420,8 @@ 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( ui_button_text( quit_button, "X", 1 ) ){
+   if( vg_loader_availible() ){
+      if( ui_button_text( quit_button, "X", 1 ) == 1 ){
          workshop_quit_form();
          return;
       }
@@ -1441,19 +1433,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( 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.async_op ){
-         case k_workshop_form_op_loading_model:
+      switch( workshop_form.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;
@@ -1477,6 +1469,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;
    }
 
@@ -1516,7 +1512,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;
       }
    }