X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=world.h;h=3734dbf353963295c2b75eb8ec25aa4436509436;hb=4a883ac1b2506032f9dddab342712de46f2ca734;hp=45003cccbe9d87afa6b4fed9c0912bfec860d454;hpb=d57b7661518800479c00300ce57407378696eec9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 45003cc..3734dbf 100644 --- a/world.h +++ b/world.h @@ -17,6 +17,7 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ); #include "traffic.h" /*TODO: -> world_traffic.h */ #include "world_routes.h" +#include "world_sfd.h" #include "shaders/terrain.h" #include "shaders/sky.h" @@ -40,15 +41,13 @@ static struct gworld u32 spawn_count; struct subworld_routes routes; + struct subworld_sfd sfd; /* ... struct subworld_spawns system_spawns; struct subworld_physics system_physics; */ - teleport_gate gates[64]; - u32 gate_count; - /* Paths */ traffic_node traffic[128]; u32 traffic_count; @@ -63,8 +62,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; @@ -88,6 +89,7 @@ static struct gworld world; static struct subworld_routes *subworld_routes(void) { return &world.routes; } +static struct subworld_sfd *subworld_sfd(void) { return &world.sfd; } vg_tex2d tex_terrain_colours = { .path = "textures/gradients.qoi", @@ -99,6 +101,9 @@ vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi", vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi", .flags = VG_TEXTURE_NEAREST }; +vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi", + .flags = VG_TEXTURE_NEAREST }; + static void ray_world_get_tri( ray_hit *hit, v3f tri[3] ) { for( int i=0; i<3; i++ ) @@ -110,9 +115,22 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ) return scene_raycast( &world.geo, pos, dir, hit ); } +static int ray_hit_is_terrain( ray_hit *hit ) +{ + u32 valid_start = 0, + valid_end = world.sm_terrain.vertex_count; + + return (hit->tri[0] >= valid_start) && + (hit->tri[0] < valid_end); +} + static int ray_hit_is_ramp( ray_hit *hit ) { - return hit->tri[0] > world.sm_geo_std_oob.vertex_count; + 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); } static void world_register(void) @@ -123,11 +141,16 @@ static void world_register(void) shader_gpos_register(); shader_fscolour_register(); shader_alphatest_register(); + + world_routes_register(); + world_sfd_register(); } static void world_free(void) { /* TODO.. */ + + world_sfd_free(); } static void render_world_depth( m4x4f projection, m4x3f camera ); @@ -195,8 +218,8 @@ static void world_apply_procedural_foliage(void) if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit )) { - if( hit.normal[1] > 0.8f && !ray_hit_is_ramp(&hit) && - hit.pos[1] > water_height()+10.0f ) + if( (hit.normal[1] > 0.8f) && ray_hit_is_terrain(&hit) && + (hit.pos[1] > water_height()+10.0f) ) { v4f qsurface, qrandom; v3f axis; @@ -222,7 +245,6 @@ static void world_load(void) mdl_header *mworld = mdl_load( "models/mp_dev.mdl" ); world.spawn_count = 0; - world.gate_count = 0; world.traffic_count = 0; world.instance_cache = NULL; @@ -235,27 +257,6 @@ static void world_load(void) if( pnode->classtype == k_classtype_none ) {} -#if 0 - 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 ); - } - } -#endif else if( pnode->classtype == k_classtype_spawn ) { struct respawn_point *rp = &world.spawns[ world.spawn_count ++ ]; @@ -366,7 +367,10 @@ static void world_load(void) u32 mat_surf = 0, mat_surf_oob = 0, mat_vertex_blend = 0, - mat_alphatest = 0; + mat_alphatest = 0, + mat_graffiti = 0, + mat_subworld = 0, + mat_terrain = 0; for( int i=1; imaterial_count; i++ ) { @@ -381,11 +385,19 @@ static void world_load(void) mat_vertex_blend = i; else if( !strcmp( "alphatest", mat_name )) mat_alphatest = i; + else if( !strcmp( "graffitibox", mat_name )) + mat_graffiti = i; + else if( !strcmp( "terrain", mat_name ) ) + mat_terrain = i; } m4x3f midentity; m4x3_identity( midentity ); + if( mat_terrain ) + add_all_if_material( midentity, &world.geo, mworld, mat_terrain ); + scene_copy_slice( &world.geo, &world.sm_terrain ); + if( mat_surf_oob ) add_all_if_material( midentity, &world.geo, mworld, mat_surf_oob ); else @@ -415,8 +427,11 @@ static void world_load(void) add_all_if_material( midentity, &world.foliage, mworld, mat_alphatest ); scene_copy_slice( &world.foliage, &world.sm_foliage_alphatest ); + add_all_if_material( midentity, &world.foliage, mworld, mat_graffiti ); + scene_copy_slice( &world.foliage, &world.sm_graffiti ); + scene_upload( &world.foliage ); - world_routes_init( mworld ); + world_routes_loadfrom( mworld ); for( int i=0; igate.co[0], camera[3] ); + + if( dist < closest ) + { + closest = dist; + id = i; + } + } + + render_gate( &world.routes.gates[id].gate, camera ); +} + static void render_world( m4x4f projection, m4x3f camera ) { 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; + + 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 ); } static void render_world_depth( m4x4f projection, m4x3f camera )