X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=e053c42177fb515e180930775d1c2486e251b948;hb=d57b7661518800479c00300ce57407378696eec9;hp=8b2f5615193d5eb146719b4993bddc2c5ca16237;hpb=84a7ae83a25966e0004a1a4b409dbb3d49fae286;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/main.c b/main.c index 8b2f561..e053c42 100644 --- a/main.c +++ b/main.c @@ -17,7 +17,7 @@ vg_tex2d tex_water = { .path = "textures/water.qoi" }; static int debugview = 0; static int sv_debugcam = 0; static int lightedit = 0; -static int sv_scene = 1; +static int sv_scene = 0; /* Components */ #include "road.h" @@ -38,9 +38,7 @@ static int sv_scene = 1; #include "shaders/standard.h" #include "shaders/unlit.h" -#ifndef VG_RELEASE #include "physics_test.h" -#endif void vg_register(void) { @@ -57,6 +55,7 @@ void vg_register(void) static void init_other(void) { + player_init(); render_init(); gate_init(); world_init(); @@ -77,7 +76,7 @@ vg_tex2d *texture_list[] = int main( int argc, char *argv[] ) { - vg_init( argc, argv, "CARBE" ); + vg_init( argc, argv, "Voyager Game Engine" ); } static int playermodel( int argc, char const *argv[] ) @@ -94,14 +93,6 @@ static int playermodel( int argc, char const *argv[] ) void vg_start(void) { - vg_convar_push( (struct vg_convar){ - .name = "scene", - .data = &sv_scene, - .data_type = k_convar_dtype_i32, - .opt_i32 = { .min=0, .max=1, .clamp=1 }, - .persistent = 1 - }); - vg_convar_push( (struct vg_convar){ .name = "fc", .data = &freecam, @@ -175,7 +166,7 @@ void vg_start(void) if( sv_scene == 0 ) { - character_load( &player.mdl, "ch_default" ); + character_load( &player.mdl, "ch_outlaw" ); character_init_ragdoll( &player.mdl ); world_load(); @@ -285,7 +276,7 @@ static void render_main_game(void) { m4x4_projection( vg_pv, gpipeline.fov, (float)vg_window_x / (float)vg_window_y, - 0.01f, 100.0f ); + 0.04f, 600.0f ); m4x4_mul( vg_pv, world_4x4, vg_pv ); } draw_player();