X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg.h;h=22cd0a7e3e80bb3fd1a2f41b97c46f97d2bb905c;hb=72e9a469a490e537f2e12464c1b075eb8991a868;hp=84991dbb1135754ab8519e4462df7f0465a3157d;hpb=d1f03ec872df15d17f12f3444d72e161bd73b147;p=fishladder.git diff --git a/vg/vg.h b/vg/vg.h index 84991db..22cd0a7 100644 --- a/vg/vg.h +++ b/vg/vg.h @@ -7,14 +7,18 @@ #include #include #include +#include #include "gl/glad/glad.h" #include "gl/glfw3.h" #define STB_DS_IMPLEMENTATION -#define STB_IMAGE_IMPLEMENTATION #include "stb/stb_ds.h" -#include "stb/stb_image.h" +//#define STB_IMAGE_IMPLEMENTATION +//#include "stb/stb_image.h" + +#define QOI_IMPLEMENTATION +#include "phoboslab/qoi.h" #include "vg/vg_platform.h" @@ -48,8 +52,8 @@ float vg_time_delta; #include "vg/vg_tex.h" #include "vg/vg_input.h" #include "vg/vg_ui.h" -#include "vg/vg_debug.h" #include "vg/vg_console.h" +#include "vg/vg_debug.h" #include "steam/steamworks_thin.h" @@ -226,7 +230,9 @@ static void vg_init( int argc, char *argv[], const char *window_name ) vg_audio_init(); vg_register_exit( &vg_audio_free, "vg_audio_free" ); - + + vg_debugtools_setup(); + // Main gameloop while( !glfwWindowShouldClose( vg_window ) ) { @@ -259,6 +265,7 @@ static void vg_init( int argc, char *argv[], const char *window_name ) vg_ui(); vg_console_draw(); + vg_debugtools_draw(); ui_resolve( &ui_global_ctx ); m3x3f view = M3X3_IDENTITY;