X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=5b27ef7951b7479ad9c715bef7abafb5f366e65c;hb=0c10e79eabdb2cc0fe0b6b4116541d8eeeef1328;hp=8b650a5e0c169d336cd0b2a872fe640408c7d29d;hpb=be6707a307bfeec1b45cca8b3fb647e81262be87;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 8b650a5..5b27ef7 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; @@ -46,6 +45,13 @@ enum logic_type k_logic_type_achievement = 3 }; +enum geo_type +{ + k_geo_type_solid = 0, + k_geo_type_nonsolid = 1, + k_geo_type_water = 2 +}; + VG_STATIC struct gworld { /* @@ -135,6 +141,22 @@ VG_STATIC struct gworld */ mdl_context *meta; + /* + * Materials / textures + */ + + GLuint *textures; + u32 texture_count; + + struct world_material + { + mdl_material info; + mdl_submesh sm_geo, + sm_no_collide; + } + * materials; + u32 material_count; + /* * Named safe places to respawn */ @@ -283,25 +305,28 @@ 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; + glmesh mesh_geo, mesh_no_collide, - mesh_route_lines, mesh_water; - rigidbody rb_geo; - - /* TODO Maybe make this less hardcoded... - * im on it, boss*/ - mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb, - sm_foliage_main, sm_foliage_alphatest, - sm_graffiti, sm_subworld, sm_terrain; - + mdl_submesh sm_foliage_main; + rigidbody rb_geo; /* todo.. ... */ } world; @@ -311,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 ); @@ -375,10 +400,10 @@ VG_STATIC int world_change_world( int argc, const char *argv[] ) VG_STATIC void world_init(void) { - vg_convar_push( (struct vg_convar){ + vg_var_push( (struct vg_var){ .name = "water_enable", .data = &world.water.enabled, - .data_type = k_convar_dtype_i32, + .data_type = k_var_dtype_i32, .opt_i32 = { .min=0, .max=1, .clamp=1 }, .persistent = 0 }); @@ -400,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" ); @@ -410,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(); @@ -425,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 ); } @@ -531,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 ); @@ -545,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] ); + } } } } @@ -625,22 +650,96 @@ 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 ) +/* + * Cast a sphere from a to b and see what time it hits + */ +VG_STATIC int spherecast_world( v3f pa, v3f pb, float r, float *t, v3f n ) { - u32 valid_start = 0, - valid_end = world.sm_terrain.vertex_count; + bh_iter it; + bh_iter_init( 0, &it ); - return (hit->tri[0] >= valid_start) && - (hit->tri[0] < valid_end); + boxf region; + box_init_inf( region ); + box_addpt( region, pa ); + box_addpt( region, pb ); + + v3_add( (v3f){ r, r, r}, region[1], region[1] ); + v3_add( (v3f){-r,-r,-r}, region[0], region[0] ); + + v3f dir; + v3_sub( pb, pa, dir ); + + v3f dir_inv; + dir_inv[0] = 1.0f/dir[0]; + dir_inv[1] = 1.0f/dir[1]; + dir_inv[2] = 1.0f/dir[2]; + + int hit = -1; + float min_t = 1.0f; + + int idx; + while( bh_next( world.geo_bh, &it, region, &idx ) ) + { + u32 *ptri = &world.scene_geo->arrindices[ idx*3 ]; + v3f tri[3]; + + boxf box; + box_init_inf( box ); + + for( int j=0; j<3; j++ ) + { + v3_copy( world.scene_geo->arrvertices[ptri[j]].co, tri[j] ); + box_addpt( box, tri[j] ); + } + + v3_add( (v3f){ r, r, r}, box[1], box[1] ); + v3_add( (v3f){-r,-r,-r}, box[0], box[0] ); + + if( !ray_aabb1( box, pa, dir_inv, 1.0f ) ) + continue; + + float t; + v3f n1; + if( spherecast_triangle( tri, pa, dir, r, &t, n1 ) ) + { + if( t < min_t ) + { + min_t = t; + hit = idx; + v3_copy( n1, n ); + } + } + } + + *t = min_t; + return hit; } -VG_STATIC int ray_hit_is_ramp( ray_hit *hit ) +VG_STATIC struct world_material *world_tri_index_material( u32 index ) { - u32 valid_start = world.sm_geo_std.vertex_start, - valid_end = world.sm_geo_vb.vertex_start; + for( int i=1; itri[0] >= valid_start) && - (hit->tri[0] < valid_end); + 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 struct world_material *world_contact_material( rb_ct *ct ) +{ + return world_tri_index_material( ct->element_id ); +} + +VG_STATIC struct world_material *ray_hit_material( ray_hit *hit ) +{ + return world_tri_index_material( hit->tri[0] ); } #endif /* WORLD_H */