fix couple TODO

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index c074e156f3e090fee656d7b9d5774a01565d0ad7..0b03894ed0223f4e44715392444a236558e6c5b1 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -1,20 +1,19 @@
-#ifndef WORKSHOP_C
-#define WORKSHOP_C
 
-#include "workshop.h"
-
-#define VG_GAME
-#include "vg/vg.h"
+#include "vg/vg_engine.h"
 #include "vg/vg_tex.h"
+#include "vg/vg_image.h"
 #include "vg/vg_msg.h"
 #include "vg/vg_binstr.h"
+#include "vg/vg_loader.h"
 #include "ent_skateshop.h"
 
 #include "vg/vg_steam_auth.h"
 #include "vg/vg_steam_ugc.h"
 #include "vg/vg_steam_friends.h"
 #include "steam.h"
-#include "highscores.h"
+#include "workshop.h"
+
+struct workshop_form workshop_form;
 
 static struct ui_enum_opt workshop_form_visibility_opts[] = {
  { k_ERemoteStoragePublishedFileVisibilityPublic,       "Public"       },
@@ -323,7 +322,8 @@ static void _workshop_form_submit_thread( void *data )
    vg_msg_frame( &descriptor, "workshop" );
       vg_msg_wkvstr( &descriptor, "title", workshop_form.submission.title );
       //vg_msg_wkvstr( &descriptor, "author", "unknown" );
-      vg_msg_wkvu32( &descriptor, "type", workshop_form.submission.type );
+      vg_msg_wkvnum( &descriptor, "type", k_vg_msg_u32, 1,
+                     &workshop_form.submission.type );
       vg_msg_wkvstr( &descriptor, "folder", workshop_form.addon_folder );
    vg_msg_end_frame( &descriptor );
    //vg_msg_wkvstr( &descriptor, "location", "USA" );
@@ -681,7 +681,8 @@ static void workshop_op_download_and_view_submission( int result_index )
          vg_msg_init( &msg, metadata_buf, len/2 );
          
          if( vg_msg_seekframe( &msg, "workshop" )){
-            u32 type = vg_msg_getkvu32( &msg, "type", 0 );
+            u32 type;
+            vg_msg_getkvintg( &msg, "type", k_vg_msg_u32, &type );
             workshop_form.submission.type = type;
             workshop_form.submission.submission_type_selection = type;
 
@@ -808,7 +809,7 @@ static void on_workshop_UGCQueryComplete( void *data, void *userdata )
 /*
  * Console command to open the workshop publisher
  */
-static int workshop_submit_command( int argc, const char *argv[] )
+int workshop_submit_command( int argc, const char *argv[] )
 {
    if( !steam_ready ){
       ui_start_modal( "Steam API is not initialized\n", UI_MODAL_BAD );
@@ -844,7 +845,7 @@ static int workshop_submit_command( int argc, const char *argv[] )
    return 0;
 }
 
-static void workshop_init(void)
+void workshop_init(void)
 {
    vg_console_reg_cmd( "workshop_submit", workshop_submit_command, NULL );
 }
@@ -897,7 +898,7 @@ static void workshop_render_player_preview(void){
    skeleton_apply_inverses( sk, localplayer.final_mtx );
    skeleton_apply_transform( sk, transform, localplayer.final_mtx );
 
-   camera cam;
+   vg_camera cam;
    v3_copy( (v3f){ 0.0f, 201.7f, 1.2f }, cam.pos );
    
    cam.nearz = 0.01f;
@@ -905,10 +906,10 @@ static void workshop_render_player_preview(void){
    cam.fov = 57.0f;
    v3_zero( cam.angles );
    
-   camera_update_transform( &cam );
-   camera_update_view( &cam );
-   camera_update_projection( &cam );
-   camera_finalize( &cam );
+   vg_camera_update_transform( &cam );
+   vg_camera_update_view( &cam );
+   vg_camera_update_projection( &cam );
+   vg_camera_finalize( &cam );
 
    render_playermodel( &cam, world_current_instance(), 0, 
                        &workshop_form.player_model, sk, localplayer.final_mtx );
@@ -946,7 +947,7 @@ static void workshop_render_board_preview(void){
    v3_add( display->transform.co, display1->transform.co, baseco );
    v3_muls( baseco, 0.5f, baseco );
 
-   camera cam;
+   vg_camera cam;
    v3f basevector;
    v3_sub( display->transform.co, ref->transform.co, basevector );
    float dist = v3_length( basevector );
@@ -977,10 +978,10 @@ static void workshop_render_board_preview(void){
    cam.farz  = 100.0f;
    cam.fov   = ref->fov;
    
-   camera_update_transform( &cam );
-   camera_update_view( &cam );
-   camera_update_projection( &cam );
-   camera_finalize( &cam );
+   vg_camera_update_transform( &cam );
+   vg_camera_update_view( &cam );
+   vg_camera_update_projection( &cam );
+   vg_camera_finalize( &cam );
 
    m4x3f mmdl, mmdl1;
    mdl_transform_m4x3( &display->transform, mmdl );
@@ -1000,7 +1001,7 @@ static void workshop_render_board_preview(void){
    glBufferSubData( GL_UNIFORM_BUFFER, 0, 
                     sizeof(struct ub_world_lighting), &world->ub_lighting );
 
-   render_world( world, &cam, 0, 0, 1, 1 );
+   render_world( world, &cam, 0, 0, 0, 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 );
@@ -1327,12 +1328,12 @@ static void workshop_form_gui_sidebar( ui_rect sidebar )
    ui_fill( controls, ui_colour( k_ui_bg+1 ) );
 
    char buf[32];
-   strcpy( buf, "page " );
-   int i  = 5;
-       i += highscore_intl( buf+i, workshop_form.view_published_page_id+1, 4 );
-            buf[ i ++ ] = '/';
-       i += highscore_intl( buf+i, workshop_form.view_published_page_count, 4 );
-            buf[ i ++ ] = '\0';
+   vg_str str;
+   vg_strnull( &str, buf, sizeof(buf) );
+   vg_strcat( &str, "page " );
+   vg_strcati32( &str,  workshop_form.view_published_page_id+1 );
+   vg_strcatch( &str, '/' );
+   vg_strcati32( &str, workshop_form.view_published_page_count );
 
    ui_rect_pad( controls, (ui_px[2]){0,4} );
    ui_rect info;
@@ -1376,7 +1377,7 @@ static void workshop_form_gui_sidebar( ui_rect sidebar )
    }
 }
 
-static void workshop_form_gui(void)
+void workshop_form_gui(void)
 {
    enum workshop_form_page stable_page = workshop_form.page;
    if( stable_page == k_workshop_form_hidden ) return;
@@ -1504,7 +1505,7 @@ static void workshop_form_gui(void)
  * -----------------------------------------------------------------------------
  */
 
-static void async_workshop_get_filepath( void *data, u32 len )
+void async_workshop_get_filepath( void *data, u32 len )
 {
    struct async_workshop_filepath_info *info = data;
 
@@ -1520,7 +1521,7 @@ static void async_workshop_get_filepath( void *data, u32 len )
    }
 }
 
-static void async_workshop_get_installed_files( void *data, u32 len )
+void async_workshop_get_installed_files( void *data, u32 len )
 {
    struct async_workshop_installed_files_info *info = data;
 
@@ -1540,5 +1541,3 @@ static void async_workshop_get_installed_files( void *data, u32 len )
 
    *info->len = j;
 }
-
-#endif /* WORKSHOP_C */