diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp index 86ffa89c7d..f4911e07c9 100644 --- a/stepmania/src/Font.cpp +++ b/stepmania/src/Font.cpp @@ -131,7 +131,7 @@ void FontPage::SetTextureCoords( const vector &widths, int iAdvanceExtraPix ++g.m_fWidth; } - const float fTexCoordsToChopOff = iSourcePixelsToChopOff * m_pTexture->GetSourceToTexCoordsRatio(); + const float fTexCoordsToChopOff = iSourcePixelsToChopOff * m_pTexture->GetSourceToTexCoordsRatioX(); g.m_TexRect.left += fTexCoordsToChopOff/2; g.m_TexRect.right -= fTexCoordsToChopOff/2; @@ -166,8 +166,8 @@ void FontPage::SetExtraPixels( int iDrawExtraPixelsLeft, int iDrawExtraPixelsRig float fExtraRight = min( float(iDrawExtraPixelsRight), (iFrameWidth-fCharWidth)/2.0f ); /* Move left and expand right. */ - m_aGlyphs[i].m_TexRect.left -= fExtraLeft * m_pTexture->GetSourceToTexCoordsRatio(); - m_aGlyphs[i].m_TexRect.right += fExtraRight * m_pTexture->GetSourceToTexCoordsRatio(); + m_aGlyphs[i].m_TexRect.left -= fExtraLeft * m_pTexture->GetSourceToTexCoordsRatioX(); + m_aGlyphs[i].m_TexRect.right += fExtraRight * m_pTexture->GetSourceToTexCoordsRatioX(); m_aGlyphs[i].m_fHshift -= fExtraLeft; m_aGlyphs[i].m_fWidth += fExtraLeft + fExtraRight; } diff --git a/stepmania/src/RageTexture.h b/stepmania/src/RageTexture.h index 37822e74d7..3cadf82d60 100644 --- a/stepmania/src/RageTexture.h +++ b/stepmania/src/RageTexture.h @@ -42,9 +42,12 @@ public: int GetImageFrameHeight() const {return GetImageHeight() / GetFramesHigh();} /* Use these to convert between the different coordinate systems: */ - float GetSourceToImageCoordsRatio() const { return float(GetImageWidth()) / GetSourceWidth(); } - float GetImageToTexCoordsRatio() const { return 1.0f / GetTextureWidth(); } - float GetSourceToTexCoordsRatio() const { return GetSourceToImageCoordsRatio() * GetImageToTexCoordsRatio(); } + float GetSourceToImageCoordsRatioX() const { return float(GetImageWidth()) / GetSourceWidth(); } + float GetImageToTexCoordsRatioX() const { return 1.0f / GetTextureWidth(); } + float GetSourceToTexCoordsRatioX() const { return GetSourceToImageCoordsRatioX() * GetImageToTexCoordsRatioX(); } + float GetSourceToImageCoordsRatioY() const { return float(GetImageHeight()) / GetSourceHeight(); } + float GetImageToTexCoordsRatioY() const { return 1.0f / GetTextureHeight(); } + float GetSourceToTexCoordsRatioY() const { return GetSourceToImageCoordsRatioY() * GetImageToTexCoordsRatioY(); } const RectF *GetTextureCoordRect( int frameNo ) const; int GetNumFrames() const { return m_iFramesWide*m_iFramesHigh; }