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

Improvements to the handling of multiple graphics contexts. Still needs alot

Browse Source 
of work, but at least it isn't crashes in trivial cases right now.
This commit is contained in:
Robert Osfield
2003-01-20 20:28:28 +00:00
parent 6e778f2436
commit 4de63e72c6
4 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgText/Text.cpp
View File

@@ -128,7 +128,7 @@ setDefaults()
_initAlignment=false;
_useDisplayList=false;
_useDisplayList=false;
_encodedText = new EncodedText();
}
@@ -191,6 +191,24 @@ void Text::accept(PrimitiveFunctor& functor) const
functor.drawArrays( GL_QUADS, 0, 4);
}
void Text::compile(State& state) const
{
// ahhhh, this is bit doddy, the draw is potentially
// modifying the text object, this isn't thread safe.
Text* this_non_const = const_cast<Text*>(this);
if(!_font->isCreated() || !(this_non_const->_font->getFont()->Created(state.getContextID())))
{
this_non_const->_font->create(state);
this_non_const->dirtyBound();
}
if(!_initAlignment)
{
this_non_const->initAlignment();
}
}
void Text::drawImplementation(State& state) const
{
if(!_init)
@@ -200,14 +218,16 @@ void Text::drawImplementation(State& state) const
// modifying the text object, this isn't thread safe.
Text* this_non_const = const_cast<Text*>(this);
if(!_font->isCreated())
if(!_font->isCreated() || !(this_non_const->_font->getFont()->Created(state.getContextID())))
{
this_non_const->_font->create(state);
this_non_const->dirtyBound();
}
if(!_initAlignment)
{
this_non_const->initAlignment();
}
// we must disable all the vertex arrays to prevent any state
// propagating into text.