refactor & vg_m

[fishladder.git] / vg / vg.h

diff --git a/vg/vg.h b/vg/vg.h
index c6b8fb9d21af30ad17914dca6bb19244da0affe5..b35091b5aa5e2779e39c64ccf76bdad1dee225ee 100644 (file)
--- 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;
@@ -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 )
@@ -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;