projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic tile editing
[fishladder.git]
/
vg
/
vg.h
diff --git
a/vg/vg.h
b/vg/vg.h
index 6b4cd233a5365a1ecbdfa66b4a4374773c515e6d..512c9a39defb6808ef31ebc6f8cd173d38cc6e13 100644
(file)
--- a/
vg/vg.h
+++ b/
vg/vg.h
@@
-18,10
+18,13
@@
void vg_register_exit( void( *funcptr )(void), const char *name );
void vg_exiterr( const char *strErr );
void vg_register_exit( void( *funcptr )(void), const char *name );
void vg_exiterr( const char *strErr );
+mat4 vg_pv;
+
#include "vg/vg_platform.h"
#include "vg/vg_io.h"
#include "vg/vg_audio.h"
#include "vg/vg_shader.h"
#include "vg/vg_platform.h"
#include "vg/vg_io.h"
#include "vg/vg_audio.h"
#include "vg/vg_shader.h"
+#include "vg/vg_lines.h"
#include "steam/steamworks_thin.h"
#include "steam/steamworks_thin.h"
@@
-333,8
+336,12
@@
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_lines_init();
+ vg_register_exit( &vg_lines_free, "vg_lines_free" );
vg_start();
vg_start();
+ vg_register_exit( &vg_free, "vg_free" );
+
if( vg_shaders_compile() )
{
// Main gameloop
if( vg_shaders_compile() )
{
// Main gameloop
@@
-351,12
+358,11
@@
static void vg_init( int argc, char *argv[], const char *window_name )
vg_time_delta = vg_min( vg_time - vg_time_last, 0.1f );
vg_update_inputs();
vg_time_delta = vg_min( vg_time - vg_time_last, 0.1f );
vg_update_inputs();
-
vg_update();
vg_update();
+ vg_render();
- // Update mashed projections etc
+ vg_lines_drawall();
- vg_render();
vg_ui();
glfwSwapBuffers( vg_window );
vg_ui();
glfwSwapBuffers( vg_window );
@@
-365,7
+371,6
@@
static void vg_init( int argc, char *argv[], const char *window_name )
}
}
}
}
- vg_free();
vg_exit();
}
vg_exit();
}