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