|
|
|
@ -2119,58 +2119,52 @@ pfnCalcShake
@@ -2119,58 +2119,52 @@ pfnCalcShake
|
|
|
|
|
*/ |
|
|
|
|
void GAME_EXPORT pfnCalcShake( void ) |
|
|
|
|
{ |
|
|
|
|
screen_shake_t *const shake = &clgame.shake; |
|
|
|
|
float frametime, fraction, freq; |
|
|
|
|
int i; |
|
|
|
|
float fraction, freq; |
|
|
|
|
float localAmp; |
|
|
|
|
|
|
|
|
|
if( clgame.shake.time == 0 ) |
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
if(( cl.time > clgame.shake.time ) || clgame.shake.amplitude <= 0 || clgame.shake.frequency <= 0 ) |
|
|
|
|
if( cl.time > shake->time || shake->amplitude <= 0 || shake->frequency <= 0 || shake->duration <= 0 ) |
|
|
|
|
{ |
|
|
|
|
memset( &clgame.shake, 0, sizeof( clgame.shake )); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if( cl.time > clgame.shake.next_shake ) |
|
|
|
|
// reset shake
|
|
|
|
|
if( shake->time != 0 ) |
|
|
|
|
{ |
|
|
|
|
// higher frequency means we recalc the extents more often and perturb the display again
|
|
|
|
|
clgame.shake.next_shake = cl.time + ( 1.0f / clgame.shake.frequency ); |
|
|
|
|
shake->time = 0; |
|
|
|
|
shake->applied_angle = 0; |
|
|
|
|
VectorClear( shake->applied_offset ); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// compute random shake extents (the shake will settle down from this)
|
|
|
|
|
for( i = 0; i < 3; i++ ) |
|
|
|
|
clgame.shake.offset[i] = COM_RandomFloat( -clgame.shake.amplitude, clgame.shake.amplitude ); |
|
|
|
|
clgame.shake.angle = COM_RandomFloat( -clgame.shake.amplitude * 0.25f, clgame.shake.amplitude * 0.25f ); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ramp down amplitude over duration (fraction goes from 1 to 0 linearly with slope 1/duration)
|
|
|
|
|
fraction = ( clgame.shake.time - cl.time ) / clgame.shake.duration; |
|
|
|
|
frametime = cl_clientframetime(); |
|
|
|
|
|
|
|
|
|
// ramp up frequency over duration
|
|
|
|
|
if( fraction ) |
|
|
|
|
if( cl.time > shake->next_shake ) |
|
|
|
|
{ |
|
|
|
|
freq = ( clgame.shake.frequency / fraction ); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
freq = 0; |
|
|
|
|
// get next shake time based on frequency over duration
|
|
|
|
|
shake->next_shake = (float)cl.time + shake->frequency / shake->duration; |
|
|
|
|
|
|
|
|
|
// randomize each shake
|
|
|
|
|
for( i = 0; i < 3; i++ ) |
|
|
|
|
shake->offset[i] = COM_RandomFloat( -shake->amplitude, shake->amplitude ); |
|
|
|
|
shake->angle = COM_RandomFloat( -shake->amplitude * 0.25f, shake->amplitude * 0.25f ); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// square fraction to approach zero more quickly
|
|
|
|
|
fraction *= fraction; |
|
|
|
|
// get initial fraction and frequency values over the duration
|
|
|
|
|
fraction = ((float)cl.time - shake->time ) / shake->duration; |
|
|
|
|
freq = fraction != 0.0f ? ( shake->frequency / fraction ) * shake->frequency : 0.0f; |
|
|
|
|
|
|
|
|
|
// Sine wave that slowly settles to zero
|
|
|
|
|
fraction = fraction * sin( cl.time * freq ); |
|
|
|
|
// quickly approach zero but apply time over sine wave
|
|
|
|
|
fraction *= fraction * sin( cl.time * freq ); |
|
|
|
|
|
|
|
|
|
// add to view origin
|
|
|
|
|
VectorScale( clgame.shake.offset, fraction, clgame.shake.applied_offset ); |
|
|
|
|
// apply shake offset
|
|
|
|
|
for( i = 0; i < 3; i++ ) |
|
|
|
|
shake->applied_offset[i] = shake->offset[i] * fraction; |
|
|
|
|
|
|
|
|
|
// add to roll
|
|
|
|
|
clgame.shake.applied_angle = clgame.shake.angle * fraction; |
|
|
|
|
// apply roll angle
|
|
|
|
|
shake->applied_angle = shake->angle * fraction; |
|
|
|
|
|
|
|
|
|
// drop amplitude a bit, less for higher frequency shakes
|
|
|
|
|
localAmp = clgame.shake.amplitude * ( host.frametime / ( clgame.shake.duration * clgame.shake.frequency )); |
|
|
|
|
clgame.shake.amplitude -= localAmp; |
|
|
|
|
// decrease amplitude, but slower on longer shakes or higher frequency
|
|
|
|
|
shake->amplitude -= shake->amplitude * ( frametime / ( shake->frequency * shake->duration )); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
@ -2181,8 +2175,11 @@ pfnApplyShake
@@ -2181,8 +2175,11 @@ pfnApplyShake
|
|
|
|
|
*/ |
|
|
|
|
void GAME_EXPORT pfnApplyShake( float *origin, float *angles, float factor ) |
|
|
|
|
{ |
|
|
|
|
if( origin ) VectorMA( origin, factor, clgame.shake.applied_offset, origin ); |
|
|
|
|
if( angles ) angles[ROLL] += clgame.shake.applied_angle * factor; |
|
|
|
|
if( origin ) |
|
|
|
|
VectorMA( origin, factor, clgame.shake.applied_offset, origin ); |
|
|
|
|
|
|
|
|
|
if( angles ) |
|
|
|
|
angles[ROLL] += clgame.shake.applied_angle * factor; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|