X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=87118fc3bef036da79d55138bb10e71dc80fd008;hb=0ba0bbe2da453f17f56a88521057e6514ae30b8f;hp=f99f8761d8d593a11e551cd1cb7c8791329eb33a;hpb=238a3a4ef19bb137e2a878ee38f99d253eddb51c;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index f99f876..87118fc 100644 --- a/skaterift.c +++ b/skaterift.c @@ -353,9 +353,9 @@ void vg_post_update(void) vg_dsp.echo_distances[sample_index] = dist; v3f ears = { 1.0f,0.0f,0.0f }; - m3x3_mulv( skaterift.cam.transform, ears, ears ); + m3x3_mulv( g_render.cam.transform, ears, ears ); v3_copy( ears, vg_audio.external_listener_ears ); - v3_copy( skaterift.cam.transform[3], vg_audio.external_listener_pos ); + v3_copy( g_render.cam.transform[3], vg_audio.external_listener_pos ); if( localplayer.gate_waiting ){ m4x3_mulv( localplayer.gate_waiting->transport, @@ -386,9 +386,9 @@ static void render_player_transparent(void) static vg_camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW SAIS OTHERWISE */ - m4x3_copy( skaterift.cam.transform, small_cam.transform ); + m4x3_copy( g_render.cam.transform, small_cam.transform ); - small_cam.fov = skaterift.cam.fov; + small_cam.fov = g_render.cam.fov; small_cam.nearz = 0.05f; small_cam.farz = 60.0f; @@ -454,27 +454,27 @@ static void render_scene(void) m4x3f identity; m4x3_identity( identity ); - render_world_override( world, world, identity, &skaterift.cam, + 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, &skaterift.cam, 0, 1 ); + render_world_routes( world, world, identity, &g_render.cam, 0, 1 ); return; } world_instance *view_world = get_view_world(); - render_world( view_world, &skaterift.cam, 0, 0, 1, 1 ); + 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, &skaterift.cam ); + 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, &skaterift.cam ); + particle_system_render( &particles_env, &g_render.cam ); - player_glide_render_effects( &skaterift.cam ); + player_glide_render_effects( &g_render.cam ); /* * render transition @@ -516,36 +516,36 @@ static void render_scene(void) static void skaterift_composite_maincamera(void) { vg_camera_lerp( &localplayer.cam, &world_static.focus_cam, - vg_smoothstepf(world_static.focus_strength), &skaterift.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, skaterift.cam.pos ); - v3_copy( player_replay.replay_freecam.angles, skaterift.cam.angles ); - skaterift.cam.fov = player_replay.replay_freecam.fov; + 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( &skaterift.cam ); + skaterift_get_replay_cam( &g_render.cam ); } } - skaterift.cam.nearz = 0.1f; - skaterift.cam.farz = 2100.0f; + 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, &skaterift.cam ); + ent_camera_unpack( menu.bg_cam, &g_render.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_copy( &world_map.cam, &g_render.cam ); + g_render.cam.nearz = 4.0f; + g_render.cam.farz = 3100.0f; } if( global_miniworld.transition ){ @@ -559,10 +559,10 @@ static void skaterift_composite_maincamera(void) } } - vg_camera_update_transform( &skaterift.cam ); - vg_camera_update_view( &skaterift.cam ); - vg_camera_update_projection( &skaterift.cam ); - vg_camera_finalize( &skaterift.cam ); + 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) @@ -594,7 +594,7 @@ static void render_main_game(void) } /* variable res target */ - vg_framebuffer_bind( gpipeline.fb_main, k_render_scale ); + 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 ); @@ -612,18 +612,18 @@ static void render_main_game(void) /* continue with variable rate */ if( !global_miniworld.transition && !menu_viewing_map() ) { - vg_framebuffer_bind( gpipeline.fb_main, k_render_scale ); - render_world_gates( get_view_world(), &skaterift.cam ); + 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, - gpipeline.blur_override ); + g_render.blur_override ); else - v2_zero( gpipeline.blur_override ); - postprocess_to_screen( gpipeline.fb_main ); + v2_zero( g_render.blur_override ); + postprocess_to_screen( g_render.fb_main ); skaterift_replay_post_render(); control_overlay_render(); @@ -646,7 +646,7 @@ void vg_render(void) glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); render_main_game(); - m4x4_copy( skaterift.cam.mtx.pv, vg.pv ); + m4x4_copy( g_render.cam.mtx.pv, vg.pv ); /* Other shite */ glDisable(GL_BLEND); @@ -666,8 +666,8 @@ void vg_gui( ui_context *ctx ) if( k_light_editor ) imgui_world_light_edit( ctx, world_current_instance() ); - vg_ui.tex_bg = gpipeline.fb_main->attachments[0].id; - vg_framebuffer_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio ); + 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 );