refactor & vg_m

[fishladder.git] / vg / vg.h

diff --git a/vg/vg.h b/vg/vg.h
index 6b4cd233a5365a1ecbdfa66b4a4374773c515e6d..b35091b5aa5e2779e39c64ccf76bdad1dee225ee 100644 (file)
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -11,17 +11,23 @@
 #include "gl/glfw3.h"
 
 #define STB_DS_IMPLEMENTATION
+#define STB_IMAGE_IMPLEMENTATION
 #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 );
 
-#include "vg/vg_platform.h"
+m3x3f vg_pv;
+
+#include "vg/vg_m.h"
 #include "vg/vg_io.h"
 #include "vg/vg_audio.h"
 #include "vg/vg_shader.h"
+#include "vg/vg_lines.h"
+#include "vg/vg_tex.h"
 
 #include "steam/steamworks_thin.h"
 
@@ -35,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;
@@ -234,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 )
@@ -249,6 +255,7 @@ void vg_framebuffer_resize_callback( GLFWwindow *ptrW, int w, int h )
        vg_window_y = h;
 }
 
+static void vg_register(void) VG_GAMELOOP;
 static void vg_start(void) VG_GAMELOOP;
 static void vg_update(void) VG_GAMELOOP;
 static void vg_render(void) VG_GAMELOOP;
@@ -277,7 +284,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
        glfwWindowHint( GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE );
        glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE );
        
-       glfwWindowHint( GLFW_SAMPLES, 4 );
+       glfwWindowHint( GLFW_SAMPLES, 1 );
        
        GLFWmonitor *monitor_primary = glfwGetPrimaryMonitor();
        
@@ -333,10 +340,16 @@ 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_lines_init();
+       vg_register_exit( &vg_lines_free, "vg_lines_free" );
+       
+       vg_register();
+       vg_register_exit( &vg_free, "vg_free" );
        
-       vg_start();
        if( vg_shaders_compile() )
        {
+               vg_start();
+       
                // Main gameloop
                while( !glfwWindowShouldClose( vg_window ) )
                {
@@ -351,12 +364,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_update();
+                       vg_render();
                        
-                       // Update mashed projections etc
+                       vg_lines_drawall();
                        
-                       vg_render();
                        vg_ui();
                        
                        glfwSwapBuffers( vg_window );
@@ -365,9 +377,26 @@ static void vg_init( int argc, char *argv[], const char *window_name )
                }
        }
        
-       vg_free();
        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;