Moved text color into TextBase, added support for colour into Text3D

This commit is contained in:
Robert Osfield
2010-11-18 17:59:55 +00:00
parent a5b83edc76
commit 5849634082
5 changed files with 13 additions and 14 deletions

View File

@@ -30,7 +30,6 @@ using namespace osgText;
//#define TREES_CODE_FOR_MAKING_SPACES_EDITABLE
Text::Text():
_color(1.0f,1.0f,1.0f,1.0f),
_enableDepthWrites(true),
_backdropType(NONE),
_backdropImplementation(DELAYED_DEPTH_WRITES),
@@ -46,7 +45,6 @@ Text::Text():
Text::Text(const Text& text,const osg::CopyOp& copyop):
osgText::TextBase(text,copyop),
_color(text._color),
_enableDepthWrites(text._enableDepthWrites),
_backdropType(text._backdropType),
_backdropImplementation(text._backdropImplementation),
@@ -67,12 +65,6 @@ Text::~Text()
}
void Text::setColor(const osg::Vec4& color)
{
_color = color;
}
Font* Text::getActiveFont()
{
return _font.valid() ? _font.get() : Font::getDefaultFont().get();