X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.c;h=b49113b3f0c381d1f27a618d9a213e57c3748776;hb=4b8fc63f926737ca0593a4e471550f9f4995c538;hp=a61bc162811e9462572201cef0488a396240934c;hpb=2dd61c7f0185ec525658ca398801f46e6adccf23;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gate.c b/world_gate.c index a61bc16..b49113b 100644 --- a/world_gate.c +++ b/world_gate.c @@ -20,8 +20,13 @@ /* * Update the transform matrices for gate */ -VG_STATIC void gate_transform_update( ent_gate *gate ) -{ +VG_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 ); + q_mul( gate->q[1], qflip, gate->q[1] ); + } + m4x3f to_local, recv_to_world; q_m3x3( gate->q[0], gate->to_world ); @@ -32,9 +37,6 @@ VG_STATIC void gate_transform_update( ent_gate *gate ) q_m3x3( gate->q[1], recv_to_world ); v3_copy( gate->co[1], recv_to_world[3] ); m4x3_mul( recv_to_world, to_local, gate->transport ); - - m3x3_scale( gate->to_world, (v3f){ gate->dimensions[0], - gate->dimensions[1], 1.0f } ); } VG_STATIC void world_gates_init(void) @@ -69,7 +71,7 @@ VG_STATIC void world_gates_init(void) /* * Render the view through a gate */ -VG_STATIC int render_gate( world_instance *world_inside, +VG_STATIC int render_gate( world_instance *world, world_instance *world_inside, ent_gate *gate, camera *cam, int layer_depth ) { v3f viewdir, gatedir; @@ -89,19 +91,20 @@ VG_STATIC int render_gate( world_instance *world_inside, return 0; { - v3f a,b,c,d; + f32 w = gate->dimensions[0], + h = gate->dimensions[1]; - m4x3_mulv( gate->to_world, (v3f){-1.0f,-1.0f,0.0f}, a ); - m4x3_mulv( gate->to_world, (v3f){ 1.0f,-1.0f,0.0f}, b ); - m4x3_mulv( gate->to_world, (v3f){ 1.0f, 1.0f,0.0f}, c ); - m4x3_mulv( gate->to_world, (v3f){-1.0f, 1.0f,0.0f}, d ); + v3f a,b,c,d; + m4x3_mulv( gate->to_world, (v3f){-w,-h,0.0f}, a ); + m4x3_mulv( gate->to_world, (v3f){ w,-h,0.0f}, b ); + m4x3_mulv( gate->to_world, (v3f){ w, h,0.0f}, c ); + m4x3_mulv( gate->to_world, (v3f){-w, h,0.0f}, d ); vg_line( a,b, 0xffffa000 ); vg_line( b,c, 0xffffa000 ); vg_line( c,d, 0xffffa000 ); vg_line( d,a, 0xffffa000 ); - - vg_line2( gate->co[0], gate->co[1], 0xff0000ff, 0x00000000 ); + vg_line( gate->co[0], gate->co[1], 0xff0000ff ); } /* update gate camera */ @@ -131,7 +134,6 @@ VG_STATIC int render_gate( world_instance *world_inside, { shader_model_gate_use(); shader_model_gate_uPv( cam->mtx.pv ); - shader_model_gate_uMdl( gate->to_world ); shader_model_gate_uCam( cam->pos ); shader_model_gate_uColour( (v4f){0.0f,1.0f,0.0f,0.0f} ); shader_model_gate_uTime( vg.time*0.25f ); @@ -143,13 +145,32 @@ VG_STATIC int render_gate( world_instance *world_inside, glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE ); glStencilFunc( GL_ALWAYS, 1, 0xFF ); glStencilMask( 0xFF ); - - mesh_bind( &world_gates.mesh ); - mdl_draw_submesh( &world_gates.sm_surface ); + glDisable( GL_CULL_FACE ); + + m4x3f mmdl; + m4x3_copy( gate->to_world, mmdl ); + + if( gate->flags & k_ent_gate_custom_mesh ){ + shader_model_gate_uMdl( mmdl ); + 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 { + m3x3_scale( mmdl, (v3f){ gate->dimensions[0], + gate->dimensions[1], 1.0f } ); + shader_model_gate_uMdl( mmdl ); + mesh_bind( &world_gates.mesh ); + mdl_draw_submesh( &world_gates.sm_surface ); + } glClear( GL_DEPTH_BUFFER_BIT ); glStencilFunc( GL_EQUAL, 1, 0xFF ); glStencilMask( 0x00 ); + glEnable( GL_CULL_FACE ); } render_world( world_inside, &world_gates.cam, layer_depth ); @@ -225,7 +246,8 @@ VG_STATIC int gate_intersect( ent_gate *gate, v3f pos, v3f last ) v2f xy; if( gate_intersect_plane( gate, pos, last, xy ) ){ - if( fabsf(xy[0]) <= 1.0f && fabsf(xy[1]) <= 1.0f ){ + if( (fabsf(xy[0]) <= gate->dimensions[0]) && + (fabsf(xy[1]) <= gate->dimensions[1]) ){ return 1; } } @@ -237,16 +259,15 @@ 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 ) -{ + v3f pos, v3f last ){ for( u32 i=0; ient_gate); i++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, i ); - if( gate->type == k_gate_type_unlinked || - gate->type == k_gate_type_nonlocal_unlinked ) - continue; - if( gate->type == k_gate_type_nonlocel ){ - if( world_loader.state != k_world_loader_none ){ + 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_static.load_state != k_world_loader_none ){ continue; } } @@ -262,13 +283,12 @@ VG_STATIC ent_gate *world_intersect_gates( world_instance *world, /* * detatches any nonlocal gates */ -VG_STATIC void world_unlink_nonlocal( world_instance *world ) -{ +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->type == k_gate_type_nonlocel ){ - gate->type = k_gate_type_nonlocal_unlinked; + if( gate->flags & k_ent_gate_nonlocal ){ + gate->flags &= ~k_ent_gate_linked; } } } @@ -276,59 +296,86 @@ VG_STATIC void world_unlink_nonlocal( world_instance *world ) /* * attatches nonlocal gates, to be called from main thread ONLY! */ -VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ) -{ +VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ){ world_instance *world = payload; - u32 world_id = world - world_static.worlds; + u32 world_id = world - world_static.instances; for( u32 j=0; jent_gate); j ++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, j ); - if( gate->type == k_gate_type_nonlocal_unlinked ){ - const char *key = mdl_pstr( &world->meta, gate->key ); - vg_info( "key: %s\n", key ); + 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 ); - for( u32 i=0; istatus != k_world_status_loaded ) continue; - vg_info( "Checking world %u for key matches\n", i ); + if( !(gate2->flags & k_ent_gate_nonlocal) ) continue; + if( gate2->flags & k_ent_gate_linked ) continue; - for( u32 j=0; jent_gate ); j++ ){ - ent_gate *gate2 = mdl_arritm( &other->ent_gate, j ); - if( gate2->type != k_gate_type_nonlocal_unlinked ) continue; + const char *key2 = mdl_pstr( &other->meta, gate2->key ); + vg_info( " key2: %s\n", key2 ); - const char *key2 = mdl_pstr( &other->meta, gate2->key ); - vg_info( " key2: %s\n", key2 ); + if( strcmp( key, key2 ) ) continue; - if( strcmp( key, key2 ) ) continue; + vg_success( "Non-local matching pair '%s' found. (%u:%u)\n", + key, world_id, i ); - vg_success( "Non-local matching pair '%s' found. (%u:%u)\n", - key, world_id, i ); - - gate->type = k_gate_type_nonlocel; - gate2->type = k_gate_type_nonlocel; - gate->target = i; - gate2->target = world_id; + 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] ); + 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 ); + gate_transform_update( gate ); + gate_transform_update( gate2 ); - goto matched; - } + goto matched; } -matched:; } +matched:; + } +} + +VG_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 ); + + if( call->function == 0 ){ /* unlock() */ + gate->flags &= ~k_ent_gate_locked; + } + else { + vg_print_backtrace(); + vg_error( "Unhandled function id: %u\n", call->function ); } }