X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=world.h;h=240e8dc1a44c77ec2b9be778e25e9d96ec688ccf;hb=a6708cef5099c83ff14816442de0954934f10276;hp=e5c039a495113f8ae528ed8b7e4890d1e3ad7064;hpb=1f0e3292c021e8263716e5f4544a1efcedf3f03d;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index e5c039a..240e8dc 100644 --- a/world.h +++ b/world.h @@ -21,11 +21,10 @@ VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit ); #include "shaders/terrain.h" #include "shaders/sky.h" -#include "shaders/planeinf.h" #include "shaders/standard.h" #include "shaders/vblend.h" #include "shaders/gpos.h" -#include "shaders/fscolour.h" +#include "shaders/blitcolour.h" #include "shaders/alphatest.h" typedef struct teleport_gate teleport_gate; @@ -53,12 +52,6 @@ enum geo_type k_geo_type_water = 2 }; -enum material_flag -{ - k_material_flag_skate_surface = 0x1, - k_material_flag_collision = 0x2 -}; - VG_STATIC struct gworld { /* @@ -312,10 +305,18 @@ VG_STATIC struct gworld *scene_no_collide, *scene_lines; + struct grind_edge + { + v3f p0, p1; + } + *grind_edges; + u32 grind_edge_count; + /* spacial mappings */ bh_tree *audio_bh, *trigger_bh, - *geo_bh; + *geo_bh, + *grind_bh; /* graphics */ glmesh mesh_route_lines; @@ -335,7 +336,7 @@ world; */ VG_STATIC int ray_hit_is_ramp( ray_hit *hit ); -VG_STATIC int ray_hit_is_terrain( ray_hit *hit ); +VG_STATIC struct world_material *ray_hit_material( ray_hit *hit ); VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] ); VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit ); @@ -424,9 +425,8 @@ VG_STATIC void world_init(void) shader_terrain_register(); shader_sky_register(); - shader_planeinf_register(); shader_gpos_register(); - shader_fscolour_register(); + shader_blitcolour_register(); shader_alphatest_register(); vg_info( "Loading world resources\n" ); @@ -434,10 +434,7 @@ VG_STATIC void world_init(void) vg_linear_clear( vg_mem.scratch ); mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" ); - mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ), - *nupper = mdl_node_from_name( msky, "dome_upper" ); - - world.dome_lower = *mdl_node_submesh( msky, nlower, 0 ); + mdl_node *nupper = mdl_node_from_name( msky, "dome_complete" ); world.dome_upper = *mdl_node_submesh( msky, nupper, 0 ); vg_acquire_thread_sync(); @@ -449,14 +446,14 @@ VG_STATIC void world_init(void) /* Other systems */ vg_info( "Loading other world systems\n" ); - vg_loader_highwater( world_render_init, NULL, NULL ); - vg_loader_highwater( world_sfd_init, NULL, NULL ); - vg_loader_highwater( world_water_init, NULL, NULL ); - vg_loader_highwater( world_gates_init, NULL, NULL ); - vg_loader_highwater( world_routes_init, NULL, NULL ); + vg_loader_step( world_render_init, NULL ); + vg_loader_step( world_sfd_init, NULL ); + vg_loader_step( world_water_init, NULL ); + vg_loader_step( world_gates_init, NULL ); + vg_loader_step( world_routes_init, NULL ); /* Allocate dynamic world memory arena */ - u32 max_size = 72*1024*1024; + u32 max_size = 76*1024*1024; world.dynamic_vgl = vg_create_linear_allocator( vg_mem.rtmemory, max_size, VG_MEMORY_SYSTEM ); } @@ -555,11 +552,11 @@ VG_STATIC void world_update( v3f pos ) { world.switching_to_new_world = 0; world_unload(); - world_load(); + vg_loader_start( world_load ); + return; } } - world.sky_time += world.sky_rate * vg.time_delta; world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate, vg.time_delta * 5.0 ); @@ -569,36 +566,40 @@ VG_STATIC void world_update( v3f pos ) world_routes_debug(); #endif - int closest = 0; - float min_dist = INFINITY; - - for( int i=0; i 0 ) { - float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos ); + int closest = 0; + float min_dist = INFINITY; - if( d < min_dist ) + for( int i=0; itrack_id; + struct route *route = &world.routes[closest]; - if( id != 0xffffffff ) - { - struct netmsg_board *local_board = &scoreboard_client_data.boards[id]; + u32 id = route->track_id; - for( int i=0; i<13; i++ ) + if( id != 0xffffffff ) { - sfd_encode( i, &local_board->data[27*i] ); + struct netmsg_board *local_board = + &scoreboard_client_data.boards[id]; + + for( int i=0; i<13; i++ ) + { + sfd_encode( i, &local_board->data[27*i] ); + } } } } @@ -649,28 +650,31 @@ VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit ) return scene_raycast( world.scene_geo, world.geo_bh, pos, dir, hit ); } -VG_STATIC int ray_hit_is_terrain( ray_hit *hit ) +VG_STATIC struct world_material *world_tri_index_material( u32 index ) { - return 0; -#if 0 - u32 valid_start = 0, - valid_end = world.sm_terrain.vertex_count; + for( int i=1; itri[0] >= valid_start) && - (hit->tri[0] < valid_end); -#endif + if( (index >= mat->sm_geo.vertex_start) && + (index < mat->sm_geo.vertex_start+mat->sm_geo.vertex_count ) ) + { + return mat; + } + } + + /* error material */ + return &world.materials[0]; } -VG_STATIC int ray_hit_is_ramp( ray_hit *hit ) +VG_STATIC struct world_material *world_contact_material( rb_ct *ct ) { - return 1; -#if 0 - u32 valid_start = world.sm_geo_std.vertex_start, - valid_end = world.sm_geo_vb.vertex_start; + return world_tri_index_material( ct->element_id ); +} - return (hit->tri[0] >= valid_start) && - (hit->tri[0] < valid_end); -#endif +VG_STATIC struct world_material *ray_hit_material( ray_hit *hit ) +{ + return world_tri_index_material( hit->tri[0] ); } #endif /* WORLD_H */