X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=0219a66463261341751e391e2e6a14e3e7247121;hb=98ecdd9f0377f1563566fe4d3d3b8185a055ec4d;hp=ba6f384ca48debf596103cdfce8fc4c24c3866f0;hpb=ecc4dfbfb3adf91d2dfc03ba0ec9a821fcc2390c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/main.c b/main.c
index ba6f384..0219a66 100644
--- a/main.c
+++ b/main.c
@@ -16,6 +16,7 @@ vg_tex2d tex_water = { .path = "textures/water.qoi" };
 /* Convars */
 static int debugview = 0;
 static int sv_debugcam = 0;
+static int lightedit = 0;
 
 /* Components */
 #include "road.h"
@@ -89,7 +90,7 @@ static int playermodel( int argc, char const *argv[] )
 void vg_start(void)
 {
    vg_convar_push( (struct vg_convar){
-      .name = "freecam",
+      .name = "fc",
       .data = &freecam,
       .data_type = k_convar_dtype_i32,
       .opt_i32 = { .min=0, .max=1, .clamp=1 },
@@ -104,6 +105,14 @@ void vg_start(void)
       .persistent = 1
    });
 
+   vg_convar_push( (struct vg_convar){
+      .name = "ledit",
+      .data = &lightedit,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min=0, .max=1, .clamp=1 },
+      .persistent = 1
+   });
+
    vg_convar_push( (struct vg_convar){
       .name = "walk_speed",
       .data = &k_walkspeed,
@@ -112,6 +121,14 @@ void vg_start(void)
       .persistent = 1
    });
 
+   vg_convar_push( (struct vg_convar){
+      .name = "dt",
+      .data = &ktimestep,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 0
+   });
+
    vg_convar_push( (struct vg_convar){
       .name = "debugcam",
       .data = &sv_debugcam,
@@ -142,8 +159,8 @@ void vg_start(void)
 
    world_load();
 
-   reset_player( 1, (const char *[]){ "tutorial" } );
-   player_transform_update();
+   reset_player( 1, (const char *[]){ "start" } );
+   rb_init( &player.rb );
 }
 
 void vg_free(void)
@@ -154,6 +171,14 @@ void vg_free(void)
 void vg_update(void)
 {
    player_update();
+   world_update();
+   //traffic_visualize( world.traffic, world.traffic_count );
+   //
+   /* TEMP */
+   if( glfwGetKey( vg_window, GLFW_KEY_J ))
+   {
+      v3_copy( player.camera_pos, world.mr_ball.co );
+   }
 }
 
 static void vg_framebuffer_resize( int w, int h )
@@ -172,7 +197,7 @@ void vg_render(void)
    glClearColor( 0.11f, 0.35f, 0.37f, 1.0f );
    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
 
-   float speed = freecam? 0.0f: v3_length( player.v );
+   float speed = freecam? 0.0f: v3_length( player.rb.v );
    v3f shake = { vg_randf()-0.5f, vg_randf()-0.5f, vg_randf()-0.5f };
    v3_muls( shake, speed*0.01f, shake );
 
@@ -226,7 +251,14 @@ void vg_render(void)
       glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
    else
       glClear( GL_COLOR_BUFFER_BIT );
-
+   
+   if( !player.is_dead )
+   {
+      m4x4_projection( vg_pv, gpipeline.fov, 
+            (float)vg_window_x / (float)vg_window_y, 
+            0.01f, 100.0f );
+      m4x4_mul( vg_pv, world_4x4, vg_pv );
+   }
    draw_player();
 
    /* Draw back in the background
@@ -253,10 +285,29 @@ void vg_render(void)
    glViewport( 0,0, vg_window_x, vg_window_y );
 }
 
+static void run_light_widget( struct light_widget *lw )
+{
+   struct ui_checkbox c1 = { .data=&lw->enabled };
+
+   ui_checkbox( &ui_global_ctx, &c1 );
+   
+   if( lw->enabled )
+   {
+      struct ui_slider_vector 
+         colour = { .min=0.0f, .max=2.0f, .len=3, .data=lw->colour },
+         dir    = { .min=-VG_PIf, .max=VG_PIf, .len=2, .data=lw->dir };
+
+      ui_slider_vector( &ui_global_ctx, &colour );
+      ui_global_ctx.cursor[1] += 4;
+      ui_slider_vector( &ui_global_ctx, &dir );
+   }
+}
+
 void vg_ui(void)
 {
    char buf[20];
 
+#if 0
    snprintf( buf, 20, "%.2fm/s", v3_length( player.v ) );
    gui_text( (ui_px [2]){ 0, 0 }, buf, 1, k_text_align_left );
    
@@ -281,4 +332,40 @@ void vg_ui(void)
       gui_text( (ui_px [2]){ 0, 60 }, 
             "Gamepad not ready", 1, k_text_align_left );
    }
+#endif
+   
+   if( lightedit )
+   {
+      ui_global_ctx.cursor[0] = 10;
+      ui_global_ctx.cursor[1] = 10;
+      ui_global_ctx.cursor[2] = 200;
+      ui_global_ctx.cursor[3] = 20;
+
+      struct ub_world_lighting *wl = &gpipeline.ub_world_lighting;
+      struct ui_slider_vector 
+         s5 = { .min=0.0f, .max=2.0f, .len=3, .data=wl->g_ambient_colour };
+
+      struct ui_slider
+         s8 = { .min=0.0f, .max=2.0f, .data = &gpipeline.shadow_spread },
+         s9 = { .min=0.0f, .max=25.0f, .data = &gpipeline.shadow_length };
+
+      for( int i=0; i<3; i++ )
+         run_light_widget( &gpipeline.widgets[i] );
+
+      gui_text( ui_global_ctx.cursor, "Ambient", 1, 0 );
+      ui_global_ctx.cursor[1] += 16;
+      ui_slider_vector( &ui_global_ctx, &s5 );
+
+      gui_text( ui_global_ctx.cursor, "Shadows", 1, 0 );
+      ui_global_ctx.cursor[1] += 16;
+      ui_slider( &ui_global_ctx, &s8 );
+      ui_slider( &ui_global_ctx, &s9 );
+
+      gui_text( ui_global_ctx.cursor, "Misc", 1, 0 );
+      ui_global_ctx.cursor[1] += 16;
+      struct ui_checkbox c1 = {.data = &wl->g_light_preview};
+      ui_checkbox( &ui_global_ctx, &c1 );
+
+      render_update_lighting_ub();
+   }
 }