X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.c;h=259260c0f006a3110409ec27d0fd7b5fc7c5e5ea;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=bc21e95bc13dea6cd4a1645201ba7ffd0b859167;hpb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gate.c b/world_gate.c index bc21e95..259260c 100644 --- a/world_gate.c +++ b/world_gate.c @@ -17,6 +17,7 @@ #include "world_water.h" #include "player_remote.h" +#include "shaders/model_gate_unlinked.h" /* * Update the transform matrices for gate @@ -45,6 +46,7 @@ static void world_gates_init(void) vg_info( "world_gates_init\n" ); shader_model_gate_register(); + shader_model_gate_unlinked_register(); vg_linear_clear( vg_mem.scratch ); @@ -65,11 +67,7 @@ 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_async_load_glmesh( &mgate, &world_gates.mesh, NULL ); mdl_close( &mgate ); } @@ -82,6 +80,21 @@ static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){ } } +static void render_gate_mesh( world_instance *world, ent_gate *gate ){ + if( gate->flags & k_ent_gate_custom_mesh ){ + mesh_bind( &world->mesh_no_collide ); + for( u32 i=0; isubmesh_count; i++ ){ + mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, + gate->submesh_start+i ); + mdl_draw_submesh( sm ); + } + } + else { + mesh_bind( &world_gates.mesh ); + mdl_draw_submesh( &world_gates.sm_surface ); + } +} + /* * Render the view through a gate */ @@ -158,24 +171,12 @@ static int render_gate( world_instance *world, world_instance *world_inside, glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE ); glStencilFunc( GL_ALWAYS, 1, 0xFF ); glStencilMask( 0xFF ); - glDisable( GL_CULL_FACE ); + glEnable( GL_CULL_FACE ); m4x3f 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 ); - for( u32 i=0; isubmesh_count; i++ ){ - mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, - gate->submesh_start+i ); - mdl_draw_submesh( sm ); - } - } - else { - mesh_bind( &world_gates.mesh ); - mdl_draw_submesh( &world_gates.sm_surface ); - } + render_gate_mesh( world, gate ); render_world( world_inside, &world_gates.cam, 1, !localplayer.gate_waiting, 1, 1 ); @@ -183,6 +184,26 @@ static int render_gate( world_instance *world, world_instance *world_inside, return 1; } +static void render_gate_unlinked( world_instance *world, + ent_gate *gate, camera *cam ){ + m4x3f mmdl; m4x4f m4mdl; + ent_gate_get_mdl_mtx( gate, mmdl ); + m4x3_expand( mmdl, m4mdl ); + m4x4_mul( cam->mtx_prev.pv, m4mdl, m4mdl ); + + shader_model_gate_unlinked_use(); + shader_model_gate_unlinked_uPv( cam->mtx.pv ); + shader_model_gate_unlinked_uPvmPrev( m4mdl ); + shader_model_gate_unlinked_uCam( cam->pos ); + shader_model_gate_unlinked_uColour( (v4f){0.0f,1.0f,0.0f,0.0f} ); + shader_model_gate_unlinked_uTime( vg.time*0.25f ); + shader_model_gate_unlinked_uMdl( mmdl ); + + vg_line_point( gate->co[0], 0.1f, 0xffffff00 ); + + render_gate_mesh( world, gate ); +} + /* * Intersect the plane of a gate with a line segment, plane coordinate result * stored in 'where' @@ -254,8 +275,11 @@ static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last ){ if( !(gate->flags & k_ent_gate_linked) ) continue; if( gate->flags & k_ent_gate_locked ) continue; - if( gate->flags & k_ent_gate_nonlocal_DELETED ) - continue; + if( gate->flags & k_ent_gate_nonlocal ){ + if( world_static.instances[gate->target].status + != k_world_status_loaded ) + continue; + } if( gate_intersect( gate, pos, last ) ) return mdl_entity_id( k_ent_gate, i ); @@ -277,4 +301,88 @@ static void ent_gate_call( world_instance *world, ent_call *call ){ } } + +/* + * detatches any nonlocal gates + */ +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! + */ +static void world_link_nonlocal_async( void *payload, u32 size ){ + world_instance *world = payload; + u32 world_id = world - world_static.instances; + + for( u32 j=0; jent_gate); j ++ ){ + ent_gate *gate = mdl_arritm( &world->ent_gate, j ); + gate_transform_update( gate ); + + 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 k=0; kent_gate ); k++ ){ + ent_gate *gate2 = mdl_arritm( &other->ent_gate, k ); + + 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 ){ + /* 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] ); + q_mul( gate2->q[1], qflip, gate2->q[1] ); + } + + gate_transform_update( gate ); + gate_transform_update( gate2 ); + + goto matched; + } + } matched:; + } +} + #endif /* WORLD_GATE_C */