zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 22:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of c:\programming\doom-dev\zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-23 13:40:19 +02:00
commit bf36900299
5 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/am_map.cpp
View file

@ -1930,16 +1930,16 @@ void AM_drawSubsectors()
// For lighting and texture determination // For lighting and texture determination
sector_t *sec = Renderer->FakeFlat(subsectors[i].render_sector, &tempsec, &floorlight, &ceilinglight, false); sector_t *sec = Renderer->FakeFlat(subsectors[i].render_sector, &tempsec, &floorlight, &ceilinglight, false);
// Find texture origin. // Find texture origin.
originpt.x = -sec->GetXOffsetF(sector_t::floor); originpt.x = -sec->GetXOffset(sector_t::floor);
originpt.y = sec->GetYOffsetF(sector_t::floor); originpt.y = sec->GetYOffset(sector_t::floor);
rotation = -sec->GetAngleF(sector_t::floor); rotation = -sec->GetAngle(sector_t::floor);
// Coloring for the polygon // Coloring for the polygon
colormap = sec->ColorMap; colormap = sec->ColorMap;
FTextureID maptex = sec->GetTexture(sector_t::floor); FTextureID maptex = sec->GetTexture(sector_t::floor);
scalex = sec->GetXScaleF(sector_t::floor); scalex = sec->GetXScale(sector_t::floor);
scaley = sec->GetYScaleF(sector_t::floor); scaley = sec->GetYScale(sector_t::floor);
if (sec->e->XFloor.ffloors.Size()) if (sec->e->XFloor.ffloors.Size())
{ {
@ -1988,11 +1988,11 @@ void AM_drawSubsectors()
floorplane = rover->top.plane; floorplane = rover->top.plane;
sector_t *model = rover->top.model; sector_t *model = rover->top.model;
int selector = (rover->flags & FF_INVERTPLANES) ? sector_t::floor : sector_t::ceiling; int selector = (rover->flags & FF_INVERTPLANES) ? sector_t::floor : sector_t::ceiling;
rotation = -model->GetAngleF(selector); rotation = -model->GetAngle(selector);
scalex = model->GetXScaleF(selector); scalex = model->GetXScale(selector);
scaley = model->GetYScaleF(selector); scaley = model->GetYScale(selector);
originpt.x = -model->GetXOffsetF(selector); originpt.x = -model->GetXOffset(selector);
originpt.y = model->GetYOffsetF(selector); originpt.y = model->GetYOffset(selector);
break; break;
} }
} }

12
src/p_buildmap.cpp
View file

@ -447,29 +447,29 @@ static void LoadSectors (sectortype *bsec)
if (bsec->floorstat & 4) if (bsec->floorstat & 4)
{ {
sec->SetAngle(sector_t::floor, DAngle(90.)); sec->SetAngle(sector_t::floor, DAngle(90.));
sec->SetXScale(sector_t::floor, -sec->GetXScaleF(sector_t::floor)); sec->SetXScale(sector_t::floor, -sec->GetXScale(sector_t::floor));
} }
if (bsec->floorstat & 16) if (bsec->floorstat & 16)
{ {
sec->SetXScale(sector_t::floor, -sec->GetXScaleF(sector_t::floor)); sec->SetXScale(sector_t::floor, -sec->GetXScale(sector_t::floor));
} }
if (bsec->floorstat & 32) if (bsec->floorstat & 32)
{ {
sec->SetYScale(sector_t::floor, -sec->GetYScaleF(sector_t::floor)); sec->SetYScale(sector_t::floor, -sec->GetYScale(sector_t::floor));
} }
if (bsec->ceilingstat & 4) if (bsec->ceilingstat & 4)
{ {
sec->SetAngle(sector_t::ceiling, DAngle(90.)); sec->SetAngle(sector_t::ceiling, DAngle(90.));
sec->SetYScale(sector_t::ceiling, -sec->GetYScaleF(sector_t::ceiling)); sec->SetYScale(sector_t::ceiling, -sec->GetYScale(sector_t::ceiling));
} }
if (bsec->ceilingstat & 16) if (bsec->ceilingstat & 16)
{ {
sec->SetXScale(sector_t::ceiling, -sec->GetXScaleF(sector_t::ceiling)); sec->SetXScale(sector_t::ceiling, -sec->GetXScale(sector_t::ceiling));
} }
if (bsec->ceilingstat & 32) if (bsec->ceilingstat & 32)
{ {
sec->SetYScale(sector_t::ceiling, -sec->GetYScaleF(sector_t::ceiling)); sec->SetYScale(sector_t::ceiling, -sec->GetYScale(sector_t::ceiling));
} }
} }
} }

2
src/p_scroll.cpp
View file

@ -139,7 +139,7 @@ void DScroller::Serialize (FArchive &arc)
static void RotationComp(const sector_t *sec, int which, double dx, double dy, double &tdx, double &tdy) static void RotationComp(const sector_t *sec, int which, double dx, double dy, double &tdx, double &tdy)
{ {
DAngle an = sec->GetAngleF(which); DAngle an = sec->GetAngle(which);
if (an == 0) if (an == 0)
{ {
tdx = dx; tdx = dx;

8
src/r_data/r_interpolate.cpp
View file

@ -604,8 +604,8 @@ void DSectorScrollInterpolation::Destroy()
void DSectorScrollInterpolation::UpdateInterpolation() void DSectorScrollInterpolation::UpdateInterpolation()
{ {
oldx = sector->GetXOffsetF(ceiling); oldx = sector->GetXOffset(ceiling);
oldy = sector->GetYOffsetF(ceiling, false); oldy = sector->GetYOffset(ceiling, false);
} }
//========================================================================== //==========================================================================
@ -628,8 +628,8 @@ void DSectorScrollInterpolation::Restore()
void DSectorScrollInterpolation::Interpolate(double smoothratio) void DSectorScrollInterpolation::Interpolate(double smoothratio)
{ {
bakx = sector->GetXOffsetF(ceiling); bakx = sector->GetXOffset(ceiling);
baky = sector->GetYOffsetF(ceiling, false); baky = sector->GetYOffset(ceiling, false);
if (refcount == 0 && oldx == bakx && oldy == baky) if (refcount == 0 && oldx == bakx && oldy == baky)
{ {

10
src/r_defs.h
View file

@ -707,7 +707,7 @@ public:
planes[pos].xform.xOffs += o; planes[pos].xform.xOffs += o;
} }
double GetXOffsetF(int pos) const double GetXOffset(int pos) const
{ {
return planes[pos].xform.xOffs; return planes[pos].xform.xOffs;
} }
@ -722,7 +722,7 @@ public:
planes[pos].xform.yOffs += o; planes[pos].xform.yOffs += o;
} }
double GetYOffsetF(int pos, bool addbase = true) const double GetYOffset(int pos, bool addbase = true) const
{ {
if (!addbase) if (!addbase)
{ {
@ -739,7 +739,7 @@ public:
planes[pos].xform.xScale = o; planes[pos].xform.xScale = o;
} }
double GetXScaleF(int pos) const double GetXScale(int pos) const
{ {
return planes[pos].xform.xScale; return planes[pos].xform.xScale;
} }
@ -749,7 +749,7 @@ public:
planes[pos].xform.yScale = o; planes[pos].xform.yScale = o;
} }
double GetYScaleF(int pos) const double GetYScale(int pos) const
{ {
return planes[pos].xform.yScale; return planes[pos].xform.yScale;
} }
@ -759,7 +759,7 @@ public:
planes[pos].xform.Angle = o; planes[pos].xform.Angle = o;
} }
DAngle GetAngleF(int pos, bool addbase = true) const DAngle GetAngle(int pos, bool addbase = true) const
{ {
if (!addbase) if (!addbase)
{ {