zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-05 07:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- cleaned out some unnecessary inlines.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 12:19:06 +02:00
parent e1ceab240b
commit 209867e036
9 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/coreactor.h
View file

@ -128,11 +128,7 @@ public:
spr.angle = spr.angle.Normalized360();
}
// Same as above but with invertex y and z axes to match the renderer's coordinate system.
DVector3 render_pos() const
{
return { spr.pos.X, -spr.pos.Y, -spr.pos.Z };
}
// Same as above but with inverted y and z axes to match the renderer's coordinate system.
double interpolatedx(double const smoothratio, int const scale = 16)
{

8
source/core/maptypes.h
View file

@ -260,8 +260,6 @@ struct sectortype
int int_ceilingz() const { return ceilingz * zworldtoint; }
int int_floorz() const { return floorz * zworldtoint; }
float render_ceilingz() const { return (float)-ceilingz; }
float render_floorz() const { return (float)-floorz; }
// panning byte fields were promoted to full floats to enable panning interpolation.
@ -509,12 +507,6 @@ struct spritetypebase
{
angle += DAngle::fromBuild(a);
}
void copy_ang(const spritetypebase* other)
{
angle = other->angle;
}
};

2
source/core/rendering/scene/hw_portal.cpp
View file

@ -670,7 +670,7 @@ bool HWLineToSpritePortal::Setup(HWDrawInfo* di, FRenderState& rstate, Clipper*
di->mClipPortal = this;
auto srccenter = (WallStart(origin) + WallEnd(origin)) / 2;
DVector2 destcenter = camera->render_pos().XY();
DVector2 destcenter = { camera->spr.pos.X, -camera->spr.pos.Y };
DVector2 npos = vp.Pos - srccenter + destcenter;
double origx = vp.Pos.X;

4
source/core/rendering/scene/hw_walls.cpp
View file

@ -1219,7 +1219,7 @@ void HWWall::ProcessWallSprite(HWDrawInfo* di, tspritetype* spr, sectortype* sec
if (!(sector->ceilingstat & CSTAT_SECTOR_SKY))
{
float polyh = (ztop[0] - zbottom[0]);
float ceilingz = sector->render_ceilingz();
float ceilingz = -sector->ceilingz;
if (ceilingz < ztop[0] && ceilingz >= zbottom[0])
{
float newv = (ceilingz - zbottom[0]) / polyh;
@ -1230,7 +1230,7 @@ void HWWall::ProcessWallSprite(HWDrawInfo* di, tspritetype* spr, sectortype* sec
if (!(sector->floorstat & CSTAT_SECTOR_SKY))
{
float polyh = (ztop[0] - zbottom[0]);
float floorz = sector->render_floorz();
float floorz = -sector->floorz;
if (floorz <= ztop[0] && floorz > zbottom[0])
{
float newv = (floorz - zbottom[0]) / polyh;

6
source/games/blood/src/animatesprite.cpp
View file

@ -101,7 +101,7 @@ tspritetype* viewInsertTSprite(tspriteArray& tsprites, sectortype* pSector, int
{
pos = parentTSprite->pos;
pTSprite->ownerActor = parentTSprite->ownerActor;
pTSprite->copy_ang(parentTSprite);
pTSprite->angle = parentTSprite->angle;
}
pos.X += gCameraAng.Cos() * 2;
pos.Y += gCameraAng.Sin() * 2;
@ -451,7 +451,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->cstat |= CSTAT_SPRITE_ONE_SIDE | CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_YFLIP | CSTAT_SPRITE_TRANSLUCENT;
pNSprite->copy_ang(pTSprite);
pNSprite->angle = pTSprite->angle;
pNSprite->ownerActor = pTSprite->ownerActor;
break;
}
@ -469,7 +469,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = nShade;
pNSprite->cstat |= CSTAT_SPRITE_ONE_SIDE | CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_TRANSLUCENT;
pNSprite->copy_ang(pTSprite);
pNSprite->angle = pTSprite->angle;
pNSprite->ownerActor = pTSprite->ownerActor;
break;
}

2
source/games/duke/src/actors.cpp
View file

@ -1795,7 +1795,7 @@ void ooz(DDukeActor *actor)
{
getglobalz(actor);
int j = (actor->actor_int_floorz() - actor->actor_int_ceilingz()) >> 9;
int j = int(actor->floorz - actor->ceilingz) >> 1;
if (j > 255) j = 255;
int x = 25 - (j >> 1);

4
source/games/duke/src/render.cpp
View file

@ -354,8 +354,8 @@ void displayrooms(int snum, double smoothratio, bool sceneonly)
}
}
cz = p->GetActor()->actor_int_ceilingz();
fz = p->GetActor()->actor_int_floorz();
cz = int(p->GetActor()->ceilingz * zworldtoint);
fz = int(p->GetActor()->floorz * zworldtoint);
if (earthquaketime > 0 && p->on_ground == 1)
{

11
source/games/duke/src/types.h
View file

@ -121,17 +121,6 @@ public:
void Serialize(FSerializer& arc) override;
int actor_int_ceilingz() const
{
return ceilingz * zworldtoint;
}
int actor_int_floorz() const
{
return floorz * zworldtoint;
}
void ChangeType(PClass* newtype)
{
if (newtype->IsDescendantOf(RUNTIME_CLASS(DDukeActor)) && newtype->Size == RUNTIME_CLASS(DDukeActor)->Size && GetClass()->Size == RUNTIME_CLASS(DDukeActor)->Size)

2
source/games/exhumed/src/sequence.cpp
View file

@ -587,7 +587,7 @@ int seq_PlotSequence(int nSprite, int16_t edx, int16_t nFrame, int16_t ecx)
tsp->pal = pTSprite->pal;
tsp->xrepeat = pTSprite->xrepeat;
tsp->yrepeat = pTSprite->yrepeat;
tsp->copy_ang(pTSprite);
tsp->angle = pTSprite->angle;
tsp->ownerActor = pTSprite->ownerActor;
tsp->sectp = pTSprite->sectp;
tsp->cstat = pTSprite->cstat |= CSTAT_SPRITE_YCENTER;