X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=3b30973099152990e276dbc780869f1f08dc623c;hb=bceb3a28f8127fa27a17f480bd21fa20a340e848;hp=c6d07144cbb39215d08cc2ef844d2c9052762912;hpb=4f4458d229e40a852708319861224b7cc48ad0b9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index c6d0714..3b30973 100644 --- a/world.h +++ b/world.h @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + */ + #include "common.h" static int ray_world( v3f pos, v3f dir, ray_hit *hit ); @@ -5,19 +9,17 @@ 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" /*TODO: -> world_traffic.h */ -#include "world_routes.h" -#include "world_sfd.h" #include "shaders/terrain.h" #include "shaders/sky.h" @@ -28,8 +30,24 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ); #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 { @@ -40,13 +58,153 @@ static struct gworld spawns[32]; u32 spawn_count; - struct subworld_routes routes; - struct subworld_sfd sfd; + struct world_audio_thing + { + v3f pos; + float volume; + u32 flags; + + audio_player player; + audio_clip temp_embedded_clip; + } + * audio_things; + + u32 audio_things_count, + audio_things_cap; + + struct achievement_zone + { + m4x3f transform, inv_transform; + char name[32]; + int triggered; + + union + { + mdl_node *ptarget_delegated; + struct world_audio_thing *ptarget; + }; + } + * achievement_zones; + + u32 achievement_zones_count, + achievement_zones_cap; + + struct subworld_routes + { + struct route_node + { + v3f co, right, up, h; + u32 next[2]; + + u32 special_type, special_id, current_refs, ref_count; + u32 route_ids[4]; /* Gates can be linked into up to four routes */ + } + *nodes; + + u32 node_count, + node_cap; + + struct route + { + u32 track_id; + v4f colour; + + u32 start; + mdl_submesh sm; + + int active; + float factive; + + double best_lap, latest_pass; /* Session */ + + struct + { + GLuint vao, vbo, ebo; + + u32 indices_head; + u32 vertex_head; + + float last_notch; + + struct route_ui_segment + { + float length; + u32 vertex_start, vertex_count, + index_start, index_count, notches; + } + segments[k_max_ui_segments]; + + u32 segment_start, segment_count, fade_start, fade_count; + double fade_timer_start; + float xpos; + } + ui; + + m4x3f scoreboard_transform; + } + *routes; + + double time, rewind_from, rewind_to, last_use; + + u32 route_count, + route_cap; + + struct route_gate + { + struct teleport_gate + { + v3f co[2]; + v4f q[2]; + v2f dims; + + m4x3f to_world, recv_to_world, transport; + } + gate; + + u32 node_id; + + struct route_timing + { + u32 version; /* Incremented on every teleport */ + double time; + } + timing; + } + *gates; + + struct route_collector + { + struct route_timing timing; + } + *collectors; + + u32 gate_count, + gate_cap, + collector_count, + collector_cap; + + u32 active_gate, + current_run_version; + + scene scene_lines; + } + routes; + + struct subworld_sfd + { + scene mesh; + mdl_submesh *sm_module, *sm_card; + glmesh temp; + + struct sfd_instance + { + float *buffer; - /* ... - struct subworld_spawns system_spawns; - struct subworld_physics system_physics; - */ + u32 w,h; + } + tester; + } + sfd; /* Paths */ traffic_node traffic[128]; @@ -55,6 +213,8 @@ static struct gworld #if 0 traffic_driver van_man[6]; #endif + + double sky_time, sky_rate, sky_target_rate; /* Physics */ @@ -62,8 +222,10 @@ static struct gworld scene geo, foliage; rigidbody rb_geo; + /* 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_foliage_main, sm_foliage_alphatest, + sm_graffiti, sm_subworld, sm_terrain; glmesh skybox, skydome; mdl_submesh dome_upper, dome_lower; @@ -71,8 +233,6 @@ static struct gworld glmesh cars; mdl_submesh car_holden; - rigidbody mr_ball; - /* Load time */ struct instance_cache @@ -83,40 +243,42 @@ static struct gworld * instance_cache; u32 instance_cache_count, instance_cache_cap; -} -world; - -static struct subworld_routes *subworld_routes(void) { return &world.routes; } -static struct subworld_sfd *subworld_sfd(void) { return &world.sfd; } + v3f render_gate_pos; + int active_route_board; +} +world ; -vg_tex2d tex_terrain_colours = { .path = "textures/gradients.qoi", - .flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST }; - -vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi", - .flags = VG_TEXTURE_NEAREST }; - -vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi", - .flags = VG_TEXTURE_NEAREST }; +/* + * API + */ -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 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 ); -static int ray_world( v3f pos, v3f dir, ray_hit *hit ) -{ - return scene_raycast( &world.geo, pos, dir, hit ); -} +/* + * 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 int ray_hit_is_ramp( ray_hit *hit ) +static void world_init(void) { - return hit->tri[0] > world.sm_geo_std_oob.vertex_count; -} + world.sky_rate = 1.0; + world.sky_target_rate = 1.0; -static void world_register(void) -{ shader_terrain_register(); shader_sky_register(); shader_planeinf_register(); @@ -124,610 +286,175 @@ static void world_register(void) shader_fscolour_register(); shader_alphatest_register(); - world_routes_register(); - world_sfd_register(); -} + vg_info( "Loading world resources\n" ); -static void world_free(void) -{ - /* TODO.. */ + VG_REQUIRED_ASSET( mdl_header*, mcars, mdl_load, "models/rs_cars.mdl" ); + VG_REQUIRED_ASSET( mdl_header*, msky, mdl_load, "models/rs_skydome.mdl" ); - world_sfd_free(); -} + mdl_node *nholden = mdl_node_from_name( mcars, "holden" ); + world.car_holden = *mdl_node_submesh( mcars, nholden, 0 ); -static void render_world_depth( m4x4f projection, m4x3f camera ); + 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 ); -static void add_all_if_material( m4x3f transform, scene *pscene, - mdl_header *mdl, u32 id ) -{ - for( int i=0; inode_count; i++ ) + vg_acquire_thread_sync(); { - mdl_node *pnode = mdl_node_from_id( mdl, i ); - - for( int j=0; jsubmesh_count; j++ ) - { - mdl_submesh *sm = mdl_node_submesh( mdl, pnode, j ); + mdl_unpack_glmesh( mcars, &world.cars ); + mdl_unpack_glmesh( msky, &world.skydome ); + } + vg_release_thread_sync(); - if( sm->material_id == id ) - { - m4x3f transform2; - mdl_node_transform( pnode, transform2 ); - m4x3_mul( transform, transform2, transform2 ); + vg_free(mcars); + vg_free(msky); - scene_add_submesh( pscene, mdl, sm, transform2 ); - } - } + /* Other systems */ + vg_info( "Loading other world systems\n" ); - if( pnode->classtype == k_classtype_instance ) - { - if( pnode->sub_uid ) - { - u32 instance_id = pnode->sub_uid -1; - struct instance_cache *cache = &world.instance_cache[instance_id]; - mdl_header *mdl2 = cache->mdl; + vg_loader_highwater( world_render_init, world_render_free, NULL ); + vg_loader_highwater( world_sfd_init, world_sfd_free, NULL ); + vg_loader_highwater( world_water_init, world_water_free, NULL ); + vg_loader_highwater( world_gates_init, world_gates_free, NULL ); + vg_loader_highwater( world_routes_init, world_routes_free, NULL ); +} - m4x3f transform2; - mdl_node_transform( pnode, transform2 ); - m4x3_mul( transform, transform2, transform2 ); +static void world_free( void *_ ) +{ + mesh_free( &world.cars ); + mesh_free( &world.skydome ); + vg_free( world.achievement_zones ); - add_all_if_material( transform2, pscene, mdl2, id ); - } - } - } + /* FIXME: This fucks with the audio player. Use-after-free */ +#if 0 + vg_free( world.audio_things ); +#endif } -static void world_apply_procedural_foliage(void) +static void world_update( v3f pos ) { - mdl_header *mfoliage = mdl_load("models/rs_foliage.mdl"); + 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 ); - 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 ); + world_routes_update(); +#if 0 + world_routes_debug(); +#endif + + int closest = 0; + float min_dist = INFINITY; - for( int i=0;i<100000;i++ ) + for( int i=0; i 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); - } + min_dist = d; + closest = i; } } - free( mfoliage ); -} -static void world_load(void) -{ - mdl_header *mworld = mdl_load( "models/mp_dev.mdl" ); - - world.spawn_count = 0; - world.traffic_count = 0; - world.instance_cache = NULL; - - /* - * Process entities - */ - for( int i=0; inode_count; i++ ) + if( (world.active_route_board != closest) || network_scores_updated ) { - mdl_node *pnode = mdl_node_from_id( mworld, i ); - - if( pnode->classtype == k_classtype_none ) - {} - else if( pnode->classtype == k_classtype_spawn ) - { - struct respawn_point *rp = &world.spawns[ world.spawn_count ++ ]; + network_scores_updated = 0; + world.active_route_board = closest; + struct subworld_sfd *sfd = &world.sfd; - 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; - } + struct route *route = &world.routes.routes[closest]; - 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 ); + u32 id = route->track_id; - 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 ); - - pnode->sub_uid = world.traffic_count ++; - } - else if( pnode->classtype == k_classtype_instance ) + if( id != 0xffffffff ) { - struct classtype_instance *inst = mdl_get_entdata( mworld, pnode ); - pnode->sub_uid = 0; - - int cached = 0; - for( int i=0; ipstr_file == cache->pstr_file ) - { - cached = 1; - pnode->sub_uid = i+1; - break; - } - } + struct netmsg_board *local_board = &scoreboard_client_data.boards[id]; - if( !cached ) + for( int i=0; i<13; i++ ) { - world.instance_cache = buffer_reserve( - world.instance_cache, world.instance_cache_count, - &world.instance_cache_cap, 1, - sizeof(struct instance_cache) ); - - struct instance_cache *cache = - &world.instance_cache[world.instance_cache_count]; - - const char *filename = mdl_pstr(mworld, inst->pstr_file); - - cache->pstr_file = inst->pstr_file; - cache->mdl = mdl_load( filename ); - - if( cache->mdl ) - { - world.instance_cache_count ++; - pnode->sub_uid = world.instance_cache_count; - mdl_link_materials( mworld, cache->mdl ); - vg_success( "Cached %s\n", filename ); - } - else - { - vg_warn( "Failed to cache %s\n", filename ); - } + sfd_encode( &sfd->tester, i, &local_board->data[27*i] ); } } } - world.instance_cache = buffer_fix( world.instance_cache, - world.instance_cache_count, - &world.instance_cache_cap, - sizeof( struct instance_cache ) ); - -#if 0 - traffic_finalize( world.traffic, world.traffic_count ); - for( int i=0; imaterial_count; i++ ) + for( int i=0; ipstr_name ); - - 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; - else if( !strcmp( "alphatest", mat_name )) - mat_alphatest = i; - } - - m4x3f midentity; - m4x3_identity( midentity ); - - if( mat_surf_oob ) - add_all_if_material( midentity, &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( midentity, &world.geo, mworld, mat_surf ); - scene_copy_slice( &world.geo, &world.sm_geo_std ); - - if( mat_vertex_blend ) - add_all_if_material( midentity, &world.geo, mworld, mat_vertex_blend ); - scene_copy_slice( &world.geo, &world.sm_geo_vb ); - - scene_upload( &world.geo ); - scene_bh_create( &world.geo ); - - - /* Foliage /nocollide layer. - * TODO: Probably should have material traits for this - */ - scene_init( &world.foliage ); - - world_apply_procedural_foliage(); - scene_copy_slice( &world.foliage, &world.sm_foliage_main ); - - add_all_if_material( midentity, &world.foliage, mworld, mat_alphatest ); - scene_copy_slice( &world.foliage, &world.sm_foliage_alphatest ); - - scene_upload( &world.foliage ); - world_routes_loadfrom( mworld ); - - 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(); - - - 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 ); + struct achievement_zone *zone = &world.achievement_zones[i]; - q_identity(world.mr_ball.q); - rb_init( &world.mr_ball ); - - /* - * Setup scene collider - */ - v3_zero( world.rb_geo.co ); - q_identity( world.rb_geo.q ); - - world.rb_geo.type = k_rb_shape_scene; - world.rb_geo.inf.scene.pscene = &world.geo; - world.rb_geo.is_world = 1; - rb_init( &world.rb_geo ); -} + v3f local; + m4x3_mulv( zone->inv_transform, pos, local ); + + if( (fabsf(local[0]) <= 1.0f) && + (fabsf(local[1]) <= 1.0f) && + (fabsf(local[2]) <= 1.0f) ) + { + in_zone_this_time = 1; -static void world_init(void) -{ - vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, - &tex_terrain_noise, - &tex_alphatest }, 3 ); + if( !in_zone && zone->ptarget ) + { + audio_lock(); + audio_player_playclip( &zone->ptarget->player, + &zone->ptarget->temp_embedded_clip ); + audio_unlock(); + } - 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); + if( !zone->triggered ) + { + steam_set_achievement( zone->name ); + steam_store_achievements(); + } + zone->triggered = 1; + } - mdl_header *msky = mdl_load("models/rs_skydome.mdl"); - mdl_unpack_glmesh( msky, &world.skydome ); + vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f}, + { 1.0f, 1.0f, 1.0f}}, + 0xff00ff00 ); + } - mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ), - *nupper = mdl_node_from_name( msky, "dome_upper" ); + in_zone = in_zone_this_time; - world.dome_lower = *mdl_node_submesh( msky, nlower, 0 ); - world.dome_upper = *mdl_node_submesh( msky, nupper, 0 ); - free(msky); - - - /* Other systems */ - world_sfd_init(); -} - -static void world_update(void) -{ - world_routes_update(); - world_routes_debug(); sfd_update( &world.sfd.tester ); - -#if 0 - rb_solver_reset(); - rb_build_manifold_terrain_sphere( &world.mr_ball ); - - for( int i=0; i<5; i++ ) - rb_solve_contacts( rb_contact_buffer, rb_contact_count ); - - rb_iter( &world.mr_ball ); - rb_update_transform( &world.mr_ball ); - rb_debug( &world.mr_ball, 0 ); - - for( int i=0; itri[i] ].co, tri[i] ); } -static void render_world_gates( m4x4f projection, m4x3f camera ) +static int ray_world( v3f pos, v3f dir, ray_hit *hit ) { - int count = 0; - for( int i=0; igate, camera ); - - if( count == 2 ) - return; - } + return scene_raycast( &world.geo, pos, dir, hit ); } -static void render_world( m4x4f projection, m4x3f camera ) +static int ray_hit_is_terrain( ray_hit *hit ) { - render_sky( camera ); - render_world_routes( projection, camera[3] ); - render_world_vb( projection, camera[3] ); - render_world_alphatest( projection, camera[3] ); - render_terrain( projection, camera[3] ); - - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); - identity_matrix[3][1] = 125.0f; + u32 valid_start = 0, + valid_end = world.sm_terrain.vertex_count; - v4f t; - q_axis_angle( t, (v3f){0.0f,1.0f,0.0f}, 2.3f ); - q_m3x3( t, identity_matrix ); - - sfd_render( &world.sfd.tester, projection, camera[3], identity_matrix ); + return (hit->tri[0] >= valid_start) && + (hit->tri[0] < valid_end); } -static void render_world_depth( m4x4f projection, m4x3f camera ) +static int ray_hit_is_ramp( ray_hit *hit ) { - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); + u32 valid_start = world.sm_geo_std.vertex_start, + valid_end = world.sm_geo_vb.vertex_start; - 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 ); - -#if 0 - glDisable(GL_CULL_FACE); - scene_bind( &world.foliage ); - scene_draw( &world.foliage ); - glEnable(GL_CULL_FACE); -#endif + return (hit->tri[0] >= valid_start) && + (hit->tri[0] < valid_end); } #endif /* WORLD_H */