u32 valid_count=0;
for( u32 i=0; i<route->checkpoints_count; i++ ){
- u32 cpid = route->checkpoints_start+(i+route->active_checkpoint);
- cpid = cpid % route->checkpoints_count;
+ u32 cpid = (i+route->active_checkpoint) % route->checkpoints_count;
+ cpid += route->checkpoints_start;
ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, cpid );
ent_gate *rg = mdl_arritm( &world->ent_gate, cp->gate_index );
rg = mdl_arritm( &world->ent_gate, rg->target );
+ if( i == 1 ){
+ route->timing_base = rg->timing_time;
+ }
+
if( i == 0 )
start_time = rg->timing_time;
else{
vg_info( "%u %f\n", rg->timing_version, rg->timing_time );
}
- if( world_global.current_run_version == last_version+1 ) valid_count ++;
+ if( world_global.current_run_version == last_version+1 ){
+ valid_count ++;
+
+ if( route->checkpoints_count == 1 ){
+ route->timing_base = world_global.time;
+ }
+ }
else valid_count = 0;
vg_info( "%u %f\n", world_global.current_run_version, world_global.time );
}
route->valid_checkpoints = valid_count+1;
- route->timing_base = start_time;
vg_info( "valid: %u\n", valid_count );
vg_info( "----------------------------\n" );
VG_STATIC void world_routes_activate_entry_gate( world_instance *world,
ent_gate *rg )
{
- ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target );
-
world_global.last_use = world_global.time;
+ /* disable all routes and leave the world */
+ if( rg->type == k_gate_type_nonlocel ){
+ 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++ ){
ent_route *route = mdl_arritm( &world->ent_route, i );
}
}
-VG_STATIC void world_routes_place_curve( world_instance *world,
- v4f h[3], v3f n0, v3f n2 )
+VG_STATIC
+void world_routes_place_curve( world_instance *world,
+ v4f h[3], v3f n0, v3f n2, scene_context *scene )
{
float t;
v3f p, pd;
struct world_surface *surfa = ray_hit_surface( world, &ha ),
*surfb = ray_hit_surface( world, &hb );
- if( (surfa->info.flags & k_material_flag_skate_surface) &&
- (surfb->info.flags & k_material_flag_skate_surface) )
+ if( (surfa->info.flags & k_material_flag_skate_target) &&
+ (surfb->info.flags & k_material_flag_skate_target) )
{
scene_vert va, vb;
vb.uv[0] = t1;
vb.uv[1] = 1.0f;
- scene_push_vert( world->scene_lines, &va );
- scene_push_vert( world->scene_lines, &vb );
+ scene_push_vert( scene, &va );
+ scene_push_vert( scene, &vb );
if( last_valid ){
/* Connect them with triangles */
- scene_push_tri( world->scene_lines, (u32[3]){
+ scene_push_tri( scene, (u32[3]){
last_valid+0-2, last_valid+1-2, last_valid+2-2} );
- scene_push_tri( world->scene_lines, (u32[3]){
+ scene_push_tri( scene, (u32[3]){
last_valid+1-2, last_valid+3-2, last_valid+2-2} );
}
- last_valid = world->scene_lines->vertex_count;
+ last_valid = scene->vertex_count;
}
else
last_valid = 0;
}
}
-VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id )
+VG_STATIC
+void world_routes_create_mesh( world_instance *world, u32 route_id,
+ scene_context *sc )
{
ent_route *route = mdl_arritm( &world->ent_route, route_id );
u32 last_valid = 0;
v3_normalize( n0 );
v3_normalize( n2 );
- world_routes_place_curve( world, p, n0, n2 );
+ world_routes_place_curve( world, p, n0, n2, sc );
/* --- */
v4_copy( p[2], p[0] );
}
}
- scene_copy_slice( world->scene_lines, &route->sm );
+ scene_copy_slice( sc, &route->sm );
}
/*
VG_STATIC void world_routes_generate( world_instance *world )
{
vg_info( "Generating route meshes\n" );
- world->scene_lines = scene_init( world_global.generic_heap, 200000, 300000 );
+ vg_async_item *call = scene_alloc_async( &world->scene_lines,
+ &world->mesh_route_lines,
+ 200000, 300000 );
for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, i );
}
for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ )
- world_routes_create_mesh( world, i );
-
- vg_acquire_thread_sync();
- {
- scene_upload( world->scene_lines, &world->mesh_route_lines );
- }
- vg_release_thread_sync();
- vg_linear_del( world_global.generic_heap, world->scene_lines );
+ world_routes_create_mesh( world, i, &world->scene_lines );
+ vg_async_dispatch( call, async_scene_upload );
world_routes_clear( world );
}
for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, i );
-
- vg_info( "ROUTES :: %hu %hu %hu %hu\n", gate->routes[0],
- gate->routes[1],
- gate->routes[2],
- gate->routes[3] );
}
world_routes_clear( world );
VG_STATIC void world_routes_init(void)
{
world_global.current_run_version = 200;
- world_global.time = RESET_MAX_TIME*2.0;
+ world_global.time = 300.0;
world_global.last_use = 0.0;
shader_scene_route_register();
int target = route->active_checkpoint == 0xffff? 0: 1;
route->factive = vg_lerpf( route->factive, target, 0.6f*vg.time_delta );
}
+
+ for( u32 i=0; i<world_global.text_particle_count; i++ ){
+ struct text_particle *particle = &world_global.text_particles[i];
+ rb_object_debug( &particle->obj, VG__RED );
+ }
+}
+
+VG_STATIC void world_routes_fixedupdate( world_instance *world )
+{
+ rb_solver_reset();
+
+ for( u32 i=0; i<world_global.text_particle_count; i++ ){
+ struct text_particle *particle = &world_global.text_particles[i];
+
+ if( rb_global_has_space() ){
+ rb_ct *buf = rb_global_buffer();
+
+ int l = rb_sphere__scene( particle->obj.rb.to_world,
+ &particle->obj.inf.sphere,
+ NULL, &world->rb_geo.inf.scene, buf );
+
+ for( int j=0; j<l; j++ ){
+ buf[j].rba = &particle->obj.rb;
+ buf[j].rbb = &world->rb_geo.rb;
+ }
+
+ rb_contact_count += l;
+ }
+ }
+
+ rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
+
+ for( int i=0; i<rb_contact_count; i++ ){
+ rb_contact_restitution( rb_contact_buffer+i, vg_randf() );
+ }
+
+ for( int i=0; i<6; i++ ){
+ rb_solve_contacts( rb_contact_buffer, rb_contact_count );
+ }
+
+ for( u32 i=0; i<world_global.text_particle_count; i++ ){
+ struct text_particle *particle = &world_global.text_particles[i];
+ rb_iter( &particle->obj.rb );
+ }
+
+ for( u32 i=0; i<world_global.text_particle_count; i++ ){
+ struct text_particle *particle = &world_global.text_particles[i];
+ rb_update_transform( &particle->obj.rb );
+ }
}
VG_STATIC void bind_terrain_noise(void);
}
}
-VG_STATIC void world_routes_fracture( world_instance *world, ent_gate *gate )
+VG_STATIC void world_routes_fracture( world_instance *world, ent_gate *gate,
+ v3f imp_co, v3f imp_v )
{
world_global.text_particle_count = 0;
for( u32 i=0; i<world_global.timer_text_count; i++ ){
struct timer_text *text = &world_global.timer_texts[i];
- if( text->gate == gate ){
- v3f co, s;
- v4f q;
- m4x3_decompose( text->transform, co, q, s );
+ if( text->gate != gate ) continue;
- for( u32 j=0;; j++ ){
- char c = text->text[j];
- if( !c ) break;
+ m4x3f transform;
+ m4x3_mul( gate->transport, text->transform, transform );
- if( c < '0' || c > '9' ) continue;
-
+ v3f co, s;
+ v4f q;
+ m4x3_decompose( transform, co, q, s );
+
+ v3f offset;
+ v3_zero( offset );
+
+ v4f colour;
+ float brightness = 0.3f + world->ub_lighting.g_day_phase;
+ v3_muls( text->route->colour, brightness, colour );
+ colour[3] = 1.0f-text->route->factive;
+
+ for( u32 j=0;; j++ ){
+ char c = text->text[j];
+ if( !c ) break;
+
+ ent_glyph *glyph = font3d_glyph( &world_global.font, 0, c );
+ if( !glyph ) continue;
+
+ if( c >= (u32)'0' && c <= (u32)'9' && glyph->indice_count ){
struct text_particle *particle =
&world_global.text_particles[world_global.text_particle_count++];
+ particle->glyph = glyph;
+ v4_copy( colour, particle->colour );
+
+ v3f origin;
+ v2_muls( glyph->size, 0.5f, origin );
+ origin[2] = -0.5f;
+
+ v3f world_co;
+
+ v3_add( offset, origin, world_co );
+ m4x3_mulv( transform, world_co, world_co );
+
+ float r = vg_maxf( s[0]*glyph->size[0], s[1]*glyph->size[1] )*0.5f;
+
+ m3x3_identity( particle->mlocal );
+ m3x3_scale( particle->mlocal, s );
+ origin[2] *= s[2];
+ v3_muls( origin, -1.0f, particle->mlocal[3] );
+
+ v3_copy( world_co, particle->obj.rb.co );
+ v3_muls( imp_v, 1.0f+vg_randf(), particle->obj.rb.v );
+ particle->obj.rb.v[1] += 2.0f;
+
+ v4_copy( q, particle->obj.rb.q );
+ particle->obj.rb.w[0] = vg_randf()*2.0f-1.0f;
+ particle->obj.rb.w[1] = vg_randf()*2.0f-1.0f;
+ particle->obj.rb.w[2] = vg_randf()*2.0f-1.0f;
+
+ particle->obj.type = k_rb_shape_sphere;
+ particle->obj.inf.sphere.radius = r*0.6f;
+
+ rb_init_object( &particle->obj );
}
+ offset[0] += glyph->size[0];
}
}
}
shader_scene_route_uPvmPrev( cam->mtx_prev.pv );
shader_scene_route_uMdl( identity_matrix );
shader_scene_route_uCamera( cam->transform[3] );
- shader_scene_route_uBoard0( TEMP_BOARD_0 );
- shader_scene_route_uBoard1( TEMP_BOARD_1 );
mesh_bind( &world->mesh_route_lines );
font3d_simple_draw( &world_global.font, 0, text->text,
cam, text->transform );
}
+
+ shader_model_font_uOffset( (v3f){0.0f,0.0f,0.0f} );
+
+ for( u32 i=0; i<world_global.text_particle_count; i++ ){
+ struct text_particle *particle = &world_global.text_particles[i];
+
+ m4x4f prev_mtx;
+
+ m4x3_expand( particle->mdl, prev_mtx );
+ m4x4_mul( cam->mtx_prev.pv, prev_mtx, prev_mtx );
+
+ shader_model_font_uPvmPrev( prev_mtx );
+
+ v4f q;
+ m4x3f model;
+ rb_extrapolate( &particle->obj.rb, model[3], q );
+ q_m3x3( q, model );
+
+ m4x3_mul( model, particle->mlocal, particle->mdl );
+ shader_model_font_uMdl( particle->mdl );
+ shader_model_font_uColour( particle->colour );
+
+ mesh_drawn( particle->glyph->indice_start,
+ particle->glyph->indice_count );
+ }
}
/* gate markers
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff