X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg.h;h=ba392bb99adba028461ce7278a6775880a1c9632;hb=a46972aa1ee718339c2512cae986f2943bed0e04;hp=2c86d4d3b596749469f7550c84947acca1118f6e;hpb=5cd0365349b88c7774e0e18c0cad591156512c1f;p=fishladder.git

diff --git a/vg/vg.h b/vg/vg.h
index 2c86d4d..ba392bb 100644
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -35,8 +35,8 @@ m3x3f vg_pv;
 
 // Engine globals
 GLFWwindow* vg_window;
-int vg_window_x = 1280;
-int vg_window_y = 720;
+int vg_window_x = 1366;
+int vg_window_y = 768;
 
 v2f vg_mouse;
 v3f vg_mouse_ws;
@@ -150,6 +150,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 	glfwWindowHint( GLFW_CONTEXT_VERSION_MINOR, 3 );
 	glfwWindowHint( GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE );
 	glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE );
+	glfwWindowHint( GLFW_RESIZABLE, GLFW_FALSE );
 	
 	glfwWindowHint( GLFW_SAMPLES, 4 );
 	
@@ -248,24 +249,14 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 			
 			{
 				ui_begin( &ui_global_ctx, vg_window_x, vg_window_y );
-		
-				// TODO: Find a more elegent form for this
-				int mouse_state = 0;
-				if( vg_get_button( "primary" ) ) mouse_state = 2;
-				if( vg_get_button_down( "primary" ) ) mouse_state = 1;
-				if( vg_get_button_up( "primary" ) ) mouse_state = 3;
-					
-				ui_set_mouse( &ui_global_ctx, vg_mouse[0], vg_mouse[1], mouse_state );
+				ui_set_mouse( &ui_global_ctx, vg_mouse[0], vg_mouse[1], vg_get_button_state( "primary" ) );
 				
 				vg_ui();
 				vg_console_draw();
 				vg_debugtools_draw();
 				
 				ui_resolve( &ui_global_ctx );
-				m3x3f view = M3X3_IDENTITY;
-				m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } );
-				m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } );	
-				ui_draw( &ui_global_ctx );
+				ui_draw( &ui_global_ctx, NULL );
 			}
 			
 			glfwSwapBuffers( vg_window );