Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv31165
Modified Files:
ScreenInfo.cpp
Log Message:
no message
Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ScreenInfo.cpp 20 Oct 2003 00:23:23 -0000 1.22
--- ScreenInfo.cpp 21 Dec 2003 10:44:32 -0000 1.23
***************
*** 71,89 ****
//m_TTFPath("ltype.ttf"),
m_FontSize(20),
! m_CharacterSize(14),
! //m_CharacterSize(11),
m_Text(0) {
m_Text = makeText(pos_x,pos_y - m_CharacterSize, text);
addDrawable(m_Text);
setName(name);
- // FIXME: these lines seems to badly interact with others parts of the code,
- // on windows at least; for example, TEXDOME code from Sky doesn t work correctly
- // when they are uncommented.
// HACK to prevent text from disappearing when chunklod multitexture details
// are turned on:
! //osg::StateSet *ss = getOrCreateStateSet();
! //ss->setTextureAttributeAndModes(1, new osg::Texture2D, osg::StateAttribute::OFF);
! //ss->setTextureAttributeAndModes(2, new osg::Texture2D, osg::StateAttribute::OFF);
! //ss->setTextureAttributeAndModes(3, new osg::Texture2D, osg::StateAttribute::OFF);
}
--- 71,86 ----
//m_TTFPath("ltype.ttf"),
m_FontSize(20),
! //m_CharacterSize(14),
! m_CharacterSize(11),
m_Text(0) {
m_Text = makeText(pos_x,pos_y - m_CharacterSize, text);
addDrawable(m_Text);
setName(name);
// HACK to prevent text from disappearing when chunklod multitexture details
// are turned on:
! osg::StateSet *ss = getOrCreateStateSet();
! ss->setTextureAttributeAndModes(1, new osg::Texture2D, osg::StateAttribute::OFF);
! ss->setTextureAttributeAndModes(2, new osg::Texture2D, osg::StateAttribute::OFF);
! ss->setTextureAttributeAndModes(3, new osg::Texture2D, osg::StateAttribute::OFF);
}
|
