OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- floatified the remaining parts of gl_walls.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-08 00:19:51 +02:00
commit eaf055dff4
6 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -327,17 +327,17 @@ const FHardwareTexture *FGLTexture::Bind(int texunit, int clampmode, int transla
//
//===========================================================================
fixed_t FTexCoordInfo::RowOffset(fixed_t rowoffset) const
float FTexCoordInfo::RowOffset(float rowoffset) const
{
if (mTempScaleY == FRACUNIT)
{
if (mScaleY==FRACUNIT || mWorldPanning) return rowoffset;
else return FixedDiv(rowoffset, mScaleY);
else return rowoffset * FIXED2FLOAT(mScaleY);
}
else
{
if (mWorldPanning) return FixedDiv(rowoffset, mTempScaleY);
else return FixedDiv(rowoffset, mScaleY);
if (mWorldPanning) return rowoffset * FIXED2FLOAT(mTempScaleY);
else return rowoffset * FIXED2FLOAT(mScaleY);
}
}
@ -347,17 +347,17 @@ fixed_t FTexCoordInfo::RowOffset(fixed_t rowoffset) const
//
//===========================================================================
fixed_t FTexCoordInfo::TextureOffset(fixed_t textureoffset) const
float FTexCoordInfo::TextureOffset(float textureoffset) const
{
if (mTempScaleX == FRACUNIT)
{
if (mScaleX==FRACUNIT || mWorldPanning) return textureoffset;
else return FixedDiv(textureoffset, mScaleX);
else return textureoffset * FIXED2FLOAT(mScaleX);
}
else
{
if (mWorldPanning) return FixedDiv(textureoffset, mTempScaleX);
else return FixedDiv(textureoffset, mScaleX);
if (mWorldPanning) return textureoffset * FIXED2FLOAT(mTempScaleX);
else return textureoffset * FIXED2FLOAT(mScaleX);
}
}