FGFS-4.1/flightgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新 '3rdparty/fonts/fntTXF.cxx'

Browse Source
This commit is contained in:
zhongjin 2022-11-21 21:05:02 +08:00
parent b3706f80e0
commit c5a811c728
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/fonts/fntTXF.cxx vendored
View File

@ -157,7 +157,6 @@ int fntTexFont::loadTXF ( const SGPath& path, GLenum mag, GLenum min )
//zhongjin //zhongjin
SG_LOG(SG_GUI,SG_ALERT, "-----------------------------------------------------------"); SG_LOG(SG_GUI,SG_ALERT, "-----------------------------------------------------------");
SG_LOG(SG_GUI,SG_ALERT, "loadTXF " << ps); SG_LOG(SG_GUI,SG_ALERT, "loadTXF " << ps);
SG_LOG(SG_GUI,SG_ALERT, "-----------------------------------------------------------");
#if defined(SG_WINDOWS) #if defined(SG_WINDOWS)
@ -210,6 +209,9 @@ int fntTexFont::loadTXF ( const SGPath& path, GLenum mag, GLenum min )
float xstep = 0.5f / (float) w ; float xstep = 0.5f / (float) w ;
float ystep = 0.5f / (float) h ; float ystep = 0.5f / (float) h ;
//zhongjin
SG_LOG(SG_GUI,SG_ALERT, "num_glyphs=" << num_glyphs);
int i, j ; int i, j ;
/* /*
@ -231,6 +233,9 @@ int fntTexFont::loadTXF ( const SGPath& path, GLenum mag, GLenum min )
glyph . x = _fnt_readShort () ; glyph . x = _fnt_readShort () ;
glyph . y = _fnt_readShort () ; glyph . y = _fnt_readShort () ;
//zhongjin
SG_LOG(SG_GUI,SG_ALERT, "ch=" << glyph.ch);
setGlyph ( (char) glyph.ch, setGlyph ( (char) glyph.ch,
(float) glyph.step / (float) max_height, (float) glyph.step / (float) max_height,
(float) glyph.x / (float) w + xstep, (float) glyph.x / (float) w + xstep,