X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg.h;h=a7e520546e7f18530d68eb477f741f79682e3ff8;hb=6d04b6eb116567af3b63c1e5a1acbdf057004e0d;hp=c6b8fb9d21af30ad17914dca6bb19244da0affe5;hpb=57a968ab8ebab8b69852c81697bc8cd27f4784ed;p=fishladder.git

diff --git a/vg/vg.h b/vg/vg.h
index c6b8fb9..a7e5205 100644
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -15,14 +15,14 @@
 #include "stb/stb_ds.h"
 #include "stb/stb_image.h"
 
-#include "cglm/include/cglm/cglm.h"
+#include "vg/vg_platform.h"
 
 void vg_register_exit( void( *funcptr )(void), const char *name );
 void vg_exiterr( const char *strErr );
 
-mat4 vg_pv;
+m3x3f vg_pv;
 
-#include "vg/vg_platform.h"
+#include "vg/vg_m.h"
 #include "vg/vg_io.h"
 #include "vg/vg_audio.h"
 #include "vg/vg_shader.h"
@@ -41,8 +41,8 @@ GLFWwindow* vg_window;
 int vg_window_x = 1280;
 int vg_window_y = 720;
 
-float vg_mouse_x;
-float vg_mouse_y;
+v2f vg_mouse;
+v3f vg_mouse_ws;
 
 float	vg_time;
 float	vg_time_last;
@@ -132,7 +132,7 @@ static inline int vg_get_button_up( const char *button )
 
 static inline int key_is_keyboard( int const id )
 {
-	static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
+	vg_static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
 	return id > GLFW_MOUSE_BUTTON_LAST;
 }
 
@@ -240,8 +240,8 @@ void vg_exiterr( const char *strErr )
 
 void vg_mouse_callback( GLFWwindow* ptrW, double xpos, double ypos )
 {
-	vg_mouse_x = xpos;
-	vg_mouse_y = ypos;
+	vg_mouse[0] = xpos;
+	vg_mouse[1] = ypos;
 }
 
 void vg_scroll_callback( GLFWwindow* ptrW, double xoffset, double yoffset )
@@ -334,7 +334,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 			vg_gamepad_ready = 1;
 			vg_gamepad_id = id;
 			
-			return;
+			break;
 		}
 	}
 	
@@ -380,5 +380,23 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 	vg_exit();
 }
 
+// Screen projections
+// ============================================================================================
+
+void vg_projection_update(void)
+{
+	// Do transform local->world
+	vg_mouse_ws[0] = vg_mouse[0];
+	vg_mouse_ws[1] = vg_mouse[1];
+	vg_mouse_ws[2] = 1.0f;
+	
+	vg_mouse_ws[0] =   (2.0f * vg_mouse_ws[0]) / ((float)vg_window_x) - 1.0f;
+	vg_mouse_ws[1] = -((2.0f * vg_mouse_ws[1]) / ((float)vg_window_y) - 1.0f);
+	
+	m3x3f inverse;
+	m3x3_inv( vg_pv, inverse ); 
+	m3x3_mulv( inverse, vg_mouse_ws, vg_mouse_ws );
+}
+
 u32 NvOptimusEnablement = 0x00000001;
 int AmdPowerXpressRequestHighPerformance = 1;