From: hgn Date: Thu, 13 Apr 2023 01:06:11 +0000 (+0100) Subject: sat X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=01e2535f8daaab0e3d46dcc61a08a9268babd47c;hp=cca3ca3a92572c77f34a99ffa2f3d9a69d029000;p=carveJwlIkooP6JGAAIwe30JlM.git sat --- diff --git a/maps_src/mp_gridmap.mdl b/maps_src/mp_gridmap.mdl index 484e165..ffe3816 100644 Binary files a/maps_src/mp_gridmap.mdl and b/maps_src/mp_gridmap.mdl differ diff --git a/player.c b/player.c index 51353b9..28adfd0 100644 --- a/player.c +++ b/player.c @@ -136,6 +136,7 @@ void player__bind( player_instance *player ) { player__skate_bind( player ); player__walk_bind( player ); + player__drive_bind( player ); } /* diff --git a/player.h b/player.h index 53016cd..3e23d17 100644 --- a/player.h +++ b/player.h @@ -7,6 +7,7 @@ #include "player_walk.h" #include "player_skate.h" #include "player_dead.h" +#include "player_drive.h" #define PLAYER_REWIND_FRAMES 60*4 @@ -26,8 +27,7 @@ struct player_instance */ camera cam; - enum camera_mode - { + enum camera_mode{ k_cam_firstperson = 1, k_cam_thirdperson = 0 } @@ -116,11 +116,11 @@ struct player_instance * ------------------------------------------------- */ - enum player_subsystem - { + enum player_subsystem{ k_player_subsystem_walk = 0, k_player_subsystem_skate = 1, - k_player_subsystem_dead = 2 + k_player_subsystem_dead = 2, + k_player_subsystem_drive = 3 } subsystem, subsystem_gate; @@ -128,6 +128,7 @@ struct player_instance struct player_skate _skate; struct player_walk _walk; struct player_dead _dead; + struct player_drive _drive; }; /* @@ -140,7 +141,8 @@ void (*_player_bind[])( player_instance *player ) = { player__walk_bind, player__skate_bind, - NULL + NULL, + player__drive_bind }; VG_STATIC @@ -148,7 +150,8 @@ void (*_player_reset[])( player_instance *player, ent_spawn *rp ) = { player__walk_reset, player__skate_reset, - NULL + NULL, + player__drive_reset }; VG_STATIC @@ -156,7 +159,8 @@ void (*_player_pre_update[])( player_instance *player ) = { player__walk_pre_update, player__skate_pre_update, - NULL + NULL, + player__drive_pre_update }; VG_STATIC @@ -165,6 +169,7 @@ void( *_player_update[])( player_instance *player ) = player__walk_update, player__skate_update, player__dead_update, + player__drive_update }; VG_STATIC @@ -172,7 +177,8 @@ void( *_player_post_update[])( player_instance *player ) = { player__walk_post_update, player__skate_post_update, - NULL + NULL, + player__drive_post_update }; VG_STATIC @@ -180,7 +186,8 @@ void( *_player_im_gui[])( player_instance *player ) = { player__walk_im_gui, player__skate_im_gui, - NULL + NULL, + player__drive_im_gui }; VG_STATIC @@ -188,7 +195,8 @@ void( *_player_animate[])( player_instance *player, player_animation *dest ) = { player__walk_animate, player__skate_animate, - player__dead_animate + player__dead_animate, + player__drive_animate }; VG_STATIC @@ -196,7 +204,8 @@ void( *_player_post_animate[])( player_instance *player ) = { player__walk_post_animate, player__skate_post_animate, - player__dead_post_animate + player__dead_post_animate, + player__drive_post_animate }; VG_STATIC @@ -204,6 +213,7 @@ void( *_player_restore[] )( player_instance *player ) = { player__walk_restore, player__skate_restore, + NULL, NULL }; @@ -214,855 +224,6 @@ void( *_player_restore[] )( player_instance *player ) = #include "player_walk.c" #include "player_skate.c" #include "player_dead.c" +#include "player_drive.c" #endif /* PLAYER_H */ - - -#if 0 -/* - * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved - */ - -#define PLAYER_H -#ifndef PLAYER_H -#define PLAYER_H - -#define PLAYER_REWIND_FRAMES 60*4 - -#include "conf.h" -#include "audio.h" -#include "common.h" -#include "world.h" -#include "skeleton.h" -#include "bvh.h" - - -/* - * ----------------------------------------------------------------------------- - * Memory - * ----------------------------------------------------------------------------- - */ - -VG_STATIC struct gplayer -{ - rigidbody rb, rb_frame; - v3f co, angles; /* used as transfer between controllers */ - - enum player_controller - { - k_player_controller_walk, - k_player_controller_skate, - k_player_controller_ragdoll, - k_player_controller_mountain_skate, - k_player_controller_snowboard, - k_player_controller_drive - } - controller, - controller_frame; - - m4x3f visual_transform, - inv_visual_transform; - - int is_dead, death_tick_allowance, rewinding; - int rewind_sound_wait; - - - v3f handl_target, handr_target, - handl, handr; - - /* Input */ - struct input_binding *input_js1h, - *input_js1v, - *input_js2h, - *input_js2v, - *input_jump, - *input_push, - *input_walk, - *input_walkh, - *input_walkv, - *input_switch_mode, - *input_reset, - *input_grab; - - /* Camera */ - float air_time; - v3f camera_pos, smooth_localcam; - - struct rewind_frame - { - v3f pos; - v3f ang; - } - *rewind_buffer; - u32 rewind_incrementer, - rewind_length; - - float rewind_time, rewind_total_length, rewind_predicted_time; - double diag_rewind_start, diag_rewind_time; - float dist_accum; - - /* animation */ - double jump_time; - float fslide, - fdirz, fdirx, - fstand, - ffly, - fpush, - fairdir, - fsetup, - walk_timer, - fjump, - fonboard, - frun, - fgrind; - - v3f board_offset; - v4f board_rotation; - - float walk; - int step_phase; - enum mdl_surface_prop surface_prop; - - /* player model */ - struct player_model - { - glmesh player_meshes[3]; - - mdl_context meta; - struct skeleton sk; - struct skeleton_anim *anim_stand, - *anim_highg, - *anim_slide, - *anim_air, - *anim_push, *anim_push_reverse, - *anim_ollie, *anim_ollie_reverse, - *anim_grabs, *anim_stop, - *anim_walk, *anim_run, *anim_idle, - *anim_jump; - - u32 id_hip, - id_ik_hand_l, - id_ik_hand_r, - id_ik_elbow_l, - id_ik_elbow_r, - id_head, - id_ik_foot_l, - id_ik_foot_r, - id_board; - - v3f cam_pos; - - struct ragdoll_part - { - u32 bone_id; - //v3f offset; - - /* Collider transform relative to bone */ - m4x3f collider_mtx, - inv_collider_mtx; - - u32 use_limits; - v3f limits[2]; - - rigidbody rb; - u32 parent; - u32 colour; - } - ragdoll[32]; - u32 ragdoll_count; - - rb_constr_pos position_constraints[32]; - u32 position_constraints_count; - - rb_constr_swingtwist cone_constraints[32]; - u32 cone_constraints_count; - - int shoes[2]; - } - mdl; -} -player__OLD - -#if 0 -= -{ - .collide_front = { .type = k_rb_shape_sphere, .inf.sphere.radius = 0.3f }, - .collide_back = { .type = k_rb_shape_sphere, .inf.sphere.radius = 0.3f } -} -#endif - -; - -/* - * API - */ -VG_STATIC float *player_get_pos(void); -VG_STATIC void player_kill(void); -VG_STATIC float *player_cam_pos(void); -VG_STATIC void player_save_frame(void); -VG_STATIC void player_restore_frame(void); -VG_STATIC void player_save_rewind_frame(void); - -/* - * Submodules - */ -VG_STATIC void player_mouseview(void); - -#include "player_physics.h" -#include "player_physics_skate.h" -#include "player_physics_walk.h" -#include "player_ragdoll.h" -#include "player_model.h" -#include "player_animation.h" -#include "player_audio.h" - -/* - * player_physics__ - * - * - * - */ - -/* - * ----------------------------------------------------------------------------- - * Events - * ----------------------------------------------------------------------------- - */ -VG_STATIC int kill_player( int argc, char const *argv[] ); -VG_STATIC int reset_player( int argc, char const *argv[] ); -VG_STATIC void reset_player_poll( int argc, char const *argv[] ); - -VG_STATIC void player_init(void) /* 1 */ -{ - rb_init( &player.rb ); - - VG_VAR_F32( k_walkspeed ); - VG_VAR_F32( k_stopspeed ); - VG_VAR_F32( k_airspeed ); - VG_VAR_F32( k_walk_friction ); - VG_VAR_F32( k_walk_air_accel ); - VG_VAR_F32( k_walk_accel ); - - VG_VAR_I32( freecam ); - VG_VAR_I32( cl_thirdperson ); - VG_VAR_F32_PERSISTENT( fc_speed ); - - VG_VAR_F32( k_ragdoll_limit_scale ); - VG_VAR_I32( k_ragdoll_div ); - VG_VAR_I32( k_ragdoll_debug_collider ); - VG_VAR_I32( k_ragdoll_debug_constraints ); - - VG_VAR_F32( k_friction_lat ); - - VG_VAR_F32( k_cog_spring ); - VG_VAR_F32( k_cog_damp ); - - VG_VAR_F32( k_cog_mass_ratio ); - VG_VAR_F32( k_downforce ); - - VG_VAR_F32( k_spring_force ); - VG_VAR_F32( k_spring_dampener ); - VG_VAR_F32( k_spring_angular ); - - VG_VAR_F32( k_mmthrow_scale ); - VG_VAR_F32( k_mmcollect_lat ); - VG_VAR_F32( k_mmcollect_vert ); - VG_VAR_F32( k_mmdecay ); - - vg_function_push( (struct vg_cmd){ - .name = "reset", - .function = reset_player, - .poll_suggest = reset_player_poll - }); - - vg_function_push( (struct vg_cmd){ - .name = "kill", - .function = kill_player - }); - - /* HACK */ - rb_register_cvar(); - - player.rewind_length = 0; - player.rewind_buffer = - vg_linear_alloc( vg_mem.rtmemory, - sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES ); - - player_model_init(); -} - -VG_STATIC void player_save_rewind_frame(void) -{ - if( player.rewind_length < PLAYER_REWIND_FRAMES ) - { - struct rewind_frame *fr = - &player.rewind_buffer[ player.rewind_length ++ ]; - - v2_copy( player.angles, fr->ang ); - v3_copy( player.camera_pos, fr->pos ); - - player.rewind_incrementer = 0; - - if( player.rewind_length > 1 ) - { - player.rewind_total_length += - v3_dist( player.rewind_buffer[player.rewind_length-1].pos, - player.rewind_buffer[player.rewind_length-2].pos ); - } - } -} - - -/* disaster */ -VG_STATIC int menu_enabled(void); -#include "menu.h" - -VG_STATIC void player_do_motion(void); -/* - * Free camera movement - */ -VG_STATIC void player_mouseview(void) -{ - if( menu_enabled() ) - return; - - v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles ); - - if( vg_input.controller_should_use_trackpad_look ) - { - static v2f last_input; - static v2f vel; - static v2f vel_smooth; - - v2f input = { player.input_js2h->axis.value, - player.input_js2v->axis.value }; - - if( (v2_length2(last_input) > 0.001f) && (v2_length2(input) > 0.001f) ) - { - v2_sub( input, last_input, vel ); - v2_muls( vel, 1.0f/vg.time_delta, vel ); - } - else - { - v2_zero( vel ); - } - - v2_lerp( vel_smooth, vel, vg.time_delta*8.0f, vel_smooth ); - - v2_muladds( player.angles, vel_smooth, vg.time_delta, player.angles ); - v2_copy( input, last_input ); - } - else - { - player.angles[0] += player.input_js2h->axis.value * vg.time_delta * 4.0f; - player.angles[1] += player.input_js2v->axis.value * vg.time_delta * 4.0f; - } - - player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f ); -} - -/* Deal with input etc */ -VG_STATIC void player_update_pre(void) -{ - - { - v3f ra, rb, rx; - v3_copy( main_camera.pos, ra ); - v3_muladds( ra, main_camera.transform[2], -10.0f, rb ); - - float t; - if( spherecast_world( ra, rb, 0.4f, &t, rx ) != -1 ) - { - m4x3f mtx; - m3x3_identity( mtx ); - v3_lerp( ra, rb, t, mtx[3] ); - - debug_sphere( mtx, 0.4f, 0xff00ff00 ); - - v3f x1; - v3_muladds( mtx[3], rx, 0.4f, x1 ); - vg_line( mtx[3], x1, 0xffffffff ); - } - } - -#if 0 - - vg_line_pt3( phys->cog, 0.10f, 0xffffffff ); - vg_line_pt3( phys->cog, 0.09f, 0xffffffff ); - vg_line_pt3( phys->cog, 0.08f, 0xffffffff ); - vg_line( phys->cog, phys->rb.co, 0xff000000 ); - - v3f spring_end; - v3f throw_end, p0, p1; - v3_muladds( phys->rb.co, phys->rb.up, 1.0f, spring_end ); - v3_muladds( spring_end, phys->throw_v, 1.0f, throw_end ); - v3_muladds( spring_end, player.debug_mmcollect_lat, 1.0f, p0 ); - v3_muladds( spring_end, player.debug_mmcollect_vert, 1.0f, p1 ); - vg_line( spring_end, throw_end, VG__RED ); - vg_line( spring_end, p0, VG__GREEN ); - vg_line( spring_end, p1, VG__BLUE ); -#endif - - if( player.rewinding ) - return; - - if( vg_input_button_down( player.input_reset ) && !menu_enabled() ) - { - double delta = world.time - world.last_use; - - if( (delta <= RESET_MAX_TIME) && (world.last_use != 0.0) ) - { - player.rewinding = 1; - player.rewind_sound_wait = 1; - player.rewind_time = (float)player.rewind_length - 0.0001f; - player_save_rewind_frame(); - audio_lock(); - audio_play_oneshot( &audio_rewind[0], 1.0f ); - audio_unlock(); - - /* based on analytical testing. DONT CHANGE! - * - * time taken: y = (x^(4/5)) * 74.5 - * inverse : x = (2/149)^(4/5) * y^(4/5) - */ - - float constant = powf( 2.0f/149.0f, 4.0f/5.0f ), - curve = powf( player.rewind_total_length, 4.0f/5.0f ); - - player.rewind_predicted_time = constant * curve; - player.diag_rewind_start = vg.time; - player.diag_rewind_time = player.rewind_time; - - player.is_dead = 0; - player.death_tick_allowance = 30; - player_restore_frame(); - - if( player.controller == k_player_controller_walk ) - { - player.angles[0] = atan2f( -player.rb.forward[2], - -player.rb.forward[0] ); - } - - player.mdl.shoes[0] = 1; - player.mdl.shoes[1] = 1; - - world_routes_notify_reset(); - - /* apply 1 frame of movement */ - player_do_motion(); - } - else - { - if( player.is_dead ) - { - reset_player( 0, NULL ); - } - else - { - /* cant do that */ - audio_lock(); - audio_play_oneshot( &audio_rewind[4], 1.0f ); - audio_unlock(); - } - } - } - - if( vg_input_button_down( player.input_switch_mode ) && !menu_enabled() ) - { - audio_lock(); - -#if 0 - if( phys->controller == k_player_controller_walk ) - { - phys->controller = k_player_controller_skate; - - v3_muladds( phys->rb.v, phys->rb.forward, 0.2f, phys->rb.v ); - audio_play_oneshot( &audio_lands[6], 1.0f ); - } - else if( phys->controller == k_player_controller_skate ) - { - phys->controller = k_player_controller_walk; - - audio_play_oneshot( &audio_lands[5], 1.0f ); - } -#endif - - audio_unlock(); - } - - if( player.controller == k_player_controller_walk ) - player_mouseview(); -} - -VG_STATIC void player_update_fixed(void) /* 2 */ -{ - if( player.rewinding ) - return; - - if( player.death_tick_allowance ) - player.death_tick_allowance --; - - if( player.is_dead ) - { - player_ragdoll_iter(); - } - else - { - player.rewind_incrementer ++; - - if( player.rewind_incrementer > (u32)(0.25/VG_TIMESTEP_FIXED) ) - { - player_save_rewind_frame(); - } - - player_do_motion(); - } -} - -VG_STATIC void player_update_post(void) -{ -#if 0 - for( int i=0; ilog_length - 1; j ++ ) - vg_line( p->log[j], p->log[j+1], p->colour ); - - vg_line_cross( p->log[p->log_length-1], p->colour, 0.25f ); - - v3f p1; - v3_add( p->log[p->log_length-1], p->n, p1 ); - vg_line( p->log[p->log_length-1], p1, 0xffffffff ); - } -#endif - -#if 0 - if( player.is_dead ) - { - player_debug_ragdoll(); - - if( !freecam ) - player_animate_death_cam(); - } - else - { - player_animate(); - - if( !freecam ) - { - if( cl_thirdperson ) - player_animate_camera_thirdperson(); - else - player_animate_camera(); - } - } - - if( freecam ) -#endif - player_freecam(); - - /* CAMERA POSITIONING: LAYER 0 */ - v2_copy( player.angles, main_camera.angles ); - v3_copy( player.camera_pos, main_camera.pos ); - -#if 0 - if( player.rewinding ) - { - if( player.rewind_time <= 0.0f ) - { - double taken = vg.time - player.diag_rewind_start; - vg_success( "Rewind took (rt, pl, tl): %f, %f, %f\n", - taken, player.diag_rewind_time, - player.rewind_total_length ); - - player.rewinding = 0; - player.rewind_length = 1; - player.rewind_total_length = 0.0f; - player.rewind_incrementer = 0; - world.sky_target_rate = 1.0; - } - else - { - world.sky_target_rate = -100.0; - assert( player.rewind_length > 0 ); - - v2f override_angles; - v3f override_pos; - - float budget = vg.time_delta, - overall_length = player.rewind_length; - - world_routes_rollback_time( player.rewind_time / overall_length ); - - for( int i=0; (i<10)&&(player.rewind_time>0.0f)&&(budget>0.0f); i ++ ) - { - /* Interpolate frames */ - int i0 = floorf( player.rewind_time ), - i1 = VG_MIN( i0+1, player.rewind_length-1 ); - - struct rewind_frame *fr = &player.rewind_buffer[i0], - *fr1 = &player.rewind_buffer[i1]; - - float dist = vg_maxf( v3_dist( fr->pos, fr1->pos ), 0.001f ), - subl = vg_fractf( player.rewind_time ) + 0.001f, - - sramp= 3.0f-(1.0f/(0.4f+0.4f*player.rewind_time)), - speed = sramp*28.0f + 0.5f*player.rewind_time, - mod = speed * (budget / dist), - - advl = vg_minf( mod, subl ), - advt = (advl / mod) * budget; - - player.dist_accum += speed * advt; - player.rewind_time -= advl; - budget -= advt; - } - - player.rewind_time = vg_maxf( 0.0f, player.rewind_time ); - - float current_time = vg.time - player.diag_rewind_start, - remaining = player.rewind_predicted_time - current_time; - - if( player.rewind_sound_wait ) - { - if( player.rewind_predicted_time >= 6.5f ) - { - if( remaining <= 6.5f ) - { - audio_lock(); - audio_play_oneshot( &audio_rewind[3], 1.0f ); - audio_unlock(); - player.rewind_sound_wait = 0; - } - } - else if( player.rewind_predicted_time >= 2.5f ) - { - if( remaining <= 2.5f ) - { - audio_lock(); - audio_play_oneshot( &audio_rewind[2], 1.0f ); - audio_unlock(); - player.rewind_sound_wait = 0; - } - } - else if( player.rewind_predicted_time >= 1.5f ) - { - if( remaining <= 1.5f ) - { - audio_lock(); - audio_play_oneshot( &audio_rewind[1], 1.0f ); - audio_unlock(); - player.rewind_sound_wait = 0; - } - } - } - - int i0 = floorf( player.rewind_time ), - i1 = VG_MIN( i0+1, player.rewind_length-1 ); - - struct rewind_frame *fr = &player.rewind_buffer[i0], - *fr1 = &player.rewind_buffer[i1]; - - float sub = vg_fractf(player.rewind_time); - - v3_lerp( fr->pos, fr1->pos, sub, override_pos ); - override_angles[0] = vg_alerpf( fr->ang[0], fr1->ang[0], sub ); - override_angles[1] = vg_lerpf ( fr->ang[1], fr1->ang[1], sub ); - - /* CAMERA POSITIONING: LAYER 1 */ - float blend = (4.0f-player.rewind_time) * 0.25f, - c = vg_clampf( blend, 0.0f, 1.0f ); - - main_camera.angles[0] = - vg_alerpf(override_angles[0], player.angles[0], c); - main_camera.angles[1] = - vg_lerpf (override_angles[1], player.angles[1], c); - v3_lerp( override_pos, player.camera_pos, c, main_camera.pos ); - } - } -#endif - - camera_update_transform( &main_camera ); - player_audio(); -} - -VG_STATIC void draw_player( camera *cam ) -{ - if( player.is_dead ) - player_model_copy_ragdoll(); - - shader_viewchar_use(); - vg_tex2d_bind( &tex_characters, 0 ); - shader_viewchar_uTexMain( 0 ); - shader_viewchar_uCamera( cam->transform[3] ); - shader_viewchar_uPv( cam->mtx.pv ); - shader_link_standard_ub( _shader_viewchar.id, 2 ); - glUniformMatrix4x3fv( _uniform_viewchar_uTransforms, - player.mdl.sk.bone_count, - 0, - (float *)player.mdl.sk.final_mtx ); - - mesh_bind( &player.mdl.player_meshes[cl_playermdl_id] ); - mesh_draw( &player.mdl.player_meshes[cl_playermdl_id] ); -} - -VG_STATIC void player_do_motion(void) -{ - if( world.water.enabled ) - { - if( (player.rb.co[1] < 0.0f) && !player.is_dead ) - { - audio_lock(); - audio_player_set_flags( &audio_player_extra, AUDIO_FLAG_SPACIAL_3D ); - audio_player_set_position( &audio_player_extra, player.rb.co ); - audio_player_set_vol( &audio_player_extra, 20.0f ); - audio_player_playclip( &audio_player_extra, &audio_splash ); - audio_unlock(); - - player_kill(); - } - } - - v3f prevco; - v3_copy( player.rb.co, prevco ); - - if( player.controller == k_player_controller_skate ) - { -#if 0 - player_skate_update(); -#endif - } - else - player_walk_physics( &player_walky ); - - - /* Real angular velocity integration */ -#if 0 - v3_lerp( phys->rb.w, (v3f){0.0f,0.0f,0.0f}, 0.125f*0.5f, phys->rb.w ); - if( v3_length2( phys->rb.w ) > 0.0f ) - { - v4f rotation; - v3f axis; - v3_copy( phys->rb.w, axis ); - - float mag = v3_length( axis ); - v3_divs( axis, mag, axis ); - q_axis_angle( rotation, axis, mag*k_rb_delta ); - q_mul( rotation, phys->rb.q, phys->rb.q ); - } - - /* Faux angular velocity */ - v4f rotate; - - float lerpq = (player_skate.activity == k_skate_activity_air)? 0.04f: 0.3f; - phys->siY = vg_lerpf( phys->siY, phys->iY, lerpq ); - - q_axis_angle( rotate, phys->rb.up, phys->siY ); - q_mul( rotate, phys->rb.q, phys->rb.q ); - phys->iY = 0.0f; -#endif - - /* - * Gate intersection, by tracing a line over the gate planes - */ -#if 0 - for( int i=0; igate; - - if( gate_intersect( gate, phys->rb.co, prevco ) ) - { - m4x3_mulv( gate->transport, phys->rb.co, phys->rb.co ); - m4x3_mulv( gate->transport, phys->cog, phys->cog ); - m3x3_mulv( gate->transport, phys->cog_v, phys->cog_v ); - m3x3_mulv( gate->transport, phys->rb.v, phys->rb.v ); - m3x3_mulv( gate->transport, phys->vl, phys->vl ); - m3x3_mulv( gate->transport, phys->v_last, phys->v_last ); - m3x3_mulv( gate->transport, phys->m, phys->m ); - m3x3_mulv( gate->transport, phys->bob, phys->bob ); - - /* Pre-emptively edit the camera matrices so that the motion vectors - * are correct */ - m4x3f transport_i; - m4x4f transport_4; - m4x3_invert_affine( gate->transport, transport_i ); - m4x3_expand( transport_i, transport_4 ); - m4x4_mul( main_camera.mtx.pv, transport_4, main_camera.mtx.pv ); - m4x4_mul( main_camera.mtx.v, transport_4, main_camera.mtx.v ); - - v4f transport_rotation; - m3x3_q( gate->transport, transport_rotation ); - q_mul( transport_rotation, phys->rb.q, phys->rb.q ); - - world_routes_activate_gate( i ); - - if( phys->controller == k_player_controller_walk ) - { - v3f fwd_dir = {cosf(player.angles[0]), - 0.0f, - sinf(player.angles[0])}; - m3x3_mulv( gate->transport, fwd_dir, fwd_dir ); - - player.angles[0] = atan2f( fwd_dir[2], fwd_dir[0] ); - } - - player.rewind_length = 0; - player.rewind_total_length = 0.0f; - player.rewind_incrementer = 10000; - player_save_frame(); - - audio_lock(); - audio_play_oneshot( &audio_gate_pass, 1.0f ); - audio_unlock(); - break; - } - } -#endif - - rb_update_transform( &player.rb ); -} - -/* - * ----------------------------------------------------------------------------- - * API implementation - * ----------------------------------------------------------------------------- - */ - -VG_STATIC float *player_get_pos(void) -{ - return player.rb.co; -} - -VG_STATIC void player_kill(void) -{ - if( player.death_tick_allowance == 0 ) - { - player.is_dead = 1; - player_ragdoll_copy_model( player.rb.v ); - } -} - -VG_STATIC float *player_cam_pos(void) -{ - return player.camera_pos; -} - - -VG_STATIC void player_save_frame(void) -{ - player.controller_frame = player.controller; - - /* TODO ->save() */ -} - -VG_STATIC void player_restore_frame(void) -{ - player.controller = player.controller_frame; - - /* TODO ->load() */ -} - -#endif /* PLAYER_H */ -#endif diff --git a/player_drive.c b/player_drive.c new file mode 100644 index 0000000..1c08212 --- /dev/null +++ b/player_drive.c @@ -0,0 +1,82 @@ +#ifndef PLAYER_DRIVE_C +#define PLAYER_DRIVE_C + +#include "player.h" + +VG_STATIC void player__drive_pre_update( player_instance *player ) +{ + struct player_drive *drive = &player->_drive; + drivable_vehicle *vehc = drive->vehicle; + + vehc->steer = vg_lerpf( vehc->steer, + player->input_walkh->axis.value * 0.4f, + k_rb_delta * 8.0f ); + vehc->drive = player->input_walkv->axis.value; +} + +VG_STATIC void player__drive_update( player_instance *player ) +{ +} + +VG_STATIC void player__drive_post_update( player_instance *player ) +{ + struct player_drive *drive = &player->_drive; + v3_copy( drive->vehicle->obj.rb.co, player->rb.co ); + v3_copy( drive->vehicle->obj.rb.v, player->rb.v ); + v4_copy( drive->vehicle->obj.rb.q, player->rb.q ); + v3_copy( drive->vehicle->obj.rb.w, player->rb.w ); +} + +VG_STATIC void player__drive_animate( player_instance *player, + player_animation *dest ) +{ + struct player_drive *drive = &player->_drive; + struct skeleton *sk = &player->playeravatar->sk; + skeleton_sample_anim( sk, drive->anim_drive, 0.0f, dest->pose ); + v3_copy( player->rb.co, dest->root_co ); + v4_copy( player->rb.q, dest->root_q ); +} + +VG_STATIC void player__drive_post_animate( player_instance *player ) +{ + if( player->camera_mode == k_cam_firstperson ) + player->cam_velocity_influence = 0.0f; + else + player->cam_velocity_influence = 1.0f; + + rigidbody *rb = &gzoomer.obj.rb; + float yaw = atan2f( -rb->to_world[2][0], rb->to_world[2][2] ), + pitch = atan2f + ( + -rb->to_world[2][1], + sqrtf + ( + rb->to_world[2][0]*rb->to_world[2][0] + + rb->to_world[2][2]*rb->to_world[2][2] + ) + ); + + player->angles[0] = yaw; + player->angles[1] = pitch; +} + +VG_STATIC void player__drive_im_gui( player_instance *player ) +{ + player__debugtext( 1, "Nothing here" ); +} + +VG_STATIC void player__drive_bind( player_instance *player ) +{ + struct player_drive *drive = &player->_drive; + struct player_avatar *av = player->playeravatar; + struct skeleton *sk = &av->sk; + + drive->vehicle = &gzoomer; + drive->anim_drive = skeleton_get_anim( sk, "idle_cycle+y" ); +} + +VG_STATIC void player__drive_reset( player_instance *player, ent_spawn *rp ) +{ +} + +#endif /* PLAYER_DRIVE_C */ diff --git a/player_drive.h b/player_drive.h new file mode 100644 index 0000000..4ce05ba --- /dev/null +++ b/player_drive.h @@ -0,0 +1,22 @@ +#ifndef PLAYER_DRIVE_H +#define PLAYER_DRIVE_H + +#include "player.h" +#include "vehicle.h" + +struct player_drive { + drivable_vehicle *vehicle; + struct skeleton_anim *anim_drive; +}; + +VG_STATIC void player__drive_pre_update( player_instance *player ); +VG_STATIC void player__drive_update( player_instance *player ); +VG_STATIC void player__drive_post_update( player_instance *player ); +VG_STATIC void player__drive_animate( player_instance *player, + player_animation *dest ); +VG_STATIC void player__drive_post_animate( player_instance *player ); +VG_STATIC void player__drive_im_gui( player_instance *player ); +VG_STATIC void player__drive_bind( player_instance *player ); +VG_STATIC void player__drive_reset( player_instance *player, ent_spawn *rp ); + +#endif /* PLAYER_DRIVE_H */ diff --git a/player_walk.c b/player_walk.c index 1e92bb1..7f857fe 100644 --- a/player_walk.c +++ b/player_walk.c @@ -255,25 +255,20 @@ VG_STATIC void player__walk_pre_update( player_instance *player ) if( w->state.activity != k_walk_activity_immobile ) player_look( player, player->angles ); - if( w->state.outro_anim ) - { + if( w->state.outro_anim ){ float outro_length = (float)w->state.outro_anim->length / w->state.outro_anim->rate, outro_time = vg.time - w->state.outro_start_time; - if( outro_time >= outro_length ) - { + if( outro_time >= outro_length ){ w->state.outro_anim = NULL; - if( w->state.outro_type == k_walk_outro_drop_in ) - { + if( w->state.outro_type == k_walk_outro_drop_in ){ player_walk_drop_in_to_skate( player ); } - else if( w->state.outro_type == k_walk_outro_jump_to_air ) - { + else if( w->state.outro_type == k_walk_outro_jump_to_air ){ player_walk_generic_to_skate( player, k_skate_activity_air, 0.0f ); } - else - { + else{ player_walk_generic_to_skate( player, k_skate_activity_ground, 1.0f ); } @@ -281,40 +276,40 @@ VG_STATIC void player__walk_pre_update( player_instance *player ) return; } } - else if( vg_input_button_down( player->input_use ) ) - { - if( w->state.activity == k_walk_activity_ground ) - { - if( player_walk_scan_for_drop_in( player ) ) - { - w->state.outro_type = k_walk_outro_drop_in; - w->state.outro_anim = w->anim_drop_in; - w->state.outro_start_time = vg.time; - w->state.activity = k_walk_activity_immobile; - - struct player_avatar *av = player->playeravatar; - m4x3_mulv( av->sk.final_mtx[ av->id_ik_foot_r ], - av->sk.bones[ av->id_ik_foot_r ].co, - w->state.drop_in_foot_anchor ); + else if( vg_input_button_down( player->input_use ) ){ + if( v3_dist2( player->rb.co, gzoomer.obj.rb.co ) <= 4.0f*4.0f ){ + player->subsystem = k_player_subsystem_drive; + } + else{ + if( w->state.activity == k_walk_activity_ground ){ + if( player_walk_scan_for_drop_in( player ) ){ + w->state.outro_type = k_walk_outro_drop_in; + w->state.outro_anim = w->anim_drop_in; + w->state.outro_start_time = vg.time; + w->state.activity = k_walk_activity_immobile; + + struct player_avatar *av = player->playeravatar; + m4x3_mulv( av->sk.final_mtx[ av->id_ik_foot_r ], + av->sk.bones[ av->id_ik_foot_r ].co, + w->state.drop_in_foot_anchor ); + } + else{ + w->state.outro_type = k_walk_outro_regular; + w->state.outro_anim = w->anim_intro; + w->state.outro_start_time = vg.time; + w->state.activity = k_walk_activity_lockedmove; + + if( player_xyspeed2(player) < 0.1f * 0.1f ) + q_mulv( player->rb.q, (v3f){0.0f,0.0f,1.6f}, player->rb.v ); + } } - else - { - w->state.outro_type = k_walk_outro_regular; - w->state.outro_anim = w->anim_intro; + else{ + w->state.outro_type = k_walk_outro_jump_to_air; + w->state.outro_anim = w->anim_jump_to_air; w->state.outro_start_time = vg.time; - w->state.activity = k_walk_activity_lockedmove; - - if( player_xyspeed2(player) < 0.1f * 0.1f ) - q_mulv( player->rb.q, (v3f){0.0f,0.0f,1.6f}, player->rb.v ); + return; } } - else - { - w->state.outro_type = k_walk_outro_jump_to_air; - w->state.outro_anim = w->anim_jump_to_air; - w->state.outro_start_time = vg.time; - return; - } } } diff --git a/rigidbody.h b/rigidbody.h index 60fc88c..c10f4f8 100644 --- a/rigidbody.h +++ b/rigidbody.h @@ -569,40 +569,35 @@ VG_STATIC int rb_box_triangle_sat( v3f extent, v3f center, v3_sub( tri[i], center, tri[i] ); } + v3f f0,f1,f2,n; + v3_sub( tri[1], tri[0], f0 ); + v3_sub( tri[2], tri[1], f1 ); + v3_sub( tri[0], tri[2], f2 ); + + + v3f axis[9]; + v3_cross( (v3f){1.0f,0.0f,0.0f}, f0, axis[0] ); + v3_cross( (v3f){1.0f,0.0f,0.0f}, f1, axis[1] ); + v3_cross( (v3f){1.0f,0.0f,0.0f}, f2, axis[2] ); + v3_cross( (v3f){0.0f,1.0f,0.0f}, f0, axis[3] ); + v3_cross( (v3f){0.0f,1.0f,0.0f}, f1, axis[4] ); + v3_cross( (v3f){0.0f,1.0f,0.0f}, f2, axis[5] ); + v3_cross( (v3f){0.0f,0.0f,1.0f}, f0, axis[6] ); + v3_cross( (v3f){0.0f,0.0f,1.0f}, f1, axis[7] ); + v3_cross( (v3f){0.0f,0.0f,1.0f}, f2, axis[8] ); + + for( int i=0; i<9; i++ ) + if(!rb_box_triangle_interval( extent, axis[i], tri )) return 0; + /* u0, u1, u2 */ if(!rb_box_triangle_interval( extent, (v3f){1.0f,0.0f,0.0f}, tri )) return 0; if(!rb_box_triangle_interval( extent, (v3f){0.0f,1.0f,0.0f}, tri )) return 0; if(!rb_box_triangle_interval( extent, (v3f){0.0f,0.0f,1.0f}, tri )) return 0; - v3f v0,v1,v2,n, e0,e1,e2; - v3_sub( tri[1], tri[0], v0 ); - v3_sub( tri[2], tri[0], v1 ); - v3_sub( tri[2], tri[1], v2 ); - v3_normalize( v0 ); - v3_normalize( v1 ); - v3_normalize( v2 ); - v3_cross( v0, v1, n ); - v3_cross( v0, n, e0 ); - v3_cross( n, v1, e1 ); - v3_cross( v2, n, e2 ); - /* normal */ + v3_cross( f0, f1, n ); if(!rb_box_triangle_interval( extent, n, tri )) return 0; - v3f axis[9]; - v3_cross( e0, (v3f){1.0f,0.0f,0.0f}, axis[0] ); - v3_cross( e0, (v3f){0.0f,1.0f,0.0f}, axis[1] ); - v3_cross( e0, (v3f){0.0f,0.0f,1.0f}, axis[2] ); - v3_cross( e1, (v3f){1.0f,0.0f,0.0f}, axis[3] ); - v3_cross( e1, (v3f){0.0f,1.0f,0.0f}, axis[4] ); - v3_cross( e1, (v3f){0.0f,0.0f,1.0f}, axis[5] ); - v3_cross( e2, (v3f){1.0f,0.0f,0.0f}, axis[6] ); - v3_cross( e2, (v3f){0.0f,1.0f,0.0f}, axis[7] ); - v3_cross( e2, (v3f){0.0f,0.0f,1.0f}, axis[8] ); - - for( int i=0; i<9; i++ ) - if(!rb_box_triangle_interval( extent, axis[i], tri )) return 0; - return 1; } @@ -1311,6 +1306,7 @@ VG_STATIC int rb_sphere__scene( m4x3f mtxA, rb_sphere *b, VG_STATIC int rb_box__scene( m4x3f mtxA, boxf bbx, m4x3f mtxB, rb_scene *s, rb_ct *buf ) { +#if 1 scene *sc = s->bh_scene->user; v3f tri[3]; @@ -1452,6 +1448,50 @@ VG_STATIC int rb_box__scene( m4x3f mtxA, boxf bbx, } } return count; +#else + + scene *sc = s->bh_scene->user; + v3f tri[3]; + + v3f extent, center; + v3_sub( bbx[1], bbx[0], extent ); + v3_muls( extent, 0.5f, extent ); + v3_add( bbx[0], extent, center ); + + float r = v3_length(extent); + boxf world_bbx; + v3_fill( world_bbx[0], -r ); + v3_fill( world_bbx[1], r ); + for( int i=0; i<2; i++ ){ + v3_add( center, world_bbx[i], world_bbx[i] ); + v3_add( mtxA[3], world_bbx[i], world_bbx[i] ); + } + + m4x3f to_local; + m4x3_invert_affine( mtxA, to_local ); + + bh_iter it; + bh_iter_init( 0, &it ); + int idx; + int count = 0; + + vg_line_boxf( world_bbx, VG__RED ); + + while( bh_next( s->bh_scene, &it, world_bbx, &idx ) ){ + u32 *ptri = &sc->arrindices[ idx*3 ]; + + for( int j=0; j<3; j++ ) + v3_copy( sc->arrvertices[ptri[j]].co, tri[j] ); + + vg_line( tri[0],tri[1],VG__BLACK ); + vg_line( tri[1],tri[2],VG__BLACK ); + vg_line( tri[2],tri[0],VG__BLACK ); + + v3f clip[2][8]; + u32 clip_length = 0; + } + +#endif } VG_STATIC int rb_capsule__triangle( m4x3f mtxA, rb_capsule *c, diff --git a/skaterift.c b/skaterift.c index c036a50..7b1d1d1 100644 --- a/skaterift.c +++ b/skaterift.c @@ -40,12 +40,19 @@ player_instance *tmp_localplayer(void) static int cl_ui = 1, cl_light_edit = 0; +#define DEV_AARON +#ifdef DEV_AARON +static rb_object aaron={ + .type=k_rb_shape_box, + .rb.bbx = {{ -2.0f, -1.0f, -1.0f }, { 2.0f, 1.0f, 1.0f }} +}; +#endif + int main( int argc, char *argv[] ) { vg_mem.use_libc_malloc = 0; vg_set_mem_quota( 160*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); - return 0; } @@ -163,6 +170,14 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " steam_init(); vg_loader_step( NULL, steam_end ); vg_loader_step( network_init, network_end ); + +#ifdef DEV_AARON + q_identity( aaron.rb.q ); + v3_zero( aaron.rb.w ); + v3_zero( aaron.rb.co ); + v3_zero( aaron.rb.v ); + rb_init_object( &aaron ); +#endif } VG_STATIC void load_playermodels(void) @@ -223,7 +238,7 @@ VG_STATIC void vg_load(void) font3d_load( &world_global.font, "models/rs_font.mdl", vg_mem.rtmemory ); //vg_loader_step( player_init, NULL ); - //vg_loader_step( vehicle_init, NULL ); + vg_loader_step( vehicle_init, NULL ); // //vg_loader_step( player_model_init, NULL ); @@ -279,12 +294,8 @@ VG_STATIC void vg_update(void) draw_origin_axis(); network_update(); -#if 0 - if( !gzoomer.inside ) - player_update_pre(); -#endif - player__pre_update( &localplayer ); + world_update( get_active_world(), localplayer.rb.co ); audio_ambient_sprites_update( get_active_world(), localplayer.rb.co ); } @@ -293,34 +304,40 @@ VG_STATIC void vg_update(void) VG_STATIC void vg_update_fixed(void) { if( vg.is_loaded ){ -#if 0 - if( !gzoomer.inside ) - player_update_fixed(); + world_routes_fixedupdate( get_active_world() ); + player__update( &localplayer ); vehicle_update_fixed(); + +#ifdef DEV_AARON + world_instance *world = get_active_world(); + rb_solver_reset(); + rb_ct *buf = rb_global_buffer(); + + int l = rb_box__scene( aaron.rb.to_world, aaron.rb.bbx, + NULL, &world->rb_geo.inf.scene, buf ); + for( int j=0; jrb_geo.rb; + } + rb_contact_count += l; + rb_presolve_contacts( rb_contact_buffer, rb_contact_count ); + + for( int j=0; j<8; j++ ){ + rb_solve_contacts( rb_contact_buffer, rb_contact_count ); + } + + rb_iter( &aaron.rb ); + rb_update_transform( &aaron.rb ); #endif - world_routes_fixedupdate( get_active_world() ); - player__update( &localplayer ); + } } VG_STATIC void vg_update_post(void) { - if( vg.is_loaded ) - { -#if 0 - if( gzoomer.inside ) - { - vehicle_camera(); - } - else - { - player_update_post(); - } -#endif - + if( vg.is_loaded ){ player__post_update( &localplayer ); - float inr3 = 0.57735027, inr2 = 0.70710678118; @@ -387,7 +404,6 @@ VG_STATIC void vg_update_post(void) if( si >= 14 ) si = 0; - /* FIXME: TEMP */ audio_lock(); vg_dsp.echo_distances[si] = dist; @@ -408,8 +424,20 @@ VG_STATIC void vg_update_post(void) audio_unlock(); menu_update(); -#if 0 vehicle_update_post(); + +#ifdef DEV_AARON + SDL_Scancode sc = SDL_GetScancodeFromKey( SDLK_q ); + if( vg_input.sdl_keys[sc] ){ + m4x3_mulv( main_camera.transform, (v3f){0.0f,0.0f,-3.0f}, + aaron.rb.co ); + + v3_zero( aaron.rb.v ); + v3_zero( aaron.rb.w ); + rb_update_transform( &aaron.rb ); + } + + rb_object_debug( &aaron, VG__PINK ); #endif } } diff --git a/vehicle.h b/vehicle.h index 06c8be1..54a2591 100644 --- a/vehicle.h +++ b/vehicle.h @@ -1,5 +1,3 @@ - -#define VEHICLE_H #ifndef VEHICLE_H #define VEHICLE_H @@ -7,7 +5,7 @@ #include "vg/vg.h" #include "rigidbody.h" #include "world.h" -#include "player_physics.h" +#include "player.h" VG_STATIC float k_car_spring = 1.0f, k_car_spring_damp = 0.001f, @@ -19,10 +17,11 @@ VG_STATIC float k_car_spring = 1.0f, k_car_air_resistance = 0.1f, k_car_downforce = 0.5f; -VG_STATIC struct gvehicle +typedef struct drivable_vehicle drivable_vehicle; +VG_STATIC struct drivable_vehicle { int alive, inside; - rigidbody rb; + rb_object obj; v3f wheels[4]; @@ -38,7 +37,7 @@ VG_STATIC struct gvehicle } gzoomer = { - .rb = { .type = k_rb_shape_sphere, .inf.sphere.radius = 1.0f } + .obj = { .type = k_rb_shape_sphere, .inf.sphere.radius = 1.0f } }; VG_STATIC int spawn_car( int argc, const char *argv[] ) @@ -48,21 +47,21 @@ VG_STATIC int spawn_car( int argc, const char *argv[] ) v3_muladds( ra, main_camera.transform[2], -10.0f, rb ); float t; - if( spherecast_world( ra, rb, gzoomer.rb.inf.sphere.radius, &t, rx ) != -1 ) + if( spherecast_world( get_active_world(), ra, rb, + gzoomer.obj.inf.sphere.radius, &t, rx ) != -1 ) { - v3_lerp( ra, rb, t, gzoomer.rb.co ); - gzoomer.rb.co[1] += 4.0f; - q_axis_angle( gzoomer.rb.q, (v3f){1.0f,0.0f,0.0f}, 0.001f ); - v3_zero( gzoomer.rb.v ); - v3_zero( gzoomer.rb.w ); + v3_lerp( ra, rb, t, gzoomer.obj.rb.co ); + gzoomer.obj.rb.co[1] += 4.0f; + q_axis_angle( gzoomer.obj.rb.q, (v3f){1.0f,0.0f,0.0f}, 0.001f ); + v3_zero( gzoomer.obj.rb.v ); + v3_zero( gzoomer.obj.rb.w ); - rb_update_transform( &gzoomer.rb ); + rb_update_transform( &gzoomer.obj.rb ); gzoomer.alive = 1; vg_success( "Spawned car\n" ); } - else - { + else{ vg_error( "Can't spawn here\n" ); } @@ -71,8 +70,11 @@ VG_STATIC int spawn_car( int argc, const char *argv[] ) VG_STATIC void vehicle_init(void) { - q_identity( gzoomer.rb.q ); - rb_init( &gzoomer.rb ); + q_identity( gzoomer.obj.rb.q ); + v3_zero( gzoomer.obj.rb.w ); + v3_zero( gzoomer.obj.rb.v ); + v3_zero( gzoomer.obj.rb.co ); + rb_init_object( &gzoomer.obj ); VG_VAR_F32_PERSISTENT( k_car_spring ); VG_VAR_F32_PERSISTENT( k_car_spring_damp ); @@ -100,14 +102,16 @@ VG_STATIC void vehicle_init(void) VG_STATIC void vehicle_wheel_force( int index ) { v3f pa, pb, n; - m4x3_mulv( gzoomer.rb.to_world, gzoomer.wheels_local[index], pa ); - v3_muladds( pa, gzoomer.rb.up, -k_car_spring_length, pb ); + m4x3_mulv( gzoomer.obj.rb.to_world, gzoomer.wheels_local[index], pa ); + v3_muladds( pa, gzoomer.obj.rb.to_world[1], -k_car_spring_length, pb ); #if 1 float t; - if( spherecast_world( pa, pb, k_car_wheel_radius, &t, n ) == -1 ) - t = 1.0f; + if( spherecast_world( get_active_world(), pa, pb, + k_car_wheel_radius, &t, n ) == -1 ) + { t = 1.0f; + } #else @@ -126,33 +130,33 @@ VG_STATIC void vehicle_wheel_force( int index ) v3_lerp( pa, pb, t, pc ); m4x3f mtx; - m3x3_copy( gzoomer.rb.to_world, mtx ); + m3x3_copy( gzoomer.obj.rb.to_world, mtx ); v3_copy( pc, mtx[3] ); debug_sphere( mtx, k_car_wheel_radius, VG__BLACK ); vg_line( pa, pc, VG__WHITE ); v3_copy( pc, gzoomer.wheels[index] ); - if( t < 1.0f ) - { + if( t < 1.0f ){ /* spring force */ float Fv = (1.0f-t) * k_car_spring*k_rb_delta; v3f delta; - v3_sub( pa, gzoomer.rb.co, delta ); + v3_sub( pa, gzoomer.obj.rb.co, delta ); v3f rv; - v3_cross( gzoomer.rb.w, delta, rv ); - v3_add( gzoomer.rb.v, rv, rv ); + v3_cross( gzoomer.obj.rb.w, delta, rv ); + v3_add( gzoomer.obj.rb.v, rv, rv ); - Fv += v3_dot( rv, gzoomer.rb.up ) * -k_car_spring_damp*k_rb_delta; + Fv += v3_dot( rv, gzoomer.obj.rb.to_world[1] ) + * -k_car_spring_damp*k_rb_delta; /* scale by normal incident */ - Fv *= v3_dot( n, gzoomer.rb.up ); + Fv *= v3_dot( n, gzoomer.obj.rb.to_world[1] ); v3f F; - v3_muls( gzoomer.rb.up, Fv, F ); + v3_muls( gzoomer.obj.rb.to_world[1], Fv, F ); - rb_linear_impulse( &gzoomer.rb, delta, F ); + rb_linear_impulse( &gzoomer.obj.rb, delta, F ); /* friction vectors * -------------------------------------------------------------*/ @@ -161,7 +165,7 @@ VG_STATIC void vehicle_wheel_force( int index ) if( index <= 1 ) v3_cross( gzoomer.steerv, n, tx ); else - v3_cross( gzoomer.rb.forward, n, tx ); + v3_cross( n, gzoomer.obj.rb.to_world[2], tx ); v3_cross( tx, n, ty ); v3_copy( tx, gzoomer.tangent_vectors[ index ][0] ); @@ -173,31 +177,29 @@ VG_STATIC void vehicle_wheel_force( int index ) /* orient inverse inertia tensors */ v3f raW; - m3x3_mulv( gzoomer.rb.to_world, gzoomer.wheels_local[index], raW ); + m3x3_mulv( gzoomer.obj.rb.to_world, gzoomer.wheels_local[index], raW ); v3f raCtx, raCtxI, raCty, raCtyI; v3_cross( tx, raW, raCtx ); v3_cross( ty, raW, raCty ); - m3x3_mulv( gzoomer.rb.iIw, raCtx, raCtxI ); - m3x3_mulv( gzoomer.rb.iIw, raCty, raCtyI ); + m3x3_mulv( gzoomer.obj.rb.iIw, raCtx, raCtxI ); + m3x3_mulv( gzoomer.obj.rb.iIw, raCty, raCtyI ); - gzoomer.tangent_mass[index][0] = gzoomer.rb.inv_mass; + gzoomer.tangent_mass[index][0] = gzoomer.obj.rb.inv_mass; gzoomer.tangent_mass[index][0] += v3_dot( raCtx, raCtxI ); gzoomer.tangent_mass[index][0] = 1.0f/gzoomer.tangent_mass[index][0]; - gzoomer.tangent_mass[index][1] = gzoomer.rb.inv_mass; + gzoomer.tangent_mass[index][1] = gzoomer.obj.rb.inv_mass; gzoomer.tangent_mass[index][1] += v3_dot( raCty, raCtyI ); gzoomer.tangent_mass[index][1] = 1.0f/gzoomer.tangent_mass[index][1]; /* apply drive force */ - if( index >= 2 ) - { - v3_muls( ty, gzoomer.drive * k_car_drive_force * k_rb_delta, F ); - rb_linear_impulse( &gzoomer.rb, raW, F ); + if( index >= 2 ){ + v3_muls( ty, -gzoomer.drive * k_car_drive_force * k_rb_delta, F ); + rb_linear_impulse( &gzoomer.obj.rb, raW, F ); } } - else - { + else{ gzoomer.normal_forces[ index ] = 0.0f; gzoomer.tangent_forces[ index ][0] = 0.0f; gzoomer.tangent_forces[ index ][1] = 0.0f; @@ -206,14 +208,14 @@ VG_STATIC void vehicle_wheel_force( int index ) VG_STATIC void vehicle_solve_friction(void) { - for( int i=0; i<4; i++ ) - { + rigidbody *rb = &gzoomer.obj.rb; + for( int i=0; i<4; i++ ){ v3f raW; - m3x3_mulv( gzoomer.rb.to_world, gzoomer.wheels_local[i], raW ); + m3x3_mulv( rb->to_world, gzoomer.wheels_local[i], raW ); v3f rv; - v3_cross( gzoomer.rb.w, raW, rv ); - v3_add( gzoomer.rb.v, rv, rv ); + v3_cross( rb->w, raW, rv ); + v3_add( rb->v, rv, rv ); float fx = k_car_friction_lat * gzoomer.normal_forces[i], fy = k_car_friction_roll * gzoomer.normal_forces[i], @@ -232,45 +234,47 @@ VG_STATIC void vehicle_solve_friction(void) v3f impulsex, impulsey; v3_muls( gzoomer.tangent_vectors[i][0], lambdax, impulsex ); v3_muls( gzoomer.tangent_vectors[i][1], lambday, impulsey ); - rb_linear_impulse( &gzoomer.rb, raW, impulsex ); - rb_linear_impulse( &gzoomer.rb, raW, impulsey ); + rb_linear_impulse( rb, raW, impulsex ); + rb_linear_impulse( rb, raW, impulsey ); } } +player_instance *tmp_localplayer(void); VG_STATIC void vehicle_update_fixed(void) { if( !gzoomer.alive ) return; - gzoomer.steer = vg_lerpf( gzoomer.steer, - player.input_walkh->axis.value * 0.4f, - k_rb_delta * 8.0f ); + rigidbody *rb = &gzoomer.obj.rb; - gzoomer.drive = player.input_walkv->axis.value * k_car_drive_force; - v3_muls( gzoomer.rb.forward, cosf(gzoomer.steer), gzoomer.steerv ); - v3_muladds( gzoomer.steerv, gzoomer.rb.right, + v3_muls( rb->to_world[2], -cosf(gzoomer.steer), gzoomer.steerv ); + v3_muladds( gzoomer.steerv, rb->to_world[0], sinf(gzoomer.steer), gzoomer.steerv ); /* apply air resistance */ v3f Fair, Fdown; - v3_muls( gzoomer.rb.v, -k_car_air_resistance, Fair ); - v3_muls( gzoomer.rb.up, -fabsf(v3_dot( gzoomer.rb.v, gzoomer.rb.forward )) * + v3_muls( rb->v, -k_car_air_resistance, Fair ); + v3_muls( rb->to_world[1], -fabsf(v3_dot( rb->v, rb->to_world[2] )) * k_car_downforce, Fdown ); - v3_muladds( gzoomer.rb.v, Fair, k_rb_delta, gzoomer.rb.v ); - v3_muladds( gzoomer.rb.v, Fdown, k_rb_delta, gzoomer.rb.v ); + v3_muladds( rb->v, Fair, k_rb_delta, rb->v ); + v3_muladds( rb->v, Fdown, k_rb_delta, rb->v ); for( int i=0; i<4; i++ ) vehicle_wheel_force( i ); rb_ct manifold[64]; - - int len = rb_sphere_scene( &gzoomer.rb, &world.rb_geo, manifold ); + int len = rb_sphere__scene( rb->to_world, &gzoomer.obj.inf.sphere, + NULL, &get_active_world()->rb_geo.inf.scene, + manifold ); + for( int j=0; jrb_geo.rb; + } rb_manifold_filter_coplanar( manifold, len, 0.05f ); - if( len > 1 ) - { + if( len > 1 ){ rb_manifold_filter_backface( manifold, len ); rb_manifold_filter_joint_edges( manifold, len, 0.05f ); rb_manifold_filter_pairs( manifold, len, 0.05f ); @@ -278,14 +282,13 @@ VG_STATIC void vehicle_update_fixed(void) len = rb_manifold_apply_filtered( manifold, len ); rb_presolve_contacts( manifold, len ); - for( int i=0; i<8; i++ ) - { + for( int i=0; i<8; i++ ){ rb_solve_contacts( manifold, len ); vehicle_solve_friction(); } - rb_iter( &gzoomer.rb ); - rb_update_transform( &gzoomer.rb ); + rb_iter( rb ); + rb_update_transform( rb ); } VG_STATIC void vehicle_update_post(void) @@ -293,14 +296,12 @@ VG_STATIC void vehicle_update_post(void) if( !gzoomer.alive ) return; - rb_debug( &gzoomer.rb, VG__WHITE ); - vg_line( player.rb.co, gzoomer.rb.co, VG__WHITE ); + rb_object_debug( &gzoomer.obj, VG__WHITE ); /* draw friction vectors */ v3f p0, px, py; - for( int i=0; i<4; i++ ) - { + for( int i=0; i<4; i++ ){ v3_copy( gzoomer.wheels[i], p0 ); v3_muladds( p0, gzoomer.tangent_vectors[i][0], 0.5f, px ); v3_muladds( p0, gzoomer.tangent_vectors[i][1], 0.5f, py ); @@ -310,23 +311,4 @@ VG_STATIC void vehicle_update_post(void) } } -VG_STATIC void vehicle_camera(void) -{ - float yaw = atan2f( gzoomer.rb.forward[0], -gzoomer.rb.forward[2] ), - pitch = atan2f - ( - -gzoomer.rb.forward[1], - sqrtf - ( - gzoomer.rb.forward[0]*gzoomer.rb.forward[0] + - gzoomer.rb.forward[2]*gzoomer.rb.forward[2] - ) - ); - - - main_camera.angles[0] = yaw; - main_camera.angles[1] = pitch; - v3_copy( gzoomer.rb.co, main_camera.pos ); -} - #endif /* VEHICLE_H */