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

From Stephan Huber, attached is a fix for the bug of present3D not loading fonts across http. I pass SlideShowConstructor's options-object to readFontFile when constructing any text-objects so freetype can pick up the font-data from the curl-plugin. It works fine now on my end.

Browse Source
This commit is contained in:
Robert Osfield
2012-12-07 10:19:05 +00:00
parent 363633a81d
commit aa3634979a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -472,7 +472,7 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
osg::Vec3 localPosition = computePositionInModelCoords(_titlePositionData);
osgText::Text* text = new osgText::Text;
text->setFont(_titleFontData.font);
text->setFont(osgText::readFontFile(_titleFontData.font, _options));
text->setColor(_titleFontData.color);
text->setCharacterSize(_titleFontData.characterSize*_slideHeight);
text->setFontResolution(110,120);
@@ -691,7 +691,7 @@ void SlideShowConstructor::addBullet(const std::string& bullet, PositionData& po
osg::Vec3 localPosition = computePositionInModelCoords(positionData);
text->setFont(fontData.font);
text->setFont(osgText::readFontFile(fontData.font, _options));
text->setColor(fontData.color);
text->setCharacterSize(fontData.characterSize*_slideHeight);
text->setCharacterSizeMode(fontData.characterSizeMode);
@@ -739,7 +739,7 @@ void SlideShowConstructor::addParagraph(const std::string& paragraph, PositionDa
osgText::Text* text = new osgText::Text;
text->setFont(fontData.font);
text->setFont(osgText::readFontFile(fontData.font, _options));
text->setColor(fontData.color);
text->setCharacterSize(fontData.characterSize*_slideHeight);
text->setCharacterSizeMode(fontData.characterSizeMode);