OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added A_QuakeEx(intensity x, y, z, duration, damrad, tremrad, sound, flags)

Browse source 
- Unlocks the full potential of using quakes, including the Z axis. Each intensity applies to X/Y/Z planes whenever a player is experiencing it.
- Flags:
- QF_RELATIVE - Adjusts the quaking of the camera to go in the direction its aiming (X: forward/backward. Y: Left/right.)
- Plans for including pitch will be implemented in the future for the Z axis with relativity.
This commit is contained in:
MajorCooke 2015-02-14 15:58:39 -06:00
commit 7050d03222
7 changed files with 143 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/r_utility.cpp
View file

@ -875,13 +875,37 @@ void R_SetupFrame (AActor *actor)
if (!paused)
{
int intensity = DEarthquake::StaticGetQuakeIntensity (camera);
if (intensity != 0)
int intensityX = DEarthquake::StaticGetQuakeIntensity(camera, 0);
int intensityY = DEarthquake::StaticGetQuakeIntensity(camera, 1);
int intensityZ = DEarthquake::StaticGetQuakeIntensity(camera, 2);
int quakeflags = DEarthquake::StaticGetQuakeFlags(camera);
if (intensityX || intensityY || intensityZ)
{
fixed_t quakefactor = FLOAT2FIXED(r_quakeintensity);
viewx += quakefactor * ((pr_torchflicker() % (intensity<<2)) - (intensity<<1));
viewy += quakefactor * ((pr_torchflicker() % (intensity<<2)) - (intensity<<1));
if ((quakeflags & QF_RELATIVE) && (intensityX != intensityY))
{
if (intensityX)
{
int ang = (camera->angle) >> ANGLETOFINESHIFT;
int tflicker = pr_torchflicker();
viewx += FixedMul(finecosine[ang], (quakefactor * ((tflicker % (intensityX << 2)) - (intensityX << 1))));
viewy += FixedMul(finesine[ang], (quakefactor * ((tflicker % (intensityX << 2)) - (intensityX << 1))));
}
if (intensityY)
{
int ang = (camera->angle + ANG90) >> ANGLETOFINESHIFT;
int tflicker = pr_torchflicker();
viewx += FixedMul(finecosine[ang], (quakefactor * ((tflicker % (intensityY << 2)) - (intensityY << 1))));
viewy += FixedMul(finesine[ang], (quakefactor * ((tflicker % (intensityY << 2)) - (intensityY << 1))));
}
}
else
{
if (intensityX) viewx += quakefactor * ((pr_torchflicker() % (intensityX << 2)) - (intensityX << 1));
if (intensityY) viewy += quakefactor * ((pr_torchflicker() % (intensityY << 2)) - (intensityY << 1));
}
if (intensityZ) viewz += quakefactor * ((pr_torchflicker() % (intensityZ << 2)) - (intensityZ << 1));
}
}