projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f0c064f
)
testing
author
hgn
<hgodden00@gmail.com>
Fri, 1 Sep 2023 21:19:05 +0000
(22:19 +0100)
committer
hgn
<hgodden00@gmail.com>
Fri, 1 Sep 2023 21:19:05 +0000
(22:19 +0100)
skaterift.c
patch
|
blob
|
history
skaterift_imgui_dev.c
patch
|
blob
|
history
diff --git
a/skaterift.c
b/skaterift.c
index 983ca9ba99c5fddc1b7d112fa7d36b5053ecf259..099ff993383b230424dd34abed69fd6009b8b5b5 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-11,7
+11,7
@@
* =============================================================================
*/
* =============================================================================
*/
-#if
1
+#if
0
#define SR_NETWORKED
#define SR_NETWORKED
diff --git
a/skaterift_imgui_dev.c
b/skaterift_imgui_dev.c
index 9d69bfcc7d7ca6e8cd196f2c9e4c8ce6140026b6..6247b82d9fe42d0f9420da5386c9b8ae8a91a4e0 100644
(file)
--- 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 ];
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_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" );
vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" );
vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" );
vg_info(" | \\ / | +-- / +----- +---' | / | \n" );
@@
-49,36
+46,29
@@
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
}
"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;
}
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_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();
}
//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 );
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_lines_drawall();
}
-VG_STATIC void vg_gui(void)
-{
+VG_STATIC void vg_gui(void){
if( !skaterift_loaded ) return;
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;
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 ) );
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();
ui_textbox( tbox, g_an_buffer, 4096, 0, NULL );
ui_dev_colourview();
+#endif
}
}