projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more refactors..
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift_imgui_dev.c
diff --git
a/skaterift_imgui_dev.c
b/skaterift_imgui_dev.c
index b27489b73fcaa5165edb4d4e5cfe5959d2b6b38f..d4365e120d47c230d852a93e03db7983588c8b80 100644
(file)
--- a/
skaterift_imgui_dev.c
+++ b/
skaterift_imgui_dev.c
@@
-13,7
+13,9
@@
#define SR_NETWORKED
#define VG_DEVWINDOW
#define SR_NETWORKED
#define VG_DEVWINDOW
+
#include "common.h"
#include "common.h"
+#if 0
#include "conf.h"
#include "steam.h"
#include "render.h"
#include "conf.h"
#include "steam.h"
#include "render.h"
@@
-23,8
+25,10
@@
#include "player.h"
#include "entity.c"
#include "workshop.c"
#include "player.h"
#include "entity.c"
#include "workshop.c"
+#endif
static int skaterift_loaded = 0;
static int skaterift_loaded = 0;
+static char g_an_buffer[ 4096 ];
int main( int argc, char *argv[] )
{
int main( int argc, char *argv[] )
{
@@
-47,9
+51,6
@@
vg_info(" | \\ / | | / | | \\ | / | \n" );
vg_info(" | \\/ | | / | | \\ | / | \n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
vg_info(" | \\/ | | / | | \\ | / | \n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
-
- steam_init();
- vg_loader_step( NULL, steam_end );
}
VG_STATIC void skaterift_load_post( void *data, u32 len )
}
VG_STATIC void skaterift_load_post( void *data, u32 len )
@@
-65,7
+66,6
@@
VG_STATIC void vg_load(void)
VG_STATIC void vg_update(void)
{
VG_STATIC void vg_update(void)
{
- steam_update();
}
VG_STATIC void vg_update_fixed(void)
}
VG_STATIC void vg_update_fixed(void)
@@
-78,7
+78,7
@@
VG_STATIC void vg_update_post(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)
@@
-118,6
+118,13
@@
VG_STATIC void vg_gui(void)
ui_rect quit_button;
ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button );
ui_rect quit_button;
ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button );
+ if( ui_button_text( quit_button, "x", 1 ) ){
+ ui_start_modal( g_an_buffer, UI_MODAL_GOOD );
+ }
+
+ ui_rect tbox;
+ ui_split( panel, k_ui_axis_h, 28, 0, tbox, panel );
+ ui_textbox( tbox, g_an_buffer, 4096, 0, NULL );
ui_dev_colourview();
}
ui_dev_colourview();
}