#include "network.h"
#include "font.h"
-#include "pointcloud.h"
#include "gui.h"
#include "steam.h"
#include "network_msg.h"
ent_gate *rg )
{
world_static.last_use = world_static.time;
-
- /* disable all routes and leave the world */
- if( rg->flags & k_ent_gate_nonlocal ){
- for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
- ent_route *route = mdl_arritm( &world->ent_route, i );
- route->active_checkpoint = 0xffff;
- }
- return;
- }
-
ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target );
for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
}
}
-static
-void world_routes_pointcloud_spot( world_instance *world,
- pointcloud_buffer *pcbuf,
- v3f co, f32 radius, u32 samples, v4f colour )
-{
- v3f inv_ext;
- v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext );
- v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext );
-
- for( u32 j=0; j<samples; j++ ){
- if( pcbuf->count >= pcbuf->max )
- return;
-
- pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ];
-
- v3f sample, jitter, point;
- vg_rand_sphere( jitter );
- v3_muladds( co, jitter, radius, sample );
-
- if( bh_closest_point( world->geo_bh, sample, point, radius*1.5f ) == -1 ){
- v3_copy( sample, point );
- }
-
- v3f pos;
- v3_sub( point, pcbuf->boundary[0], pos );
- v3_mul( pos, inv_ext, pos );
-
- float dist = 1.0f-(v3_length(jitter));
-
- v4f final_colour;
- v4_muls( colour, dist*dist, final_colour );
-
- pointcloud_packvert( vert, pos, final_colour );
- }
-}
-
-/*
- * '
- * .
- * |
- * |
- * /#\
- * -'###`-
- */
-static
-void world_routes_pointcloud_tower( world_instance *world,
- pointcloud_buffer *pcbuf,
- v3f co, f32 radius, f32 height,
- u32 samples, v4f colour )
-{
- v3f inv_ext;
- v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext );
- v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext );
-
- for( u32 j=0; j<samples; j++ ){
- if( pcbuf->count >= pcbuf->max )
- return;
-
- pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ];
-
- v3f point;
- point[0] = vg_randf64()*2.0f-1.0f;
- point[1] = 0.0f;
- point[2] = vg_randf64()*2.0f-1.0f;
- v3_normalize( point );
- v3_muls( point, sqrtf(vg_randf64()), point );
-
- f32 h = vg_randf64();
- point[1] = h*h*h*height;
- point[0] *= radius;
- point[2] *= radius;
-
- v3_add( point, co, point );
- v3_sub( point, pcbuf->boundary[0], point );
- v3_mul( point, inv_ext, point );
-
- pointcloud_packvert( vert, point, colour );
- }
-}
static
void world_routes_place_curve( world_instance *world, ent_route *route,
- v4f h[3], v3f n0, v3f n2, scene_context *scene,
- pointcloud_buffer *pcbuf )
+ v4f h[3], v3f n0, v3f n2, scene_context *scene )
{
float t;
v3f p, pd;
int resa = ray_world( world, sa, down, &ha, k_material_flag_ghosts ),
resb = ray_world( world, sb, down, &hb, k_material_flag_ghosts );
-
- if( pcbuf && resa ){
- world_routes_pointcloud_spot( world, pcbuf, ha.pos,
- 12.0f, 10, route->colour );
- }
if( resa && resb ){
struct world_surface *surfa = ray_hit_surface( world, &ha ),
}
static void world_routes_gen_meshes( world_instance *world, u32 route_id,
- scene_context *sc,
- pointcloud_buffer *pcbuf )
+ scene_context *sc )
{
ent_route *route = mdl_arritm( &world->ent_route, route_id );
u8 colour[4];
v3_normalize( n0 );
v3_normalize( n2 );
- world_routes_place_curve( world, route, p, n0, n2, sc, pcbuf );
+ world_routes_place_curve( world, route, p, n0, n2, sc );
/* --- */
v4_copy( p[2], p[0] );
struct world_surface *world_tri_index_surface( world_instance *world,
u32 index );
-static f64 world_routes_scatter_surface_points( world_instance *world,
- pointcloud_buffer *pcbuf,
- f32 rate )
-{
- static f32 densities[] = {
- [k_surface_prop_concrete] = 2.0f,
- [k_surface_prop_grass] = 0.8f,
- [k_surface_prop_metal] = 1.0f,
- [k_surface_prop_wood] = 2.5f,
- [k_surface_prop_tiles] = 4.0f
- };
-
- /* calculate total area */
- f64 total_area = 0.0f;
- for( u32 i=0; i<world->scene_geo.indice_count/3; i++ ){
- u32 *tri = &world->scene_geo.arrindices[i*3];
- struct world_surface *surf = world_tri_index_surface( world, tri[0] );
-
- if( surf->info.shader == k_shader_boundary ||
- surf->info.shader == k_shader_invisible ) continue;
-
- if( !(surf->info.flags & k_material_flag_preview_visibile) ) continue;
-
- scene_vert *va = &world->scene_geo.arrvertices[tri[0]],
- *vb = &world->scene_geo.arrvertices[tri[1]],
- *vc = &world->scene_geo.arrvertices[tri[2]];
-
- v3f v0, v1, vn;
- v3_sub( vb->co, va->co, v0 );
- v3_sub( vc->co, va->co, v1 );
- v3_cross( v0, v1, vn );
- if( vn[1] < 0.0f ) continue;
-
- f32 density = 1.0f;
- if( surf->info.surface_prop < vg_list_size(densities) )
- density = densities[surf->info.surface_prop];
- total_area += v3_length(vn)*0.5f*density;
- }
-
- f32 accum = 0.0f;
-
- u8 colour[] = { 80,80,80,255 };
- v3f light_dir = {0.3f,0.8f,0.1f};
- v3_normalize( light_dir );
-
- v3f inv_ext;
- v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext );
- v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext );
-
- for( u32 i=0; i<world->scene_geo.indice_count/3; i++ ){
- u32 *tri = &world->scene_geo.arrindices[i*3];
- struct world_surface *surf = world_tri_index_surface( world, tri[0] );
-
- if( surf->info.shader == k_shader_boundary ||
- surf->info.shader == k_shader_invisible ) continue;
-
- if( !(surf->info.flags & k_material_flag_preview_visibile) ) continue;
-
- scene_vert *va = &world->scene_geo.arrvertices[tri[0]],
- *vb = &world->scene_geo.arrvertices[tri[1]],
- *vc = &world->scene_geo.arrvertices[tri[2]];
-
- v3f v0, v1, vn;
- v3_sub( vb->co, va->co, v0 );
- v3_sub( vc->co, va->co, v1 );
- v3_cross( v0, v1, vn );
- if( vn[1] < 0.0f ) continue;
-
- f32 density = 1.0f;
- if( surf->info.surface_prop < vg_list_size(densities) )
- density = densities[surf->info.surface_prop];
-
- f32 area = v3_length(vn)*0.5f*density;
- accum += area;
-
- v3_normalize( vn );
-
- while( accum > rate ){
- accum -= rate;
-
- if( pcbuf->count >= pcbuf->max ) return total_area;
-
- v2f co = { vg_randf64(), vg_randf64() };
- if( v2_length2(co) > 0.5f ){
- co[0] = 1.0f-co[0];
- co[1] = 1.0f-co[1];
- }
-
- v3f pt;
- v3_muls( v0, co[0], pt );
- v3_muladds( pt, v1, co[1], pt );
- v3_add( va->co, pt, pt );
-
- if( pt[1] < world->water.height ) continue;
- pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ];
-
- v3f pos;
- v3_sub( pt, pcbuf->boundary[0], pos );
- v3_mul( pos, inv_ext, pos );
-
- static v4f colours[] = {
- [k_surface_prop_concrete] = { 0.13, 0.15, 0.17, 1.0 },
- [k_surface_prop_grass] = { 0.07, 0.1, 0.14, 1.0 },
- [k_surface_prop_metal] = { 0.15, 0.19, 0.22, 1.0 },
- [k_surface_prop_wood] = { 0.1, 0.13, 0.17, 1.0 },
- [k_surface_prop_tiles] = { 0.05, 0.06, 0.07, 1.0 },
- };
-
- v4f col = {0.0f,0.0f,0.0f,0.0f};
- if( surf->info.surface_prop < vg_list_size(colours) )
- v4_copy( colours[surf->info.surface_prop], col );
-
- f32 brightness = v3_dot(vn,light_dir)*0.5f+0.5f;
- v3_muls( col, brightness, col );
-
- pointcloud_packvert( vert, pos, col );
- }
- }
-
- return total_area;
-}
-
-static void world_routes_surface_grid( world_instance *world,
- pointcloud_buffer *pcbuf )
-{
- i32 const k_gridlines = 32,
- k_gridres = 255;
-
- v3f inv_ext;
- v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext );
- v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext );
- v4f colour = {0.2f,0.2f,0.2f,1.0f};
- v3f dir = {0.0f,-1.0f,0.0f};
-
- for( u32 k=0; k<2; k++ ){
- u32 a = k*2,
- b = (k^0x1)*2;
-
- for( i32 x=0; x<=k_gridlines; x++ ){
- f32 t = (float)x / (float)k_gridlines,
- px = vg_lerpf( pcbuf->boundary[0][a], pcbuf->boundary[1][a], t );
-
- for( i32 z=0; z<=k_gridres; z++ ){
- f32 tz = (float)z / (float)k_gridres,
- pz = vg_lerpf(pcbuf->boundary[0][b],pcbuf->boundary[1][b], tz);
-
- v3f ro, hit;
- ro[a] = px;
- ro[1] = 1000.0f;
- ro[b] = pz;
-
- bh_iter it;
- bh_iter_init_ray( 0, &it, ro, dir, INFINITY );
- i32 idx;
-
- while( bh_next( world->geo_bh, &it, &idx ) ){
- u32 *tri = &world->scene_geo.arrindices[ idx*3 ];
- v3f vs[3];
-
- u16 mask = k_material_flag_preview_visibile;
- if( !(world->scene_geo.arrvertices[tri[0]].flags & mask) )
- continue;
-
- for( u32 i=0; i<3; i++ ){
- v3_copy( world->scene_geo.arrvertices[tri[i]].co, vs[i] );
- }
-
- f32 t;
- if( ray_tri( vs, ro, dir, &t ) ){
- v3_muladds( ro, dir, t, hit );
-
- if( world->water.enabled )
- if( hit[1] < world->water.height )
- continue;
-
- if( pcbuf->count >= pcbuf->max ) return;
-
- pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ];
-
- v3f co;
- v3_sub( hit, pcbuf->boundary[0], co );
- v3_mul( co, inv_ext, co );
-
- pointcloud_packvert( vert, co, colour );
- }
- }
- }
- }
- }
-}
-
-static void world_write_preview( addon_reg *reg, pointcloud_buffer *pcbuf ){
- if( reg->alias.workshop_id ) return;
-
- /*
- * FIXME: BUG: cannot correctly handle workshop because there is a stalling
- * call below, which deadlocks the scene upload. TODO: improve the async
- * stack to handle out of order execution. MAYBE
- */
-
- char path_buf[4096];
- vg_str path;
- vg_strnull( &path, path_buf, 4096 );
-
- addon_get_content_folder( reg, &path );
- vg_strcat( &path, "/preview.bin" );
-
- if( !vg_strgood( &path ) ) vg_fatal_error( "Path too long\n" );
- FILE *fp = fopen( path_buf, "wb" );
- if( !fp ) vg_fatal_error( "Cannot open '%s' for writing\n", path_buf );
-
- fwrite( pcbuf, sizeof(struct pointcloud_buffer) +
- sizeof(struct pointcloud_vert)*pcbuf->count, 1, fp );
- fclose( fp );
- vg_info( "written %s\n", path_buf );
-}
-
/*
* Create the strips of colour that run through the world along course paths
*/
&world->mesh_route_lines,
200000, 300000 );
- vg_async_item *call_pointcloud = NULL;
- pointcloud_buffer *pcbuf = NULL;
-
- if( instance_id <= 1 /*world_loader.generate_point_cloud*/ ){
- call_pointcloud = vg_async_alloc(
- sizeof(pointcloud_buffer) +
- sizeof(pointcloud_vert)*POINTCLOUD_POINTS );
- pcbuf = call_pointcloud->payload;
- pcbuf->count = 0;
- pcbuf->max = POINTCLOUD_POINTS;
- pcbuf->op = k_pointcloud_op_clear;
-
- v3f ext, mid, v0;
- v3_sub( world->scene_geo.bbx[1], world->scene_geo.bbx[0], ext );
- f32 maxe = v3_maxf( ext );
- v3_fill( v0, maxe * 0.5f );
- v3_muladds( world->scene_geo.bbx[0], ext, 0.5f, mid );
- v3_add( mid, v0, pcbuf->boundary[1] );
- v3_sub( mid, v0, pcbuf->boundary[0] );
- }
-
for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, i );
gate->ref_count = 0;
}
for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
- world_routes_gen_meshes( world, i, &world->scene_lines, pcbuf );
- }
-
- if( instance_id <= 1 /*world_loader.generate_point_cloud*/ ){
- f64 area = 0.0;
-
- area = world_routes_scatter_surface_points( world, pcbuf, 16.0f );
- world_routes_surface_grid( world, pcbuf );
-
- for( u32 i=0; i<mdl_arrcount( &world->ent_gate ); i++ ){
- ent_gate *gate = mdl_arritm( &world->ent_gate, i );
-
- world_routes_pointcloud_tower( world, pcbuf, gate->co[0],
- 2.0f, 50.0f, 128,
- (v4f){0.2f,0.2f,0.2f,1.0f} );
- }
-
- vg_info( "Distributed %u points over %fkm^2!\n",
- pcbuf->count, area/1e6f );
-
- world_write_preview( world_static.instance_addons[ instance_id ], pcbuf );
- vg_async_dispatch( call_pointcloud, async_pointcloud_sub );
+ world_routes_gen_meshes( world, i, &world->scene_lines );
}
vg_async_dispatch( call_scene, async_scene_upload );
}
if( (gate->flags & k_ent_gate_linked) &
- !(gate->flags & k_ent_gate_nonlocal) ){
+ !(gate->flags & k_ent_gate_nonlocal_DELETED) ){
gate = mdl_arritm(&world->ent_gate, gate->target );
for( u32 k=0; k<4; k++ ){
return;
}
- if( body->max > NETWORK_LEADERBOARD_MAX_SIZE ){
+ if( body->max > NETWORK_REQUEST_MAX ){
vg_error( "Scoreboard leaderboard too big (%u>%u)\n", body->max,
- NETWORK_LEADERBOARD_MAX_SIZE );
+ NETWORK_REQUEST_MAX );
return;
}
}
static void render_world_routes( world_instance *world, camera *cam,
- int layer_depth ){
+ int viewing_from_gate ){
m4x3f identity_matrix;
m4x3_identity( identity_matrix );
/* timers
* ---------------------------------------------------- */
- if( layer_depth == 0 ){
+ if( !viewing_from_gate ){
font3d_bind( &gui.font, k_font_shader_default, 0, world, cam );
for( u32 i=0; i<world_render.timer_text_count; i++ ){
for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, j );
- if( !(gate->flags & k_ent_gate_nonlocal) )
+ if( !(gate->flags & k_ent_gate_nonlocal_DELETED) )
render_gate_markers( i, gate );
}
}
shader_model_gate_uColour( colour );
- u32 next = route->active_checkpoint+1+layer_depth;
+ u32 next = route->active_checkpoint+1+viewing_from_gate;
next = next % route->checkpoints_count;
next += route->checkpoints_start;
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff