+#pragma once
+
/*
- * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2024 Mt.ZERO Software - All Rights Reserved
+ *
+ * World routes
*/
-#ifndef ROUTES_C
-#define ROUTES_C
-
#include <time.h>
#include "entity.h"
#include "world_routes.h"
#include "world_gate.h"
#include "world_load.h"
-#include "highscores.h"
#include "network.h"
#include "font.h"
#include "shaders/scene_route.h"
#include "shaders/routeui.h"
#include "ent_region.h"
+#include "scene_rigidbody.h"
static void world_routes_clear( world_instance *world )
{
vg_info( "Generating route meshes\n" );
vg_async_stall();
- vg_rand_seed( 2000 );
vg_async_item *call_scene = scene_alloc_async( &world->scene_lines,
&world->mesh_route_lines,
200000, 300000 );
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
- rb_object_debug( &particle->obj, VG__RED );
+ //rb_object_debug( &particle->obj, VG__RED );
}
}
static void world_routes_fixedupdate( world_instance *world ){
rb_solver_reset();
+ rigidbody _null = {0};
+ _null.inv_mass = 0.0f;
+ m3x3_zero( _null.iI );
+
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.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,
+ int l = rb_sphere__scene( particle->rb.to_world,
+ particle->radius,
+ NULL, world->geo_bh, buf,
k_material_flag_ghosts );
for( int j=0; j<l; j++ ){
- buf[j].rba = &particle->obj.rb;
- buf[j].rbb = &world->rb_geo.rb;
+ buf[j].rba = &particle->rb;
+ buf[j].rbb = &_null;
}
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_randf64() );
+ rb_contact_restitution( rb_contact_buffer+i, vg_randf64(&vg.rand) );
}
for( int i=0; i<6; i++ ){
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
- rb_iter( &particle->obj.rb );
+ rb_iter( &particle->rb );
}
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
- rb_update_transform( &particle->obj.rb );
+ rb_update_matrices( &particle->rb );
}
}
text->gate = gate;
text->route = route;
- if( route->valid_checkpoints >= route->checkpoints_count ){
+ vg_str str;
+ vg_strnull( &str, text->text, sizeof(text->text) );
+
+ if( route->valid_checkpoints >= route->checkpoints_count )
+ {
double lap_time = world_static.time - route->timing_base,
time_centiseconds = lap_time * 100.0;
seconds %= 60;
minutes %= 60;
- if( minutes > 9 ) minutes = 9;
+ if( minutes > 9 )
+ minutes = 9;
- int j=0;
- if( minutes ){
- highscore_intr( text->text, minutes, 1, ' ' ); j++;
- text->text[j++] = ':';
+ if( minutes )
+ {
+ vg_strcati32r( &str, minutes, 1, ' ' );
+ vg_strcatch( &str, ':' );
}
- if( seconds >= 10 || minutes ){
- highscore_intr( text->text+j, seconds, 2, '0' ); j+=2;
+ if( seconds >= 10 || minutes )
+ {
+ vg_strcati32r( &str, seconds, 2, '0' );
}
- else{
- highscore_intr( text->text+j, seconds, 1, '0' ); j++;
+ else
+ {
+ vg_strcati32r( &str, seconds, 1, '0' );
}
- text->text[j++] = '.';
- highscore_intr( text->text+j, centiseconds, 1, '0' ); j++;
- text->text[j] = '\0';
+ vg_strcatch( &str, '.' );
+ vg_strcati32r( &str, centiseconds, 1, '0' );
}
- else{
- highscore_intr( text->text, route->valid_checkpoints, 1, ' ' );
- text->text[1] = '/';
- highscore_intr( text->text+2, route->checkpoints_count+1, 1, ' ' );
- text->text[3] = '\0';
+ else
+ {
+ vg_strcati32r( &str, route->valid_checkpoints, 1, ' ' );
+ vg_strcatch( &str, '/' );
+ vg_strcati32r( &str, route->checkpoints_count + 1, 1, ' ' );
}
gui_font3d.font = &gui.font;
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_randf64(), particle->obj.rb.v );
- particle->obj.rb.v[1] += 2.0f;
-
- v4_copy( q, particle->obj.rb.q );
- particle->obj.rb.w[0] = vg_randf64()*2.0f-1.0f;
- particle->obj.rb.w[1] = vg_randf64()*2.0f-1.0f;
- particle->obj.rb.w[2] = vg_randf64()*2.0f-1.0f;
+ v3_copy( world_co, particle->rb.co );
+ v3_muls( imp_v, 1.0f+vg_randf64(&vg.rand), particle->rb.v );
+ particle->rb.v[1] += 2.0f;
- particle->obj.type = k_rb_shape_sphere;
- particle->obj.inf.sphere.radius = r*0.6f;
+ v4_copy( q, particle->rb.q );
+ particle->rb.w[0] = vg_randf64(&vg.rand)*2.0f-1.0f;
+ particle->rb.w[1] = vg_randf64(&vg.rand)*2.0f-1.0f;
+ particle->rb.w[2] = vg_randf64(&vg.rand)*2.0f-1.0f;
- rb_init_object( &particle->obj );
+ f32 r = vg_maxf( s[0]*glyph->size[0], s[1]*glyph->size[1] )*0.5f;
+ particle->radius = r*0.6f;
+ rb_setbody_sphere( &particle->rb, particle->radius, 1.0f, 1.0f );
}
offset[0] += glyph->size[0];
}
for( u32 j=0; j<4; j++ ){
if( gate->routes[j] == run_id ){
m4x3f mmdl;
- ent_gate_get_mdl_mtx( gate, mmdl );
+ m4x3_copy( gate->to_world, mmdl );
+ m3x3_scale( mmdl, (v3f){ gate->dimensions[0],
+ gate->dimensions[1], 1.0f } );
+
m4x3_mul( world_mmdl, mmdl, mmdl );
shader_model_gate_uMdl( mmdl );
mdl_draw_submesh( &world_gates.sm_marker[j] );
v4f q;
m4x3f model;
- rb_extrapolate( &particle->obj.rb, model[3], q );
+ rb_extrapolate( &particle->rb, model[3], q );
q_m3x3( q, model );
m4x3_mul( model, particle->mlocal, particle->mdl );
glEnable( GL_CULL_FACE );
glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } );
}
-
-#endif /* ROUTES_C */
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff