OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Initial groundwork for QF_SCALEDOWN.

Browse source
This commit is contained in:
MajorCooke 2015-02-19 21:42:32 -06:00
commit 045ab9fd5b
4 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/r_utility.cpp
View file

@ -770,16 +770,23 @@ bool R_GetViewInterpolationStatus()
//
//==========================================================================
static fixed_t QuakePower(fixed_t factor, int intensity)
static fixed_t QuakePower(fixed_t factor, int intensity, int scaleDown, int scaleDownStart, int scaleUp)
{
//if (!scaledown) scaledown = 1;
//if (!scaleup) scaleup = 1;
//double sd = (scaledown / ((!scaledownstart) ? 1 : scaledownstart));
if (intensity == 0)
{
return 0;
}
else
else if (!scaleDownStart)
{
return factor * ((pr_torchflicker() % (intensity << 2)) - (intensity << 1));
}
else
{
return (factor * ((pr_torchflicker() % (intensity << 2)) - (intensity << 1)) * ((scaleDown / scaleDownStart) >> 3));
}
}
//==========================================================================
@ -892,40 +899,40 @@ void R_SetupFrame (AActor *actor)
if (!paused)
{
int intensityX, intensityY, intensityZ, relIntensityX, relIntensityY, relIntensityZ;
int intensityX, intensityY, intensityZ, relIntensityX, relIntensityY, relIntensityZ, scaleDown, scaleDownStart, scaleUp;
if (DEarthquake::StaticGetQuakeIntensities(camera,
intensityX, intensityY, intensityZ,
relIntensityX, relIntensityY, relIntensityZ) > 0)
relIntensityX, relIntensityY, relIntensityZ, scaleDown, scaleDownStart, scaleUp) > 0)
{
fixed_t quakefactor = FLOAT2FIXED(r_quakeintensity);
if (relIntensityX != 0)
{
int ang = (camera->angle) >> ANGLETOFINESHIFT;
fixed_t power = QuakePower(quakefactor, relIntensityX);
fixed_t power = QuakePower(quakefactor, relIntensityX, scaleDown, scaleDownStart, scaleUp);
viewx += FixedMul(finecosine[ang], power);
viewy += FixedMul(finesine[ang], power);
}
if (relIntensityY != 0)
{
int ang = (camera->angle + ANG90) >> ANGLETOFINESHIFT;
fixed_t power = QuakePower(quakefactor, relIntensityY);
fixed_t power = QuakePower(quakefactor, relIntensityY, scaleDown, scaleDownStart, scaleUp);
viewx += FixedMul(finecosine[ang], power);
viewy += FixedMul(finesine[ang], power);
}
if (intensityX != 0)
{
viewx += QuakePower(quakefactor, intensityX);
viewx += QuakePower(quakefactor, intensityX, scaleDown, scaleDownStart, scaleUp);
}
if (intensityY != 0)
{
viewy += QuakePower(quakefactor, intensityY);
viewy += QuakePower(quakefactor, intensityY, scaleDown, scaleDownStart, scaleUp);
}
// FIXME: Relative Z is not relative
intensityZ = MAX(intensityZ, relIntensityZ);
if (intensityZ != 0)
{
viewz += QuakePower(quakefactor, intensityZ);
viewz += QuakePower(quakefactor, intensityZ, scaleDown, scaleDownStart, scaleUp);
}
}
}