zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into Glew_Version_For_Real

Browse source
This commit is contained in:
Christoph Oelckers 2014-07-28 19:56:17 +02:00
commit 183d0ba82a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/r_data/r_interpolate.cpp
View file

@ -451,12 +451,12 @@ void DSectorPlaneInterpolation::Restore()
if (!ceiling) if (!ceiling)
{ {
sector->floorplane.d = bakheight; sector->floorplane.d = bakheight;
sector->SetPlaneTexZ(sector_t::floor, baktexz); sector->SetPlaneTexZ(sector_t::floor, baktexz, true);
} }
else else
{ {
sector->ceilingplane.d = bakheight; sector->ceilingplane.d = bakheight;
sector->SetPlaneTexZ(sector_t::ceiling, baktexz); sector->SetPlaneTexZ(sector_t::ceiling, baktexz, true);
} }
P_RecalculateAttached3DFloors(sector); P_RecalculateAttached3DFloors(sector);
} }
@ -487,7 +487,7 @@ void DSectorPlaneInterpolation::Interpolate(fixed_t smoothratio)
baktexz = sector->GetPlaneTexZ(pos); baktexz = sector->GetPlaneTexZ(pos);
*pheight = oldheight + FixedMul(bakheight - oldheight, smoothratio); *pheight = oldheight + FixedMul(bakheight - oldheight, smoothratio);
sector->SetPlaneTexZ(pos, oldtexz + FixedMul(baktexz - oldtexz, smoothratio)); sector->SetPlaneTexZ(pos, oldtexz + FixedMul(baktexz - oldtexz, smoothratio), true);
P_RecalculateAttached3DFloors(sector); P_RecalculateAttached3DFloors(sector);
} }

4
src/r_defs.h
View file

@ -649,10 +649,10 @@ struct sector_t
for (unsigned i = 0; i < e->XFloor.attached.Size(); i++) e->XFloor.attached[i]->SetVerticesDirty(); for (unsigned i = 0; i < e->XFloor.attached.Size(); i++) e->XFloor.attached[i]->SetVerticesDirty();
} }
void SetPlaneTexZ(int pos, fixed_t val) void SetPlaneTexZ(int pos, fixed_t val, bool dirtify = false) // This mainly gets used by init code. The only place where it must set the vertex to dirty is the interpolation code.
{ {
planes[pos].TexZ = val; planes[pos].TexZ = val;
SetAllVerticesDirty(); if (dirtify) SetAllVerticesDirty();
} }
void ChangePlaneTexZ(int pos, fixed_t val) void ChangePlaneTexZ(int pos, fixed_t val)