projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better console handling // simple map serialzer
[fishladder.git]
/
vg
/
vg.h
diff --git
a/vg/vg.h
b/vg/vg.h
index b0119ecf03458ac0f3c2abe0c6a3d895c04cb336..bf3a0a0224166961d968560d04e2e1cd41dc8f90 100644
(file)
--- a/
vg/vg.h
+++ b/
vg/vg.h
@@
-6,6
+6,7
@@
#include <stdint.h>
#include <string.h>
#include <stdarg.h>
#include <stdint.h>
#include <string.h>
#include <stdarg.h>
+#include <ctype.h>
#include "gl/glad/glad.h"
#include "gl/glfw3.h"
#include "gl/glad/glad.h"
#include "gl/glfw3.h"
@@
-47,8
+48,8
@@
float vg_time_delta;
#include "vg/vg_tex.h"
#include "vg/vg_input.h"
#include "vg/vg_ui.h"
#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_console.h"
+#include "vg/vg_debug.h"
#include "steam/steamworks_thin.h"
#include "steam/steamworks_thin.h"
@@
-180,8
+181,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 );
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) )
//glfwSetInputMode(vg_window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
if( !gladLoadGLLoader((GLADloadproc)glfwGetProcAddress) )
@@
-225,7
+226,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_audio_init();
vg_register_exit( &vg_audio_free, "vg_audio_free" );
-
+
+ vg_debugtools_setup();
+
// Main gameloop
while( !glfwWindowShouldClose( vg_window ) )
{
// Main gameloop
while( !glfwWindowShouldClose( vg_window ) )
{
@@
-258,6
+261,7
@@
static void vg_init( int argc, char *argv[], const char *window_name )
vg_ui();
vg_console_draw();
vg_ui();
vg_console_draw();
+ vg_debugtools_draw();
ui_resolve( &ui_global_ctx );
m3x3f view = M3X3_IDENTITY;
ui_resolve( &ui_global_ctx );
m3x3f view = M3X3_IDENTITY;