From 013d3e236849d591757e6921e0eda191e820caf2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 14 Dec 2018 22:34:28 +0100 Subject: [PATCH] - code simplification. --- src/textures/texture.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp index bd2b87054..304be17d5 100644 --- a/src/textures/texture.cpp +++ b/src/textures/texture.cpp @@ -1566,19 +1566,9 @@ CCMD (printspans) float FTexCoordInfo::RowOffset(float rowoffset) const { - float tscale = fabs(mTempScale.Y); float scale = fabs(mScale.Y); - - if (tscale == 1.f) - { - if (scale == 1.f || mWorldPanning) return rowoffset; - else return rowoffset / scale; - } - else - { - if (mWorldPanning) return rowoffset; - else return rowoffset / scale; - } + if (scale == 1.f || mWorldPanning) return rowoffset; + else return rowoffset / scale; } //=========================================================================== @@ -1589,18 +1579,9 @@ float FTexCoordInfo::RowOffset(float rowoffset) const float FTexCoordInfo::TextureOffset(float textureoffset) const { - float tscale = fabs(mTempScale.X); float scale = fabs(mScale.X); - if (tscale == 1.f) - { - if (scale == 1.f || mWorldPanning) return textureoffset; - else return textureoffset / scale; - } - else - { - if (mWorldPanning) return textureoffset; - else return textureoffset / scale; - } + if (scale == 1.f || mWorldPanning) return textureoffset; + else return textureoffset / scale; } //===========================================================================