OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed QF_SCALEUP until I can figure out a proper way to implement it.

Browse source
This commit is contained in:
MajorCooke 2015-02-20 01:33:30 -06:00
commit 9c5d90e4cb
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/r_utility.cpp
View file

@ -770,21 +770,26 @@ bool R_GetViewInterpolationStatus()
//
//==========================================================================
static double QuakePower(double factor, int intensity, double scaleDown, double scaleDownStart, double scaleUp)
static double QuakePower(double factor, int intensity, double scaleDown, double scaleDownStart)
{
double ss = (double)((pr_torchflicker() % (intensity << 2)) - (intensity << 1));
if (intensity == 0)
{
return 0;
}
else if (!scaleDownStart)
{
return factor * ss;
}
else
{
return ((factor * ss) * ((scaleDown / scaleDownStart) / 256.0f));
double ss = (double)((pr_torchflicker() % (intensity << 2)) - (intensity << 1));
if (scaleDownStart == 0)
{
return factor * ss;
}
else
{
return ((factor * ss) * ((scaleDown / scaleDownStart)));
}
}
}
//==========================================================================
@ -898,41 +903,41 @@ void R_SetupFrame (AActor *actor)
if (!paused)
{
int intensityX, intensityY, intensityZ, relIntensityX, relIntensityY, relIntensityZ;
double scaleDown, scaleDownStart, scaleUp;
double scaleDown, scaleDownStart;
//double sdown = (double)scaleDown; double sdownstart = (double)scaleDownStart;
if (DEarthquake::StaticGetQuakeIntensities(camera,
intensityX, intensityY, intensityZ,
relIntensityX, relIntensityY, relIntensityZ, scaleDown, scaleDownStart, scaleUp) > 0)
relIntensityX, relIntensityY, relIntensityZ, scaleDown, scaleDownStart) > 0)
{
double quakefactor = r_quakeintensity;
if (relIntensityX != 0)
{
int ang = (camera->angle) >> ANGLETOFINESHIFT;
fixed_t power = FLOAT2FIXED(QuakePower(quakefactor, relIntensityX, scaleDown, scaleDownStart, scaleUp));
fixed_t power = FLOAT2FIXED(QuakePower(quakefactor, relIntensityX, scaleDown, scaleDownStart));
viewx += FixedMul(finecosine[ang], power);
viewy += FixedMul(finesine[ang], power);
}
if (relIntensityY != 0)
{
int ang = (camera->angle + ANG90) >> ANGLETOFINESHIFT;
fixed_t power = FLOAT2FIXED(QuakePower(quakefactor, relIntensityY, scaleDown, scaleDownStart, scaleUp));
fixed_t power = FLOAT2FIXED(QuakePower(quakefactor, relIntensityY, scaleDown, scaleDownStart));
viewx += FixedMul(finecosine[ang], power);
viewy += FixedMul(finesine[ang], power);
}
if (intensityX != 0)
{
viewx += FLOAT2FIXED(QuakePower(quakefactor, intensityX, scaleDown, scaleDownStart, scaleUp));
viewx += FLOAT2FIXED(QuakePower(quakefactor, intensityX, scaleDown, scaleDownStart));
}
if (intensityY != 0)
{
viewy += FLOAT2FIXED(QuakePower(quakefactor, intensityY, scaleDown, scaleDownStart, scaleUp));
viewy += FLOAT2FIXED(QuakePower(quakefactor, intensityY, scaleDown, scaleDownStart));
}
// FIXME: Relative Z is not relative
intensityZ = MAX(intensityZ, relIntensityZ);
if (intensityZ != 0)
{
viewz += FLOAT2FIXED(QuakePower(quakefactor, intensityZ, scaleDown, scaleDownStart, scaleUp));
viewz += FLOAT2FIXED(QuakePower(quakefactor, intensityZ, scaleDown, scaleDownStart));
}
}
}