libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2024-11-30 11:40:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: pass physents into Cam_Track

Browse Source 
Need the physents stack so we can properly test visiblity when trying
to place the camera.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-03-21 14:58:37 +10:30
parent 503fc4ae8d
commit c3a4ac3a34
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
QW/client/cl_cam.c
View File

@ -130,16 +130,19 @@ Cam_Lock(int playernum)
Sbar_Changed();
}
static void
Cam_DoTrace(const vec3_t start, const vec3_t end, trace_t *trace)
static inline void
Cam_DoTrace(const vec3_t start, const vec3_t end,
const physent_stack_t *pestack, trace_t *trace)
{
PM_PlayerMove(start, end, &pestack, trace);
/* Fake a player move */
PM_PlayerMove(start, end, pestack, trace);
}
// Returns distance or 9999 if invalid for some reason
static float
Cam_TryFlyby(const player_state_t *self, const player_state_t *player,
const vec3_t viewvec, qboolean checkvis)
const vec3_t viewvec, const physent_stack_t *pestack,
qboolean checkvis)
{
vec3_t viewnormal, endpos, camvec;
vec_t dist;
@ -150,8 +153,7 @@ Cam_TryFlyby(const player_state_t *self, const player_state_t *player,
VectorNormalize(viewnormal);
VectorMA(player->origin, 800, viewnormal, endpos);
/* fake a player move */
Cam_DoTrace(player->origin, endpos, &trace);
Cam_DoTrace(player->origin, endpos, pestack, &trace);
if ( /*trace.inopen || */ trace.inwater)
return 9999;
@ -162,7 +164,7 @@ Cam_TryFlyby(const player_state_t *self, const player_state_t *player,
if (checkvis) {
VectorSubtract(trace.endpos, self->origin, endpos);
Cam_DoTrace(self->origin, endpos, &trace);
Cam_DoTrace(self->origin, endpos, pestack, &trace);
if (trace.fraction != 1 || trace.inwater)
return 9999;
}
@ -172,13 +174,14 @@ Cam_TryFlyby(const player_state_t *self, const player_state_t *player,
// Is player visible?
static qboolean
Cam_IsVisible(const player_state_t *player, const vec3_t viewpoint)
Cam_IsVisible(const player_state_t *player, const vec3_t viewpoint,
const physent_stack_t *pestack)
{
trace_t trace;
vec3_t viewvec;
float dist;
Cam_DoTrace(player->origin, viewpoint, &trace);
Cam_DoTrace(player->origin, viewpoint, pestack, &trace);
if (trace.fraction != 1 || /*trace.inopen || */ trace.inwater)
return false;
@ -193,7 +196,7 @@ Cam_IsVisible(const player_state_t *player, const vec3_t viewpoint)
static qboolean
InitFlyby(const player_state_t *self, const player_state_t *player,
int checkvis)
const physent_stack_t *pestack, int checkvis)
{
int i;
float flydist, max;
@ -210,7 +213,7 @@ InitFlyby(const player_state_t *self, const player_state_t *player,
for (i = 0; i < 8; i++) {
VectorAdd(forward, up, vec2);
VectorAdd(vec2, right, vec2);
flydist = Cam_TryFlyby(self, player, vec2, checkvis);
flydist = Cam_TryFlyby(self, player, vec2, pestack, checkvis);
if (flydist < max) {
max = flydist;
VectorCopy(vec2, vec);
@ -219,13 +222,13 @@ InitFlyby(const player_state_t *self, const player_state_t *player,
/* invert */
VectorSubtract(vec3_origin, forward, vec2);
flydist = Cam_TryFlyby(self, player, vec2, checkvis);
flydist = Cam_TryFlyby(self, player, vec2, pestack, checkvis);
if (flydist < max) {
max = flydist;
VectorCopy(vec2, vec);
}
VectorCopy(forward, vec2);
flydist = Cam_TryFlyby(self, player, vec2, checkvis);
flydist = Cam_TryFlyby(self, player, vec2, pestack, checkvis);
if (flydist < max) {
max = flydist;
VectorCopy(vec2, vec);
@ -233,13 +236,13 @@ InitFlyby(const player_state_t *self, const player_state_t *player,
/* invert */
VectorSubtract(vec3_origin, right, vec2);
flydist = Cam_TryFlyby(self, player, vec2, checkvis);
flydist = Cam_TryFlyby(self, player, vec2, pestack, checkvis);
if (flydist < max) {
max = flydist;
VectorCopy(vec2, vec);
}
VectorCopy(right, vec2);
flydist = Cam_TryFlyby(self, player, vec2, checkvis);
flydist = Cam_TryFlyby(self, player, vec2, pestack, checkvis);
if (flydist < max) {
max = flydist;
VectorCopy(vec2, vec);
@ -281,7 +284,7 @@ Cam_CheckHighTarget(void)
* We find a nice position to watch the player and move there
*/
void
Cam_Track(usercmd_t *cmd)
Cam_Track(usercmd_t *cmd, const physent_stack_t *pestack)
{
player_state_t *player, *self;
frame_t *frame;
@ -311,10 +314,10 @@ Cam_Track(usercmd_t *cmd)
player = frame->playerstate + spec_track;
self = frame->playerstate + cl.playernum;
if (!locked || !Cam_IsVisible(player, desired_position)) {
if (!locked || !Cam_IsVisible(player, desired_position, pestack)) {
if (!locked || realtime - cam_lastviewtime > 0.1) {
if (!InitFlyby(self, player, true))
InitFlyby(self, player, false);
if (!InitFlyby(self, player, pestack, true))
InitFlyby(self, player, pestack, false);
cam_lastviewtime = realtime;
}
} else

2
QW/client/cl_input.c
View File

@ -594,7 +594,7 @@ CL_SendCmd(void)
// if we are spectator, try autocam
if (cl.spectator)
Cam_Track(cmd);
Cam_Track(cmd, &pestack);
CL_FinishMove(cmd);

2
QW/client/client.h
View File

@ -485,7 +485,7 @@ extern int spec_track; // player# of who we are tracking
qboolean Cam_DrawViewModel(void);
qboolean Cam_DrawPlayer(int playernum);
void Cam_Track(usercmd_t *cmd);
void Cam_Track(usercmd_t *cmd, const physent_stack_t *pestack);
void Cam_FinishMove(usercmd_t *cmd);
void Cam_Reset(void);
void CL_InitCam(void);