OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt

Browse source 
# Conflicts:
#	src/r_utility.h
This commit is contained in:
Christoph Oelckers 2016-03-31 09:24:41 +02:00
commit a5c4e2dab3
25 changed files with 377 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/r_data/r_interpolate.cpp
View file

@ -494,8 +494,8 @@ void DSectorPlaneInterpolation::Interpolate(double smoothratio)
pos = sector_t::ceiling;
}
bakheight = pplane->fixD();
baktexz = sector->GetPlaneTexZ(pos);
bakheight = pplane->fD();
baktexz = sector->GetPlaneTexZF(pos);
if (refcount == 0 && oldheight == bakheight)
{
@ -628,8 +628,8 @@ void DSectorScrollInterpolation::Restore()
void DSectorScrollInterpolation::Interpolate(double smoothratio)
{
bakx = sector->GetXOffset(ceiling);
baky = sector->GetYOffset(ceiling, false);
bakx = sector->GetXOffsetF(ceiling);
baky = sector->GetYOffsetF(ceiling, false);
if (refcount == 0 && oldx == bakx && oldy == baky)
{
@ -719,8 +719,8 @@ void DWallScrollInterpolation::Restore()
void DWallScrollInterpolation::Interpolate(double smoothratio)
{
bakx = side->GetTextureXOffset(part);
baky = side->GetTextureYOffset(part);
bakx = side->GetTextureXOffsetF(part);
baky = side->GetTextureYOffsetF(part);
if (refcount == 0 && oldx == bakx && oldy == baky)
{
@ -791,8 +791,8 @@ void DPolyobjInterpolation::UpdateInterpolation()
oldverts[i*2 ] = poly->Vertices[i]->fX();
oldverts[i*2+1] = poly->Vertices[i]->fY();
}
oldcx = poly->CenterSpot.x;
oldcy = poly->CenterSpot.y;
oldcx = poly->CenterSpot.pos.X;
oldcy = poly->CenterSpot.pos.Y;
}
//==========================================================================
@ -807,8 +807,8 @@ void DPolyobjInterpolation::Restore()
{
poly->Vertices[i]->set(bakverts[i*2 ], bakverts[i*2+1]);
}
poly->CenterSpot.x = bakcx;
poly->CenterSpot.y = bakcy;
poly->CenterSpot.pos.X = bakcx;
poly->CenterSpot.pos.Y = bakcy;
poly->ClearSubsectorLinks();
}
@ -823,8 +823,8 @@ void DPolyobjInterpolation::Interpolate(double smoothratio)
bool changed = false;
for(unsigned int i = 0; i < poly->Vertices.Size(); i++)
{
bakverts[i*2 ] = poly->Vertices[i]->fixX();
bakverts[i*2+1] = poly->Vertices[i]->fixY();
bakverts[i*2 ] = poly->Vertices[i]->fX();
bakverts[i*2+1] = poly->Vertices[i]->fY();
if (bakverts[i * 2] != oldverts[i * 2] || bakverts[i * 2 + 1] != oldverts[i * 2 + 1])
{
@ -840,10 +840,10 @@ void DPolyobjInterpolation::Interpolate(double smoothratio)
}
else
{
bakcx = poly->CenterSpot.x;
bakcy = poly->CenterSpot.y;
poly->CenterSpot.x = bakcx + (bakcx - oldcx) * smoothratio;
poly->CenterSpot.y = bakcy + (bakcy - oldcy) * smoothratio;
bakcx = poly->CenterSpot.pos.X;
bakcy = poly->CenterSpot.pos.Y;
poly->CenterSpot.pos.X = bakcx + (bakcx - oldcx) * smoothratio;
poly->CenterSpot.pos.Y = bakcy + (bakcy - oldcy) * smoothratio;
poly->ClearSubsectorLinks();
}