OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added rollIntensity and rollWave to A_QuakeEx.

Browse source 
- Instead of moving the camera around, it rolls the camera.
- This only has an effect in GZDoom.
This commit is contained in:
MajorCooke 2016-04-25 09:56:01 -05:00 • committed by Christoph Oelckers
commit c972caa9f3
9 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/r_utility.cpp
View file

@ -799,6 +799,7 @@ void R_SetupFrame (AActor *actor)
P_AimCamera (camera, campos, camangle, viewsector, unlinked); // fixme: This needs to translate the angle, too.
iview->New.Pos = campos;
iview->New.Angles.Yaw = camangle;
r_showviewer = true;
// Interpolating this is a very complicated thing because nothing keeps track of the aim camera's movement, so whenever we detect a portal transition
// it's probably best to just reset the interpolation for this move.
@ -868,6 +869,10 @@ void R_SetupFrame (AActor *actor)
double quakefactor = r_quakeintensity;
DAngle an;
if (jiggers.RollIntensity != 0 || jiggers.RollWave != 0)
{
camera->Angles.CamRoll = camera->Angles.Roll + QuakePower(quakefactor, jiggers.RollIntensity, jiggers.RollWave, jiggers.Falloff, jiggers.WFalloff);
}
if (jiggers.RelIntensity.X != 0 || jiggers.RelOffset.X != 0)
{
an = camera->Angles.Yaw;
@ -898,6 +903,10 @@ void R_SetupFrame (AActor *actor)
ViewPos.Z += QuakePower(quakefactor, jiggers.Intensity.Z, jiggers.Offset.Z, jiggers.Falloff, jiggers.WFalloff);
}
}
else
{
camera->Angles.CamRoll = camera->Angles.Roll;
}
}
extralight = camera->player ? camera->player->extralight : 0;