From: hgn Date: Fri, 1 Sep 2023 21:19:05 +0000 (+0100) Subject: testing X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=b536a4c2301a21e5902c064d98a1be49c9d587c5;hp=f0c064ff3c9bb162db39bf533e5df973816621c0;p=carveJwlIkooP6JGAAIwe30JlM.git testing --- diff --git a/skaterift.c b/skaterift.c index 983ca9b..099ff99 100644 --- a/skaterift.c +++ b/skaterift.c @@ -11,7 +11,7 @@ * ============================================================================= */ -#if 1 +#if 0 #define SR_NETWORKED diff --git a/skaterift_imgui_dev.c b/skaterift_imgui_dev.c index 9d69bfc..6247b82 100644 --- a/skaterift_imgui_dev.c +++ b/skaterift_imgui_dev.c @@ -26,20 +26,17 @@ static int skaterift_loaded = 0; static char g_an_buffer[ 4096 ]; -int main( int argc, char *argv[] ) -{ +int main( int argc, char *argv[] ){ vg_mem.use_libc_malloc = 0; vg_set_mem_quota( 160*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); return 0; } -VG_STATIC void vg_launch_opt(void) -{ +VG_STATIC void vg_launch_opt(void){ } -VG_STATIC void vg_preload(void) -{ +VG_STATIC void vg_preload(void){ vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); @@ -49,36 +46,29 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); } -VG_STATIC void skaterift_load_post( void *data, u32 len ) -{ +VG_STATIC void skaterift_load_post( void *data, u32 len ){ skaterift_loaded = 1; } -VG_STATIC void vg_load(void) -{ +VG_STATIC void vg_load(void){ vg_bake_shaders(); vg_async_call( skaterift_load_post, NULL, 0 ); } -VG_STATIC void vg_update(void) -{ +VG_STATIC void vg_pre_update(void){ } -VG_STATIC void vg_update_fixed(void) -{ +VG_STATIC void vg_fixed_update(void){ } -VG_STATIC void vg_update_post(void) -{ +VG_STATIC void vg_post_update(void){ } -VG_STATIC void vg_framebuffer_resize( int w, int h ) -{ +VG_STATIC void vg_framebuffer_resize( int w, int h ){ //render_fb_resize(); } -VG_STATIC void vg_render(void) -{ +VG_STATIC void vg_render(void){ glBindFramebuffer( GL_FRAMEBUFFER, 0 ); glViewport( 0,0, vg.window_x, vg.window_y ); @@ -93,16 +83,29 @@ VG_STATIC void vg_render(void) vg_lines_drawall(); } -VG_STATIC void vg_gui(void) -{ +VG_STATIC void vg_gui(void){ if( !skaterift_loaded ) return; - ui_rect null; - ui_rect screen = { 0, 0, vg.window_x, vg.window_y }; - ui_rect window = { 0, 0, 1000, 700 }; - ui_rect_center( screen, window ); + static ui_rect window; + static int once = 1; + if( once ){ + ui_rect screen = { 0, 0, vg.window_x, vg.window_y }; + rect_copy( (ui_rect){ 0, 0, 1000, 700 }, window ); + ui_rect_center( screen, window ); + once = 0; + } + vg_ui.wants_mouse = 1; + ui_rect panel; + if( vgi_window( window, "Test window", k_vgi_window_standard, panel ) ){ + + } + else{ + /* window close */ + } + +#if 0 ui_fill( window, ui_colour( k_ui_bg+1 ) ); ui_outline( window, 1, ui_colour( k_ui_bg+7 ) ); @@ -123,4 +126,5 @@ VG_STATIC void vg_gui(void) ui_textbox( tbox, g_an_buffer, 4096, 0, NULL ); ui_dev_colourview(); +#endif }