X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=f065cb3ccf78abe82a48966da1c396b8d30e9408;hb=5f34184cad016aa2f8ea530b3be009703459e981;hp=ab663d005e4ffadacb32956e34c3e503c9287679;hpb=610907ae753bdda202236d52a6fcf77d14d63193;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index ab663d0..f065cb3 100644 --- a/world.h +++ b/world.h @@ -60,7 +60,14 @@ struct world_instance { * ------------------------------------------------------- */ + void *heap; char world_name[ 64 ]; + enum world_status{ + k_world_status_unloaded = 0, + k_world_status_loading = 1, + k_world_status_loaded = 2 + } + status; struct{ boxf depthbounds; @@ -87,6 +94,8 @@ struct world_instance { v4f g_sunset_ambient; v4f g_sun_colour; v4f g_sun_dir; + v4f g_board_0; + v4f g_board_1; float g_water_fog; float g_time; @@ -155,7 +164,11 @@ struct world_instance { ent_audio_clip, ent_audio, - ent_volume; + ent_volume, + ent_traffic, + ent_skateshop, + ent_marker, + ent_camera; ent_gate *rendering_gate; @@ -164,9 +177,9 @@ struct world_instance { */ /* world geometry */ - scene *scene_geo, - *scene_no_collide, - *scene_lines; + scene_context scene_geo, + scene_no_collide, + scene_lines; /* spacial mappings */ bh_tree *audio_bh, @@ -182,12 +195,12 @@ struct world_instance { rb_object rb_geo; }; -VG_STATIC struct world_global{ +struct world_global{ /* * Allocated as system memory * -------------------------------------------------------------------------- */ - void *generic_heap; + void *heap; /* rendering */ glmesh skydome; @@ -211,6 +224,7 @@ VG_STATIC struct world_global{ glmesh mesh_base, mesh_display; mdl_submesh sm_base; u32 active_route_board; + scene_context scene; u32 w, h; float *buffer; @@ -248,9 +262,8 @@ VG_STATIC struct world_global{ } text_particles[6*4]; u32 text_particle_count; - } -world_global; +static world_global; VG_STATIC world_instance *get_active_world( void ) { @@ -273,10 +286,64 @@ void ray_world_get_tri( world_instance *world, ray_hit *hit, v3f tri[3] ); VG_STATIC int ray_world( world_instance *world, v3f pos, v3f dir, ray_hit *hit ); +VG_STATIC +ent_spawn *world_find_closest_spawn( world_instance *world, v3f position ) +{ + ent_spawn *rp = NULL, *r; + float min_dist = INFINITY; + + for( u32 i=0; ient_spawn); i++ ){ + r = mdl_arritm( &world->ent_spawn, i ); + float d = v3_dist2( r->transform.co, position ); + + if( d < min_dist ){ + min_dist = d; + rp = r; + } + } + + if( !rp ){ + if( mdl_arrcount(&world->ent_spawn) ){ + vg_warn( "Invalid distances to spawns.. defaulting to first one.\n" ); + return mdl_arritm( &world->ent_spawn, 0 ); + } + else{ + vg_error( "There are no spawns in the level!\n" ); + } + } + + return rp; +} + +VG_STATIC +ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name ) +{ + ent_spawn *rp = NULL, *r; + for( u32 i=0; ient_spawn); i++ ){ + r = mdl_arritm( &world->ent_spawn, i ); + if( !strcmp( mdl_pstr(&world->meta, r->pstr_name), name ) ){ + rp = r; + break; + } + } + + if( !rp ) + vg_warn( "No spawn named '%s'\n", name ); + + return rp; +} + /* * Submodules */ +VG_STATIC float + k_day_length = 30.0f; /* minutes */ + +VG_STATIC int k_debug_light_indices = 0, + k_debug_light_complexity = 0, + k_light_preview = 0; + #include "world_routes.h" #include "world_sfd.h" #include "world_render.h" @@ -299,6 +366,11 @@ VG_STATIC int world_stop_sound( int argc, const char *argv[] ) VG_STATIC void world_init(void) { + VG_VAR_F32( k_day_length ); + VG_VAR_I32( k_debug_light_indices ); + VG_VAR_I32( k_debug_light_complexity ); + VG_VAR_I32( k_light_preview ); + world_global.sky_rate = 1.0; world_global.sky_target_rate = 1.0; @@ -318,15 +390,9 @@ VG_STATIC void world_init(void) mdl_context msky; mdl_open( &msky, "models/rs_skydome.mdl", vg_mem.scratch ); mdl_load_metadata_block( &msky, vg_mem.scratch ); - mdl_load_mesh_block( &msky, vg_mem.scratch ); + mdl_async_load_glmesh( &msky, &world_global.skydome ); mdl_close( &msky ); - vg_acquire_thread_sync(); - { - mdl_unpack_glmesh( &msky, &world_global.skydome ); - } - vg_release_thread_sync(); - /* Other systems */ vg_info( "Loading other world systems\n" ); @@ -338,27 +404,18 @@ VG_STATIC void world_init(void) /* Allocate dynamic world memory arena */ u32 max_size = 76*1024*1024; - world_global.generic_heap = vg_create_linear_allocator( vg_mem.rtmemory, - max_size, - VG_MEMORY_SYSTEM ); + world_global.heap = vg_create_linear_allocator( vg_mem.rtmemory, max_size, + VG_MEMORY_SYSTEM ); } -typedef struct ent_call ent_call; -struct ent_call{ - ent_index ent; - u32 function; - void *data; -}; - -VG_STATIC void entity_call( world_instance *world, ent_call *call ); - VG_STATIC void ent_volume_call( world_instance *world, ent_call *call ) { - ent_volume *volume = mdl_arritm( &world->ent_volume, call->ent.index ); - if( !volume->target.type ) return; + u32 index = mdl_entity_id_id( call->id ); + ent_volume *volume = mdl_arritm( &world->ent_volume, index ); + if( !volume->target ) return; if( call->function == k_ent_function_trigger ){ - call->ent = volume->target; + call->id = volume->target; if( volume->type == k_volume_subtype_particle ){ float *co = alloca( sizeof(float)*3 ); @@ -371,14 +428,16 @@ VG_STATIC void ent_volume_call( world_instance *world, ent_call *call ) call->data = co; entity_call( world, call ); } - else + else{ entity_call( world, call ); + } } } VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ) { - ent_audio *audio = mdl_arritm( &world->ent_audio, call->ent.index ); + u32 index = mdl_entity_id_id( call->id ); + ent_audio *audio = mdl_arritm( &world->ent_audio, index ); v3f sound_co; @@ -389,7 +448,7 @@ VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ) v3_copy( audio->transform.co, sound_co ); } else - vg_fatal_exit_loop( "ent_audio_call (invalid function id)" ); + vg_fatal_error( "ent_audio_call (invalid function id)" ); float chance = vg_randf()*100.0f, bar = 0.0f; @@ -462,67 +521,77 @@ VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ) } } -VG_STATIC void entity_call( world_instance *world, ent_call *call ) -{ - if( call->ent.type == k_ent_volume ){ - ent_volume_call( world, call ); - } else if( call->ent.type == k_ent_audio ){ - ent_audio_call( world, call ); - } -} - VG_STATIC void world_update( world_instance *world, v3f pos ) { - /* TEMP!!!!!! */ - static double g_time = 0.0; - g_time += vg.time_delta * (1.0/(k_day_length*60.0)); + world_global.sky_time += world_global.sky_rate * vg.time_delta; + world_global.sky_rate = vg_lerp( world_global.sky_rate, + world_global.sky_target_rate, + vg.time_delta * 5.0 ); + world_routes_update_timer_texts( world ); + world_routes_update( world ); + //world_routes_debug( world ); + + /* ---- traffic -------- */ - struct ub_world_lighting *state = &world->ub_lighting; + for( u32 i=0; ient_traffic ); i++ ){ + ent_traffic *traffic = mdl_arritm( &world->ent_traffic, i ); + + u32 i1 = traffic->index, + i0, + i2 = i1+1; - state->g_time = g_time; - state->g_realtime = vg.time; - state->g_debug_indices = k_debug_light_indices; - state->g_light_preview = k_light_preview; - state->g_debug_complexity = k_debug_light_complexity; + if( i1 == 0 ) i0 = traffic->node_count-1; + else i0 = i1-1; - state->g_time_of_day = vg_fractf( g_time ); - state->g_day_phase = cosf( state->g_time_of_day * VG_PIf * 2.0f ); - state->g_sunset_phase= cosf( state->g_time_of_day * VG_PIf * 4.0f + VG_PIf ); + if( i2 >= traffic->node_count ) i2 = 0; - state->g_day_phase = state->g_day_phase * 0.5f + 0.5f; - state->g_sunset_phase = powf( state->g_sunset_phase * 0.5f + 0.5f, 6.0f ); + i0 += traffic->start_node; + i1 += traffic->start_node; + i2 += traffic->start_node; + + v3f h[3]; - float a = state->g_time_of_day * VG_PIf * 2.0f; - state->g_sun_dir[0] = sinf( a ); - state->g_sun_dir[1] = cosf( a ); - state->g_sun_dir[2] = 0.2f; - v3_normalize( state->g_sun_dir ); + ent_route_node *rn0 = mdl_arritm( &world->ent_route_node, i0 ), + *rn1 = mdl_arritm( &world->ent_route_node, i1 ), + *rn2 = mdl_arritm( &world->ent_route_node, i2 ); + v3_copy( rn1->co, h[1] ); + v3_lerp( rn0->co, rn1->co, 0.5f, h[0] ); + v3_lerp( rn1->co, rn2->co, 0.5f, h[2] ); - world->probabilities[ k_probability_curve_constant ] = 1.0f; + float const k_sample_dist = 0.0025f; + v3f pc, pd; + eval_bezier3( h[0], h[1], h[2], traffic->t, pc ); + eval_bezier3( h[0], h[1], h[2], traffic->t+k_sample_dist, pd ); - float dp = state->g_day_phase; + v3f v0; + v3_sub( pd, pc, v0 ); + float length = vg_maxf( 0.0001f, v3_length( v0 ) ); + v3_muls( v0, 1.0f/length, v0 ); - world->probabilities[ k_probability_curve_wildlife_day ] = - (dp*dp*0.8f+state->g_sunset_phase)*0.8f; - world->probabilities[ k_probability_curve_wildlife_night ] = - 1.0f-powf(fabsf((state->g_time_of_day-0.5f)*5.0f),5.0f); - + float mod = k_sample_dist / length; - glBindBuffer( GL_UNIFORM_BUFFER, world->ubo_lighting ); - glBufferSubData( GL_UNIFORM_BUFFER, 0, - sizeof(struct ub_world_lighting), &world->ub_lighting ); - /* TEMP!!!!!! */ + traffic->t += traffic->speed * vg.time_delta * mod; - world_global.sky_time += world_global.sky_rate * vg.time_delta; - world_global.sky_rate = vg_lerp( world_global.sky_rate, - world_global.sky_target_rate, - vg.time_delta * 5.0 ); + if( traffic->t > 1.0f ){ + traffic->t -= 1.0f; - world_routes_update_timer_texts( world ); - world_routes_update( world ); - //world_routes_debug( world ); + if( traffic->t > 1.0f ) traffic->t = 0.0f; + + traffic->index ++; + + if( traffic->index >= traffic->node_count ) + traffic->index = 0; + } + + v3_copy( pc, traffic->transform.co ); + + float a = atan2f( -v0[0], v0[2] ); + q_axis_angle( traffic->transform.q, (v3f){0.0f,1.0f,0.0f}, -a ); + + vg_line_pt3( traffic->transform.co, 0.3f, VG__BLUE ); + } /* ---- SFD ------------ */ @@ -563,8 +632,6 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) } } sfd_update(); - - static float random_accum = 0.0f; random_accum += vg.time_delta; @@ -605,9 +672,8 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) if( !world_global.in_volume ){ ent_call basecall; - basecall.ent.index = idx; - basecall.ent.type = k_ent_volume; basecall.function = k_ent_function_trigger; + basecall.id = mdl_entity_id( k_ent_volume, idx ); basecall.data = NULL; entity_call( world, &basecall ); @@ -621,9 +687,7 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) for( int j=0; jsoundscape_count; i++ ) - { - struct soundscape *s = &world->soundscapes[i]; - s->usage_count = 0; - - for( int j=0; jmax_instances; j++ ) - { - if( s->channels[j] ) - { - if( audio_channel_finished(s->channels[j]) ) - s->channels[j] = audio_relinquish_channel( s->channels[j] ); - else - s->usage_count ++; - } - } - } - audio_unlock(); -#endif } /* @@ -688,13 +729,13 @@ VG_STATIC void ray_world_get_tri( world_instance *world, ray_hit *hit, v3f tri[3] ) { for( int i=0; i<3; i++ ) - v3_copy( world->scene_geo->arrvertices[ hit->tri[i] ].co, tri[i] ); + v3_copy( world->scene_geo.arrvertices[ hit->tri[i] ].co, tri[i] ); } VG_STATIC int ray_world( world_instance *world, v3f pos, v3f dir, ray_hit *hit ) { - return scene_raycast( world->scene_geo, world->geo_bh, pos, dir, hit ); + return scene_raycast( &world->scene_geo, world->geo_bh, pos, dir, hit ); } /* @@ -727,14 +768,14 @@ VG_STATIC int spherecast_world( world_instance *world, int idx; while( bh_next( world->geo_bh, &it, region, &idx ) ){ - u32 *ptri = &world->scene_geo->arrindices[ idx*3 ]; + 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] ); + v3_copy( world->scene_geo.arrvertices[ptri[j]].co, tri[j] ); box_addpt( box, tri[j] ); } @@ -788,4 +829,130 @@ VG_STATIC struct world_surface *ray_hit_surface( world_instance *world, return world_tri_index_surface( world, hit->tri[0] ); } +/* + * ----------------------------------------------------------------------------- + * Audio sampling + * ----------------------------------------------------------------------------- + */ + +VG_STATIC +enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output); +VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value ); + +#include "audio.h" + +/* + * Trace out a random point, near the player to try and determine water areas + */ +VG_STATIC +enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output) +{ + v3f chance = { (vg_randf()-0.5f) * 30.0f, + 8.0f, + (vg_randf()-0.5f) * 30.0f }; + + v3f pos; + v3_add( chance, origin, pos ); + + ray_hit contact; + contact.dist = vg_minf( 16.0f, pos[1] ); + + world_instance *world = get_active_world(); + + if( ray_world( world, pos, (v3f){0.0f,-1.0f,0.0f}, &contact ) ){ + struct world_surface *mat = ray_hit_surface( world, &contact ); + + if( mat->info.surface_prop == k_surface_prop_grass){ + v3_copy( contact.pos, output ); + return k_audio_sprite_type_grass; + } + else{ + return k_audio_sprite_type_none; + } + } + + output[0] = pos[0]; + output[1] = 0.0f; + output[2] = pos[2]; + + float dist = fabsf(output[1] - origin[1]); + + if( world->water.enabled && dist<=40.0f ) + return k_audio_sprite_type_water; + else + return k_audio_sprite_type_none; +} + +VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value ) +{ + float inr3 = 0.57735027, + inr2 = 0.70710678118; + + v3f sample_directions[] = { + { -1.0f, 0.0f, 0.0f }, + { 1.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 1.0f }, + { 0.0f, 0.0f, -1.0f }, + { 0.0f, 1.0f, 0.0f }, + { 0.0f, -1.0f, 0.0f }, + { -inr3, inr3, inr3 }, + { inr3, inr3, inr3 }, + { -inr3, inr3, -inr3 }, + { inr3, inr3, -inr3 }, + { -inr2, 0.0f, inr2 }, + { inr2, 0.0f, inr2 }, + { -inr2, 0.0f, -inr2 }, + { inr2, 0.0f, -inr2 }, + }; + + static int si = 0; + static float distances[16]; + + ray_hit ray; + ray.dist = 5.0f; + + v3f rc, rd, ro; + v3_copy( sample_directions[ si ], rd ); + v3_add( co, (v3f){0.0f,1.5f,0.0f}, ro ); + v3_copy( ro, rc ); + + float dist = 200.0f; + + for( int i=0; i<10; i++ ){ + if( ray_world( get_active_world(), rc, rd, &ray ) ){ + dist = (float)i*5.0f + ray.dist; + break; + } + else{ + v3_muladds( rc, rd, ray.dist, rc ); + } + } + + distances[si] = dist; + + if( vg_lines.draw ){ + for( int i=0; i<14; i++ ){ + if( distances[i] != 200.0f ){ + u32 colours[] = { VG__RED, VG__BLUE, VG__GREEN, + VG__CYAN, VG__YELOW, VG__PINK, + VG__WHITE }; + + u32 colour = colours[i%7]; + + v3f p1; + v3_muladds( ro, sample_directions[i], distances[i], p1 ); + vg_line( ro, p1, colour ); + vg_line_pt3( p1, 0.1f, colour ); + } + } + } + + *index = si; + *value = dist; + + si ++; + if( si >= 14 ) + si = 0; +} + #endif /* WORLD_H */