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

Merged the decoration vertices with the same vertex arrays used for text glyphs

Browse Source
This commit is contained in:
Robert Osfield
2017-03-01 16:43:05 +00:00
parent f4966a96d4
commit f233005988
5 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/osgText/Text
View File

@@ -23,8 +23,6 @@
namespace osgText {
#define NEW_APPROACH
class OSGTEXT_EXPORT Text : public osgText::TextBase
{
public:
@@ -295,20 +293,6 @@ public:
public:
Coords _coords;
ColorCoords _colorCoords;
TexCoords _texcoords;
unsigned int addCoord(const osg::Vec2& c) { unsigned int s = _coords->size(); _coords->push_back(osg::Vec3(c.x(), c.y(), 0.0f)); return s; }
unsigned int addCoord(const osg::Vec3& c) { unsigned int s = _coords->size(); _coords->push_back(c); return s; }
void getCoord(unsigned int i, osg::Vec2& c) const { c.set((*_coords)[i].x(), (*_coords)[i].y()); }
void getCoord(unsigned int i, osg::Vec3& c) const { c = (*_coords)[i]; }
Coords& getCoords() { return _coords; }
const Coords& getCoords() const { return _coords; }
void addTexCoord(const osg::Vec2& tc) { _texcoords->push_back(tc); }
// internal structures, variable and methods used for rendering of characters.
struct OSGTEXT_EXPORT GlyphQuads

18
include/osgText/TextBase
View File

@@ -22,7 +22,6 @@
namespace osgText {
class OSGTEXT_EXPORT TextBase : public osg::Drawable
{
public:
@@ -266,6 +265,13 @@ public:
virtual osg::BoundingBox computeBoundingBox() const;
typedef osg::ref_ptr<osg::Vec3Array> Coords;
Coords& getCoords() { return _coords; }
const Coords& getCoords() const { return _coords; }
void getCoord(unsigned int i, osg::Vec2& c) const { c.set((*_coords)[i].x(), (*_coords)[i].y()); }
void getCoord(unsigned int i, osg::Vec3& c) const { c = (*_coords)[i]; }
protected:
virtual ~TextBase();
@@ -279,11 +285,11 @@ protected:
virtual void computeGlyphRepresentation() = 0;
typedef osg::ref_ptr<osg::Vec3Array> Coords;
typedef osg::ref_ptr<osg::Vec2Array> TexCoords;
typedef osg::ref_ptr<osg::Vec4Array> ColorCoords;
typedef std::vector< osg::ref_ptr<osg::DrawElementsUShort> > Primitives;
// members which have public access.
osg::Vec4 _color;
osg::ref_ptr<Font> _font;
@@ -315,13 +321,19 @@ protected:
mutable osg::Matrix _matrix;
Coords _decorationVertices;
Primitives _decorationPrimitives;
void setupDecoration();
Coords _coords;
ColorCoords _colorCoords;
TexCoords _texcoords;
unsigned int addCoord(const osg::Vec2& c) { unsigned int s = _coords->size(); _coords->push_back(osg::Vec3(c.x(), c.y(), 0.0f)); return s; }
unsigned int addCoord(const osg::Vec3& c) { unsigned int s = _coords->size(); _coords->push_back(c); return s; }
void addTexCoord(const osg::Vec2& tc) { _texcoords->push_back(tc); }
};