scoreboards

[carveJwlIkooP6JGAAIwe30JlM.git] / main.c

diff --git a/main.c b/main.c
index 0d4ee25781014e1026cd45c90721130aab2cbafb..6e61fa25cbf6b5f259f08c116270b84f2bed491c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -26,11 +26,13 @@
 #include "audio.h"
 #include "world.h"
 #include "player.h"
+#include "network.h"
 
-static int cl_ui = 1;
+static int cl_ui     = 1,
+           cl_menu   = 0;
 
 int main( int argc, char *argv[] )
-{ 
+{
    vg_enter( argc, argv, "Voyager Game Engine" ); 
 }
 
@@ -109,6 +111,11 @@ void vg_update( int loaded )
       player_update_pre();
       world_update( player.phys.rb.co );
    }
+
+   if( vg_get_button_down( "menu" ) )
+   {
+      cl_menu = !cl_menu;
+   }
 }
 
 static void vg_update_fixed( int loaded )
@@ -139,7 +146,11 @@ static void render_main_game(void)
    m4x4f world_4x4;
    m4x3_expand( player.camera_inverse, world_4x4 );
 
-   gpipeline.fov = freecam? 60.0f: 125.0f; /* 120 */
+   static float fov = 97.0f;
+   float fov_target = player.phys.on_board? 125.0f: 108.0f;
+   fov = vg_lerpf( fov, fov_target, vg.time_delta * 2.0f );
+
+   gpipeline.fov = freecam? 60.0f: fov; /* 120 */
    m4x4_projection( vg.pv, gpipeline.fov, 
          (float)vg.window_x / (float)vg.window_y, 
          0.02f, 2100.0f );
@@ -228,6 +239,39 @@ void vg_render(void)
 
 void vg_ui(void)
 {
+   if( cl_menu )
+   {
+      ui_rect menu =
+      {
+         vg.window_x / 2 - 150,
+         vg.window_y / 2 - 50,
+         300,
+         130
+      };
+
+      ui_fill_rect( &ui_global_ctx, menu, 0xa0000000 );
+
+      ui_text( &ui_global_ctx, (ui_rect){ menu[0]+menu[2]/2,menu[1]+6, 0, 0 },
+                               steam_username_at_startup, 
+                               1, k_text_align_center );
+      menu[1] += 24;
+      menu[3] -= 30;
+
+      ui_rect_pad( menu, 8 );
+      ui_fill_rect( &ui_global_ctx, menu, 0x90ffffff );
+      ui_rect_pad( menu, 2 );
+      ui_fill_rect( &ui_global_ctx, menu, 0xa0000000 );
+
+      menu[1] += 32;
+      ui_text( &ui_global_ctx, (ui_rect){ menu[0]+menu[2]/2,menu[1], 0, 0 },
+                               "Exit", 2, k_text_align_center );
+
+      if( vg_get_button_down( "jump" ) )
+      {
+         glfwSetWindowShouldClose( vg.window, 1 );
+      }
+   }
+   
 #if 0
    if( lightedit )
    {