Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene
graph containing text. Fixed warning in MD2 plugin.
This commit is contained in:
@@ -119,6 +119,8 @@ osgText::Font::Glyph* FreeTypeFont::getGlyph(unsigned int charcode)
|
||||
glyph->setVerticalAdvance((float)metrics->vertAdvance/64.0f);
|
||||
|
||||
addGlyph(_facade->getWidth(),_facade->getHeight(),charcode,glyph.get());
|
||||
|
||||
// cout << " in getGlyph() implementation="<<this<<" "<<_filename<<" facade="<<_facade<<endl;
|
||||
|
||||
return glyph.get();
|
||||
|
||||
|
||||
@@ -296,7 +296,7 @@ load_md2 (const char *filename)
|
||||
for (int curFrame = 0; curFrame < md2_header->numFrames; curFrame++) {
|
||||
// std::cerr << "Num vertices " << md2_header->numVertices << std::endl;
|
||||
|
||||
long *command = (long *) ((unsigned char *) mapbase + md2_header->offsetGlCommands);
|
||||
//long *command = (long *) ((unsigned char *) mapbase + md2_header->offsetGlCommands);
|
||||
|
||||
MD2_FRAME *frame = (MD2_FRAME *) ((unsigned char *) mapbase + md2_header->offsetFrames + (md2_header->frameSize * curFrame));
|
||||
MD2_VERTEX *frame_vertices = frame->vertices;
|
||||
|
||||
Reference in New Issue
Block a user