fix movement bugs

[fishladder.git] / vg / vg.h

diff --git a/vg/vg.h b/vg/vg.h
index b0119ecf03458ac0f3c2abe0c6a3d895c04cb336..53670b24ad93f6034b9f87111f3585a60b11de75 100644 (file)
--- 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"
 
@@ -134,7 +139,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 {
 #ifdef VG_STEAM
        // Initialize steamworks
-       if( !sw_init( 1218140U ) )
+       if( !sw_init( VG_STEAM_APPID ) )
        {
                vg_exiterr( "Steamworks failed to initialize" );
        }
@@ -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;