#include "bvh.h"
#include "lighting.h"
#include "model.h"
-#include "traffic.h"
+
+#include "traffic.h" /*TODO: -> world_traffic.h */
+#include "world_routes.h"
+#include "world_sfd.h"
#include "shaders/terrain.h"
#include "shaders/sky.h"
#include "shaders/vblend.h"
#include "shaders/gpos.h"
#include "shaders/fscolour.h"
+#include "shaders/alphatest.h"
static struct gworld
{
spawns[32];
u32 spawn_count;
- teleport_gate gates[64];
- u32 gate_count;
+ struct subworld_routes routes;
+ struct subworld_sfd sfd;
+
+ /* ...
+ struct subworld_spawns system_spawns;
+ struct subworld_physics system_physics;
+ */
/* Paths */
traffic_node traffic[128];
u32 traffic_count;
+#if 0
traffic_driver van_man[6];
+#endif
/* Physics */
- rigidbody temp_rbs[128];
- u32 rb_count;
/* Rendering & geometry */
scene geo, foliage;
+ rigidbody rb_geo;
- mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb;
+ /* 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;
glmesh skybox, skydome;
mdl_submesh dome_upper, dome_lower;
mdl_submesh car_holden;
rigidbody mr_ball;
+
+ /* Load time */
+
+ struct instance_cache
+ {
+ mdl_header *mdl;
+ u32 pstr_file;
+ }
+ * 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; }
+
+
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 };
+
+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++ )
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)
shader_planeinf_register();
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 );
-static void add_all_if_material( scene *pscene, mdl_header *mdl, u32 id )
+static void add_all_if_material( m4x3f transform, scene *pscene,
+ mdl_header *mdl, u32 id )
{
for( int i=0; i<mdl->node_count; i++ )
{
if( sm->material_id == id )
{
- m4x3f transform;
- mdl_node_transform( pnode, transform );
- scene_add_submesh( pscene, mdl, sm, transform );
+ m4x3f transform2;
+ mdl_node_transform( pnode, transform2 );
+ m4x3_mul( transform, transform2, transform2 );
+
+ scene_add_submesh( pscene, mdl, sm, transform2 );
+ }
+ }
+
+ 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;
+
+ m4x3f transform2;
+ mdl_node_transform( pnode, transform2 );
+ m4x3_mul( transform, transform2, transform2 );
+
+ add_all_if_material( transform2, pscene, mdl2, id );
}
}
}
}
-static void world_apply_foliage(void)
+static void world_apply_procedural_foliage(void)
{
- scene_init( &world.foliage );
mdl_header *mfoliage = mdl_load("models/rs_foliage.mdl");
v3f volume;
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;
}
}
}
-
- scene_upload( &world.foliage );
free( mfoliage );
}
mdl_header *mworld = mdl_load( "models/mp_dev.mdl" );
world.spawn_count = 0;
- world.gate_count = 0;
- world.rb_count = 0;
world.traffic_count = 0;
-
- scene_init( &world.geo );
-
- /*
- * Compile meshes into the world scenes
- */
- u32 mat_surf = 0,
- mat_surf_oob = 0,
- mat_vertex_blend = 0;
-
- for( int i=1; i<mworld->material_count; i++ )
- {
- mdl_material *mat = mdl_material_from_id( mworld, i );
- const char *mat_name = mdl_pstr( mworld, mat->pstr_name );
-
- vg_info( "%d %s\n", mat->pstr_name, mat_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;
- }
-
- 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 );
-
- scene_upload( &world.geo );
- scene_bh_create( &world.geo );
+ world.instance_cache = NULL;
/*
* Process entities
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 );
-
- m4x3f transform;
- mdl_node_transform( pnode, transform );
-
- rigidbody *rb = &world.temp_rbs[ world.rb_count ++ ];
-
- 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 ++ ];
pnode->sub_uid = world.traffic_count ++;
}
+ else if( pnode->classtype == k_classtype_instance )
+ {
+ struct classtype_instance *inst = mdl_get_entdata( mworld, pnode );
+ pnode->sub_uid = 0;
+
+ int cached = 0;
+ for( int i=0; i<world.instance_cache_count; i++ )
+ {
+ struct instance_cache *cache = &world.instance_cache[i];
+ if( inst->pstr_file == cache->pstr_file )
+ {
+ cached = 1;
+ pnode->sub_uid = i+1;
+ break;
+ }
+ }
+
+ if( !cached )
+ {
+ 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 );
+ }
+ }
+ }
}
-
+
+ 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; i<vg_list_size(world.van_man); i++ )
world.van_man[i].current =&world.traffic[vg_randint(world.traffic_count)];
+#endif
+
+ /*
+ * Compile meshes into the world scenes
+ */
+ scene_init( &world.geo );
+
+ u32 mat_surf = 0,
+ mat_surf_oob = 0,
+ mat_vertex_blend = 0,
+ mat_alphatest = 0,
+ mat_graffiti = 0,
+ mat_subworld = 0,
+ mat_terrain = 0;
+
+ for( int i=1; i<mworld->material_count; i++ )
+ {
+ mdl_material *mat = mdl_material_from_id( mworld, i );
+ const char *mat_name = mdl_pstr( mworld, mat->pstr_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;
+ 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
+ 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 );
+
+ add_all_if_material( midentity, &world.foliage, mworld, mat_graffiti );
+ scene_copy_slice( &world.foliage, &world.sm_graffiti );
+
+ scene_upload( &world.foliage );
+ world_routes_loadfrom( mworld );
+
+ for( int i=0; i<world.instance_cache_count; i++ )
+ free( world.instance_cache[i].mdl );
- world_apply_foliage();
+ free( world.instance_cache );
free( mworld );
/*
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 );
}
static void world_init(void)
{
vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours,
- &tex_terrain_noise }, 2 );
+ &tex_terrain_noise,
+ &tex_alphatest,
+ &tex_graffiti }, 4 );
+
+ 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);
mdl_header *msky = mdl_load("models/rs_skydome.mdl");
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);
+
+ /* 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 );
traffic_drive( &world.van_man[i] );
traffic_visualize_car( &world.van_man[i] );
}
+#endif
}
/*
mesh_bind( &world.cars );
+#if 0
for( int i=0; i<vg_list_size(world.van_man); i++ )
{
shader_vblend_uMdl( world.van_man[i].transform );
mdl_draw_submesh( &world.car_holden );
}
+#endif
+}
+
+static void render_world_alphatest( m4x4f projection, v3f camera )
+{
+ m4x3f identity_matrix;
+ m4x3_identity( identity_matrix );
+
+ shader_alphatest_use();
+ shader_alphatest_uTexGarbage(0);
+ shader_alphatest_uTexMain(1);
+ shader_link_standard_ub( _shader_alphatest.id, 2 );
+
+ vg_tex2d_bind( &tex_terrain_noise, 0 );
+ vg_tex2d_bind( &tex_alphatest, 1 );
+
+ shader_alphatest_uPv( projection );
+ shader_alphatest_uMdl( identity_matrix );
+ shader_alphatest_uCamera( camera );
+
+ glDisable(GL_CULL_FACE);
+ scene_bind( &world.foliage );
+ mdl_draw_submesh( &world.sm_foliage_alphatest );
+
+ vg_tex2d_bind( &tex_graffiti, 1 );
+ mdl_draw_submesh( &world.sm_graffiti );
+
+ glEnable(GL_CULL_FACE);
}
static void render_terrain( m4x4f projection, v3f camera )
shader_terrain_uCamera( camera );
scene_bind( &world.geo );
+ mdl_draw_submesh( &world.sm_terrain );
mdl_draw_submesh( &world.sm_geo_std_oob );
mdl_draw_submesh( &world.sm_geo_std );
+ mdl_draw_submesh( &world.sm_subworld );
+ /* TODO: Dont draw in reflection */
glDisable(GL_CULL_FACE);
scene_bind( &world.foliage );
- scene_draw( &world.foliage );
+ mdl_draw_submesh( &world.sm_foliage_main );
glEnable(GL_CULL_FACE);
}
glDepthMask( GL_TRUE );
}
+static void render_world_gates( m4x4f projection, m4x3f camera )
+{
+ float closest = INFINITY;
+ int id = 0;
+
+ for( int i=0; i<world.routes.gate_count; i++ )
+ {
+ struct route_gate *rg = &world.routes.gates[i];
+ float dist = v3_dist2( rg->gate.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 )