MENY

[carveJwlIkooP6JGAAIwe30JlM.git] / main.c

diff --git a/main.c b/main.c
index 2ac5e20bdddbe140c3d20e114baa4823bd4d7dbe..bbb4c321f310f8e297409801e3c3605c1874b2ae 100644 (file)
--- a/main.c
+++ b/main.c
@@ -27,6 +27,7 @@
 #include "world.h"
 #include "player.h"
 #include "network.h"
+#include "menu.h"
 
 static int cl_ui     = 1,
            cl_menu   = 0;
@@ -70,13 +71,13 @@ vg_info("            '        ' '--' [] '----- '----- '     ' '---'  "
 
    steam_init();
    vg_loader_highwater( NULL, steam_end, NULL );
-
    vg_loader_highwater( network_init, network_end, NULL );
 }
 
 void vg_load(void)
 {
    vg_loader_highwater( render_init, render_free, NULL );
+   vg_loader_highwater( menu_init, menu_free, NULL );
    vg_loader_highwater( world_init, world_free, NULL );
    vg_loader_highwater( player_init, NULL, NULL );
 
@@ -92,7 +93,7 @@ void vg_load(void)
 
 static void vg_start(void)
 {
-   player_load_model( "ch_new" );
+   player_load_model( "ch_jordan" );
    reset_player( 1, (const char *[]){ "start" } );
 }
 
@@ -109,21 +110,27 @@ void vg_update( int loaded )
 
    if( loaded )
    {
+      if( vg_get_button_down( "menu" ) )
+      {
+         cl_menu = !cl_menu;
+      }
+
       draw_origin_axis();
       network_update();
-      player_update_pre();
-      world_update( player.phys.rb.co );
-   }
 
-   if( vg_get_button_down( "menu" ) )
-   {
-      cl_menu = !cl_menu;
+      if( !cl_menu )
+      {
+         player_update_pre();
+         world_update( player.phys.rb.co );
+      }
+
+      menu_update( cl_menu );
    }
 }
 
 static void vg_update_fixed( int loaded )
 {
-   if( loaded )
+   if( loaded && !cl_menu )
    {
       player_update_fixed();
    }
@@ -131,7 +138,7 @@ static void vg_update_fixed( int loaded )
 
 static void vg_update_post( int loaded )
 {
-   if( loaded )
+   if( loaded && !cl_menu )
    {
       player_update_post();
    }
@@ -146,17 +153,32 @@ static void vg_framebuffer_resize( int w, int h )
 
 static void render_main_game(void)
 {
+   v3f *active_cam_inv = NULL,
+       *active_cam     = NULL;
+
    m4x4f world_4x4;
-   m4x3_expand( player.camera_inverse, world_4x4 );
+
+   if( cl_menu )
+   {
+      active_cam = menu_cam;
+      active_cam_inv = menu_cam_inv;
+   }
+   else
+   {
+      active_cam_inv = player.camera_inverse;
+      active_cam = player.camera;
+   }
+
+   m4x3_expand( active_cam_inv, world_4x4 );
 
    static float fov = 97.0f;
-   float fov_target = player.phys.on_board? 125.0f: 108.0f;
+   float fov_target = (player.phys.on_board&&!cl_menu)? 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 );
+         0.1f, 2100.0f );
 
    m4x4_mul( vg.pv, world_4x4, vg.pv );
    glEnable( GL_DEPTH_TEST );
@@ -167,15 +189,18 @@ static void render_main_game(void)
 
    int draw_solid = player.is_dead | freecam;
    
-   render_world( vg.pv, player.camera );
+   render_world( vg.pv, active_cam );
    if( draw_solid )
-      draw_player();
-   render_water_texture( player.camera );
+      draw_player( active_cam );
+
+   render_water_texture( active_cam );
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-   render_water_surface( vg.pv, player.camera );
+   render_water_surface( vg.pv, active_cam );
+   render_world_gates( vg.pv, player.phys.rb.co, active_cam );
 
-   render_world_gates( vg.pv, player.phys.rb.co, player.camera );
+   if( cl_menu )
+      menu_render( vg.pv );
    
    /* Copy the RGB of what we have into the background buffer */
    glBindFramebuffer( GL_READ_FRAMEBUFFER, 0 );
@@ -200,7 +225,7 @@ static void render_main_game(void)
             (float)vg.window_x / (float)vg.window_y, 
             0.01f, 600.0f );
       m4x4_mul( vg.pv, world_4x4, vg.pv );
-      draw_player();
+      draw_player( active_cam );
    }
 
    /* Draw back in the background
@@ -242,6 +267,7 @@ void vg_render(void)
 
 void vg_ui(void)
 {
+#if 0
    if( cl_menu )
    {
       ui_rect menu =
@@ -275,7 +301,6 @@ void vg_ui(void)
       }
    }
    
-#if 0
    if( lightedit )
    {
       ui_global_ctx.cursor[0] = 10;