Refactored osgText so that it no longer uses GLBeginEndAdapter

This commit is contained in:
Robert Osfield
2016-09-02 17:01:25 +01:00
parent 987513d309
commit 0f3e61146d
6 changed files with 225 additions and 207 deletions

View File

@@ -422,6 +422,7 @@ protected:
osg::Vec4 _colorGradientBottomRight;
osg::Vec4 _colorGradientTopRight;
// Helper function for color interpolation
float bilinearInterpolate(float x1, float x2, float y1, float y2, float x, float y, float q11, float q12, float q21, float q22) const;
};

View File

@@ -149,10 +149,6 @@ class OSGTEXT_EXPORT Text3D : public osgText::TextBase
osg::ref_ptr<osg::StateSet> _wallStateSet;
osg::ref_ptr<osg::StateSet> _backStateSet;
void setupDecoration();
osg::ref_ptr<osg::Vec3Array> _decorationVertices;
};
}

View File

@@ -327,6 +327,11 @@ protected:
mutable osg::Vec3 _offset;
mutable osg::Vec3 _normal;
mutable osg::BoundingBox _textBB;
void setupDecoration();
osg::ref_ptr<osg::Vec3Array> _decorationVertices;
};
}