X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=be4084ef8588c6a2b9b41159a7a8002cc1ca6cab;hb=4c3dc94e7221f599491e7d111cac3d51d8d83b17;hp=011fa268c3b1e4494c7b1a95f513a90cf74b5799;hpb=ca1798f62b65b72703e960d132dd0170728b7709;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 011fa26..be4084e 100644 --- a/skaterift.c +++ b/skaterift.c @@ -11,10 +11,9 @@ * ============================================================================= */ -#if 1 - #define SR_NETWORKED -#define SR_USE_LOCALHOST +#define VG_AUDIO_FORCE_COMPRESSED +#define SDL_MAIN_HANDLED #ifndef VG_RELEASE #define VG_DEVWINDOW @@ -49,12 +48,15 @@ #include "entity.c" #include "workshop.c" #include "addon.c" -#include "highscores.c" #include "save.c" -#include "respawn.c" +#include "world_map.c" #include "network.c" #include "player_remote.c" #include "vg/vg_audio_dsp.h" +#include "world_routes_ui.c" +#include "particle.c" +#include "player_effects.c" +#include "freecam.c" static int k_tools_mode = 0; @@ -79,6 +81,14 @@ static void vg_launch_opt(void){ if( vg_long_opt( "tools" ) ){ k_tools_mode = 1; } + + if( vg_long_opt( "demo" ) ){ + skaterift.demo_mode = 1; + } + + if( (arg = vg_long_opt_arg( "world" )) ){ + skaterift.hub_world = arg; + } } static void vg_preload(void){ @@ -90,6 +100,12 @@ vg_info(" | \\/ | | / | | \\ | / | \n" ); vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); + /* please forgive me! */ + u32 sz; char *drm; + if( (drm = vg_file_read_text( vg_mem.scratch, "DRM", &sz )) ) + if( !strcmp(drm, "blibby!") ) + skaterift.demo_mode = 0; + vg_loader_step( remote_players_init, NULL ); if( k_tools_mode ) @@ -100,13 +116,6 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " vg_loader_step( network_init, network_end ); } -static void load_playermodels(void){ - /* FIXME: hack */ - shader_model_character_view_register(); - shader_model_board_view_register(); - shader_model_entity_register(); -} - static void async_skaterift_player_start( void *payload, u32 size ){ world_switch_instance(0); } @@ -122,12 +131,12 @@ static void skaterift_restore_state(void){ vg_msg kvsav; vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) ); + skaterift.achievements |= vg_msg_getkvu32( &kvsav, "ach", 0 ); u32 board_reg_id = 0, player_reg_id = 0; vg_msg_cursor orig = kvsav.cur; - if( vg_msg_seekframe( &kvsav, "player" ) ){ addon_alias q; @@ -153,6 +162,47 @@ static void skaterift_restore_state(void){ kvsav.cur = orig; } +static addon_reg *skaterift_mount_world_unloadable( const char *path, u32 ext ){ + addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" ); + if( !reg ) vg_fatal_error( "world not found\n" ); + reg->flags |= (ADDON_REG_HIDDEN | ext); + return reg; +} + +static void skaterift_load_world_content(void){ + /* hub world */ + addon_reg *hub = skaterift_mount_world_unloadable( skaterift.hub_world, 0 ); + skaterift_mount_world_unloadable( "maps/mp_spawn", + ADDON_REG_CITY|ADDON_REG_PREMIUM ); + skaterift_mount_world_unloadable( "maps/mp_mtzero", + ADDON_REG_MTZERO|ADDON_REG_PREMIUM ); + skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 ); + skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 ); + + world_static.load_state = k_world_loader_load; + + struct world_load_args args = { + .purpose = k_world_purpose_hub, + .reg = hub + }; + skaterift_world_load_thread( &args ); +} + +static void skaterift_load_player_content(void){ + u32 bytes = 1024*1024*10; + skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); + skaterift.replay.size = bytes; + replay_clear( &skaterift.replay ); + + particle_alloc( &particles_grind, 300 ); + particle_alloc( &particles_env, 200 ); + + player_load_animation_reference( "models/ch_none.mdl" ); + player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); + player__bind(); + player_board_load( &localplayer.fallback_board, "models/board_none.mdl" ); +} + static void vg_load(void){ if( k_tools_mode ){ vg_async_call( async_call_ready, NULL, 0 ); @@ -162,6 +212,8 @@ static void vg_load(void){ vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL ); vg_console_reg_cmd( "switch_active_instance", skaterift_switch_instance_cmd, NULL ); + vg_console_reg_cmd( "fc", freecam_cmd, NULL ); + vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 ); vg_loader_step( render_init, NULL ); vg_loader_step( menu_init, NULL ); @@ -177,20 +229,9 @@ static void vg_load(void){ vg_loader_step( addon_system_init, NULL ); vg_loader_step( workshop_init, NULL ); vg_loader_step( skateshop_init, NULL ); - - /* ----------------- */ - vg_loader_step( load_playermodels, NULL ); + vg_loader_step( ent_tornado_init, NULL ); - /* player setup */ - u32 bytes = 1024*1024*10; - skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); - skaterift.replay.size = bytes; - replay_clear( &skaterift.replay ); - - player_load_animation_reference( "models/ch_none.mdl" ); - - player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); - player__bind(); + vg_loader_step( skaterift_load_player_content, NULL ); /* --------------------- */ @@ -203,48 +244,8 @@ static void vg_load(void){ * ------------------------------------- */ - /* hub world */ - addon_reg *hub = - addon_mount_local_addon( "maps/dev_hub", k_addon_type_world, ".mdl" ); - hub->metadata_len = 0; - - /* understate diy. */ - addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", - k_addon_type_world, - ".mdl" ); - { - vg_msg msg; - vg_msg_init( &msg, spawn->metadata, sizeof(spawn->metadata) ); - vg_msg_frame( &msg, "workshop" ); - vg_msg_wkvstr( &msg, "title", "Understate DIY" ); - vg_msg_end_frame( &msg ); - vg_msg_wkvstr( &msg, "location", "USA" ); - spawn->metadata_len = msg.cur.co; - } - - /* mtzero island */ - addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero", - k_addon_type_world, - ".mdl" ); - { - vg_msg msg; - vg_msg_init( &msg, spawn->metadata, sizeof(mtzero->metadata) ); - vg_msg_frame( &msg, "workshop" ); - vg_msg_wkvstr( &msg, "title", "Mt.Zero Island" ); - vg_msg_end_frame( &msg ); - vg_msg_wkvstr( &msg, "location", "Australia" ); - mtzero->metadata_len = msg.cur.co; - } - /* load home/permanent world manually */ - world_static.load_state = k_world_loader_load; - - struct world_load_args args = { - .purpose = k_world_purpose_hub, - .reg = hub - }; - skaterift_world_load_thread( &args ); - + vg_loader_step( skaterift_load_world_content, NULL ); vg_async_call( async_skaterift_player_start, NULL, 0 ); vg_async_stall(); @@ -261,6 +262,8 @@ static void vg_load(void){ /* and now */ skaterift_restore_state(); + update_ach_models(); + vg_loader_step( NULL, skaterift_autosave_synchronous ); //board_processview_thread(NULL); @@ -294,7 +297,8 @@ static void vg_pre_update(void){ /* time rate */ f32 target = 1; - if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ){ + if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu| + k_skaterift_world_map) ){ target = 0; } @@ -307,9 +311,11 @@ static void vg_pre_update(void){ world_entity_focus_preupdate(); skaterift_replay_pre_update(); remote_sfx_pre_update(); + skateshop_world_preupdate( world_current_instance() ); world_update( world_current_instance(), localplayer.rb.co ); audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); + world_map_pre_update(); } static void vg_fixed_update(void){ @@ -441,6 +447,16 @@ static void render_player_transparent(void){ player__render( &small_cam ); } +static world_instance *get_view_world(void){ + world_instance *view_world = world_current_instance(); + if( localplayer.gate_waiting && + (localplayer.gate_waiting->flags & k_ent_gate_nonlocal) ){ + view_world = &world_static.instances[world_static.active_instance ^ 0x1]; + } + + return view_world; +} + static void render_scene(void){ /* Draw world */ glEnable( GL_DEPTH_TEST ); @@ -451,7 +467,53 @@ static void render_scene(void){ } } - render_world( world_current_instance(), &skaterift.cam, 0, 0, 1, 1 ); + if( skaterift.activity == k_skaterift_world_map ){ + world_instance *world = world_current_instance(); + glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } ); + + v3f bg; + v3_muls( world->ub_lighting.g_daysky_colour, + world->ub_lighting.g_day_phase - + world->ub_lighting.g_sunset_phase*0.1f, bg ); + + v3_muladds( bg, world->ub_lighting.g_sunset_colour, + (1.0f-0.5f)*world->ub_lighting.g_sunset_phase, bg ); + + v3_muladds( bg, world->ub_lighting.g_nightsky_colour, + (1.0f-world->ub_lighting.g_day_phase), bg ); + + glClearColor( bg[0], bg[1], bg[2], 0.0f ); + glClear( GL_COLOR_BUFFER_BIT ); + glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, + GL_COLOR_ATTACHMENT1 } ); + + m4x3f identity; + m4x3_identity( identity ); + render_world_override( world, world, identity, &skaterift.cam, + world_map.spawn, + (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f}); + render_world_routes( world, world, identity, &skaterift.cam, 0, 1 ); + return; + } + + world_instance *view_world = get_view_world(); + render_world( view_world, &skaterift.cam, 0, 0, 1, 1 ); + + particle_system_update( &particles_grind, vg.time_delta ); + //particle_system_debug( &particles_grind ); + particle_system_prerender( &particles_grind ); + particle_system_render( &particles_grind, &skaterift.cam ); + + ent_tornado_pre_update(); + particle_system_update( &particles_env, vg.time_delta ); + particle_system_prerender( &particles_env ); + particle_system_render( &particles_env, &skaterift.cam ); + + /* + * render transition + */ + if( global_miniworld.transition == 0 ) + return; world_instance *holdout_world = NULL; f32 t = 0.0f; @@ -460,57 +522,64 @@ static void render_scene(void){ holdout_world = &world_static.instances[ k_world_purpose_hub ]; t = global_miniworld.t; } - else if( global_miniworld.transition == -1 ){ + else{ holdout_world = &world_static.instances[ k_world_purpose_client ]; t = 1.0f-global_miniworld.t; } - else { - } - if( holdout_world ){ - if( holdout_world->status != k_world_status_loaded ) - return; + if( holdout_world->status != k_world_status_loaded ) + return; - t = vg_smoothstepf( t ); + t = vg_smoothstepf( t ); - glEnable( GL_STENCIL_TEST ); - glDisable( GL_DEPTH_TEST ); - glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE ); - glStencilFunc( GL_ALWAYS, 1, 0xFF ); - glStencilMask( 0xFF ); + glEnable( GL_STENCIL_TEST ); + glDisable( GL_DEPTH_TEST ); + glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE ); + glStencilFunc( GL_ALWAYS, 1, 0xFF ); + glStencilMask( 0xFF ); - shader_blit_transition_use(); - shader_blit_transition_uInverseRatio( (v2f){1.0f,1.0f} ); - shader_blit_transition_uT( -(sqrtf(2)+0.5f) * t ); + shader_blit_transition_use(); + shader_blit_transition_uInverseRatio( (v2f){1.0f,1.0f} ); + shader_blit_transition_uT( -(sqrtf(2)+0.5f) * t ); - render_fsquad(); - render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 ); - } + render_fsquad(); + render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 ); } static void skaterift_composite_maincamera(void){ camera_lerp( &localplayer.cam, &world_static.focus_cam, vg_smoothstepf(world_static.focus_strength), &skaterift.cam ); - if( skaterift.activity == k_skaterift_replay ){ - skaterift_get_replay_camera( &skaterift.cam ); + if( skaterift.freecam ){ + freecam_preupdate(); + v3_copy( skaterift.replay_freecam.pos, skaterift.cam.pos ); + v3_copy( skaterift.replay_freecam.angles, skaterift.cam.angles ); + skaterift.cam.fov = skaterift.replay_freecam.fov; + } + else { + if( skaterift.activity == k_skaterift_replay ){ + replay_get_camera( &skaterift.replay, &skaterift.cam ); + } } skaterift.cam.nearz = 0.1f; skaterift.cam.farz = 2100.0f; + if( skaterift.activity == k_skaterift_world_map ){ + camera_copy( &world_map.cam, &skaterift.cam ); + skaterift.cam.nearz = 4.0f; + skaterift.cam.farz = 3100.0f; + } + if( global_miniworld.transition ){ f32 dt = vg.time_frame_delta / 2.0f, s = vg_signf( global_miniworld.transition ); global_miniworld.t += s * dt; if( (global_miniworld.t > 1.0f) || (global_miniworld.t < 0.0f) ){ - /* TODO: maybe next frame! */ global_miniworld.t = vg_clampf( global_miniworld.t, 0.0f, 1.0f ); global_miniworld.transition = 0; } - else { - } } camera_update_transform( &skaterift.cam ); @@ -525,7 +594,9 @@ static void render_main_game(void){ } else{ player__animate(); - skaterift_record_frame( &skaterift.replay, 0 ); + skaterift_record_frame( &skaterift.replay, + localplayer.deferred_frame_record ); + localplayer.deferred_frame_record = 0; } animate_remote_players(); player__pre_render(); @@ -533,7 +604,14 @@ static void render_main_game(void){ skaterift_composite_maincamera(); /* --------------------------------------------------------------------- */ - render_world_cubemaps( world_current_instance() ); + if( skaterift.activity != k_skaterift_world_map ){ + world_instance *world = world_current_instance(); + render_world_cubemaps( world ); + + ent_gate *nlg = world->rendering_gate; + if( nlg && nlg->flags & k_ent_gate_nonlocal ) + render_world_cubemaps( &world_static.instances[nlg->target] ); + } /* variable res target */ render_fb_bind( gpipeline.fb_main, 1 ); @@ -552,9 +630,10 @@ static void render_main_game(void){ portals */ /* continue with variable rate */ - if( !global_miniworld.transition ){ + if( !global_miniworld.transition && + (skaterift.activity != k_skaterift_world_map) ){ render_fb_bind( gpipeline.fb_main, 1 ); - render_world_gates( world_current_instance(), &skaterift.cam ); + render_world_gates( get_view_world(), &skaterift.cam ); } /* composite */ @@ -600,6 +679,9 @@ static void vg_render(void){ static void vg_gui(void){ if( skaterift.op == k_async_op_clientloading ) return; + vg_ui.tex_bg = gpipeline.fb_main->attachments[0].id; + render_fb_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio ); + menu_update(); if( skaterift.activity == k_skaterift_menu ){ glClear( GL_DEPTH_BUFFER_BIT ); @@ -609,18 +691,18 @@ static void vg_gui(void){ player__im_gui(); world_instance *world = world_current_instance(); + world_routes_imgui( world ); skaterift_replay_imgui(); workshop_form_gui(); render_view_framebuffer_ui(); remote_player_network_imgui( vg.pv ); - remote_players_chat_imgui(); /* TODO: conditional */ - remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 ); + if( skaterift.activity == k_skaterift_world_map ){ + remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 ); + remote_players_imgui_lobby(); + } + else { + remote_players_chat_imgui(); /* TODO: conditional */ + remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 ); + } } - - -#else - -#include "skaterift_imgui_dev.c" - -#endif