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_MTZERO|ADDON_REG_PREMIUM );
+ skaterift_mount_world_unloadable( "maps/mp_line1", ADDON_REG_PREMIUM );
world_static.load_state = k_world_loader_load;
vg_async_stall();
vg_console_load_autos();
- menu_link();
addon_mount_content_folder( k_addon_type_player,
"playermodels", ".mdl" );
/* time rate */
f32 target = 1;
- if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
- k_skaterift_world_map) )
+ if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) )
{
target = 0;
}
shader_blitblur_uGlitchStrength( glitch_strength );
v2f override;
- if( skaterift.activity == k_skaterift_menu )
+ if( (skaterift.activity == k_skaterift_menu) && !menu_viewing_map() )
v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
else
v2_zero( override );
return view_world;
}
-static void render_scene(void){
+static void render_scene(void)
+{
/* Draw world */
glEnable( GL_DEPTH_TEST );
- for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
- if( world_static.instances[i].status == k_world_status_loaded ){
+ 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_world_map ){
+ if( menu_viewing_map() )
+ {
world_instance *world = world_current_instance();
glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
m4x3f identity;
m4x3_identity( identity );
render_world_override( world, world, identity, &skaterift.cam,
- world_map.spawn,
+ world_map.close_spawn,
(v4f){world->tar_min, world->tar_max, 1.0f, 0.0f});
render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
return;
skaterift.cam.nearz = 0.1f;
skaterift.cam.farz = 2100.0f;
- if( skaterift.activity == k_skaterift_world_map ){
+ if( menu_viewing_map() )
+ {
vg_camera_copy( &world_map.cam, &skaterift.cam );
skaterift.cam.nearz = 4.0f;
skaterift.cam.farz = 3100.0f;
skaterift_composite_maincamera();
/* --------------------------------------------------------------------- */
- if( skaterift.activity != k_skaterift_world_map ){
+ if( menu_viewing_map() )
+ {
world_instance *world = world_current_instance();
render_world_cubemaps( world );
portals */
/* continue with variable rate */
- if( !global_miniworld.transition &&
- (skaterift.activity != k_skaterift_world_map) ){
+ if( !global_miniworld.transition && !menu_viewing_map() )
+ {
render_fb_bind( gpipeline.fb_main, 1 );
render_world_gates( get_view_world(), &skaterift.cam );
}
glDisable(GL_DEPTH_TEST);
vg_lines_drawall();
glViewport( 0,0, vg.window_x, vg.window_y );
- gui_draw();
+
+ gui_render_icons();
}
void vg_gui(void)
{
if( skaterift.op == k_async_op_clientloading ) return;
+ gui_draw();
+
if( k_tools_mode ){
ui_rect null;
ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
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 );
- menu_render();
- }
-
+ menu_gui();
player__im_gui();
world_instance *world = world_current_instance();
render_view_framebuffer_ui();
remote_player_network_imgui( vg.pv );
- if( skaterift.activity == k_skaterift_world_map ){
+ if( menu_viewing_map() )
+ {
remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
remote_players_imgui_lobby();
}
- else {
+ else
+ {
remote_players_chat_imgui(); /* TODO: conditional */
remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
}