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

Improvements to the Text .osg support.

Browse Source
This commit is contained in:
Robert Osfield
2003-03-10 16:40:26 +00:00
parent bc35d8d33b
commit 06fb808ad3
10 changed files with 279 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgText/Font.cpp
View File

@@ -231,6 +231,10 @@ void Font::addGlyph(unsigned int width, unsigned int height, unsigned int charco
_stateSetList.push_back(stateset);
glyphTexture = new GlyphTexture;
// static int numberOfTexturesAllocated = 0;
// ++numberOfTexturesAllocated;
// std::cout << this<< " numberOfTexturesAllocated "<<numberOfTexturesAllocated<<std::endl;
// reserve enough space for the glyphs.
glyphTexture->setGlyphImageMargin(_margin);

2
src/osgText/Makefile
View File

@@ -11,7 +11,7 @@ CXXFILES = \
DEF += -DOSGTEXT_LIBRARY
LIBS += -losgDB -losgUtil -losg $(GL_LIBS) $(OTHER_LIBS)
LIBS += -losgDB -losg $(GL_LIBS) $(OTHER_LIBS)
TARGET_BASENAME = osgText
LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

53
src/osgText/Text.cpp
View File

@@ -240,8 +240,8 @@ void Text::computeGlyphRepresentation()
if (charcode=='\n')
{
if (horizontal) startOfLine.y() -= _fontHeight;
else startOfLine.x() += _fontWidth;
if (horizontal) startOfLine.y() -= _characterHeight;
else startOfLine.x() += _characterHeight;
cursor = startOfLine;
previous_charcode = 0;
continue;
@@ -300,7 +300,7 @@ void Text::computeGlyphRepresentation()
{
if (local.x()+width>_maximumWidth)
{
startOfLine.y() -= _fontHeight;
startOfLine.y() -= _characterHeight;
cursor = startOfLine;
previous_charcode = 0;
@@ -317,7 +317,7 @@ void Text::computeGlyphRepresentation()
{
if (local.x()<-_maximumWidth)
{
startOfLine.y() -= _fontHeight;
startOfLine.y() -= _characterHeight;
cursor = startOfLine;
previous_charcode = 0;
@@ -333,7 +333,7 @@ void Text::computeGlyphRepresentation()
{
if (local.y()<-_maximumHeight)
{
startOfLine.x() += _fontWidth;
startOfLine.x() += _characterHeight/_characterAspectRatio;
cursor = startOfLine;
previous_charcode = 0;
@@ -470,8 +470,6 @@ void Text::drawImplementation(osg::State& state) const
if (_drawMode & TEXT)
{
bool first = false;
state.disableAllVertexArrays();
for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
@@ -479,11 +477,7 @@ void Text::drawImplementation(osg::State& state) const
++titr)
{
// need to set the texture here...
if (!first)
{
state.apply(titr->first.get());
}
state.apply(titr->first.get());
const GlyphQuads& glyphquad = titr->second;
@@ -492,8 +486,6 @@ void Text::drawImplementation(osg::State& state) const
glDrawArrays(GL_QUADS,0,glyphquad._coords.size());
first = false;
}
}
@@ -536,3 +528,36 @@ void Text::drawImplementation(osg::State& state) const
glPopMatrix();
}
void Text::accept(osg::Drawable::ConstAttributeFunctor& af) const
{
for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end();
++titr)
{
const GlyphQuads& glyphquad = titr->second;
af.apply(osg::Drawable::VERTICES,glyphquad._coords.size(),&(glyphquad._coords.front()));
af.apply(osg::Drawable::TEXTURE_COORDS_0,glyphquad._texcoords.size(),&(glyphquad._texcoords.front()));
}
}
void Text::accept(osg::Drawable::PrimitiveFunctor& pf) const
{
for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end();
++titr)
{
const GlyphQuads& glyphquad = titr->second;
pf.begin(GL_QUADS);
for(GlyphQuads::Coords::const_iterator itr = glyphquad._coords.begin();
itr!=glyphquad._coords.end();
++itr)
{
osg::Vec3 pos(itr->x(),itr->y(),0.0f);
pf.vertex(pos*_matrix);
}
pf.end();
}
}