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

- fixed multiplication/division mixup in TextureAdjustWidth.

Browse source 
- fixed: For top textures an incorrect ceiling height was passed to DoTexture.
This commit is contained in:
Christoph Oelckers 2016-04-13 23:09:45 +02:00
parent bac3f1ee9b
commit caf80e74c4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/scene/gl_walls.cpp
View file

@ -1503,7 +1503,7 @@ void GLWall::Process(seg_t *seg, sector_t * frontsector, sector_t * backsector)
if (gltexture) if (gltexture)
{ {
DoTexture(RENDERWALL_TOP, seg, (seg->linedef->flags & (ML_DONTPEGTOP)) == 0, DoTexture(RENDERWALL_TOP, seg, (seg->linedef->flags & (ML_DONTPEGTOP)) == 0,
frefz, realback->GetPlaneTexZF(sector_t::ceiling), crefz, realback->GetPlaneTexZF(sector_t::ceiling),
fch1, fch2, bch1a, bch2a, 0); fch1, fch2, bch1a, bch2a, 0);
} }
else if (!(seg->sidedef->Flags & WALLF_POLYOBJ)) else if (!(seg->sidedef->Flags & WALLF_POLYOBJ))
@ -1516,7 +1516,7 @@ void GLWall::Process(seg_t *seg, sector_t * frontsector, sector_t * backsector)
if (gltexture) if (gltexture)
{ {
DoTexture(RENDERWALL_TOP, seg, (seg->linedef->flags & (ML_DONTPEGTOP)) == 0, DoTexture(RENDERWALL_TOP, seg, (seg->linedef->flags & (ML_DONTPEGTOP)) == 0,
frefz, realback->GetPlaneTexZF(sector_t::ceiling), crefz, realback->GetPlaneTexZF(sector_t::ceiling),
fch1, fch2, bch1a, bch2a, 0); fch1, fch2, bch1a, bch2a, 0);
} }
} }

2
src/gl/textures/gl_material.cpp
View file

@ -372,7 +372,7 @@ float FTexCoordInfo::TextureAdjustWidth() const
if (mWorldPanning) if (mWorldPanning)
{ {
if (mTempScale.X == 1.f) return mRenderWidth; if (mTempScale.X == 1.f) return mRenderWidth;
else return mWidth * mTempScale.X; else return mWidth / mTempScale.X;
} }
else return mWidth; else return mWidth;
} }