diff --git a/include/osg/LineStipple b/include/osg/LineStipple index a01d1816e..c8d889244 100644 --- a/include/osg/LineStipple +++ b/include/osg/LineStipple @@ -24,6 +24,10 @@ class OSG_EXPORT LineStipple : public StateAttribute LineStipple(); + LineStipple(GLint factor, GLushort pattern): + _factor(factor), + _pattern(pattern) {} + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ LineStipple(const LineStipple& lw,const CopyOp& copyop=CopyOp::SHALLOW_COPY): StateAttribute(lw,copyop), diff --git a/include/osg/Point b/include/osg/Point index 4bc1a6319..eaddb61cd 100644 --- a/include/osg/Point +++ b/include/osg/Point @@ -26,6 +26,8 @@ class OSG_EXPORT Point : public StateAttribute Point(); + Point(float size); + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ Point(const Point& point,const CopyOp& copyop=CopyOp::SHALLOW_COPY): StateAttribute(point,copyop), diff --git a/include/osg/PolygonStipple b/include/osg/PolygonStipple index b097cbaf0..bc78f85df 100644 --- a/include/osg/PolygonStipple +++ b/include/osg/PolygonStipple @@ -26,6 +26,8 @@ class OSG_EXPORT PolygonStipple : public StateAttribute PolygonStipple(); + PolygonStipple(const GLubyte* mask); + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ PolygonStipple(const PolygonStipple& lw,const CopyOp& copyop=CopyOp::SHALLOW_COPY); diff --git a/src/osg/Point.cpp b/src/osg/Point.cpp index dd50b5cc1..b8aba37fc 100644 --- a/src/osg/Point.cpp +++ b/src/osg/Point.cpp @@ -29,15 +29,23 @@ using namespace osg; Point::Point() { - _size = 1.0f; // TODO find proper default - _fadeThresholdSize = 1.0f; // TODO find proper default - // TODO find proper default - _distanceAttenuation = Vec3(1, 0.0, 0.0); + _size = 1.0f; // TODO find proper default + _fadeThresholdSize = 1.0f; // TODO find proper default + _distanceAttenuation = Vec3(1, 0.0, 0.0); // TODO find proper default _minSize = 0.0; _maxSize = 100.0;//depends on mulitsampling ... some default necessary } +Point::Point(float size) +{ + _size = size; + _fadeThresholdSize = 1.0f; // TODO find proper default + _distanceAttenuation = Vec3(1, 0.0, 0.0); // TODO find proper default + + _minSize = 0.0; + _maxSize = 100.0;//depends on mulitsampling ... some default necessary +} Point::~Point() { diff --git a/src/osg/PolygonStipple.cpp b/src/osg/PolygonStipple.cpp index 291da0775..a6adcd329 100644 --- a/src/osg/PolygonStipple.cpp +++ b/src/osg/PolygonStipple.cpp @@ -43,6 +43,11 @@ PolygonStipple::PolygonStipple() setMask(defaultPolygonStippleMask); } +PolygonStipple::PolygonStipple(const GLubyte* mask) +{ + setMask(mask); +} + PolygonStipple::PolygonStipple(const PolygonStipple& ps,const CopyOp& copyop): StateAttribute(ps,copyop) {