#include "network.h"
#include "menu.h"
#include "vehicle.h"
-#include "pointcloud.h"
#include "save.h"
#include "player_remote.h"
}
static void async_skaterift_player_start( void *payload, u32 size ){
- localplayer.viewable_world = world_current_instance();
- localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
+ world_switch_instance(0);
}
static void async_call_ready( void *payload, u32 size ){
addon_cache_create_viewer( k_addon_type_player, player_reg_id );
kvsav.cur = orig;
- if( vg_msg_seekframe( &kvsav, "world" ) ){
- addon_alias q;
-
- /* world */
- skaterift_read_addon_alias( &kvsav, "alias", k_addon_type_world, &q );
- u32 reg_id = addon_match( &q );
- if( reg_id != 0xffffffff ){
- addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
-
- world_static.load_state = k_world_loader_load;
- struct world_load_args args = {
- .purpose = k_world_purpose_client,
- .reg = reg
- };
- skaterift_world_load_thread( &args );
-
- world_set_active_instance( vg_msg_getkvu32( &kvsav, "index", 0 ) );
- world_static.active_trigger_volume_count = 0;
- localplayer.viewable_world = world_current_instance();
- }
-
- v3f pos;
- vg_msg_getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f} );
-
- if( v3_length2(pos) > 1.0f )
- player__setpos( pos );
- }
}
static void vg_load(void){
return;
}
- vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
+ vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
+ vg_console_reg_cmd( "switch_active_instance",
+ skaterift_switch_instance_cmd, NULL );
vg_loader_step( render_init, NULL );
vg_loader_step( menu_init, NULL );
- vg_loader_step( pointcloud_init, NULL );
vg_loader_step( world_init, NULL );
vg_loader_step( vehicle_init, NULL );
vg_loader_step( font3d_init, NULL );
* -------------------------------------
*/
+ /* 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,
/* load home/permanent world manually */
world_static.load_state = k_world_loader_load;
+
struct world_load_args args = {
.purpose = k_world_purpose_hub,
- .reg = spawn
+ .reg = hub
};
skaterift_world_load_thread( &args );
vg_async_call( async_skaterift_player_start, NULL, 0 );
vg_async_stall();
-
- global_skateshop.selected_world_id=1;
- global_skateshop.pointcloud_world_id=1;
- skateshop_world_preview_loader_thread( mtzero ); /* HACK */
-
vg_console_load_autos();
menu_link();
* ---------------------------------------------------------------------------*/
static void vg_pre_update(void){
- srinput.enabled = 1;
skaterift_preupdate_inputs();
if( k_tools_mode ) return;
/* time rate */
f32 target = 1;
if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
- k_skaterift_respawning) ) {
+ k_skaterift_respawning) ){
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();
player__pre_update();
world_entity_focus_preupdate();
skaterift_replay_pre_update();
/* Draw world */
glEnable( GL_DEPTH_TEST );
- world_instance *view_world = localplayer.viewable_world;
-
- if( view_world == NULL ){
- glClearColor( 0.25f, 0.25f, 0.0f, 1.0f );
- glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
- return;
- }
-
for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
if( world_static.instances[i].status == k_world_status_loaded ){
world_prerender( &world_static.instances[i] );
}
if( skaterift.activity == k_skaterift_respawning ){
+ world_instance *world = world_current_instance();
glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
- glClearColor( 0.624f, 0.659f, 0.769f, 0.0f );
+
+ 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 } );
- view_world = &world_static.instances[respawn_chooser.world_id];
- render_world_override( view_world );
- render_world_routes( view_world, &skaterift.cam, 1 );
+
+ m4x3f identity;
+ m4x3_identity( identity );
+ render_world_override( world, world, identity, &skaterift.cam,
+ respawn_chooser.spawn, 1.0f );
+ render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
+ return;
}
- else{
- render_world( view_world, &skaterift.cam, 0 );
- render_water_texture( view_world, &skaterift.cam, 0 );
- render_fb_bind( gpipeline.fb_main, 1 );
- render_water_surface( view_world, &skaterift.cam );
- render_remote_players( view_world, &skaterift.cam );
+
+ render_world( world_current_instance(), &skaterift.cam, 0, 0, 1, 1 );
+
+ 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 if( global_miniworld.transition == -1 ){
+ holdout_world = &world_static.instances[ k_world_purpose_client ];
+ t = 1.0f-global_miniworld.t;
+ }
+ else {
}
-}
-static void render_scene_gate_subview(void){
- render_fb_bind( gpipeline.fb_main, 1 );
- world_instance *view_world = localplayer.viewable_world;
- if( !view_world ) return; /* ??? */
- if( skaterift.activity == k_skaterift_respawning ) return;
+ if( holdout_world ){
+ if( holdout_world->status != k_world_status_loaded )
+ return;
+
+ t = vg_smoothstepf( t );
- int depth = 1;
- if( localplayer.gate_waiting ) depth = 0;
- render_world_gates( view_world, &skaterift.cam, depth );
+ 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){
if( skaterift.activity == k_skaterift_respawning ){
camera_copy( &respawn_chooser.cam, &skaterift.cam );
skaterift.cam.nearz = 4.0f;
- skaterift.cam.farz = 3100.0f;
+ skaterift.cam.farz = 3100.0f;
}
- camera_update_transform( &skaterift.cam );
+ if( global_miniworld.transition ){
+ f32 dt = vg.time_frame_delta / 2.0f,
+ s = vg_signf( global_miniworld.transition );
+ global_miniworld.t += s * dt;
- if( skaterift.activity != k_skaterift_respawning ){
- if( localplayer.gate_waiting ){
- m3x3_mul( localplayer.basis_gate, skaterift.cam.transform,
- skaterift.cam.transform );
+ 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{
- m3x3_mul( localplayer.basis, skaterift.cam.transform,
- skaterift.cam.transform );
+ else {
}
}
-
+
+ camera_update_transform( &skaterift.cam );
camera_update_view( &skaterift.cam );
camera_update_projection( &skaterift.cam );
camera_finalize( &skaterift.cam );
skaterift_composite_maincamera();
/* --------------------------------------------------------------------- */
-
- world_instance *view_world = localplayer.viewable_world;
- if( (view_world != NULL) && (skaterift.activity != k_skaterift_respawning) ){
- render_world_cubemaps( view_world );
-
- ent_gate *gate = view_world->rendering_gate;
- if( gate ){
- if( gate->flags & k_ent_gate_nonlocal ){
- world_instance *dest = &world_static.instances[ gate->target ];
- render_world_cubemaps( dest );
- }
- }
- }
+ if( skaterift.activity != k_skaterift_respawning )
+ render_world_cubemaps( world_current_instance() );
/* variable res target */
render_fb_bind( gpipeline.fb_main, 1 );
portals */
/* continue with variable rate */
- render_scene_gate_subview();
+ if( !global_miniworld.transition &&
+ (skaterift.activity != k_skaterift_respawning) ){
+ render_fb_bind( gpipeline.fb_main, 1 );
+ render_world_gates( world_current_instance(), &skaterift.cam );
+ }
/* composite */
present_view_with_post_processing();
- /* --------------------------------------------------------------------- */
-
- /* capture the current resume frame at the very last point */
- if( button_down( k_srbind_reset ) ){
- if( skaterift.activity == k_skaterift_default ){
- skaterift.activity = k_skaterift_replay;
- skaterift_record_frame( &skaterift.replay, 1 );
- if( skaterift.replay.head ){
- skaterift.replay.cursor = skaterift.replay.head->time;
- skaterift.replay.cursor_frame = skaterift.replay.head;
- }
- skaterift.replay_control = k_replay_control_scrub;
- }
- }
+ skaterift_replay_post_render();
}
static void vg_render(void){
render_view_framebuffer_ui();
remote_player_network_imgui( vg.pv );
-
if( skaterift.activity == k_skaterift_respawning ){
- remote_players_imgui_world( world_current_instance(), vg.pv,
- 2000.0f, 0 );
+ 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 );
}
}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff