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

Further work on new 3D text support

Browse Source
This commit is contained in:
Robert Osfield
2010-09-06 15:43:59 +00:00
parent 32db4d6a98
commit a6abbb545e
10 changed files with 109 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgText/Font.cpp
View File

@@ -342,6 +342,8 @@ osg::Texture::FilterMode Font::getMagFilterHint() const
Glyph* Font::getGlyph(const FontResolution& fontRes, unsigned int charcode)
{
OSG_NOTICE<<"Font::getGlyph("<<charcode<<")"<<std::endl;
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);
FontSizeGlyphMap::iterator itr = _sizeGlyphMap.find(fontRes);
@@ -364,6 +366,8 @@ Glyph* Font::getGlyph(const FontResolution& fontRes, unsigned int charcode)
Glyph3D* Font::getGlyph3D(unsigned int charcode)
{
OSG_NOTICE<<"Font::getGlyph3D("<<charcode<<")"<<std::endl;
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);
Glyph3DMap::iterator itr = _glyph3DMap.find(charcode);

4
src/osgText/Text3D.cpp
View File

@@ -102,7 +102,7 @@ void Text3D::accept(osg::PrimitiveFunctor& pf) const
}
}
void Text3D::setFont(osg::ref_ptr<Font3D> font)
void Text3D::setFont(Font* font)
{
_font = font;
@@ -111,7 +111,7 @@ void Text3D::setFont(osg::ref_ptr<Font3D> font)
void Text3D::setFont(const std::string & fontfile)
{
setFont(readRefFont3DFile(fontfile));
setFont(readRefFontFile(fontfile));
}
String::iterator Text3D::computeLastCharacterOnLine(osg::Vec2& cursor, String::iterator first,String::iterator last)