X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=4c531a4736f66dee33740b3cb13905db8e9777c9;hb=aa4c26eae2208872824e0eb5b71bc05c16d43242;hp=1851a73af538d7b23cbcbc57a2bc15e1434e2995;hpb=33de52d9660ab86caafdd0ae4abb496dbc072778;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 1851a73..4c531a4 100644 --- a/skaterift.c +++ b/skaterift.c @@ -232,7 +232,7 @@ VG_STATIC void load_playermodels(void) vg_release_thread_sync(); /* FIXME: hack */ - shader_viewchar_register(); + shader_model_character_view_register(); vg_acquire_thread_sync(); { vg_tex2d_init( (vg_tex2d *[]){ &localplayer_texture }, 1 ); @@ -424,6 +424,12 @@ VG_STATIC void render_scene(void) int player_transparent = 1, player_draw = 1; +#if 0 + if( (localplayer.subsystem == k_player_subsystem_dead) || + (localplayer.camera_mode == k_cam_thirdperson) ) + player_transparent = 0; +#endif + if( !player_transparent && player_draw ) player__render( &main_camera, &localplayer ); @@ -474,6 +480,18 @@ VG_STATIC void render_main_game(void) main_camera.farz = 2100.0f; camera_update_transform( &main_camera ); + + if( localplayer.gate_waiting ) + { + m3x3_mul( localplayer.basis_gate, main_camera.transform, + main_camera.transform ); + } + else + { + m3x3_mul( localplayer.basis, main_camera.transform, + main_camera.transform ); + } + camera_update_view( &main_camera ); camera_update_projection( &main_camera ); camera_finalize( &main_camera );