From: hgn Date: Thu, 13 Jun 2024 18:52:40 +0000 (+0100) Subject: a mess but stable X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=22aab5cc99ed5b927c57f0fd8fa65b33575101a6;p=carveJwlIkooP6JGAAIwe30JlM.git a mess but stable --- diff --git a/client.c b/client.c index 2005855..b958425 100644 --- a/client.c +++ b/client.c @@ -83,10 +83,4 @@ int main( int argc, char *argv[] ) return 0; } -#ifdef SKATERIFT #include "skaterift.c" -#endif - -#ifdef HGATE -#include "hgate.c" -#endif diff --git a/client.h b/client.h index 22022aa..e3435b9 100644 --- a/client.h +++ b/client.h @@ -1,3 +1,4 @@ +#pragma once #include "vg/vg_platform.h" /* diff --git a/hgate.c b/hgate.c deleted file mode 100644 index 9c02564..0000000 --- a/hgate.c +++ /dev/null @@ -1,678 +0,0 @@ -/* - * ============================================================================= - * - * Copyright . . . -----, ,----- ,---. .---. - * 2021-2024 |\ /| | / | | | | /| - * | \ / | +-- / +----- +---' | / | - * | \ / | | / | | \ | / | - * | \/ | | / | | \ | / | - * ' ' '--' [] '----- '----- ' ' '---' SOFTWARE - * - * ============================================================================= - */ - -#define SR_ALLOW_REWIND_HUB - -#ifdef _WIN32 - #include -#endif - -/* - * system headers - * --------------------- */ - -#include "vg/vg_opt.h" -#include "vg/vg_loader.h" -#include "vg/vg_io.h" - -#include "skaterift.h" -#include "steam.h" -#include "render.h" -#include "world.h" -#include "font.h" -#include "player.h" -#include "network.h" -#include "menu.h" -#include "vehicle.h" -#include "save.h" -#include "player_remote.h" -#include "particle.h" -#include "trail.h" -#include "freecam.h" -#include "ent_tornado.h" -#include "ent_miniworld.h" -#include "ent_skateshop.h" -#include "ent_npc.h" -#include "ent_camera.h" -#include "world_map.h" -#include "gui.h" -#include "workshop.h" -#include "audio.h" -#include "player_render.h" -#include "control_overlay.h" - -struct skaterift_globals skaterift = -{ - .time_rate = 1.0f, - .hub_world = "maps/dev_hub", -}; - -void game_launch_opt(void) -{ - const char *arg; - if( (arg = vg_long_opt_arg( "world" )) ) - skaterift.hub_world = arg; -} - -static void async_skaterift_player_start( void *payload, u32 size ){ - world_switch_instance(0); -} - -static void skaterift_restore_state(void) -{ - savedata_file sav; - skaterift_read_main_savedata( &sav ); - - vg_msg kvsav; - vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) ); - - u32 ach; - vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach, NULL ); - skaterift.achievements |= ach; - - u32 board_reg_id = time(NULL) % addon_count( k_addon_type_board, 0 ), - player_reg_id = (time(NULL)+44) % addon_count( k_addon_type_player, 0 ); - - vg_msg_cursor orig = kvsav.cur; - if( vg_msg_seekframe( &kvsav, "player" ) ){ - addon_alias q; - - /* board */ - skaterift_read_addon_alias( &kvsav, "board", k_addon_type_board, &q ); - u32 reg_id = addon_match( &q ); - if( reg_id != 0xffffffff ) - board_reg_id = reg_id; - - /* playermodel */ - skaterift_read_addon_alias( &kvsav, "playermodel", - k_addon_type_player, &q ); - reg_id = addon_match( &q ); - if( reg_id != 0xffffffff ) - player_reg_id = reg_id; - } - - localplayer.board_view_slot = - addon_cache_create_viewer( k_addon_type_board, board_reg_id ); - localplayer.playermodel_view_slot = - addon_cache_create_viewer( k_addon_type_player, player_reg_id ); - - 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 ); - skaterift_mount_world_unloadable( "maps/mp_line1", ADDON_REG_PREMIUM ); - - 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) -{ - 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" ); -} - -void game_load(void) -{ - vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL ); - vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 ); - vg_loader_step( menu_init, NULL ); - - vg_loader_step( control_overlay_init, NULL ); - vg_loader_step( world_init, NULL ); - vg_loader_step( vehicle_init, NULL ); - vg_loader_step( gui_init, NULL ); - - vg_loader_step( player_init, NULL ); - vg_loader_step( player_ragdoll_init, NULL ); - vg_loader_step( npc_init, NULL ); - - /* content stuff */ - vg_loader_step( addon_system_init, NULL ); - vg_loader_step( workshop_init, NULL ); - vg_loader_step( skateshop_init, NULL ); - vg_loader_step( ent_tornado_init, NULL ); - vg_loader_step( skaterift_replay_init, NULL ); - vg_loader_step( skaterift_load_player_content, NULL ); - - vg_bake_shaders(); - vg_loader_step( audio_init, NULL ); - - vg_loader_step( skaterift_load_world_content, NULL ); - vg_async_call( async_skaterift_player_start, NULL, 0 ); - vg_async_stall(); - - vg_console_load_autos(); - - addon_mount_content_folder( k_addon_type_player, - "playermodels", ".mdl" ); - addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" ); - addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" ); - addon_mount_workshop_items(); - vg_async_call( async_addon_reg_update, NULL, 0 ); - vg_async_stall(); - - skaterift_restore_state(); - update_ach_models(); - - vg_loader_step( NULL, skaterift_autosave_synchronous ); -} - -static void draw_origin_axis(void) -{ - vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 1.0f, 0.0f, 0.0f }, 0xffff0000 ); - vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 ); - vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff ); -} -void skaterift_change_client_world_preupdate(void); - -/* - * UPDATE LOOP - * ---------------------------------------------------------------------------*/ - -void vg_pre_update(void) -{ - skaterift_preupdate_inputs(); - - steam_update(); - skaterift_change_client_world_preupdate(); - - if( !g_client.loaded ) return; - - draw_origin_axis(); - addon_system_pre_update(); - skateshop_world_preview_preupdate(); - network_update(); - - /* time rate */ - f32 target = 1; - if( skaterift.activity & k_skaterift_replay ) - target = 0; - - v3f listen_co; - v3_copy( localplayer.rb.co, listen_co ); - - if( skaterift.activity & k_skaterift_menu ) - { - if( menu.bg_cam ) - { - v3_copy( menu.bg_cam->transform.co, listen_co ); - } - else target = 0; - } - - vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) ); - vg.time_rate = vg_smoothstepf( skaterift.time_rate ); - - /* TODO: how can we compress this? */ - ent_miniworld_preupdate(); - world_entity_focus_preupdate(); - - if( skaterift.activity != k_skaterift_menu ) - { - player__pre_update(); - } - - 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(), listen_co ); - world_map_pre_update(); -} - -void vg_fixed_update(void) -{ - if( !g_client.loaded ) return; - - world_routes_fixedupdate( world_current_instance() ); - player__update(); - vehicle_update_fixed(); -} - -void vg_post_update(void) -{ - if( !g_client.loaded ) return; - - player__post_update(); - - float dist; - int sample_index; - world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist ); - - audio_lock(); - vg_dsp.echo_distances[sample_index] = dist; - - v3f ears = { 1.0f,0.0f,0.0f }; - m3x3_mulv( g_render.cam.transform, ears, ears ); - v3_copy( ears, vg_audio.external_listener_ears ); - v3_copy( g_render.cam.transform[3], vg_audio.external_listener_pos ); - - if( localplayer.gate_waiting ){ - m4x3_mulv( localplayer.gate_waiting->transport, - vg_audio.external_listener_pos, - vg_audio.external_listener_pos ); - } - - v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); - audio_unlock(); - - vehicle_update_post(); - skaterift_autosave_update(); -} - -/* - * RENDERING - * ---------------------------------------------------------------------------*/ - -static void render_player_transparent(void) -{ - if( (skaterift.activity == k_skaterift_menu) && - (menu.page == k_menu_page_main) && - (menu.main_index == k_menu_main_guide) ) - { - return; - } - - static vg_camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW - SAIS OTHERWISE */ - - m4x3_copy( g_render.cam.transform, small_cam.transform ); - - small_cam.fov = g_render.cam.fov; - small_cam.nearz = 0.05f; - small_cam.farz = 60.0f; - - vg_camera_update_view( &small_cam ); - vg_camera_update_projection( &small_cam ); - vg_camera_finalize( &small_cam ); - - /* Draw player to window buffer and blend background ontop */ - player__render( &small_cam ); -} - -static world_instance *get_view_world(void) -{ - if( (skaterift.activity & k_skaterift_menu) && - (menu.page == k_menu_page_main) && - (menu.main_index == k_menu_main_guide) ) - { - return &world_static.instances[0]; - } - - 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 ); - - for( u32 i=0; iub_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, &g_render.cam, - world_map.close_spawn, - (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f}); - render_world_routes( world, world, identity, &g_render.cam, 0, 1 ); - return; - } - - world_instance *view_world = get_view_world(); - render_world( view_world, &g_render.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, &g_render.cam ); - - ent_tornado_pre_update(); - particle_system_update( &particles_env, vg.time_delta ); - particle_system_prerender( &particles_env ); - particle_system_render( &particles_env, &g_render.cam ); - - player_glide_render_effects( &g_render.cam ); - - /* - * render transition - */ - if( global_miniworld.transition == 0 ) - return; - - world_instance *holdout_world = NULL; - f32 t = 0.0f; - - if( global_miniworld.transition == 1 ){ - holdout_world = &world_static.instances[ k_world_purpose_hub ]; - t = global_miniworld.t; - } - else{ - holdout_world = &world_static.instances[ k_world_purpose_client ]; - t = 1.0f-global_miniworld.t; - } - - if( holdout_world->status != k_world_status_loaded ) - return; - - 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 ); - - 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 ); -} - -static void skaterift_composite_maincamera(void) -{ - vg_camera_lerp( &localplayer.cam, &world_static.focus_cam, - vg_smoothstepf(world_static.focus_strength), &g_render.cam ); - - if( skaterift.activity == k_skaterift_replay ) - { - if( player_replay.use_freecam ) - { - freecam_preupdate(); - v3_copy( player_replay.replay_freecam.pos, g_render.cam.pos ); - v3_copy( player_replay.replay_freecam.angles, g_render.cam.angles ); - g_render.cam.fov = player_replay.replay_freecam.fov; - } - else - { - skaterift_get_replay_cam( &g_render.cam ); - } - } - - g_render.cam.nearz = 0.1f; - g_render.cam.farz = 2100.0f; - - if( (skaterift.activity == k_skaterift_menu) && menu.bg_cam ) - { - ent_camera_unpack( menu.bg_cam, &g_render.cam ); - } - - if( menu_viewing_map() ) - { - vg_camera_copy( &world_map.cam, &g_render.cam ); - g_render.cam.nearz = 4.0f; - g_render.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) ){ - global_miniworld.t = vg_clampf( global_miniworld.t, 0.0f, 1.0f ); - global_miniworld.transition = 0; - } - } - - vg_camera_update_transform( &g_render.cam ); - vg_camera_update_view( &g_render.cam ); - vg_camera_update_projection( &g_render.cam ); - vg_camera_finalize( &g_render.cam ); -} - -static void render_main_game(void) -{ - if( skaterift.activity == k_skaterift_replay ) - { - player__animate_from_replay( &player_replay.local ); - } - else{ - player__animate(); - skaterift_record_frame( &player_replay.local, - localplayer.deferred_frame_record ); - localplayer.deferred_frame_record = 0; - } - animate_remote_players(); - player__pre_render(); - - skaterift_composite_maincamera(); - - /* --------------------------------------------------------------------- */ - if( !menu_viewing_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 */ - vg_framebuffer_bind( g_render.fb_main, k_render_scale ); - glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); - glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT ); - - render_scene(); - glEnable( GL_DEPTH_TEST ); - - /* full res target */ - glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - glViewport( 0,0, vg.window_x, vg.window_y ); - - render_player_transparent(); /* needs to read the depth buffer before we fuck - it up with the oblique rendering inside the - portals */ - - /* continue with variable rate */ - if( !global_miniworld.transition && !menu_viewing_map() ) - { - vg_framebuffer_bind( g_render.fb_main, k_render_scale ); - render_world_gates( get_view_world(), &g_render.cam ); - } - - /* composite */ - - if( (skaterift.activity == k_skaterift_menu) && menu.bg_blur ) - v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, - g_render.blur_override ); - else - v2_zero( g_render.blur_override ); - postprocess_to_screen( g_render.fb_main ); - - skaterift_replay_post_render(); - control_overlay_render(); -} - -void vg_render(void) -{ - if( !g_client.loaded ) - { - vg_loader_render(); - return; - } - - glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - - glViewport( 0,0, vg.window_x, vg.window_y ); - glDisable( GL_DEPTH_TEST ); - glDisable( GL_BLEND ); - - glClearColor( 1.0f, 0.0f, 0.0f, 0.0f ); - glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); - - render_main_game(); - m4x4_copy( g_render.cam.mtx.pv, vg.pv ); - - /* Other shite */ - glDisable(GL_BLEND); - glDisable(GL_DEPTH_TEST); - vg_lines_drawall(); - glViewport( 0,0, vg.window_x, vg.window_y ); - - gui_render_icons(); -} - -void vg_gui( ui_context *ctx ) -{ - if( !g_client.loaded ) return; - - gui_draw( ctx ); - - if( k_light_editor ) - imgui_world_light_edit( ctx, world_current_instance() ); - - vg_ui.tex_bg = g_render.fb_main->attachments[0].id; - vg_framebuffer_inverse_ratio( g_render.fb_main, vg_ui.bg_inverse_ratio ); - - menu_gui( ctx ); - player__im_gui( ctx ); - world_instance *world = world_current_instance(); - - world_routes_imgui( ctx, world ); - skaterift_replay_imgui( ctx ); - workshop_form_gui( ctx ); - remote_player_network_imgui( ctx, vg.pv ); - - if( menu_viewing_map() ) - { - remote_players_imgui_world( ctx, world_current_instance(), - vg.pv, 2000.0f, 0 ); - remote_players_imgui_lobby( ctx ); - } - else - { - remote_players_chat_imgui( ctx ); /* TODO: conditional */ - remote_players_imgui_world( ctx, world_current_instance(), - vg.pv, 100.0f, 1 ); - } -} - -#include "addon.c" -#include "addon_types.c" -#include "audio.c" -#include "ent_challenge.c" -#include "ent_glider.c" -#include "entity.c" -#include "ent_miniworld.c" -#include "ent_objective.c" -#include "ent_region.c" -#include "ent_relay.c" -#include "ent_route.c" -#include "ent_skateshop.c" -#include "ent_tornado.c" -#include "ent_traffic.c" -#include "freecam.c" -#include "menu.c" -#include "network.c" -#include "particle.c" -#include "player_basic_info.c" -#include "player.c" -#include "player_common.c" -#include "player_dead.c" -#include "player_drive.c" -#include "player_effects.c" -#include "player_glide.c" -#include "player_ragdoll.c" -#include "player_remote.c" -#include "player_render.c" -#include "player_replay.c" -#include "player_skate.c" -#include "player_walk.c" -#include "render.c" -#include "save.c" -#include "scene.c" -#include "steam.c" -#include "trail.c" -#include "vehicle.c" -#include "workshop.c" -#include "world_audio.c" -#include "world.c" -#include "world_entity.c" -#include "world_gate.c" -#include "world_gen.c" -#include "world_load.c" -#include "world_map.c" -#include "world_physics.c" -#include "world_render.c" -#include "world_routes.c" -#include "world_routes_ui.c" -#include "world_sfd.c" -#include "world_volumes.c" -#include "world_water.c" -#include "ent_npc.c" -#include "model.c" -#include "control_overlay.c" -#include "ent_camera.c" diff --git a/skaterift.c b/skaterift.c index 9c02564..d9ff9d1 100644 --- a/skaterift.c +++ b/skaterift.c @@ -50,6 +50,7 @@ #include "audio.h" #include "player_render.h" #include "control_overlay.h" +#include "client.h" struct skaterift_globals skaterift = { diff --git a/skaterift.h b/skaterift.h index 5801ec8..e480d2e 100644 --- a/skaterift.h +++ b/skaterift.h @@ -1,5 +1,7 @@ #pragma once +#define SKATERIFT #define SKATERIFT_APPID 2103940 + #include "vg/vg_engine.h" #include "vg/vg_camera.h"