projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grind phys
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index d3038915c0b09b6393c66c0f0dbcdf39bc18f2de..0edbbdd44493b66ca2f29808c65edf1dcc68b90f 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-2,6
+2,10
@@
* Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
*/
* Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
*/
+/*
+ * TODO: Tilt camera down to face borde when its behind you or out of vision
+ */
+
#ifndef PLAYER_H
#define PLAYER_H
#ifndef PLAYER_H
#define PLAYER_H
@@
-31,7
+35,7
@@
VG_STATIC float
k_steer_air = 3.6f,
k_steer_air_lerp = 0.3f,
k_pump_force = 0.0f,
k_steer_air = 3.6f,
k_steer_air_lerp = 0.3f,
k_pump_force = 0.0f,
- k_downforce =
5
.0f,
+ k_downforce =
8
.0f,
k_walk_downforce = 8.0f,
k_jump_charge_speed = (1.0f/1.0f),
k_jump_force = 5.0f,
k_walk_downforce = 8.0f,
k_jump_charge_speed = (1.0f/1.0f),
k_jump_force = 5.0f,
@@
-64,14
+68,15
@@
VG_STATIC struct gplayer
v3f a, v_last, m, bob, vl;
/* Utility */
v3f a, v_last, m, bob, vl;
/* Utility */
- float vswitch, slip, slip_last,
- reverse;
+ float vswitch, slip, slip_last, reverse;
float grab, jump, pushing, push_time;
v2f grab_mouse_delta;
float grab, jump, pushing, push_time;
v2f grab_mouse_delta;
+ int lift_frames;
+
double start_push;
double start_push;
- int in_air, on_board, jump_charge, jump_dir;
+ int in_air, on_board, jump_charge, jump_dir
, grind
;
m3x3f vr,vr_pstep;
}
m3x3f vr,vr_pstep;
}
@@
-138,7
+143,8
@@
VG_STATIC struct gplayer
walk_timer,
fjump,
fonboard,
walk_timer,
fjump,
fonboard,
- frun;
+ frun,
+ fgrind;
float walk;
int step_phase;
float walk;
int step_phase;
@@
-395,7
+401,7
@@
VG_STATIC void player_mouseview(void)
v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles );
v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles );
- if( vg
.gamepa
d_use_trackpad_look )
+ if( vg
_input.controller_shoul
d_use_trackpad_look )
{
static v2f last_input;
static v2f vel;
{
static v2f last_input;
static v2f vel;