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

From Andreas Henne, Support for GL3 core profile in osgText

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14717 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-25 18:56:29 +00:00
parent 7d50c8e634
commit 47db2da8b4
10 changed files with 282 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgQt/QFontImplementation.cpp
View File

@@ -90,12 +90,12 @@ QFontImplementation::getGlyph(const osgText::FontResolution& fontRes, unsigned i
// the glyph texture in osg
glyph->setImage(imageWidth, imageHeight, 1,
GL_ALPHA,
GL_ALPHA, GL_UNSIGNED_BYTE,
OSGTEXT_GLYPH_INTERNALFORMAT,
OSGTEXT_GLYPH_FORMAT, GL_UNSIGNED_BYTE,
data,
osg::Image::USE_NEW_DELETE,
1);
glyph->setInternalTextureFormat(GL_ALPHA);
glyph->setInternalTextureFormat(OSGTEXT_GLYPH_INTERNALFORMAT);
glyph->setWidth((float)imageWidth * coord_scale);
glyph->setHeight((float)imageHeight * coord_scale);