a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index f8072c150607174cb997ba8bd00f594f0377c7ff..6975d601e587d43edcdd6ff7790a18bf69f7ce05 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -275,13 +275,13 @@ static void workshop_form_async_submit_begin( void *payload, u32 size )
 static void workshop_form_async_download_image( void *payload, u32 size )
 {
    int w, h;
-   vg_framebuffer_get_res( gpipeline.fb_workshop_preview, &w, &h );
+   vg_framebuffer_get_res( g_render.fb_workshop_preview, &w, &h );
    vg_linear_clear( vg_mem.scratch );
    workshop_form.img_buffer = vg_linear_alloc( vg_mem.scratch, w*h*3 );
 
    vg_info( "read framebuffer: glReadPixels( %dx%d )\n", w,h );
 
-   glBindFramebuffer( GL_READ_FRAMEBUFFER, gpipeline.fb_workshop_preview->id );
+   glBindFramebuffer( GL_READ_FRAMEBUFFER, g_render.fb_workshop_preview->id );
    glReadBuffer( GL_COLOR_ATTACHMENT0 );
    glReadPixels( 0,0, w,h, GL_RGB, GL_UNSIGNED_BYTE, workshop_form.img_buffer );
 
@@ -588,7 +588,7 @@ static void workshop_form_async_imageload( void *data, u32 len )
    if( data )
    {
       vg_framebuffer_attachment *a = 
-         &gpipeline.fb_workshop_preview->attachments[0];
+         &g_render.fb_workshop_preview->attachments[0];
 
       glBindTexture( GL_TEXTURE_2D, a->id );
       glTexSubImage2D( GL_TEXTURE_2D, 0,0,0,
@@ -725,7 +725,7 @@ static void workshop_op_download_and_view_submission( int result_index )
          vg_error( "No metadata was returned with this item.\n" );
       }
 
-      vg_framebuffer_bind( gpipeline.fb_workshop_preview, 1.0f );
+      vg_framebuffer_bind( g_render.fb_workshop_preview, 1.0f );
       glClearColor( 0.2f, 0.0f, 0.0f, 1.0f );
       glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
       glBindFramebuffer( GL_FRAMEBUFFER, 0 );
@@ -890,14 +890,14 @@ void workshop_init(void)
 
 static void workshop_render_world_preview(void)
 {
-   vg_framebuffer_bind( gpipeline.fb_workshop_preview, 1.0f );
+   vg_framebuffer_bind( g_render.fb_workshop_preview, 1.0f );
 
    glClearColor( 0.0f, 0.0f, 0.3f, 1.0f );
    glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
    glEnable( GL_DEPTH_TEST );
    glDisable( GL_BLEND );
 
-   render_world( world_current_instance(), &skaterift.cam, 0, 0, 1, 1 );
+   render_world( world_current_instance(), &g_render.cam, 0, 0, 1, 1 );
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
    glViewport( 0,0, vg.window_x, vg.window_y );
@@ -908,7 +908,7 @@ static void workshop_render_world_preview(void)
  */
 static void workshop_render_player_preview(void)
 {
-   vg_framebuffer_bind( gpipeline.fb_workshop_preview, 1.0f );
+   vg_framebuffer_bind( g_render.fb_workshop_preview, 1.0f );
    glClearColor( 0.16f, 0.15f, 0.15f, 1.0f );
    glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
    glEnable( GL_DEPTH_TEST );
@@ -968,7 +968,7 @@ static void workshop_render_board_preview(void)
       return;
    }
 
-   vg_framebuffer_bind( gpipeline.fb_workshop_preview, 1.0f );
+   vg_framebuffer_bind( g_render.fb_workshop_preview, 1.0f );
 
    glClearColor( 0.0f, 0.0f, 0.3f, 1.0f );
    glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
@@ -1129,12 +1129,12 @@ static void workshop_form_gui_draw_preview( ui_context *ctx, ui_rect img_box )
    if( workshop_form.file_intent == k_workshop_form_file_intent_keep_old )
    {
       ui_image( ctx, 
-                img_box, &gpipeline.fb_workshop_preview->attachments[0].id );
+                img_box, &g_render.fb_workshop_preview->attachments[0].id );
    }
    else if( workshop_form.file_intent == k_workshop_form_file_intent_new )
    {
       ui_image( ctx, 
-                img_box, &gpipeline.fb_workshop_preview->attachments[0].id );
+                img_box, &g_render.fb_workshop_preview->attachments[0].id );
 
       if( type == k_addon_type_world )
       {