a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / network.c

diff --git a/network.c b/network.c
index fdec386ccd62f0e884414ea860f5f28c4df67612..6d6178e2a9b6fb9adf8218d3d417f5566e81a6f3 100644 (file)
--- a/network.c
+++ b/network.c
@@ -11,7 +11,7 @@
 #include "world.h"
 #include "world_sfd.h"
 #include "world_routes.h"
-#include "vg/vg_imgui.h"
+#include "vg/vg_ui/imgui.h"
 #include "gui.h"
 #include "ent_region.h"
 #include "vg/vg_loader.h"
@@ -372,13 +372,16 @@ void network_status_string( vg_str *str, u32 *colour )
 
 void render_server_status_gui(void)
 {
-   render_fb_bind( gpipeline.fb_workshop_preview, 0 );
+   vg_framebuffer_bind( g_render.fb_network_status, 1.0f );
+
+   vg_ui_set_screen( 128, 48 );
+   ui_context *ctx = &vg_ui.ctx;
 
    /* HACK */
-       vg_ui.cur_vert = 0;
-       vg_ui.cur_indice = 0;
-   vg_ui.vert_start = 0;
-   vg_ui.indice_start = 0;
+       ctx->cur_vert = 0;
+       ctx->cur_indice = 0;
+   ctx->vert_start = 0;
+   ctx->indice_start = 0;
 
    ui_rect r = { 0, 0, 128, 48 };
    
@@ -389,12 +392,12 @@ void render_server_status_gui(void)
    u32 bg = 0xff000000;
    network_status_string( &str, &bg );
 
-   ui_fill( r, bg );
-   ui_text( r, buf, 1, k_ui_align_center, 0 );
-   ui_flush( k_ui_shader_colour, 128, 48 );
+   ui_fill( ctx, r, bg );
+   ui_text( ctx, r, buf, 1, k_ui_align_center, 0 );
+   ui_flush( ctx, k_ui_shader_colour, NULL );
    
    skaterift.rt_textures[ k_skaterift_rt_server_status ] =
-      gpipeline.fb_workshop_preview->attachments[0].id;
+      g_render.fb_network_status->attachments[0].id;
 }
 
 static void on_server_connect_status( CallbackMsg_t *msg ){