actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

split GetSourceToImageCoordsRatio(), GetSourceWidth(), GetTextureWidth()

Browse Source 
into more correct X, Y versions
This commit is contained in:
Glenn Maynard
2007-02-08 21:35:43 +00:00
parent ff420be0eb
commit 71b70c4cba
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Font.cpp
+3 -3
View File
@@ -131,7 +131,7 @@ void FontPage::SetTextureCoords( const vector<int> &widths, int iAdvanceExtraPix
++g.m_fWidth; ++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.left += fTexCoordsToChopOff/2;
g.m_TexRect.right -= 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 ); float fExtraRight = min( float(iDrawExtraPixelsRight), (iFrameWidth-fCharWidth)/2.0f );
/* Move left and expand right. */ /* Move left and expand right. */
m_aGlyphs[i].m_TexRect.left -= fExtraLeft * m_pTexture->GetSourceToTexCoordsRatio(); m_aGlyphs[i].m_TexRect.left -= fExtraLeft * m_pTexture->GetSourceToTexCoordsRatioX();
m_aGlyphs[i].m_TexRect.right += fExtraRight * m_pTexture->GetSourceToTexCoordsRatio(); m_aGlyphs[i].m_TexRect.right += fExtraRight * m_pTexture->GetSourceToTexCoordsRatioX();
m_aGlyphs[i].m_fHshift -= fExtraLeft; m_aGlyphs[i].m_fHshift -= fExtraLeft;
m_aGlyphs[i].m_fWidth += fExtraLeft + fExtraRight; m_aGlyphs[i].m_fWidth += fExtraLeft + fExtraRight;
} }
stepmania/src/RageTexture.h
+6 -3
View File
@@ -42,9 +42,12 @@ public:
int GetImageFrameHeight() const {return GetImageHeight() / GetFramesHigh();} int GetImageFrameHeight() const {return GetImageHeight() / GetFramesHigh();}
/* Use these to convert between the different coordinate systems: */ /* Use these to convert between the different coordinate systems: */
float GetSourceToImageCoordsRatio() const { return float(GetImageWidth()) / GetSourceWidth(); } float GetSourceToImageCoordsRatioX() const { return float(GetImageWidth()) / GetSourceWidth(); }
float GetImageToTexCoordsRatio() const { return 1.0f / GetTextureWidth(); } float GetImageToTexCoordsRatioX() const { return 1.0f / GetTextureWidth(); }
float GetSourceToTexCoordsRatio() const { return GetSourceToImageCoordsRatio() * GetImageToTexCoordsRatio(); } 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; const RectF *GetTextureCoordRect( int frameNo ) const;
int GetNumFrames() const { return m_iFramesWide*m_iFramesHigh; } int GetNumFrames() const { return m_iFramesWide*m_iFramesHigh; }