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

Fixed missing initializer for _color and assignment of color to ShapeDrawable

Browse Source
This commit is contained in:
Robert Osfield 2017-03-23 14:40:44 +00:00
parent 9848c1d264
commit 7ccd25a4d5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/ShapeDrawable.cpp
View File

@ -16,11 +16,13 @@
using namespace osg;
ShapeDrawable::ShapeDrawable()
ShapeDrawable::ShapeDrawable():
_color(1.0f, 1.0f, 1.0f, 1.0f)
{
}
ShapeDrawable::ShapeDrawable(Shape* shape,TessellationHints* hints):
_color(1.0f, 1.0f, 1.0f, 1.0f),
_tessellationHints(hints)
{
setShape(shape);
@ -49,8 +51,6 @@ void ShapeDrawable::setShape(Shape* shape)
void ShapeDrawable::setColor(const Vec4& color)
{
if (color==_color) return;
_color = color;
Vec4Array* colors = dynamic_cast<Vec4Array*>(_colorArray.get());
@ -91,4 +91,6 @@ void ShapeDrawable::build()
BuildShapeGeometryVisitor dsv(this, _tessellationHints.get());
_shape->accept(dsv);
}
setColor(_color);
}