zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 21:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Interpolations were deleted too early.

Browse source 
They were immediately deleted when the associated thinker was destroyed. But this was too early because it missed the final tic of movement, resulting in a visible jump when a moving platform with a player on it came to a halt.
Changed it so that DelRef no longer destroys the interpolation itself. Instead the ::Interpolate method will check if the reference count is 0, and if so and there was no more movement, will then destroy the interpolation.
This ensures that it keeps running until it has interpolated all remaining bits of movement induced by the thinker.

Now moving up a lift is 100% smooth, even with movement interpolation on.
This commit is contained in:
Christoph Oelckers 2016-01-21 11:58:44 +01:00
parent d347415aee
commit cf2ee1eb3f
2 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/r_data/r_interpolate.cpp
View file

@ -344,10 +344,6 @@ int DInterpolation::AddRef()
int DInterpolation::DelRef() int DInterpolation::DelRef()
{ {
if (refcount > 0) --refcount; if (refcount > 0) --refcount;
if (refcount <= 0 && !(ObjectFlags & OF_EuthanizeMe))
{
Destroy();
}
return refcount; return refcount;
} }
@ -496,9 +492,16 @@ void DSectorPlaneInterpolation::Interpolate(fixed_t smoothratio)
bakheight = *pheight; bakheight = *pheight;
baktexz = sector->GetPlaneTexZ(pos); baktexz = sector->GetPlaneTexZ(pos);
*pheight = oldheight + FixedMul(bakheight - oldheight, smoothratio); if (refcount == 0 && oldheight == bakheight)
sector->SetPlaneTexZ(pos, oldtexz + FixedMul(baktexz - oldtexz, smoothratio)); {
P_RecalculateAttached3DFloors(sector); Destroy();
}
else
{
*pheight = oldheight + FixedMul(bakheight - oldheight, smoothratio);
sector->SetPlaneTexZ(pos, oldtexz + FixedMul(baktexz - oldtexz, smoothratio));
P_RecalculateAttached3DFloors(sector);
}
} }
//========================================================================== //==========================================================================
@ -622,8 +625,15 @@ void DSectorScrollInterpolation::Interpolate(fixed_t smoothratio)
bakx = sector->GetXOffset(ceiling); bakx = sector->GetXOffset(ceiling);
baky = sector->GetYOffset(ceiling, false); baky = sector->GetYOffset(ceiling, false);
sector->SetXOffset(ceiling, oldx + FixedMul(bakx - oldx, smoothratio)); if (refcount == 0 && oldx == bakx && oldy == baky)
sector->SetYOffset(ceiling, oldy + FixedMul(baky - oldy, smoothratio)); {
Destroy();
}
else
{
sector->SetXOffset(ceiling, oldx + FixedMul(bakx - oldx, smoothratio));
sector->SetYOffset(ceiling, oldy + FixedMul(baky - oldy, smoothratio));
}
} }
//========================================================================== //==========================================================================
@ -706,8 +716,15 @@ void DWallScrollInterpolation::Interpolate(fixed_t smoothratio)
bakx = side->GetTextureXOffset(part); bakx = side->GetTextureXOffset(part);
baky = side->GetTextureYOffset(part); baky = side->GetTextureYOffset(part);
side->SetTextureXOffset(part, oldx + FixedMul(bakx - oldx, smoothratio)); if (refcount == 0 && oldx == bakx && oldy == baky)
side->SetTextureYOffset(part, oldy + FixedMul(baky - oldy, smoothratio)); {
Destroy();
}
else
{
side->SetTextureXOffset(part, oldx + FixedMul(bakx - oldx, smoothratio));
side->SetTextureYOffset(part, oldy + FixedMul(baky - oldy, smoothratio));
}
} }
//========================================================================== //==========================================================================
@ -798,6 +815,7 @@ void DPolyobjInterpolation::Restore()
void DPolyobjInterpolation::Interpolate(fixed_t smoothratio) void DPolyobjInterpolation::Interpolate(fixed_t smoothratio)
{ {
bool changed = false;
for(unsigned int i = 0; i < poly->Vertices.Size(); i++) for(unsigned int i = 0; i < poly->Vertices.Size(); i++)
{ {
fixed_t *px = &poly->Vertices[i]->x; fixed_t *px = &poly->Vertices[i]->x;
@ -806,15 +824,26 @@ void DPolyobjInterpolation::Interpolate(fixed_t smoothratio)
bakverts[i*2 ] = *px; bakverts[i*2 ] = *px;
bakverts[i*2+1] = *py; bakverts[i*2+1] = *py;
*px = oldverts[i*2 ] + FixedMul(bakverts[i*2 ] - oldverts[i*2 ], smoothratio); if (bakverts[i * 2] != oldverts[i * 2] || bakverts[i * 2 + i] != oldverts[i * 2 + 1])
*py = oldverts[i*2+1] + FixedMul(bakverts[i*2+1] - oldverts[i*2+1], smoothratio); {
changed = true;
*px = oldverts[i * 2] + FixedMul(bakverts[i * 2] - oldverts[i * 2], smoothratio);
*py = oldverts[i * 2 + 1] + FixedMul(bakverts[i * 2 + 1] - oldverts[i * 2 + 1], smoothratio);
}
} }
bakcx = poly->CenterSpot.x; if (refcount == 0 && !changed)
bakcy = poly->CenterSpot.y; {
poly->CenterSpot.x = bakcx + FixedMul(bakcx - oldcx, smoothratio); Destroy();
poly->CenterSpot.y = bakcy + FixedMul(bakcy - oldcy, smoothratio); }
else
{
bakcx = poly->CenterSpot.x;
bakcy = poly->CenterSpot.y;
poly->CenterSpot.x = bakcx + FixedMul(bakcx - oldcx, smoothratio);
poly->CenterSpot.y = bakcy + FixedMul(bakcy - oldcy, smoothratio);
poly->ClearSubsectorLinks(); poly->ClearSubsectorLinks();
}
} }
//========================================================================== //==========================================================================

3
src/r_data/r_interpolate.h
View file

@ -17,9 +17,10 @@ class DInterpolation : public DObject
TObjPtr<DInterpolation> Next; TObjPtr<DInterpolation> Next;
TObjPtr<DInterpolation> Prev; TObjPtr<DInterpolation> Prev;
int refcount;
protected: protected:
int refcount;
DInterpolation(); DInterpolation();
public: public: