#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"
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 )
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) );
skateshop_world_preupdate( world_current_instance() );
world_update( world_current_instance(), localplayer.rb.co );
- audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
+ audio_ambient_sprites_update( world_current_instance(), listen_co );
world_map_pre_update();
}
* RENDERING
* ---------------------------------------------------------------------------*/
-void vg_framebuffer_resize( int w, int h ){
- render_fb_resize();
-}
-
static void present_view_with_post_processing(void){
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
glViewport( 0,0, vg.window_x, vg.window_y );
glBlendEquation(GL_FUNC_ADD);
v2f inverse;
- render_fb_inverse_ratio( gpipeline.fb_main, inverse );
+ vg_framebuffer_inverse_ratio( gpipeline.fb_main, inverse );
if( k_blur_effect ){
shader_blitblur_use();
shader_blitblur_uGlitchStrength( glitch_strength );
v2f override;
- if( skaterift.activity == k_skaterift_menu )
+ if( (skaterift.activity == k_skaterift_menu) && menu.bg_blur )
v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
else
v2_zero( override );
shader_blitblur_uOverrideDir( override );
- render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
- render_fb_bind_texture( gpipeline.fb_main, 1, 1 );
+ vg_framebuffer_bind_texture( gpipeline.fb_main, 0, 0 );
+ vg_framebuffer_bind_texture( gpipeline.fb_main, 1, 1 );
}
else{
shader_blit_use();
shader_blit_uTexMain( 0 );
shader_blit_uInverseRatio( inverse );
- render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
+ vg_framebuffer_bind_texture( gpipeline.fb_main, 0, 0 );
}
render_fsquad();
}
-static void render_player_transparent(void){
+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 */
player__render( &small_cam );
}
-static world_instance *get_view_world(void){
+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) ){
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( (skaterift.activity == k_skaterift_menu) && menu.bg_cam )
+ {
+ ent_camera_unpack( menu.bg_cam, &skaterift.cam );
+ }
+
+ if( menu_viewing_map() )
+ {
vg_camera_copy( &world_map.cam, &skaterift.cam );
skaterift.cam.nearz = 4.0f;
skaterift.cam.farz = 3100.0f;
vg_camera_finalize( &skaterift.cam );
}
-static void render_main_game(void){
- if( skaterift.activity == k_skaterift_replay ){
+static void render_main_game(void)
+{
+ if( skaterift.activity == k_skaterift_replay )
+ {
player__animate_from_replay( &player_replay.local );
}
else{
skaterift_composite_maincamera();
/* --------------------------------------------------------------------- */
- if( skaterift.activity != k_skaterift_world_map ){
+ 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 )
+ 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 );
+ vg_framebuffer_bind( gpipeline.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 );
portals */
/* continue with variable rate */
- if( !global_miniworld.transition &&
- (skaterift.activity != k_skaterift_world_map) ){
- render_fb_bind( gpipeline.fb_main, 1 );
+ if( !global_miniworld.transition && !menu_viewing_map() )
+ {
+ vg_framebuffer_bind( gpipeline.fb_main, k_render_scale );
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)
+void vg_gui( ui_context *ctx )
{
if( skaterift.op == k_async_op_clientloading ) return;
- if( k_tools_mode ){
+ gui_draw( ctx );
+
+ if( k_tools_mode )
+ {
ui_rect null;
ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
ui_rect panel = { 0, 0, 1000, 700 };
ui_rect_center( screen, panel );
- vg_ui.wants_mouse = 1;
+ ui_capture_mouse( ctx, 1 );
- ui_fill( panel, ui_colour( k_ui_bg+1 ) );
- ui_outline( panel, 1, ui_colour( k_ui_bg+7 ), 0 );
+ ui_fill( ctx, panel, ui_colour( ctx, k_ui_bg+1 ) );
+ ui_outline( ctx, panel, 1, ui_colour( ctx, k_ui_bg+7 ), 0 );
ui_rect_pad( panel, (ui_px[2]){ 8, 8 } );
}
if( k_light_editor )
- imgui_world_light_edit( world_current_instance() );
-
+ imgui_world_light_edit( ctx, world_current_instance() );
+
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();
- }
+ vg_framebuffer_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio );
- player__im_gui();
+ menu_gui( ctx );
+ player__im_gui( ctx );
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 );
+ world_routes_imgui( ctx, world );
+ skaterift_replay_imgui( ctx );
+ workshop_form_gui( ctx );
+ remote_player_network_imgui( ctx, vg.pv );
- if( skaterift.activity == k_skaterift_world_map ){
- remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
- remote_players_imgui_lobby();
+ 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(); /* TODO: conditional */
- remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
+ else
+ {
+ remote_players_chat_imgui( ctx ); /* TODO: conditional */
+ remote_players_imgui_world( ctx, world_current_instance(),
+ vg.pv, 100.0f, 1 );
}
}
#include "ent_npc.c"
#include "model.c"
#include "control_overlay.c"
+#include "ent_camera.c"
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff