X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=2879ef9d117e43cd37443fc6c95904670d56e421;hb=bc40c302f1b8313bdd3c773fcfa2f850511c4634;hp=73767a22ca3580898d32fda5604239f9d1933076;hpb=872ad3e040f22df357929d3778a955ae8c4ac52b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 73767a2..2879ef9 100644 --- a/skaterift.c +++ b/skaterift.c @@ -11,6 +11,10 @@ * ============================================================================= */ +#include "skaterift_imgui_dev.c" + +#if 0 + #define SR_NETWORKED #define VG_DEVWINDOW #include "common.h" @@ -181,6 +185,8 @@ VG_STATIC void vg_update(void) { steam_update(); + skaterift_preupdate_inputs(); + if( skaterift_status == 1 ){ draw_origin_axis(); network_update(); @@ -190,6 +196,7 @@ VG_STATIC void vg_update(void) world_update( get_active_world(), localplayer.rb.co ); audio_ambient_sprites_update( get_active_world(), localplayer.rb.co ); + //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" ); } } @@ -466,6 +473,7 @@ VG_STATIC void vg_render(void) glDisable(GL_DEPTH_TEST); vg_lines_drawall(); glViewport( 0,0, vg.window_x, vg.window_y ); + gui_draw(); } VG_STATIC void vg_ui(void) @@ -482,3 +490,5 @@ VG_STATIC void vg_ui(void) render_view_framebuffer_ui(); } + +#endif