cross compile build script

[fishladder.git] / vg / vg.h

diff --git a/vg/vg.h b/vg/vg.h
index 190b9e96f0e9b34f6db165fb19b1d36a9e7f4828..575bf036eeabf667aa322983555a3a2dee818830 100644 (file)
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -48,6 +48,7 @@ int vg_window_y = 768;
 #endif
 
 v2f vg_mouse;
+v2f vg_mouse_wheel;
 v3f vg_mouse_ws;
 
 float  vg_time;
@@ -130,7 +131,8 @@ void vg_mouse_callback( GLFWwindow* ptrW, double xpos, double ypos )
 
 void vg_scroll_callback( GLFWwindow* ptrW, double xoffset, double yoffset )
 {
-       
+       vg_mouse_wheel[0] += xoffset;
+       vg_mouse_wheel[1] += yoffset;
 }
 
 void vg_framebuffer_resize_callback( GLFWwindow *ptrW, int w, int h )
@@ -208,9 +210,6 @@ static void vg_init( int argc, char *argv[], const char *window_name )
        const unsigned char* glver = glGetString( GL_VERSION );
        vg_success( "Load setup complete, OpenGL version: %s\n", glver );
        
-       vg_console_init();
-       vg_register_exit( &vg_console_free, "Console" );
-       
        vg_run_gfx_diagnostics();
        
        for( int id = 0; id <= GLFW_JOYSTICK_LAST; id ++ )
@@ -239,6 +238,9 @@ static void vg_init( int argc, char *argv[], const char *window_name )
        {
                vg_start();
        
+               vg_console_init();
+               vg_register_exit( &vg_console_free, "Console" );
+       
                vg_audio_init();
                vg_register_exit( &vg_audio_free, "vg_audio_free" );
                
@@ -247,6 +249,8 @@ static void vg_init( int argc, char *argv[], const char *window_name )
                // Main gameloop
                while( !glfwWindowShouldClose( vg_window ) )
                {
+                       v2_copy( (v2f){ 0.0f, 0.0f }, vg_mouse_wheel );
+
                        glfwPollEvents();
                        
                        #ifdef VG_STEAM