projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fuckin hell
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 87fbc7f5cab1c017e2ca3d1b3d00055a1377b895..4c531a4736f66dee33740b3cb13905db8e9777c9 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-232,7
+232,7
@@
VG_STATIC void load_playermodels(void)
vg_release_thread_sync();
/* FIXME: hack */
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 );
vg_acquire_thread_sync();
{
vg_tex2d_init( (vg_tex2d *[]){ &localplayer_texture }, 1 );
@@
-269,7
+269,7
@@
VG_STATIC void vg_load(void)
/* 'systems' are completely loaded now */
strcpy( world.world_name, "maps/mp_mtzero.mdl" );
/* 'systems' are completely loaded now */
strcpy( world.world_name, "maps/mp_mtzero.mdl" );
-
//
strcpy( world.world_name, "maps/mp_gridmap.mdl" );
+ strcpy( world.world_name, "maps/mp_gridmap.mdl" );
world_load();
vg_console_load_autos();
}
world_load();
vg_console_load_autos();
}
@@
-480,6
+480,18
@@
VG_STATIC void render_main_game(void)
main_camera.farz = 2100.0f;
camera_update_transform( &main_camera );
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 );
camera_update_view( &main_camera );
camera_update_projection( &main_camera );
camera_finalize( &main_camera );