X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=d744d192d06db58c16097a3c2df53fdfaa3f1f2e;hb=76042e561d89b232f04cac8a431b5cd7b30a6b9d;hp=8e4ae82b99d0ff547c8aa61d874359d395e9b7e9;hpb=5b06975b35952497d771db4171c7454123edfea1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 8e4ae82..d744d19 100644 --- a/player.h +++ b/player.h @@ -1,11 +1,211 @@ +#ifndef PLAYER_H +#define PLAYER_H + +#include "player_api.h" + +#include "player_common.h" +#include "player_walk.h" +#include "player_skate.h" +//#include "player_dead.h" + +struct player_instance +{ + /* transform definition */ + rigidbody rb; + v3f angles; + + /* + * Camera management + * --------------------------- + */ + camera cam; /* output final camera */ + + enum camera_mode + { + k_cam_firstperson = 0, + k_cam_thirdperson = 1 + } + camera_mode; + float camera_type_blend; + +#if 0 + struct + { + v3f co, angles; + } + cam1, cam3; +#endif + +#if 0 + v3f follow_pos, + follow_angles, + follow_pos_target, + follow_angles_target, + override_pos, + override_angles, + fpv_pos, + fpv_angles, + fpv_offset, + fpv_offset_target; + + float cam_position_override_strength, + cam_angles_override_strength, + cam_land_punch, + cam_land_punch_v; +#endif + + v3f fpv_offset, /* expressed relative to rigidbody */ + tpv_offset, + fpv_viewpoint, /* expressed relative to neck bone inverse final */ + fpv_offset_smooth, + fpv_viewpoint_smooth, + tpv_offset_smooth, + tpv_lpf, + cam_velocity_smooth; + + float cam_velocity_influence, + cam_velocity_coefficient, + cam_velocity_constant, + cam_velocity_coefficient_smooth, + cam_velocity_constant_smooth, + cam_velocity_influence_smooth, + cam_land_punch, + cam_land_punch_v; + + teleport_gate *gate_waiting; + + /* + * Input + * -------------------------------- + */ + struct input_binding *input_js1h, + *input_js1v, + *input_js2h, + *input_js2v, + *input_jump, + *input_push, + *input_walk, + *input_walkh, + *input_walkv, + *input_use, + *input_reset, + *input_grab, + *input_camera; + + /* + * Animation + * -------------------------------------------------- + */ + + struct player_avatar *playeravatar; + glmesh *playermesh; + struct player_ragdoll ragdoll; + vg_tex2d *playertex; + + /* + * Subsystems + * ------------------------------------------------- + */ + + enum player_subsystem + { + k_player_subsystem_walk = 0, + k_player_subsystem_skate = 1, + k_player_subsystem_dead = 2 + } + subsystem; + + struct player_skate _skate; + struct player_walk _walk; + //struct player_dead _dead; +}; + /* - * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + * Gameloop tables + * --------------------------------------------------------- */ +VG_STATIC +void (*_player_bind[])( player_instance *player ) = +{ + player__walk_bind, + player__skate_bind, + NULL +}; + +VG_STATIC +void (*_player_reset[])( player_instance *player, struct respawn_point *rp ) = +{ + NULL, + player__skate_reset, + NULL +}; + +VG_STATIC +void (*_player_pre_update[])( player_instance *player ) = +{ + player__walk_pre_update, + player__skate_pre_update, + NULL +}; + +VG_STATIC +void( *_player_update[])( player_instance *player ) = +{ + player__walk_update, + player__skate_update, + NULL +}; + +VG_STATIC +void( *_player_post_update[])( player_instance *player ) = +{ + player__walk_post_update, + player__skate_post_update, + NULL +}; + +VG_STATIC +void( *_player_im_gui[])( player_instance *player ) = +{ + player__walk_im_gui, + player__skate_im_gui, + NULL +}; + +VG_STATIC +void( *_player_animate[])( player_instance *player, player_animation *dest ) = +{ + player__walk_animate, + player__skate_animate, + NULL +}; + +VG_STATIC +void( *_player_post_animate[])( player_instance *player ) = +{ + player__walk_post_animate, + player__skate_post_animate, + NULL +}; + +/* implementation */ + +#include "player.c" +#include "player_common.c" +#include "player_walk.c" +#include "player_skate.c" +//#include "player_dead.c" + +#endif /* PLAYER_H */ + + +#if 0 /* - * TODO: Tilt camera down to face borde when its behind you or out of vision + * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved */ +#define PLAYER_H #ifndef PLAYER_H #define PLAYER_H @@ -18,36 +218,6 @@ #include "skeleton.h" #include "bvh.h" -VG_STATIC float - k_walkspeed = 12.0f, - k_air_accelerate = 20.0f, - - k_runspeed = 20.0f, - k_board_radius = 0.3f, - k_board_length = 0.45f, - k_board_allowance = 0.04f, - //k_friction_lat = 8.8f, - k_friction_lat = 12.0f, - k_friction_resistance = 0.01f, - k_max_push_speed = 16.0f, - k_push_accel = 10.0f, - k_push_cycle_rate = 8.0f, - k_steer_ground = 2.5f, - k_steer_air = 3.6f, - k_steer_air_lerp = 0.3f, - k_pump_force = 0.0f, - k_downforce = 8.0f, - k_walk_downforce = 8.0f, - k_jump_charge_speed = (1.0f/1.0f), - k_jump_force = 5.0f, - k_pitch_limit = 1.5f, - k_look_speed = 2.0f, - k_walk_accel = 150.0f, - k_walk_friction = 8.0f; - -VG_STATIC int freecam = 0; -VG_STATIC int walk_grid_iterations = 1; -VG_STATIC float fc_speed = 10.0f; /* * ----------------------------------------------------------------------------- @@ -57,30 +227,20 @@ VG_STATIC float fc_speed = 10.0f; VG_STATIC struct gplayer { - /* Physics */ - rigidbody collide_front, collide_back; + rigidbody rb, rb_frame; + v3f co, angles; /* used as transfer between controllers */ - struct player_phys + enum player_controller { - rigidbody rb, rb_gate_frame; - float iY, siY; /* Yaw inertia */ - - v3f a, v_last, m, bob, vl; - - /* Utility */ - float vswitch, slip, slip_last, reverse; - float grab, jump, pushing, push_time, rise; - v2f grab_mouse_delta; - - int lift_frames; - - double start_push; - int in_air, on_board, jump_charge, jump_dir, grind; - - m3x3f vr,vr_pstep; + 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 } - phys, - phys_gate_frame; + controller, + controller_frame; m4x3f visual_transform, inv_visual_transform; @@ -88,25 +248,6 @@ VG_STATIC struct gplayer int is_dead, death_tick_allowance, rewinding; int rewind_sound_wait; - struct land_prediction - { - v3f log[50]; - v3f n; - u32 log_length; - float score; - - enum prediction_type - { - k_prediction_none, - k_prediction_land, - k_prediction_grind - } - type; - - u32 colour; - } - predictions[22]; - u32 prediction_count; v3f handl_target, handr_target, handl, handr; @@ -126,16 +267,13 @@ VG_STATIC struct gplayer *input_grab; /* Camera */ - float air_blend; float air_time; - v3f camera_pos, smooth_localcam; - v2f angles; struct rewind_frame { v3f pos; - v2f ang; + v3f ang; } *rewind_buffer; u32 rewind_incrementer, @@ -160,6 +298,9 @@ VG_STATIC struct gplayer frun, fgrind; + v3f board_offset; + v4f board_rotation; + float walk; int step_phase; enum mdl_surface_prop surface_prop; @@ -186,33 +327,53 @@ VG_STATIC struct gplayer id_ik_hand_r, id_ik_elbow_l, id_ik_elbow_r, - id_head; + id_head, + id_ik_foot_l, + id_ik_foot_r, + id_board; v3f cam_pos; struct ragdoll_part { u32 bone_id; - v3f offset; + //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 = +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 @@ -230,19 +391,32 @@ VG_STATIC void player_save_rewind_frame(void); 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 */ { +#if 0 player.input_js1h = vg_create_named_input( "steer-h", k_input_type_axis ); player.input_js1v = vg_create_named_input( "steer-v", k_input_type_axis ); player.input_grab = vg_create_named_input( "grab", k_input_type_axis_norm ); @@ -302,73 +476,65 @@ VG_STATIC void player_init(void) /* 1 */ for( int i=0; icog, 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; @@ -507,10 +683,10 @@ VG_STATIC void player_update_pre(void) player.death_tick_allowance = 30; player_restore_frame(); - if( !phys->on_board ) + if( player.controller == k_player_controller_walk ) { - player.angles[0] = atan2f( -phys->rb.forward[2], - -phys->rb.forward[0] ); + player.angles[0] = atan2f( -player.rb.forward[2], + -player.rb.forward[0] ); } player.mdl.shoes[0] = 1; @@ -539,23 +715,28 @@ VG_STATIC void player_update_pre(void) if( vg_input_button_down( player.input_switch_mode ) && !menu_enabled() ) { - phys->on_board ^= 0x1; - audio_lock(); - if( phys->on_board ) + +#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 + 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( !phys->on_board ) + if( player.controller == k_player_controller_walk ) player_mouseview(); } @@ -567,8 +748,6 @@ VG_STATIC void player_update_fixed(void) /* 2 */ if( player.death_tick_allowance ) player.death_tick_allowance --; - struct player_phys *phys = &player.phys; - if( player.is_dead ) { player_ragdoll_iter(); @@ -588,6 +767,7 @@ VG_STATIC void player_update_fixed(void) /* 2 */ VG_STATIC void player_update_post(void) { +#if 0 for( int i=0; ilog[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(); @@ -614,16 +796,23 @@ VG_STATIC void player_update_post(void) player_animate(); if( !freecam ) - player_animate_camera(); + { + 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 ) @@ -738,6 +927,7 @@ VG_STATIC void player_update_post(void) v3_lerp( override_pos, player.camera_pos, c, main_camera.pos ); } } +#endif camera_update_transform( &main_camera ); player_audio(); @@ -763,6 +953,123 @@ VG_STATIC void draw_player( camera *cam ) 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 @@ -771,7 +1078,7 @@ VG_STATIC void draw_player( camera *cam ) VG_STATIC float *player_get_pos(void) { - return player.phys.rb.co; + return player.rb.co; } VG_STATIC void player_kill(void) @@ -779,7 +1086,7 @@ VG_STATIC void player_kill(void) if( player.death_tick_allowance == 0 ) { player.is_dead = 1; - player_ragdoll_copy_model( player.phys.rb.v ); + player_ragdoll_copy_model( player.rb.v ); } } @@ -789,4 +1096,19 @@ VG_STATIC float *player_cam_pos(void) } +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