zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed FraggleScript's moving camera. 

The logic here was a bit more complicated than I assumed but it was all buried in a heap of code that tried to deal with angular wraparounds in the BAM format.
This commit is contained in:
Christoph Oelckers 2018-08-13 20:47:56 +02:00
parent c33f358894
commit 57ed4df85e
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/fragglescript/t_func.cpp
View File

@ -2885,44 +2885,62 @@ void FParser::SF_MoveCamera(void)
} }
double targetheight = floatvalue(t_argv[2]); double targetheight = floatvalue(t_argv[2]);
double movespeed = floatvalue(t_argv[3]);
DVector3 campos = cam->Pos(); DVector3 campos = cam->Pos();
DVector3 targpos = DVector3(target->Pos(), targetheight); DVector3 targpos = DVector3(target->Pos(), targetheight);
DVector3 movement = targpos - campos;
double movelen = movement.Length();
bool finishedmove = false;
bool finishedangle = false;
cam->radius = 1 / 8192.;
cam->Height = 1 / 8192.;
if (campos != targpos) if (campos != targpos)
{ {
DVector3 movement = targpos - campos;
double movelen = movement.Length();
double movespeed = floatvalue(t_argv[3]);
DVector3 movepos; DVector3 movepos;
bool finished = (movespeed >= movelen); finishedmove = (movespeed >= movelen);
if (finished) movepos = targpos; if (finishedmove) movepos = targpos;
else movepos = campos + movement.Resized(movespeed); else movepos = campos + movement.Resized(movespeed);
cam->SetOrigin(movepos, true);
}
DAngle targetangle = floatvalue(t_argv[4]); DAngle targetangle = DAngle(floatvalue(t_argv[4])).Normalized360();
if (cam->Angles.Yaw != targetangle)
{
DAngle anglespeed = floatvalue(t_argv[5]); DAngle anglespeed = floatvalue(t_argv[5]);
DAngle anglenow = targetangle;
const DAngle diffangle = deltaangle(cam->Angles.Yaw, targetangle);
if (movespeed > 0 && anglespeed == 0.) if (movespeed > 0 && anglespeed == 0.)
{ {
if (!finished) if (!finishedmove)
{ {
const DAngle diffangle = targetangle - cam->Angles.Yaw; anglenow = cam->Angles.Yaw + diffangle * movespeed / movelen;
targetangle = cam->Angles.Yaw + diffangle * movespeed / movelen;
} }
else finishedangle = true;
} }
else else
{ {
targetangle = cam->Angles.Yaw + anglespeed; if (diffangle > 0)
{
anglenow = (cam->Angles.Yaw + anglespeed).Normalized360();
}
else
{
anglenow = (cam->Angles.Yaw - anglespeed).Normalized360();
}
const DAngle diffangle2 = deltaangle(anglenow, targetangle);
if (diffangle.Degrees * diffangle2.Degrees <= 0)
{
anglenow = targetangle;
finishedangle = true;
}
} }
cam->SetAngle(anglenow, false);
cam->radius = 1 / 8192.;
cam->Height = 1 / 8192.;
cam->SetOrigin(movepos, true);
cam->SetAngle(targetangle, false);
t_return.value.i = 1;
}
else
{
t_return.value.i = 0;
} }
t_return.value.i = !(finishedmove & finishedangle);
t_return.type = svt_int; t_return.type = svt_int;
} }
} }