X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=9ae654e27937333728d5db924b404edb88723176;hb=b9dedb4dd2a1e94ae76a3986716ee3c57e568213;hp=079d6d3c421cfd1eeafc2162355cdc96bfcbcf22;hpb=98ecdd9f0377f1563566fe4d3d3b8185a055ec4d;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 079d6d3..9ae654e 100644 --- a/world.h +++ b/world.h @@ -5,16 +5,19 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ); #ifndef WORLD_H #define WORLD_H +#include "vg/vg_loader.h" + +#include "network.h" +#include "network_msg.h" #include "scene.h" #include "terrain.h" #include "render.h" -#include "water.h" #include "rigidbody.h" -#include "gate.h" #include "bvh.h" #include "lighting.h" #include "model.h" -#include "traffic.h" + +#include "traffic.h" /*TODO: -> world_traffic.h */ #include "shaders/terrain.h" #include "shaders/sky.h" @@ -23,9 +26,26 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ); #include "shaders/vblend.h" #include "shaders/gpos.h" #include "shaders/fscolour.h" +#include "shaders/alphatest.h" + +enum { k_max_ui_segments = 8 }; +enum { k_max_ui_splits_per_segment = 16 }; + +enum { k_max_ui_elements = k_max_ui_segments*k_max_ui_splits_per_segment }; +enum { k_max_element_verts = 10 }; +enum { k_max_element_indices = 20 }; + +enum { k_route_ui_max_verts = k_max_ui_elements*k_max_element_verts }; +enum { k_route_ui_max_indices = k_max_ui_elements*k_max_element_indices }; static struct gworld { + struct subworld_gen + { + + } + subworld_gen; + /* gameplay */ struct respawn_point { @@ -36,535 +56,314 @@ static struct gworld spawns[32]; u32 spawn_count; - teleport_gate gates[64]; - u32 gate_count; - - /* Paths */ - traffic_node traffic[128]; - u32 traffic_count; - - traffic_driver van_man[6]; - - /* Physics */ - rigidbody temp_rbs[128]; - u32 rb_count; - - /* Rendering & geometry */ - scene geo, foliage; + struct subworld_routes + { + struct route_node + { + v3f co, right, up, h; + u32 next[2]; - mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb; + u32 special_type, special_id, current_refs, ref_count; + u32 route_ids[4]; /* Gates can be linked into up to four routes */ + } + *nodes; - glmesh skybox, skydome; - mdl_submesh dome_upper, dome_lower; + u32 node_count, + node_cap; - glmesh cars; - mdl_submesh car_holden; + struct route + { + u32 track_id; + v4f colour; - rigidbody mr_ball; -} -world; + u32 start; + mdl_submesh sm; + + int active; + float factive; -vg_tex2d tex_terrain_colours = { .path = "textures/gradients.qoi", - .flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST }; + double best_lap, latest_pass; /* Session */ -vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi", - .flags = VG_TEXTURE_NEAREST }; + struct + { + GLuint vao, vbo, ebo; -static void ray_world_get_tri( ray_hit *hit, v3f tri[3] ) -{ - for( int i=0; i<3; i++ ) - v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] ); -} + u32 indices_head; + u32 vertex_head; -static int ray_world( v3f pos, v3f dir, ray_hit *hit ) -{ - return scene_raycast( &world.geo, pos, dir, hit ); -} + float last_notch; -static int ray_hit_is_ramp( ray_hit *hit ) -{ - return hit->tri[0] > world.sm_geo_std_oob.vertex_count; -} + struct route_ui_segment + { + float length; + u32 vertex_start, vertex_count, + index_start, index_count, notches; + } + segments[k_max_ui_segments]; -static void world_register(void) -{ - shader_terrain_register(); - shader_sky_register(); - shader_planeinf_register(); - shader_gpos_register(); - shader_fscolour_register(); -} + u32 segment_start, segment_count, fade_start, fade_count; + double fade_timer_start; + float xpos; + } + ui; -static void world_free(void) -{ - /* TODO.. */ -} + m4x3f scoreboard_transform; + } + *routes; -static void render_world_depth( m4x4f projection, m4x3f camera ); + double last_interaction; -static void add_all_if_material( scene *pscene, mdl_header *mdl, u32 id ) -{ - for( int i=0; inode_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id( mdl, i ); + u32 route_count, + route_cap; - for( int j=0; jsubmesh_count; j++ ) + struct route_gate { - mdl_submesh *sm = mdl_node_submesh( mdl, pnode, j ); + struct teleport_gate + { + v3f co[2]; + v4f q[2]; + v2f dims; + + m4x3f to_world, recv_to_world, transport; + } + gate; + + u32 node_id; - if( sm->material_id == id ) + struct route_timing { - m4x3f transform; - mdl_node_transform( pnode, transform ); - scene_add_submesh( pscene, mdl, sm, transform ); - } + u32 version; /* Incremented on every teleport */ + double time; + } + timing; } - } -} - -static void world_apply_foliage(void) -{ - scene_init( &world.foliage ); - mdl_header *mfoliage = mdl_load("models/rs_foliage.mdl"); - - v3f volume; - v3_sub( world.geo.bbx[1], world.geo.bbx[0], volume ); - volume[1] = 1.0f; - - m4x3f transform; - mdl_node *mblob = mdl_node_from_name( mfoliage, "blob" ); - mdl_submesh *sm_blob = mdl_node_submesh( mfoliage, mblob, 0 ); - - for( int i=0;i<100000;i++ ) - { - v3f pos; - v3_mul( volume, (v3f){ vg_randf(), 1000.0f, vg_randf() }, pos ); - pos[1] = 1000.0f; - v3_add( pos, world.geo.bbx[0], pos ); - - ray_hit hit; - hit.dist = INFINITY; + *gates; - if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit )) + struct route_collector { - if( hit.normal[1] > 0.8f && !ray_hit_is_ramp(&hit) && - hit.pos[1] > water_height()+10.0f ) - { - v4f qsurface, qrandom; - v3f axis; - - v3_cross( (v3f){0.0f,1.0f,0.0f}, hit.normal, axis ); - - float angle = v3_dot(hit.normal,(v3f){0.0f,1.0f,0.0f}); - q_axis_angle( qsurface, axis, angle ); - q_axis_angle( qrandom, (v3f){0.0f,1.0f,0.0f}, vg_randf()*VG_TAUf ); - q_mul( qsurface, qrandom, qsurface ); - q_m3x3( qsurface, transform ); - - v3_copy( hit.pos, transform[3] ); - scene_add_submesh( &world.foliage, mfoliage, sm_blob, transform); - } + struct route_timing timing; } - } - - scene_upload( &world.foliage ); - free( mfoliage ); -} - -static void world_load(void) -{ - mdl_header *mworld = mdl_load( "models/mp_dev.mdl" ); + *collectors; - world.spawn_count = 0; - world.gate_count = 0; - world.rb_count = 0; - world.traffic_count = 0; + u32 gate_count, + gate_cap, + collector_count, + collector_cap; - scene_init( &world.geo ); + u32 active_gate, + current_run_version; - /* - * Compile meshes into the world scenes - */ - u32 mat_surf = 0, - mat_surf_oob = 0, - mat_vertex_blend = 0; + scene scene_lines; + } + routes; - for( int i=1; imaterial_count; i++ ) + struct subworld_sfd { - mdl_material *mat = mdl_material_from_id( mworld, i ); - const char *mat_name = mdl_pstr( mworld, mat->pstr_name ); + scene mesh; + mdl_submesh *sm_module, *sm_card; + glmesh temp; - vg_info( "%d %s\n", mat->pstr_name, mat_name ); + struct sfd_instance + { + float *buffer; - if( !strcmp( "surf", mat_name )) - mat_surf = i; - else if( !strcmp( "surf_oob", mat_name )) - mat_surf_oob = i; - else if( !strcmp( "vertex_blend", mat_name )) - mat_vertex_blend = i; + u32 w,h; + } + tester; } + sfd; - if( mat_surf_oob ) - add_all_if_material( &world.geo, mworld, mat_surf_oob ); - else - vg_warn( "No OOB surface\n" ); - scene_copy_slice( &world.geo, &world.sm_geo_std_oob ); - - if( mat_surf ) - add_all_if_material( &world.geo, mworld, mat_surf ); - scene_copy_slice( &world.geo, &world.sm_geo_std ); - - if( mat_vertex_blend ) - add_all_if_material( &world.geo, mworld, mat_vertex_blend ); - scene_copy_slice( &world.geo, &world.sm_geo_vb ); + /* Paths */ + traffic_node traffic[128]; + u32 traffic_count; - scene_upload( &world.geo ); - scene_bh_create( &world.geo ); +#if 0 + traffic_driver van_man[6]; +#endif - /* - * Process entities - */ - for( int i=0; inode_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id( mworld, i ); - - if( pnode->classtype == k_classtype_none ) - {} - else if( pnode->classtype == k_classtype_gate ) - { - struct classtype_gate *entgate = mdl_get_entdata( mworld, pnode ); - - if( entgate->target ) - { - mdl_node *pother = mdl_node_from_id( mworld, entgate->target ); - - teleport_gate *gate = &world.gates[ world.gate_count ++ ]; - - v3_copy( pnode->co, gate->co[0] ); - v3_copy( pother->co, gate->co[1] ); - v4_copy( pnode->q, gate->q[0] ); - v4_copy( pother->q, gate->q[1] ); - v2_copy( pnode->s, gate->dims ); - - gate_transform_update( gate ); - } - } - else if( pnode->classtype == k_classtype_block ) - { - struct classtype_block *block = mdl_get_entdata( mworld, pnode ); + /* Physics */ + + /* Rendering & geometry */ + scene geo, foliage; + rigidbody rb_geo; - m4x3f transform; - mdl_node_transform( pnode, transform ); + /* TODO Maybe make this less hardcoded */ + mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb, + sm_foliage_main, sm_foliage_alphatest, + sm_graffiti, sm_subworld, sm_terrain; - rigidbody *rb = &world.temp_rbs[ world.rb_count ++ ]; + glmesh skybox, skydome; + mdl_submesh dome_upper, dome_lower; - box_copy( block->bbx, rb->bbx ); /* TODO: apply scale */ - v3_copy( pnode->co, rb->co ); - rb_init( rb ); - v4_copy( pnode->q, rb->q ); - rb_update_transform( rb ); - } - else if( pnode->classtype == k_classtype_spawn ) - { - struct respawn_point *rp = &world.spawns[ world.spawn_count ++ ]; + glmesh cars; + mdl_submesh car_holden; - v3_copy( pnode->co, rp->co ); - v4_copy( pnode->q, rp->q ); - strcpy( rp->name, mdl_pstr( mworld, pnode->pstr_name ) ); - } - else if( pnode->classtype == k_classtype_water ) - { - if( wrender.enabled ) - { - vg_warn( "Multiple water surfaces in level! ('%s')\n", - mdl_pstr( mworld, pnode->pstr_name )); - continue; - } + /* Load time */ - mdl_submesh *sm = mdl_node_submesh( mworld, pnode, 0 ); - - if( sm ) - { - glmesh surf; - mdl_unpack_submesh( mworld, &surf, sm ); - water_init(); - water_set_surface( &surf, pnode->co[1] ); - } - } - else if( pnode->classtype == k_classtype_car_path ) - { - struct classtype_car_path *p = mdl_get_entdata( mworld, pnode ); - traffic_node *tn = &world.traffic[ world.traffic_count ]; - tn->mn_next = NULL; - tn->mn_next1 = NULL; - - if( p->target ) tn->mn_next = mdl_node_from_id( mworld, p->target ); - if( p->target1 ) tn->mn_next1 = mdl_node_from_id( mworld, p->target1 ); + struct instance_cache + { + mdl_header *mdl; + u32 pstr_file; + } + * instance_cache; + u32 instance_cache_count, + instance_cache_cap; - m4x3f transform; - mdl_node_transform( pnode, transform ); - m3x3_mulv( transform, (v3f){1.0f,0.0f,0.0f}, tn->h ); - v3_copy( transform[3], tn->co ); + v3f render_gate_pos; + int active_route_board; +} +world; - pnode->sub_uid = world.traffic_count ++; - } - } - - traffic_finalize( world.traffic, world.traffic_count ); - for( int i=0; ig_water_plane ); - - v4f bounds; - bounds[0] = world.geo.bbx[0][0]; - bounds[1] = world.geo.bbx[0][2]; - bounds[2] = 1.0f/ (world.geo.bbx[1][0]-world.geo.bbx[0][0]); - bounds[3] = 1.0f/ (world.geo.bbx[1][2]-world.geo.bbx[0][2]); - v4_copy( bounds, winfo->g_depth_bounds ); - - winfo->g_water_fog = 0.04f; - render_update_lighting_ub(); - +/* + * API + */ - world.mr_ball.type = k_rb_shape_sphere; - world.mr_ball.inf.sphere.radius = 2.0f; - v3_copy( (v3f){ 0.0f, 110.0f, 0.0f }, world.mr_ball.co ); +static int ray_hit_is_ramp( ray_hit *hit ); +static int ray_hit_is_terrain( ray_hit *hit ); +static void ray_world_get_tri( ray_hit *hit, v3f tri[3] ); +static int ray_world( v3f pos, v3f dir, ray_hit *hit ); - q_identity(world.mr_ball.q); - rb_init( &world.mr_ball ); -} +/* + * Submodules + */ +#include "world_routes.h" +#include "world_sfd.h" +#include "world_render.h" +#include "world_water.h" +#include "world_gen.h" +#include "world_gate.h" + +/* + * ----------------------------------------------------------------------------- + * Events + * ----------------------------------------------------------------------------- + */ static void world_init(void) { - vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, - &tex_terrain_noise }, 2 ); + shader_terrain_register(); + shader_sky_register(); + shader_planeinf_register(); + shader_gpos_register(); + shader_fscolour_register(); + shader_alphatest_register(); + + vg_info( "Loading world resources\n" ); + VG_REQUIRED_ASSET( mdl_header*, mcars, mdl_load, "models/rs_cars.mdl" ); + VG_REQUIRED_ASSET( mdl_header*, msky, mdl_load, "models/rs_skydome.mdl" ); - mdl_header *msky = mdl_load("models/rs_skydome.mdl"); - mdl_unpack_glmesh( msky, &world.skydome ); + mdl_node *nholden = mdl_node_from_name( mcars, "holden" ); + world.car_holden = *mdl_node_submesh( mcars, nholden, 0 ); 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 ); world.dome_upper = *mdl_node_submesh( msky, nupper, 0 ); - free(msky); - mdl_header *mcars = mdl_load( "models/rs_cars.mdl" ); - mdl_unpack_glmesh( mcars, &world.cars ); - mdl_node *nholden = mdl_node_from_name( mcars, "holden" ); - world.car_holden = *mdl_node_submesh( mcars, nholden, 0 ); - free(mcars); -} + vg_acquire_thread_sync(); + { + mdl_unpack_glmesh( mcars, &world.cars ); + mdl_unpack_glmesh( msky, &world.skydome ); + } + vg_release_thread_sync(); -static void world_update(void) -{ - rb_solver_reset(); - rb_build_manifold_terrain_sphere( &world.mr_ball ); - - for( int i=0; i<5; i++ ) - rb_solve_contacts(); + vg_free(mcars); + vg_free(msky); - rb_iter( &world.mr_ball ); - rb_update_transform( &world.mr_ball ); - rb_debug( &world.mr_ball, 0 ); + /* Other systems */ + vg_info( "Loading other world systems\n" ); - for( int i=0; itrack_id; - m4x3f inverse; - m3x3_transpose( camera, inverse ); - v3_copy((v3f){0.0f,0.0f,0.0f}, inverse[3]); - m4x3_expand( inverse, full ); - m4x4_mul( projection, full, full ); + if( id != 0xffffffff ) + { + struct netmsg_board *local_board = &scoreboard_client_data.boards[id]; - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); - - shader_planeinf_use(); - shader_planeinf_uMdl(identity_matrix); - shader_planeinf_uPv(full); - shader_planeinf_uCamera(camera[3]); - shader_planeinf_uPlane( (v4f){0.0f,1.0f,0.0f, water_height()} ); + for( int i=0; i<13; i++ ) + { + sfd_encode( &sfd->tester, i, &local_board->data[27*i] ); + } + } + } - mdl_draw_submesh( &world.dome_lower ); + sfd_update( &world.sfd.tester ); } -static void render_sky(m4x3f camera) -{ - m4x4f projection, full; - pipeline_projection( projection, 0.4f, 1000.0f ); - - m4x3f inverse; - m3x3_transpose( camera, inverse ); - v3_copy((v3f){0.0f,0.0f,0.0f}, inverse[3]); - m4x3_expand( inverse, full ); - m4x4_mul( projection, full, full ); - - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); - - shader_sky_use(); - shader_sky_uMdl(identity_matrix); - shader_sky_uPv(full); - shader_sky_uTexGarbage(0); - shader_sky_uTime( vg_time ); - - vg_tex2d_bind( &tex_terrain_noise, 0 ); - - glDepthMask( GL_FALSE ); - glDisable( GL_DEPTH_TEST ); +/* + * ----------------------------------------------------------------------------- + * API implementation + * ----------------------------------------------------------------------------- + */ - mesh_bind( &world.skydome ); - mdl_draw_submesh( &world.dome_upper ); - - glEnable( GL_DEPTH_TEST ); - glDepthMask( GL_TRUE ); +static void ray_world_get_tri( ray_hit *hit, v3f tri[3] ) +{ + for( int i=0; i<3; i++ ) + v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] ); } -static void render_world( m4x4f projection, m4x3f camera ) +static int ray_world( v3f pos, v3f dir, ray_hit *hit ) { - render_sky( camera ); - render_world_vb( projection, camera[3] ); - render_terrain( projection, camera[3] ); + return scene_raycast( &world.geo, pos, dir, hit ); } -static void render_world_depth( m4x4f projection, m4x3f camera ) +static int ray_hit_is_terrain( ray_hit *hit ) { - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); + u32 valid_start = 0, + valid_end = world.sm_terrain.vertex_count; - shader_gpos_use(); - shader_gpos_uCamera( camera[3] ); - shader_gpos_uPv( projection ); - shader_gpos_uMdl( identity_matrix ); - - scene_bind( &world.geo ); - scene_draw( &world.geo ); + return (hit->tri[0] >= valid_start) && + (hit->tri[0] < valid_end); +} -#if 0 - glDisable(GL_CULL_FACE); - scene_bind( &world.foliage ); - scene_draw( &world.foliage ); - glEnable(GL_CULL_FACE); -#endif +static int ray_hit_is_ramp( ray_hit *hit ) +{ + u32 valid_start = world.sm_geo_std.vertex_start, + valid_end = world.sm_geo_vb.vertex_start; + + return (hit->tri[0] >= valid_start) && + (hit->tri[0] < valid_end); } #endif /* WORLD_H */