X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.c;h=96317c1b4da3b458a8fbb449c0caddf3f1823c0e;hb=874c9d7e6ee2d826f9eb34518e8163283439c38e;hp=64333da9f6db11ca65626db0d1f60a216f4d0af1;hpb=5d8b16974b3c7d1104d23df42f23e901eb01a326;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gate.c b/world_gate.c index 64333da..96317c1 100644 --- a/world_gate.c +++ b/world_gate.c @@ -16,11 +16,12 @@ #include "camera.h" #include "world_water.h" +#include "player_remote.h" /* * Update the transform matrices for gate */ -VG_STATIC void gate_transform_update( ent_gate *gate ){ +static void gate_transform_update( ent_gate *gate ){ if( gate->flags & k_ent_gate_flip ){ v4f qflip; q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf ); @@ -39,7 +40,7 @@ VG_STATIC void gate_transform_update( ent_gate *gate ){ m4x3_mul( recv_to_world, to_local, gate->transport ); } -VG_STATIC void world_gates_init(void) +static void world_gates_init(void) { vg_info( "world_gates_init\n" ); @@ -64,14 +65,27 @@ VG_STATIC void world_gates_init(void) world_gates.sm_marker[i] = *sm; } + mdl_mesh *icosphere = mdl_find_mesh( &mgate, "rs_icosphere" ); + world_gates.sm_icosphere = + *((mdl_submesh *)mdl_arritm( &mgate.submeshs, icosphere->submesh_start )); + mdl_async_load_glmesh( &mgate, &world_gates.mesh ); mdl_close( &mgate ); } +static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){ + m4x3_copy( gate->to_world, mmdl ); + + if( !(gate->flags & k_ent_gate_custom_mesh) ){ + m3x3_scale( mmdl, (v3f){ gate->dimensions[0], + gate->dimensions[1], 1.0f } ); + } +} + /* * Render the view through a gate */ -VG_STATIC int render_gate( world_instance *world, world_instance *world_inside, +static int render_gate( world_instance *world, world_instance *world_inside, ent_gate *gate, camera *cam, int layer_depth ) { v3f viewdir, gatedir; @@ -148,7 +162,8 @@ VG_STATIC int render_gate( world_instance *world, world_instance *world_inside, glDisable( GL_CULL_FACE ); m4x3f mmdl; - m4x3_copy( gate->to_world, mmdl ); + ent_gate_get_mdl_mtx( gate, mmdl ); + shader_model_gate_uMdl( mmdl ); if( gate->flags & k_ent_gate_custom_mesh ){ mesh_bind( &world->mesh_no_collide ); @@ -159,15 +174,10 @@ VG_STATIC int render_gate( world_instance *world, world_instance *world_inside, } } else { - m3x3_scale( mmdl, (v3f){ gate->dimensions[0], - gate->dimensions[1], 1.0f } ); - mesh_bind( &world_gates.mesh ); mdl_draw_submesh( &world_gates.sm_surface ); } - shader_model_gate_uMdl( mmdl ); - glClear( GL_DEPTH_BUFFER_BIT ); glStencilFunc( GL_EQUAL, 1, 0xFF ); glStencilMask( 0x00 ); @@ -175,6 +185,7 @@ VG_STATIC int render_gate( world_instance *world, world_instance *world_inside, } render_world( world_inside, &world_gates.cam, layer_depth ); + render_remote_players( world_inside, &world_gates.cam ); { glDisable( GL_STENCIL_TEST ); @@ -198,7 +209,7 @@ VG_STATIC int render_gate( world_instance *world, world_instance *world_inside, * Intersect the plane of a gate with a line segment, plane coordinate result * stored in 'where' */ -VG_STATIC int gate_intersect_plane( ent_gate *gate, +static int gate_intersect_plane( ent_gate *gate, v3f pos, v3f last, v2f where ) { v4f surface; @@ -242,8 +253,7 @@ VG_STATIC int gate_intersect_plane( ent_gate *gate, /* * Intersect specific gate */ -VG_STATIC int gate_intersect( ent_gate *gate, v3f pos, v3f last ) -{ +static int gate_intersect( ent_gate *gate, v3f pos, v3f last ){ v2f xy; if( gate_intersect_plane( gate, pos, last, xy ) ){ @@ -259,116 +269,24 @@ VG_STATIC int gate_intersect( ent_gate *gate, v3f pos, v3f last ) /* * Intersect all gates in the world */ -VG_STATIC ent_gate *world_intersect_gates( world_instance *world, - v3f pos, v3f last ){ +static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last ){ for( u32 i=0; ient_gate); i++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, i ); if( !(gate->flags & k_ent_gate_linked) ) continue; if( gate->flags & k_ent_gate_locked ) continue; - if( gate->flags & k_ent_gate_nonlocal ){ - if( world_loader.state != k_world_loader_none ){ - continue; - } - } + if( gate->flags & k_ent_gate_nonlocal_DELETED ) + continue; - if( gate_intersect( gate, pos, last ) ){ - return gate; - } + if( gate_intersect( gate, pos, last ) ) + return mdl_entity_id( k_ent_gate, i ); } - return NULL; -} - -/* - * detatches any nonlocal gates - */ -VG_STATIC void world_unlink_nonlocal( world_instance *world ){ - for( u32 j=0; jent_gate); j ++ ){ - ent_gate *gate = mdl_arritm( &world->ent_gate, j ); - - if( gate->flags & k_ent_gate_nonlocal ){ - gate->flags &= ~k_ent_gate_linked; - } - } -} - -/* - * attatches nonlocal gates, to be called from main thread ONLY! - */ -VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ) -{ - world_instance *world = payload; - u32 world_id = world - world_static.worlds; - - for( u32 j=0; jent_gate); j ++ ){ - ent_gate *gate = mdl_arritm( &world->ent_gate, j ); - - if( !(gate->flags & k_ent_gate_nonlocal) ) continue; - if( gate->flags & k_ent_gate_linked ) continue; - - const char *key = mdl_pstr( &world->meta, gate->key ); - vg_info( "key: %s\n", key ); - - for( u32 i=0; istatus != k_world_status_loaded ) continue; - vg_info( "Checking world %u for key matches\n", i ); - - for( u32 j=0; jent_gate ); j++ ){ - ent_gate *gate2 = mdl_arritm( &other->ent_gate, j ); - - if( !(gate2->flags & k_ent_gate_nonlocal) ) continue; - if( gate2->flags & k_ent_gate_linked ) continue; - - const char *key2 = mdl_pstr( &other->meta, gate2->key ); - vg_info( " key2: %s\n", key2 ); - - if( strcmp( key, key2 ) ) continue; - - vg_success( "Non-local matching pair '%s' found. (%u:%u)\n", - key, world_id, i ); - - gate->flags |= k_ent_gate_linked; - gate2->flags |= k_ent_gate_linked; - gate->target = i; - gate2->target = world_id; - - v3_copy( gate->co[0], gate2->co[1] ); - v3_copy( gate2->co[0], gate->co[1] ); - v4_copy( gate->q[0], gate2->q[1] ); - v4_copy( gate2->q[0], gate->q[1] ); - - if( world->meta.info.version >= 102 ){ - gate->flags |= k_ent_gate_flip; - gate2->flags |= k_ent_gate_flip; - } - else { - /* LEGACY BEHAVIOUR: v101 - * this would flip both the client worlds portal's entrance and - * exit. effectively the clients portal would be the opposite - * to the hub worlds one. new behaviour is to just flip the - * destinations so the rules are consistent in each world. - */ - v4f qflip; - q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf ); - q_mul( gate->q[0], qflip, gate->q[0] ); - q_mul( gate->q[1], qflip, gate->q[1] ); - } - - gate_transform_update( gate ); - gate_transform_update( gate2 ); - - goto matched; - } - } -matched:; - } + return 0; } -VG_STATIC void ent_gate_call( world_instance *world, ent_call *call ){ +static void ent_gate_call( world_instance *world, ent_call *call ){ u32 index = mdl_entity_id_id( call->id ); ent_gate *gate = mdl_arritm( &world->ent_gate, index );