build system revision

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index 5b0d5855e213ebaa0e61b2fc7eb068ec5b707bd0..469eeea2260d40bca903f93cb0e1990187c6fc28 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -1,20 +1,15 @@
-#ifndef WORKSHOP_C
-#define WORKSHOP_C
-
 #include "workshop.h"
 
-#define VG_GAME
-#include "vg/vg.h"
 #include "vg/vg_tex.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"
 
 static struct ui_enum_opt workshop_form_visibility_opts[] = {
  { k_ERemoteStoragePublishedFileVisibilityPublic,       "Public"       },
@@ -323,7 +318,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 +677,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;
 
@@ -857,7 +854,7 @@ static void workshop_render_world_preview(void){
    glEnable( GL_DEPTH_TEST );
    glDisable( GL_BLEND );
 
-   render_world( localplayer.viewable_world, &skaterift.cam, 1 );
+   render_world( world_current_instance(), &skaterift.cam, 0, 0, 1, 1 );
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
    glViewport( 0,0, vg.window_x, vg.window_y );
@@ -910,9 +907,8 @@ static void workshop_render_player_preview(void){
    camera_update_projection( &cam );
    camera_finalize( &cam );
 
-   world_instance *world = localplayer.viewable_world;
-   render_playermodel( &cam, world, 0, &workshop_form.player_model, sk,
-                        localplayer.final_mtx );
+   render_playermodel( &cam, world_current_instance(), 0, 
+                       &workshop_form.player_model, sk, localplayer.final_mtx );
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
    glViewport( 0,0, vg.window_x, vg.window_y );
@@ -953,7 +949,7 @@ static void workshop_render_board_preview(void){
    float dist = v3_length( basevector );
 
    v3f baseangles;
-   player_vector_angles( baseangles, basevector, 1.0f, 0.0f );
+   v3_angles( basevector, baseangles );
 
    v2_add( workshop_form.view_angles, baseangles, cam.angles );
    cam.angles[2] = 0.0f;
@@ -1001,7 +997,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, 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 );
@@ -1328,12 +1324,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;
@@ -1541,5 +1537,3 @@ static void async_workshop_get_installed_files( void *data, u32 len )
 
    *info->len = j;
 }
-
-#endif /* WORKSHOP_C */