X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg.h;h=22cd0a7e3e80bb3fd1a2f41b97c46f97d2bb905c;hb=edd5498fac470c6a98e45ab326c2bf2e2a552664;hp=b0119ecf03458ac0f3c2abe0c6a3d895c04cb336;hpb=3b9fa3ad6ac1ff919f31fafaeceac689c7c4736b;p=fishladder.git

diff --git a/vg/vg.h b/vg/vg.h
index b0119ec..22cd0a7 100644
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -6,14 +6,19 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdarg.h>
+#include <ctype.h>
+#include <math.h>
 
 #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"
 
@@ -47,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"
 
@@ -180,8 +185,8 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 	glfwSetCursorPosCallback( vg_window, vg_mouse_callback );
 	glfwSetScrollCallback( vg_window, vg_scroll_callback );
 	
-	//glfwSetCharCallback( vg_window, console_proc_wchar );
-	//glfwSetKeyCallback( vg_window, console_proc_key );
+	glfwSetCharCallback( vg_window, console_proc_wchar );
+	glfwSetKeyCallback( vg_window, console_proc_key );
 	//glfwSetInputMode(vg_window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
 
 	if( !gladLoadGLLoader((GLADloadproc)glfwGetProcAddress) ) 
@@ -225,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 ) )
 		{
@@ -258,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;