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

Added BlenColour(Vec4) constructor and updated wrappers.

Browse Source
This commit is contained in:
Robert Osfield
2006-02-09 12:20:42 +00:00
parent 8f7d349f7e
commit 59ad441be1
5 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/BlendColor
View File

@@ -30,6 +30,8 @@ class OSG_EXPORT BlendColor : public StateAttribute
BlendColor();
BlendColor(const osg::Vec4& constantColor);
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
BlendColor(const BlendColor& trans,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
StateAttribute(trans,copyop),

7
src/osg/BlendColor.cpp
View File

@@ -20,7 +20,12 @@ using namespace osg;
BlendColor::BlendColor() :
_constantColor(0.0f,0.0f,0.0f,0.0f)
_constantColor(0.0f,0.0f,0.0f,0.0f)
{
}
BlendColor::BlendColor(const osg::Vec4& constantColor):
_constantColor(constantColor)
{
}

1
src/osgWrappers/osg/BlendColor.cpp
View File

@@ -27,6 +27,7 @@
BEGIN_OBJECT_REFLECTOR(osg::BlendColor)
I_BaseType(osg::StateAttribute);
I_Constructor0();
I_Constructor1(IN, const osg::Vec4 &, constantColor);
I_ConstructorWithDefaults2(IN, const osg::BlendColor &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
I_Method0(osg::Object *, cloneType);
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);

4
src/osgWrappers/osgDB/DatabasePager.cpp
View File

@@ -92,13 +92,17 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
I_Method1(bool, getCompileGLObjectsForContextID, IN, unsigned int, contextID);
I_Method0(bool, requiresCompileGLObjects);
I_Method2(void, compileGLObjects, IN, osg::State &, state, IN, double &, availableTime);
I_Method0(unsigned int, getFileRequestListSize);
I_Method0(unsigned int, getDataToCompileListSize);
I_Property(bool, AcceptNewDatabaseRequests);
I_IndexedProperty1(bool, CompileGLObjectsForContextID, unsigned int, contextID);
I_ReadOnlyProperty(unsigned int, DataToCompileListSize);
I_Property(bool, DatabasePagerThreadPause);
I_Property(bool, DeleteRemovedSubgraphsInDatabaseThread);
I_Property(bool, DoPreCompile);
I_Property(osgDB::DatabasePager::DrawablePolicy, DrawablePolicy);
I_Property(double, ExpiryDelay);
I_ReadOnlyProperty(unsigned int, FileRequestListSize);
I_ReadOnlyProperty(osg::Block *, FrameBlock);
I_Property(unsigned int, MaximumNumOfObjectsToCompilePerFrame);
I_Property(double, MinimumTimeAvailableForGLCompileAndDeletePerFrame);

11
src/osgWrappers/osgUtil/Simplifier.cpp
View File

@@ -25,11 +25,17 @@ TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList);
BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier)
I_BaseType(osg::NodeVisitor);
I_ConstructorWithDefaults2(IN, float, sampleRatio, 1.0f, IN, float, maximumError, 0.0f);
I_ConstructorWithDefaults3(IN, float, sampleRatio, 1.0f, IN, float, maximumError, FLT_MAX, IN, float, maximumLength, 0.0);
I_Method1(void, setSampleRatio, IN, float, sampleRatio);
I_Method0(float, getSampleRatio);
I_Method1(void, setMaximumError, IN, float, error);
I_Method0(float, getMaximumError);
I_Method1(void, setMaximumLength, IN, float, length);
I_Method0(float, getMaximumLength);
I_Method1(void, setDoTriStrip, IN, bool, on);
I_Method0(bool, getDoTriStrip);
I_Method1(void, setSmoothing, IN, bool, on);
I_Method0(bool, getSmoothing);
I_Method1(void, setContinueSimplificationCallback, IN, osgUtil::Simplifier::ContinueSimplificationCallback *, cb);
I_Method0(osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback);
I_Method0(const osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback);
@@ -39,8 +45,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier)
I_Method1(void, simplify, IN, osg::Geometry &, geometry);
I_Method2(void, simplify, IN, osg::Geometry &, geometry, IN, const osgUtil::Simplifier::IndexList &, protectedPoints);
I_Property(osgUtil::Simplifier::ContinueSimplificationCallback *, ContinueSimplificationCallback);
I_Property(bool, DoTriStrip);
I_Property(float, MaximumError);
I_Property(float, MaximumLength);
I_Property(float, SampleRatio);
I_Property(bool, Smoothing);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier::ContinueSimplificationCallback)