X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=518ac439995c8dd39c42764e4217b9ae4161ebd6;hb=23ef4d7f6bfe6a5a91c78822b081a9ea63cb74a6;hp=c0fe0031cc71e44da732218dfbfa3c9606d2bc74;hpb=c52e639cdcf6d21f69caa9625238afded7513ca4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index c0fe003..518ac43 100644 --- a/skaterift.c +++ b/skaterift.c @@ -18,9 +18,30 @@ #include "render.h" #include "audio.h" #include "world.h" + +#if 0 #include "player.h" +#else +#include "player_interface.h" +#include "player_device_walk.h" +#include "player_device_skate.h" +#include "player_model.h" + +/* temp */ +VG_STATIC player_interface localplayer; +VG_STATIC struct player_device_walk localplayer_walk; +VG_STATIC struct player_device_skate localplayer_skate; +VG_STATIC struct player_avatar localplayer_avatar; +VG_STATIC glmesh localplayer_meshes[3]; + +#endif + #include "network.h" + +#if 0 #include "menu.h" +#endif +#include "vehicle.h" static int cl_ui = 1, cl_view_id = 0, @@ -45,10 +66,64 @@ VG_STATIC void vg_launch_opt(void) } +VG_STATIC int __respawn( int argc, const char *argv[] ) +{ + struct respawn_point *rp = NULL, *r; + + if( argc == 1 ) + { + for( int i=0; iname, argv[0] ) ) + { + rp = r; + break; + } + } + + if( !rp ) + vg_warn( "No spawn named '%s'\n", argv[0] ); + } + + if( !rp ) + { + float min_dist = INFINITY; + + for( int i=0; ico, localplayer.rb.co ); + + vg_info( "Dist %s : %f\n", r->name, d ); + if( d < min_dist ) + { + min_dist = d; + rp = r; + } + } + } + + if( !rp ) + { + vg_error( "No spawn found\n" ); + + if( !world.spawn_count ) + return 0; + + rp = &world.spawns[0]; + } + + player_spawn( &localplayer, rp ); + return 1; +} + VG_STATIC void vg_preload(void) { g_conf_init(); + common_var_temp(); + vg_var_push( (struct vg_var){ .name = "cl_ui", .data = &cl_ui, @@ -73,6 +148,12 @@ VG_STATIC void vg_preload(void) .persistent = 0 }); + vg_function_push( (struct vg_cmd) { + .name = "respawn", + .function = __respawn, + //.poll_suggest = reset_player_poll + }); + vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2022 |\\ /| | / | | | | /| \n" ); vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); @@ -92,12 +173,73 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " vg_loader_step( network_init, network_end ); } +VG_STATIC void load_playermodels(void) +{ + vg_linear_clear( vg_mem.scratch ); + + /* + * load in other player models. This may need to be more sophisticated in + * the futre if we have more of these guys + */ + mdl_context ctx_default, + ctx_outlaw, + ctx_jordan; + + mdl_open( &ctx_default, "models/ch_new.mdl" ); + mdl_load_metadata( &ctx_default, vg_mem.scratch ); + mdl_load_mesh_data( &ctx_default, vg_mem.scratch ); + mdl_close( &ctx_default ); + + mdl_open( &ctx_outlaw, "models/ch_outlaw.mdl" ); + mdl_load_metadata( &ctx_outlaw, vg_mem.scratch ); + mdl_load_mesh_data( &ctx_outlaw, vg_mem.scratch ); + mdl_close( &ctx_outlaw ); + + mdl_open( &ctx_jordan, "models/ch_jordan.mdl" ); + mdl_load_metadata( &ctx_jordan, vg_mem.scratch ); + mdl_load_mesh_data( &ctx_jordan, vg_mem.scratch ); + mdl_close( &ctx_jordan ); + + vg_acquire_thread_sync(); + { + mdl_unpack_glmesh( &ctx_default, &localplayer_meshes[0] ); + mdl_unpack_glmesh( &ctx_outlaw, &localplayer_meshes[1] ); + mdl_unpack_glmesh( &ctx_jordan, &localplayer_meshes[2] ); + } + vg_release_thread_sync(); + + /* FIXME: hack */ + shader_viewchar_register(); + vg_acquire_thread_sync(); + { + vg_tex2d_init( (vg_tex2d *[]){ &tex_characters }, 1 ); + } + vg_release_thread_sync(); +} + VG_STATIC void vg_load(void) { vg_loader_step( render_init, NULL ); - vg_loader_step( menu_init, NULL ); + //vg_loader_step( menu_init, NULL ); vg_loader_step( world_init, NULL ); - vg_loader_step( player_init, NULL ); + //vg_loader_step( player_init, NULL ); + //vg_loader_step( vehicle_init, NULL ); + // + //vg_loader_step( player_model_init, NULL ); + + /* ----------------- */ + vg_loader_step( load_playermodels, NULL ); + + /* player setup */ + player_interface_create_player( &localplayer ); + + player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); + player_use_avatar( &localplayer, &localplayer_avatar ); + player_use_mesh( &localplayer, &localplayer_meshes[0] ); + player_use_device( &localplayer, &player_device_walk, &localplayer_walk ); + player_use_device( &localplayer, &player_device_skate, &localplayer_skate ); + + /* --------------------- */ vg_bake_shaders(); vg_loader_step( audio_init, audio_free ); @@ -112,7 +254,7 @@ VG_STATIC void vg_load(void) VG_STATIC void vg_start(void) { - reset_player( 1, (const char *[]){ "start" } ); + __respawn( 1, (const char *[]){ "start" } ); } VG_STATIC void draw_origin_axis(void) @@ -130,9 +272,14 @@ VG_STATIC void vg_update(void) { draw_origin_axis(); network_update(); + +#if 0 + if( !gzoomer.inside ) + player_update_pre(); +#endif - player_update_pre(); - world_update( player.phys.rb.co ); + player_pre_update( &localplayer ); + world_update( localplayer.rb.co ); } } @@ -140,7 +287,14 @@ VG_STATIC void vg_update_fixed(void) { if( vg.is_loaded ) { - player_update_fixed(); +#if 0 + if( !gzoomer.inside ) + player_update_fixed(); + + vehicle_update_fixed(); +#endif + + player_update( &localplayer ); } } @@ -148,8 +302,23 @@ VG_STATIC void vg_update_post(void) { if( vg.is_loaded ) { - player_update_post(); +#if 0 + if( gzoomer.inside ) + { + vehicle_camera(); + } + else + { + player_update_post(); + } +#endif + + player_post_update( &localplayer ); + +#if 0 menu_update(); + vehicle_update_post(); +#endif } } @@ -175,7 +344,8 @@ VG_STATIC void present_view_with_post_processing(void) shader_blitblur_uBlurStrength(cl_blur_strength / (vg.frame_delta*60.0f)); v2f menu_blurring; - v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring ); + //v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring ); + v2_muls( (v2f){ 0.04f, 0.001f }, 0.0f, menu_blurring ); shader_blitblur_uOverrideDir( menu_blurring ); if( cl_view_id == 0 ) @@ -213,27 +383,27 @@ VG_STATIC void render_player_transparent(void) camera_finalize( &small_cam ); /* Draw player to window buffer and blend background ontop */ - glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - draw_player( &small_cam ); + player_render( &small_cam, &localplayer ); } VG_STATIC void render_scene(void) { render_fb_bind( gpipeline.fb_main ); glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); - glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT ); + glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT ); /* Draw world */ glEnable( GL_DEPTH_TEST ); - render_world( &main_camera ); - int player_transparent = !(player.is_dead || freecam), - player_draw = !cl_menu; + + + int player_transparent = 1, + player_draw = 1; if( !player_transparent && player_draw ) - draw_player( &main_camera ); + player_render( &main_camera, &localplayer ); render_water_texture( &main_camera ); render_fb_bind( gpipeline.fb_main ); @@ -247,24 +417,41 @@ VG_STATIC void render_scene(void) VG_STATIC void render_menu(void) { glClear( GL_DEPTH_BUFFER_BIT ); +#if 0 menu_render( &main_camera ); +#endif } VG_STATIC void render_main_game(void) { +#if 0 static float fov = 60.0f; float fov_target = vg_lerpf( 90.0f, 110.0f, cl_fov ); - if( player.phys.on_board ) + + if( player.controller == k_player_controller_skate ) fov_target = vg_lerpf( 97.0f, 135.0f, cl_fov ); + if( cl_menu ) fov_target = menu_fov_target; fov = vg_lerpf( fov, fov_target, vg.frame_delta * 2.0f ); fov = freecam? 60.0f: fov; main_camera.fov = fov; +#endif + + /* copy camera from player. + * TODO: blend with camera from menu */ + + /* FIXME: TEMP!! */ + player_pre_render( &localplayer ); + + v3_copy( localplayer.cam.pos, main_camera.pos ); + v3_copy( localplayer.cam.angles, main_camera.angles ); + main_camera.fov = localplayer.cam.fov; main_camera.nearz = 0.1f; main_camera.farz = 2100.0f; + camera_update_transform( &main_camera ); camera_update_view( &main_camera ); camera_update_projection( &main_camera ); camera_finalize( &main_camera ); @@ -274,11 +461,13 @@ VG_STATIC void render_main_game(void) render_scene(); present_view_with_post_processing(); +#if 0 if( cl_menu ) { render_menu(); render_player_transparent(); } +#endif /* =========== End Frame =========== */ } @@ -305,7 +494,11 @@ VG_STATIC void vg_render(void) VG_STATIC void run_light_widget( struct light_widget *lw ); VG_STATIC void vg_ui(void) { + player_ui( &localplayer ); + +#if 0 menu_crap_ui(); +#endif if( cl_light_edit ) { @@ -351,6 +544,10 @@ VG_STATIC void vg_ui(void) audio_debug_soundscapes(); render_view_framebuffer_ui(); + +#if 0 + player_physics_gui(); +#endif } VG_STATIC void run_light_widget( struct light_widget *lw ) @@ -373,9 +570,10 @@ VG_STATIC void run_light_widget( struct light_widget *lw ) VG_STATIC void run_debug_info(void) { +#if 0 char buf[40]; - snprintf( buf, 40, "%.2fm/s", v3_length( player.phys.rb.v ) ); + snprintf( buf, 40, "%.2fm/s", v3_length( player.rb.v ) ); ui_text( (ui_px [2]){ 0, 0 }, buf, 1, k_text_align_left ); snprintf( buf, 40, "%.2f %.2f %.2f m/s", @@ -399,4 +597,5 @@ VG_STATIC void run_debug_info(void) ui_text( (ui_px [2]){ 0, 60 }, "Gamepad not ready", 1, k_text_align_left ); } +#endif }