X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=a410301d171e836ae82697678606ce19a4941ef2;hb=0ca7f5ca2560908de1a03db112df67e52b476107;hp=0d3ff70599a60ec40e2b2e653363c5b66e810d8b;hpb=15ee98e7238aa0f2726db46fa5dabe48bf686454;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 0d3ff70..a410301 100644 --- a/skaterift.c +++ b/skaterift.c @@ -19,24 +19,18 @@ #include "audio.h" #include "world.h" -#if 0 + + #include "player.h" -#else -#include "player_interface.h" -#include "player_device_walk.h" -#include "player_device_skate.h" -#include "player_device_dead.h" -#include "player_model.h" - -/* temp */ -VG_STATIC player_interface localplayer; -VG_STATIC struct player_device_walk localplayer_walk; -VG_STATIC struct player_device_skate localplayer_skate; -VG_STATIC struct player_device_dead localplayer_dead; +VG_STATIC player_instance localplayer; VG_STATIC struct player_avatar localplayer_avatar; VG_STATIC glmesh localplayer_meshes[3]; +vg_tex2d localplayer_texture = { .path = "textures/ch_gradient.qoi" }; + + + + -#endif #include "network.h" @@ -52,7 +46,7 @@ static int cl_ui = 1, int main( int argc, char *argv[] ) { vg_mem.use_libc_malloc = 0; - vg_set_mem_quota( 128*1024*1024 ); + vg_set_mem_quota( 160*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); return 0; @@ -70,7 +64,9 @@ VG_STATIC void vg_launch_opt(void) VG_STATIC int __kill( int argc, const char *argv[] ) { +#if 0 player_use_device( &localplayer, &player_device_dead, &localplayer_dead ); +#endif return 0; } @@ -78,11 +74,13 @@ VG_STATIC int __respawn( int argc, const char *argv[] ) { struct respawn_point *rp = NULL, *r; + world_instance *world = get_active_world(); + if( argc == 1 ) { - for( int i=0; ispawn_count; i++ ) { - r = &world.spawns[i]; + r = &world->spawns[i]; if( !strcmp( r->name, argv[0] ) ) { rp = r; @@ -98,9 +96,9 @@ VG_STATIC int __respawn( int argc, const char *argv[] ) { float min_dist = INFINITY; - for( int i=0; ispawn_count; i++ ) { - r = &world.spawns[i]; + r = &world->spawns[i]; float d = v3_dist2( r->co, localplayer.rb.co ); vg_info( "Dist %s : %f\n", r->name, d ); @@ -116,13 +114,13 @@ VG_STATIC int __respawn( int argc, const char *argv[] ) { vg_error( "No spawn found\n" ); - if( !world.spawn_count ) + if( !world->spawn_count ) return 0; - rp = &world.spawns[0]; + rp = &world->spawns[0]; } - player_spawn( &localplayer, rp ); + player__spawn( &localplayer, rp ); return 1; } @@ -223,10 +221,10 @@ 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 *[]){ &tex_characters }, 1 ); + vg_tex2d_init( (vg_tex2d *[]){ &localplayer_texture }, 1 ); } vg_release_thread_sync(); } @@ -245,13 +243,12 @@ VG_STATIC void vg_load(void) vg_loader_step( load_playermodels, NULL ); /* player setup */ - player_interface_create_player( &localplayer ); - + player__create( &localplayer ); player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); - player_use_avatar( &localplayer, &localplayer_avatar ); - player_use_mesh( &localplayer, &localplayer_meshes[0] ); - player_use_device( &localplayer, &player_device_walk, &localplayer_walk ); - player_use_device( &localplayer, &player_device_skate, &localplayer_skate ); + player__use_avatar( &localplayer, &localplayer_avatar ); + player__use_mesh( &localplayer, &localplayer_meshes[0] ); + player__use_texture( &localplayer, &localplayer_texture ); + player__bind( &localplayer ); /* --------------------- */ @@ -260,9 +257,15 @@ VG_STATIC void vg_load(void) world_audio_init(); /* 'systems' are completely loaded now */ - strcpy( world.world_name, "maps/mp_mtzero.mdl" ); - strcpy( world.world_name, "maps/mp_gridmap.mdl" ); - world_load(); + + /* load home world */ + world_load( &world_global.worlds[0], "maps/mp_home.mdl" ); + + world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" ); + world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" ); + world_link_nonlocal_gates( 0, 1 ); + world_link_nonlocal_gates( 0, 2 ); + vg_console_load_autos(); } @@ -292,8 +295,8 @@ VG_STATIC void vg_update(void) player_update_pre(); #endif - player_pre_update( &localplayer ); - world_update( localplayer.rb.co ); + player__pre_update( &localplayer ); + world_update( get_active_world(), localplayer.rb.co ); } } @@ -308,7 +311,7 @@ VG_STATIC void vg_update_fixed(void) vehicle_update_fixed(); #endif - player_update( &localplayer ); + player__update( &localplayer ); } } @@ -327,7 +330,7 @@ VG_STATIC void vg_update_post(void) } #endif - player_post_update( &localplayer ); + player__post_update( &localplayer ); #if 0 menu_update(); @@ -398,7 +401,7 @@ VG_STATIC void render_player_transparent(void) /* Draw player to window buffer and blend background ontop */ glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - player_render( &small_cam, &localplayer ); + player__render( &small_cam, &localplayer ); } VG_STATIC void render_scene(void) @@ -409,20 +412,27 @@ VG_STATIC void render_scene(void) /* Draw world */ glEnable( GL_DEPTH_TEST ); - render_world( &main_camera ); - + world_instance *view_world = localplayer.viewable_world; + render_world( view_world, &main_camera ); 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 ); + player__render( &main_camera, &localplayer ); - render_water_texture( &main_camera ); + + render_water_texture( view_world, &main_camera ); render_fb_bind( gpipeline.fb_main ); - render_water_surface( &main_camera ); - render_world_gates( &main_camera ); + render_water_surface( view_world, &main_camera ); + render_world_gates( view_world, &main_camera ); if( player_transparent && player_draw ) render_player_transparent(); @@ -457,7 +467,7 @@ VG_STATIC void render_main_game(void) * TODO: blend with camera from menu */ /* FIXME: TEMP!! */ - player_pre_render( &localplayer ); + player__pre_render( &localplayer ); v3_copy( localplayer.cam.pos, main_camera.pos ); v3_copy( localplayer.cam.angles, main_camera.angles ); @@ -466,6 +476,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 ); @@ -508,12 +530,14 @@ VG_STATIC void vg_render(void) VG_STATIC void run_light_widget( struct light_widget *lw ); VG_STATIC void vg_ui(void) { - player_ui( &localplayer ); + player__im_gui( &localplayer ); + world_instance *world = get_active_world(); #if 0 menu_crap_ui(); #endif +#if 0 if( cl_light_edit ) { vg_uictx.cursor[0] = 10; @@ -548,11 +572,12 @@ VG_STATIC void vg_ui(void) render_update_lighting_ub(); } +#endif //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); if( cl_ui ) { - render_world_routes_ui(); + render_world_routes_ui( world ); } //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );