X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=d8aae1bde47d3b99950d19b32a394b98ffb5fc77;hb=c0e4a67ba2f001179df6e2cde97370a946669c22;hp=7da7109f0afb0ff4952cd8629d73369fa091836a;hpb=70ff4a83e5a4b35436388d9bb999c939559ac23f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 7da7109..d8aae1b 100644 --- a/skaterift.c +++ b/skaterift.c @@ -55,6 +55,7 @@ #include "network.c" #include "player_remote.c" #include "vg/vg_audio_dsp.h" +#include "world_routes_ui.c" static int k_tools_mode = 0; @@ -153,6 +154,12 @@ static void skaterift_restore_state(void){ kvsav.cur = orig; } +static addon_reg *skaterift_mount_world_unloadable( const char *path ){ + addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" ); + reg->flags |= ADDON_REG_HIDDEN; + return reg; +} + static void vg_load(void){ if( k_tools_mode ){ vg_async_call( async_call_ready, NULL, 0 ); @@ -188,10 +195,11 @@ static void vg_load(void){ replay_clear( &skaterift.replay ); 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" ); + /* --------------------- */ vg_bake_shaders(); @@ -204,37 +212,9 @@ 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; - } + addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub" ); + skaterift_mount_world_unloadable( "maps/mp_spawn" ); + skaterift_mount_world_unloadable( "maps/mp_mtzero" ); /* load home/permanent world manually */ world_static.load_state = k_world_loader_load; @@ -308,6 +288,7 @@ 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 ); @@ -443,6 +424,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 ); @@ -476,12 +467,20 @@ static void render_scene(void){ m4x3f identity; m4x3_identity( identity ); render_world_override( world, world, identity, &skaterift.cam, - respawn_chooser.spawn, 1.0f ); + respawn_chooser.spawn, + (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f}); render_world_routes( world, world, identity, &skaterift.cam, 0, 1 ); return; } - render_world( world_current_instance(), &skaterift.cam, 0, 0, 1, 1 ); + world_instance *view_world = get_view_world(); + render_world( view_world, &skaterift.cam, 0, 0, 1, 1 ); + + /* + * render transition + */ + if( global_miniworld.transition == 0 ) + return; world_instance *holdout_world = NULL; f32 t = 0.0f; @@ -490,32 +489,28 @@ 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){ @@ -569,8 +564,14 @@ static void render_main_game(void){ skaterift_composite_maincamera(); /* --------------------------------------------------------------------- */ - if( skaterift.activity != k_skaterift_respawning ) - render_world_cubemaps( world_current_instance() ); + if( skaterift.activity != k_skaterift_respawning ){ + 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 ); @@ -592,7 +593,7 @@ static void render_main_game(void){ if( !global_miniworld.transition && (skaterift.activity != k_skaterift_respawning) ){ render_fb_bind( gpipeline.fb_main, 1 ); - render_world_gates( world_current_instance(), &skaterift.cam ); + render_world_gates( get_view_world(), &skaterift.cam ); } /* composite */ @@ -647,6 +648,7 @@ 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();