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

Added computeDataVariance method into osg::Object and implementations in Drawable and StateSet,

Browse Source 
and calling of osgUtil::StaticObjectDetectionVisitor in osgViewer::Viewer
This commit is contained in:
Robert Osfield
2007-02-14 11:24:42 +00:00
parent 5dcb7af6a4
commit 89c99a88fa
256 changed files with 503 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Make/openscenegraph.pc
View File

@@ -7,8 +7,8 @@ includedir=${prefix}/include
Name: openscenegraph
Description: 3D scenegraph
Version: 1.0,0
Version: 1.2,0
Requires: openthreads
Conflicts:
Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgProducer -losgSim -losgText -losgUtil
Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgViewer -losgSim -losgText -losgUtil
Cflags: -I${includedir}

2
examples/osgspacewarp/osgspacewarp.cpp
View File

@@ -111,7 +111,7 @@ osg::Node* createScene(unsigned int noStars)
return group;
}
int main( int argc, char **argv )
int main(int , char **)
{
// construct the viewer.
osgViewer::Viewer viewer;

4
include/osg/Drawable
View File

@@ -125,6 +125,10 @@ class OSG_EXPORT Drawable : public Object
virtual const Geometry* asGeometry() const { return 0; }
/** Compute the DataVariance based on an assestment of callback etc.*/
virtual void computeDataVariance();
/** A vector of osg::Node pointers which is used to store the parent(s) of drawable.*/
typedef std::vector<Node*> ParentList;

3
include/osg/Object
View File

@@ -102,6 +102,9 @@ class OSG_EXPORT Object : public Referenced
/** Get the data variance of this object.*/
inline DataVariance getDataVariance() const { return _dataVariance; }
/** Compute the DataVariance based on an assestment of callback etc.*/
virtual void computeDataVariance() {}
/**

6
include/osg/StateSet
View File

@@ -92,6 +92,10 @@ class OSG_EXPORT StateSet : public Object
inline unsigned int getNumParents() const { return _parents.size(); }
/** Compute the DataVariance based on an assestment of callback etc.*/
virtual void computeDataVariance();
/** Set all the modes to on or off so that it defines a
complete state, typically used for a default global state.*/
void setGlobalDefaults();
@@ -426,8 +430,6 @@ class OSG_EXPORT StateSet : public Object
/** call release on all StateAttributes contained within this StateSet.*/
virtual void releaseGLObjects(State* state=0) const;
protected :

13
src/osg/Drawable.cpp
View File

@@ -294,6 +294,19 @@ Drawable::~Drawable()
dirtyDisplayList();
}
void Drawable::computeDataVariance()
{
bool dynamic = false;
if (getUpdateCallback() ||
getEventCallback() ||
getCullCallback())
{
dynamic = true;
}
setDataVariance(dynamic ? DYNAMIC : STATIC);
}
void Drawable::addParent(osg::Node* node)
{
_parents.push_back(node);

72
src/osg/StateSet.cpp
View File

@@ -169,6 +169,78 @@ StateSet::~StateSet()
clear();
}
void StateSet::computeDataVariance()
{
bool dynamic = false;
if (_updateCallback.valid() ||
_eventCallback.valid())
{
dynamic = true;
}
// run attribute callbacks
for(AttributeList::iterator itr=_attributeList.begin();
itr!=_attributeList.end();
++itr)
{
if (itr->second.first->getUpdateCallback() ||
itr->second.first->getEventCallback() ||
itr->second.first->getDataVariance()==DYNAMIC)
{
dynamic = true;
itr->second.first->setDataVariance(DYNAMIC);
}
}
// run texture attribute callbacks.
for(unsigned int i=0;i<_textureAttributeList.size();++i)
{
AttributeList& attributeList = _textureAttributeList[i];
for(AttributeList::iterator itr=attributeList.begin();
itr!=attributeList.end();
++itr)
{
if (itr->second.first->getUpdateCallback() ||
itr->second.first->getEventCallback() ||
itr->second.first->getDataVariance()==DYNAMIC)
{
itr->second.first->setDataVariance(DYNAMIC);
dynamic = true;
}
}
}
// run uniform callbacks.
for(UniformList::iterator uitr = _uniformList.begin();
uitr != _uniformList.end();
++uitr)
{
if (uitr->second.first->getUpdateCallback() ||
uitr->second.first->getEventCallback() ||
uitr->second.first->getDataVariance()==DYNAMIC)
{
uitr->second.first->setDataVariance(DYNAMIC);
dynamic = true;
}
}
#if 0
if (dynamic)
{
osg::notify(osg::NOTICE)<<"StateSet::computeDataVariance setting to DYNAMIC"<<std::endl;
}
else
{
osg::notify(osg::NOTICE)<<"StateSet::computeDataVariance to STATIC"<<std::endl;
}
#endif
setDataVariance(dynamic ? DYNAMIC : STATIC);
}
void StateSet::addParent(osg::Object* object)
{
// osg::notify(osg::INFO)<<"Adding parent"<<std::endl;

13
src/osgUtil/Optimizer.cpp
View File

@@ -4148,19 +4148,14 @@ void Optimizer::StaticObjectDetectionVisitor::apply(osg::Geode& geode)
void Optimizer::StaticObjectDetectionVisitor::applyStateSet(osg::StateSet& stateset)
{
stateset.setDataVariance(osg::Object::STATIC);
stateset.computeDataVariance();
}
void Optimizer::StaticObjectDetectionVisitor::applyDrawable(osg::Drawable& drawable)
{
{
if (drawable.getStateSet()) applyStateSet(*drawable.getStateSet());
osg::Object::DataVariance dataVariance = osg::Object::STATIC;
if (drawable.getDrawCallback()) dataVariance = osg::Object::DYNAMIC;
if (drawable.getCullCallback()) dataVariance = osg::Object::DYNAMIC;
if (drawable.getDrawCallback()) dataVariance = osg::Object::DYNAMIC;
drawable.setDataVariance(dataVariance);
drawable.computeDataVariance();
}

12
src/osgViewer/Viewer.cpp
View File

@@ -13,6 +13,7 @@
#include <osg/GLExtensions>
#include <osg/DeleteHandler>
#include <osgUtil/Optimizer>
#include <osgUtil/GLObjectsVisitor>
#include <osgGA/TrackballManipulator>
#include <osgViewer/Viewer>
@@ -672,13 +673,13 @@ int Viewer::run()
realize();
}
#if 1
#if 0
while (!done())
{
frame();
}
#else
int runTillFrameNumber = 10;
int runTillFrameNumber = 100;
while (!done() && getFrameStamp()->getFrameNumber()<runTillFrameNumber)
{
frame();
@@ -954,7 +955,7 @@ Viewer::ThreadingModel Viewer::suggestBestThreadingModel()
{
if (strcmp(str,"SingleThreaded")==0) return SingleThreaded;
else if (strcmp(str,"CullDrawThreadPerContext")==0) return CullDrawThreadPerContext;
else if (strcmp(str,"DrawThreadPerContext")==0) return CullDrawThreadPerContext;
else if (strcmp(str,"DrawThreadPerContext")==0) return DrawThreadPerContext;
else if (strcmp(str,"CullThreadPerCameraDrawThreadPerContext")==0) return CullThreadPerCameraDrawThreadPerContext;
}
@@ -1089,6 +1090,11 @@ void Viewer::startThreading()
if (!osg::Referenced::getDeleteHandler()) osg::Referenced::setDeleteHandler(new osg::DeleteHandler(2));
else osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(2);
// now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of
// the scene graph from being run in parallel.
osgUtil::Optimizer::StaticObjectDetectionVisitor sodv;
getSceneData()->accept(sodv);
}
if (numThreadsOnBarrier>1)

2
src/osgWrappers/osg/AlphaFunc.cpp
View File

@@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::AlphaFunc::ComparisonFunction)
I_EnumLabel(osg::AlphaFunc::ALWAYS);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AlphaFunc)
BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc)
I_BaseType(osg::StateAttribute);
I_Constructor0(____AlphaFunc,
"",

4
src/osgWrappers/osg/AnimationPath.cpp
View File

@@ -36,7 +36,7 @@ BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode)
I_EnumLabel(osg::AnimationPath::NO_LOOPING);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AnimationPath)
BEGIN_OBJECT_REFLECTOR(osg::AnimationPath)
I_VirtualBaseType(osg::Object);
I_Constructor0(____AnimationPath,
"",
@@ -260,7 +260,7 @@ BEGIN_VALUE_REFLECTOR(osg::AnimationPath::ControlPoint)
__void__setScale__C5_osg_Vec3d_R1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AnimationPathCallback)
BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback)
I_BaseType(osg::NodeCallback);
I_Constructor0(____AnimationPathCallback,
"",

2
src/osgWrappers/osg/ApplicationUsage.cpp
View File

@@ -28,7 +28,7 @@ BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type)
I_EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ApplicationUsage)
BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage)
I_BaseType(osg::Referenced);
I_Constructor0(____ApplicationUsage,
"",

42
src/osgWrappers/osg/Array.cpp
View File

@@ -173,7 +173,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Array)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ArrayVisitor)
BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor)
I_Constructor0(____ArrayVisitor,
"",
"");
@@ -269,7 +269,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ArrayVisitor)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstArrayVisitor)
BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor)
I_Constructor0(____ConstArrayVisitor,
"",
"");
@@ -365,7 +365,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstArrayVisitor)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstValueVisitor)
BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor)
I_Constructor0(____ConstValueVisitor,
"",
"");
@@ -478,7 +478,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::IndexArray)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ValueVisitor)
BEGIN_VALUE_REFLECTOR(osg::ValueVisitor)
I_Constructor0(____ValueVisitor,
"",
"");
@@ -603,7 +603,7 @@ TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType
TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >, osg::Vec4bArray);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<GLfloat>);
I_Constructor0(____TemplateArray,
@@ -685,7 +685,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::F
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec2>);
I_Constructor0(____TemplateArray,
@@ -767,7 +767,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array:
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec2b>);
I_Constructor0(____TemplateArray,
@@ -849,7 +849,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec2s>);
I_Constructor0(____TemplateArray,
@@ -931,7 +931,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec3>);
I_Constructor0(____TemplateArray,
@@ -1013,7 +1013,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array:
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec3b>);
I_Constructor0(____TemplateArray,
@@ -1095,7 +1095,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec3s>);
I_Constructor0(____TemplateArray,
@@ -1177,7 +1177,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec4>);
I_Constructor0(____TemplateArray,
@@ -1259,7 +1259,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array:
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec4b>);
I_Constructor0(____TemplateArray,
@@ -1341,7 +1341,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec4s>);
I_Constructor0(____TemplateArray,
@@ -1423,7 +1423,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >)
I_BaseType(osg::Array);
I_BaseType(std::vector<osg::Vec4ub>);
I_Constructor0(____TemplateArray,
@@ -1505,7 +1505,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Arra
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >)
I_BaseType(osg::IndexArray);
I_BaseType(std::vector<GLbyte>);
I_Constructor0(____TemplateIndexArray,
@@ -1592,7 +1592,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Arra
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >)
I_BaseType(osg::IndexArray);
I_BaseType(std::vector<GLint>);
I_Constructor0(____TemplateIndexArray,
@@ -1679,7 +1679,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >)
I_BaseType(osg::IndexArray);
I_BaseType(std::vector<GLshort>);
I_Constructor0(____TemplateIndexArray,
@@ -1766,7 +1766,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Arr
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >)
I_BaseType(osg::IndexArray);
I_BaseType(std::vector<GLubyte>);
I_Constructor0(____TemplateIndexArray,
@@ -1853,7 +1853,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Arr
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >)
I_BaseType(osg::IndexArray);
I_BaseType(std::vector<GLuint>);
I_Constructor0(____TemplateIndexArray,
@@ -1940,7 +1940,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Arra
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >)
BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >)
I_BaseType(osg::IndexArray);
I_BaseType(std::vector<GLushort>);
I_Constructor0(____TemplateIndexArray,

2
src/osgWrappers/osg/AutoTransform.cpp
View File

@@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::AutoTransform::AutoRotateMode)
I_EnumLabel(osg::AutoTransform::ROTATE_TO_CAMERA);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AutoTransform)
BEGIN_OBJECT_REFLECTOR(osg::AutoTransform)
I_BaseType(osg::Transform);
I_Constructor0(____AutoTransform,
"",

2
src/osgWrappers/osg/Billboard.cpp
View File

@@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode)
I_EnumLabel(osg::Billboard::AXIAL_ROT);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Billboard)
BEGIN_OBJECT_REFLECTOR(osg::Billboard)
I_BaseType(osg::Geode);
I_Constructor0(____Billboard,
"",

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

@@ -25,7 +25,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendColor)
BEGIN_OBJECT_REFLECTOR(osg::BlendColor)
I_BaseType(osg::StateAttribute);
I_Constructor0(____BlendColor,
"",
@@ -115,7 +115,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendColor)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendColor::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::BlendColor::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

4
src/osgWrappers/osg/BlendEquation.cpp
View File

@@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::BlendEquation::Equation)
I_EnumLabel(osg::BlendEquation::FUNC_REVERSE_SUBTRACT);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendEquation)
BEGIN_OBJECT_REFLECTOR(osg::BlendEquation)
I_BaseType(osg::StateAttribute);
I_Constructor0(____BlendEquation,
"",
@@ -120,7 +120,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendEquation)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendEquation::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::BlendEquation::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

4
src/osgWrappers/osg/BlendFunc.cpp
View File

@@ -42,7 +42,7 @@ BEGIN_ENUM_REFLECTOR(osg::BlendFunc::BlendFuncMode)
I_EnumLabel(osg::BlendFunc::ZERO);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendFunc)
BEGIN_OBJECT_REFLECTOR(osg::BlendFunc)
I_BaseType(osg::StateAttribute);
I_Constructor0(____BlendFunc,
"",
@@ -205,7 +205,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendFunc)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendFunc::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::BlendFunc::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

4
src/osgWrappers/osg/BufferObject.cpp
View File

@@ -121,7 +121,7 @@ BEGIN_VALUE_REFLECTOR(osg::BufferObject::BufferEntry)
I_PublicMemberProperty(unsigned int, offset);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BufferObject::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,
@@ -212,7 +212,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PixelBufferObject)
BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject)
I_BaseType(osg::BufferObject);
I_ConstructorWithDefaults1(IN, osg::Image *, image, 0,
Properties::NON_EXPLICIT,

4
src/osgWrappers/osg/Camera.cpp
View File

@@ -72,7 +72,7 @@ BEGIN_ENUM_REFLECTOR(osg::Camera::BufferComponent)
I_EnumLabel(osg::Camera::COLOR_BUFFER7);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Camera)
BEGIN_OBJECT_REFLECTOR(osg::Camera)
I_BaseType(osg::Transform);
I_BaseType(osg::CullSettings);
I_Constructor0(____Camera,
@@ -578,7 +578,7 @@ BEGIN_VALUE_REFLECTOR(osg::Camera::Attachment)
I_PublicMemberProperty(bool, _mipMapGeneration);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Camera::DrawCallback)
BEGIN_OBJECT_REFLECTOR(osg::Camera::DrawCallback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____DrawCallback,
"",

2
src/osgWrappers/osg/CameraView.cpp
View File

@@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osg::CameraView::FieldOfViewMode)
I_EnumLabel(osg::CameraView::VERTICAL);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CameraView)
BEGIN_OBJECT_REFLECTOR(osg::CameraView)
I_BaseType(osg::Transform);
I_Constructor0(____CameraView,
"",

4
src/osgWrappers/osg/ClampColor.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClampColor)
BEGIN_OBJECT_REFLECTOR(osg::ClampColor)
I_BaseType(osg::StateAttribute);
I_Constructor0(____ClampColor,
"",
@@ -129,7 +129,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClampColor)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClampColor::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::ClampColor::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/ClearNode.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClearNode)
BEGIN_OBJECT_REFLECTOR(osg::ClearNode)
I_BaseType(osg::Group);
I_Constructor0(____ClearNode,
"",

2
src/osgWrappers/osg/ClipNode.cpp
View File

@@ -30,7 +30,7 @@
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClipNode)
BEGIN_OBJECT_REFLECTOR(osg::ClipNode)
I_BaseType(osg::Group);
I_Constructor0(____ClipNode,
"",

2
src/osgWrappers/osg/ClipPlane.cpp
View File

@@ -26,7 +26,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClipPlane)
BEGIN_OBJECT_REFLECTOR(osg::ClipPlane)
I_BaseType(osg::StateAttribute);
I_Constructor0(____ClipPlane,
"",

2
src/osgWrappers/osg/ClusterCullingCallback.cpp
View File

@@ -28,7 +28,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClusterCullingCallback)
BEGIN_OBJECT_REFLECTOR(osg::ClusterCullingCallback)
I_BaseType(osg::Drawable::CullCallback);
I_BaseType(osg::NodeCallback);
I_Constructor0(____ClusterCullingCallback,

2
src/osgWrappers/osg/CollectOccludersVisitor.cpp
View File

@@ -29,7 +29,7 @@
TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CollectOccludersVisitor)
BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor)
I_BaseType(osg::NodeVisitor);
I_BaseType(osg::CullStack);
I_Constructor0(____CollectOccludersVisitor,

2
src/osgWrappers/osg/ColorMask.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ColorMask)
BEGIN_OBJECT_REFLECTOR(osg::ColorMask)
I_BaseType(osg::StateAttribute);
I_Constructor0(____ColorMask,
"",

2
src/osgWrappers/osg/ColorMatrix.cpp
View File

@@ -25,7 +25,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ColorMatrix)
BEGIN_OBJECT_REFLECTOR(osg::ColorMatrix)
I_BaseType(osg::StateAttribute);
I_Constructor0(____ColorMatrix,
"",

2
src/osgWrappers/osg/ConvexPlanarOccluder.cpp
View File

@@ -25,7 +25,7 @@
TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder)
BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder)
I_BaseType(osg::Object);
I_Constructor0(____ConvexPlanarOccluder,
"",

4
src/osgWrappers/osg/CoordinateSystemNode.cpp
View File

@@ -25,7 +25,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CoordinateSystemNode)
BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode)
I_BaseType(osg::Group);
I_Constructor0(____CoordinateSystemNode,
"",
@@ -129,7 +129,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CoordinateSystemNode)
__void__setFormat__C5_std_string_R1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::EllipsoidModel)
BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel)
I_BaseType(osg::Object);
I_ConstructorWithDefaults2(IN, double, radiusEquator, osg::WGS_84_RADIUS_EQUATOR, IN, double, radiusPolar, osg::WGS_84_RADIUS_POLAR,
____EllipsoidModel__double__double,

2
src/osgWrappers/osg/CopyOp.cpp
View File

@@ -50,7 +50,7 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options)
I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CopyOp)
BEGIN_VALUE_REFLECTOR(osg::CopyOp)
I_ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY,
Properties::NON_EXPLICIT,
____CopyOp__CopyFlags,

2
src/osgWrappers/osg/CullFace.cpp
View File

@@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osg::CullFace::Mode)
I_EnumLabel(osg::CullFace::FRONT_AND_BACK);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullFace)
BEGIN_OBJECT_REFLECTOR(osg::CullFace)
I_BaseType(osg::StateAttribute);
I_ConstructorWithDefaults1(IN, osg::CullFace::Mode, mode, osg::CullFace::BACK,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/CullSettings.cpp
View File

@@ -64,7 +64,7 @@ BEGIN_ENUM_REFLECTOR(osg::CullSettings::CullingModeValues)
I_EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullSettings)
BEGIN_VALUE_REFLECTOR(osg::CullSettings)
I_Constructor0(____CullSettings,
"",
"");

2
src/osgWrappers/osg/CullingSet.cpp
View File

@@ -50,7 +50,7 @@ BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues)
I_EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullingSet)
BEGIN_OBJECT_REFLECTOR(osg::CullingSet)
I_BaseType(osg::Referenced);
I_Constructor0(____CullingSet,
"",

2
src/osgWrappers/osg/Depth.cpp
View File

@@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::Depth::Function)
I_EnumLabel(osg::Depth::ALWAYS);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Depth)
BEGIN_OBJECT_REFLECTOR(osg::Depth)
I_BaseType(osg::StateAttribute);
I_ConstructorWithDefaults4(IN, osg::Depth::Function, func, osg::Depth::LESS, IN, double, zNear, 0.0, IN, double, zFar, 1.0, IN, bool, writeMask, true,
____Depth__Function__double__double__bool,

2
src/osgWrappers/osg/DisplaySettings.cpp
View File

@@ -49,7 +49,7 @@ BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoVerticalEyeMapping)
I_EnumLabel(osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DisplaySettings)
BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings)
I_BaseType(osg::Referenced);
I_Constructor0(____DisplaySettings,
"",

2
src/osgWrappers/osg/DrawPixels.cpp
View File

@@ -26,7 +26,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawPixels)
BEGIN_OBJECT_REFLECTOR(osg::DrawPixels)
I_BaseType(osg::Drawable);
I_Constructor0(____DrawPixels,
"",

21
src/osgWrappers/osg/Drawable.cpp
View File

@@ -93,6 +93,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable)
__C5_Geometry_P1__asGeometry,
"Convert 'const this' into a const Geometry pointer if Drawable is a Geometry, otherwise return 0. ",
"Equivalent to dynamic_cast<const Geometry*>(this). ");
I_Method0(void, computeDataVariance,
Properties::VIRTUAL,
__void__computeDataVariance,
"Compute the DataVariance based on an assestment of callback etc. ",
"");
I_Method0(const osg::Drawable::ParentList &, getParents,
Properties::NON_VIRTUAL,
__C5_ParentList_R1__getParents,
@@ -477,7 +482,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable)
__void__setUseVertexBufferObjects__bool);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::AttributeFunctor)
BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor)
I_Constructor0(____AttributeFunctor,
"",
"");
@@ -538,7 +543,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::AttributeFunctor)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback)
BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback)
I_BaseType(osg::Object);
I_Constructor0(____ComputeBoundingBoxCallback,
"",
@@ -579,7 +584,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ConstAttributeFunctor)
BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor)
I_Constructor0(____ConstAttributeFunctor,
"",
"");
@@ -640,7 +645,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ConstAttributeFunctor)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::CullCallback)
BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____CullCallback,
"",
@@ -686,7 +691,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::CullCallback)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::DrawCallback)
BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____DrawCallback,
"",
@@ -732,7 +737,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::DrawCallback)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::EventCallback)
BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____EventCallback,
"",
@@ -773,7 +778,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::EventCallback)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,
@@ -1093,7 +1098,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::Extensions)
__void__setVertexProgramSupported__bool);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback)
BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____UpdateCallback,
"",

2
src/osgWrappers/osg/Fog.cpp
View File

@@ -36,7 +36,7 @@ BEGIN_ENUM_REFLECTOR(osg::Fog::FogCoordinateSource)
I_EnumLabel(osg::Fog::FRAGMENT_DEPTH);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Fog)
BEGIN_OBJECT_REFLECTOR(osg::Fog)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Fog,
"",

4
src/osgWrappers/osg/FragmentProgram.cpp
View File

@@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::Local
TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FragmentProgram)
BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram)
I_BaseType(osg::StateAttribute);
I_Constructor0(____FragmentProgram,
"",
@@ -194,7 +194,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FragmentProgram)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

6
src/osgWrappers/osg/FrameBufferObject.cpp
View File

@@ -56,7 +56,7 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT);
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FBOExtensions)
BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
I_BaseType(osg::Referenced);
I_Method0(bool, isSupported,
Properties::NON_VIRTUAL,
@@ -141,7 +141,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrameBufferObject)
BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
I_BaseType(osg::StateAttribute);
I_Constructor0(____FrameBufferObject,
"",
@@ -230,7 +230,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrameBufferObject)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::RenderBuffer)
BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer)
I_BaseType(osg::Object);
I_Constructor0(____RenderBuffer,
"",

2
src/osgWrappers/osg/FrameStamp.cpp
View File

@@ -20,7 +20,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrameStamp)
BEGIN_OBJECT_REFLECTOR(osg::FrameStamp)
I_BaseType(osg::Referenced);
I_Constructor0(____FrameStamp,
"",

2
src/osgWrappers/osg/FrontFace.cpp
View File

@@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::FrontFace::Mode)
I_EnumLabel(osg::FrontFace::COUNTER_CLOCKWISE);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrontFace)
BEGIN_OBJECT_REFLECTOR(osg::FrontFace)
I_BaseType(osg::StateAttribute);
I_ConstructorWithDefaults1(IN, osg::FrontFace::Mode, face, osg::FrontFace::COUNTER_CLOCKWISE,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/GL2Extensions.cpp
View File

@@ -20,7 +20,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GL2Extensions)
BEGIN_OBJECT_REFLECTOR(osg::GL2Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/Geode.cpp
View File

@@ -30,7 +30,7 @@
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Geode)
BEGIN_OBJECT_REFLECTOR(osg::Geode)
I_BaseType(osg::Node);
I_Constructor0(____Geode,
"",

2
src/osgWrappers/osg/Geometry.cpp
View File

@@ -38,7 +38,7 @@ BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding)
I_EnumLabel(osg::Geometry::BIND_PER_VERTEX);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Geometry)
BEGIN_OBJECT_REFLECTOR(osg::Geometry)
I_BaseType(osg::Drawable);
I_Constructor0(____Geometry,
"",

2
src/osgWrappers/osg/GraphicsContext.cpp
View File

@@ -360,7 +360,7 @@ BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::ScreenIdentifier)
I_PublicMemberProperty(unsigned int, screenNum);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::Traits)
BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits)
I_BaseType(osg::Referenced);
I_BaseType(osg::GraphicsContext::ScreenIdentifier);
I_Constructor0(____Traits,

10
src/osgWrappers/osg/GraphicsThread.cpp
View File

@@ -27,7 +27,7 @@ BEGIN_ENUM_REFLECTOR(osg::BarrierOperation::PreBlockOp)
I_EnumLabel(osg::BarrierOperation::GL_FINISH);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BarrierOperation)
BEGIN_OBJECT_REFLECTOR(osg::BarrierOperation)
I_BaseType(osg::Operation);
I_ConstructorWithDefaults2(IN, int, numThreads, , IN, osg::BarrierOperation::PreBlockOp, op, osg::BarrierOperation::NO_OPERATION,
____BarrierOperation__int__PreBlockOp,
@@ -41,7 +41,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BarrierOperation)
I_PublicMemberProperty(osg::BarrierOperation::PreBlockOp, _preBlockOp);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Block)
BEGIN_OBJECT_REFLECTOR(osg::Block)
I_VirtualBaseType(osg::Referenced);
I_Constructor0(____Block,
"",
@@ -109,7 +109,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Operation)
I_PublicMemberProperty(bool, _keep);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::OperationsThread)
BEGIN_OBJECT_REFLECTOR(osg::OperationsThread)
I_BaseType(osg::Referenced);
I_Constructor0(____OperationsThread,
"",
@@ -185,7 +185,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::OperationsThread)
__void__setParent__Object_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation)
BEGIN_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation)
I_BaseType(osg::Operation);
I_BaseType(osg::Block);
I_Constructor0(____ReleaseContext_Block_MakeCurrentOperation,
@@ -198,7 +198,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::SwapBuffersOperation)
BEGIN_OBJECT_REFLECTOR(osg::SwapBuffersOperation)
I_BaseType(osg::Operation);
I_Constructor0(____SwapBuffersOperation,
"",

2
src/osgWrappers/osg/Group.cpp
View File

@@ -26,7 +26,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Group)
BEGIN_OBJECT_REFLECTOR(osg::Group)
I_BaseType(osg::Node);
I_Constructor0(____Group,
"",

2
src/osgWrappers/osg/Image.cpp
View File

@@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode)
I_EnumLabel(osg::Image::USE_MALLOC_FREE);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Image)
BEGIN_OBJECT_REFLECTOR(osg::Image)
I_BaseType(osg::Object);
I_Constructor0(____Image,
"",

2
src/osgWrappers/osg/ImageStream.cpp
View File

@@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::ImageStream::LoopingMode)
I_EnumLabel(osg::ImageStream::LOOPING);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ImageStream)
BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
I_BaseType(osg::Image);
I_Constructor0(____ImageStream,
"",

2
src/osgWrappers/osg/LOD.cpp
View File

@@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osg::LOD::RangeMode)
I_EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LOD)
BEGIN_OBJECT_REFLECTOR(osg::LOD)
I_BaseType(osg::Group);
I_Constructor0(____LOD,
"",

2
src/osgWrappers/osg/Light.cpp
View File

@@ -26,7 +26,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Light)
BEGIN_OBJECT_REFLECTOR(osg::Light)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Light,
"",

2
src/osgWrappers/osg/LightModel.cpp
View File

@@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osg::LightModel::ColorControl)
I_EnumLabel(osg::LightModel::SINGLE_COLOR);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LightModel)
BEGIN_OBJECT_REFLECTOR(osg::LightModel)
I_BaseType(osg::StateAttribute);
I_Constructor0(____LightModel,
"",

2
src/osgWrappers/osg/LightSource.cpp
View File

@@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osg::LightSource::ReferenceFrame)
I_EnumLabel(osg::LightSource::ABSOLUTE_RF);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LightSource)
BEGIN_OBJECT_REFLECTOR(osg::LightSource)
I_BaseType(osg::Group);
I_Constructor0(____LightSource,
"",

2
src/osgWrappers/osg/LineSegment.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LineSegment)
BEGIN_OBJECT_REFLECTOR(osg::LineSegment)
I_BaseType(osg::Referenced);
I_Constructor0(____LineSegment,
"",

2
src/osgWrappers/osg/LineStipple.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LineStipple)
BEGIN_OBJECT_REFLECTOR(osg::LineStipple)
I_BaseType(osg::StateAttribute);
I_Constructor0(____LineStipple,
"",

2
src/osgWrappers/osg/LineWidth.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LineWidth)
BEGIN_OBJECT_REFLECTOR(osg::LineWidth)
I_BaseType(osg::StateAttribute);
I_ConstructorWithDefaults1(IN, float, width, 1.0f,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/LogicOp.cpp
View File

@@ -43,7 +43,7 @@ BEGIN_ENUM_REFLECTOR(osg::LogicOp::Opcode)
I_EnumLabel(osg::LogicOp::OR_INVERTED);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LogicOp)
BEGIN_OBJECT_REFLECTOR(osg::LogicOp)
I_BaseType(osg::StateAttribute);
I_Constructor0(____LogicOp,
"",

2
src/osgWrappers/osg/Material.cpp
View File

@@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osg::Material::ColorMode)
I_EnumLabel(osg::Material::OFF);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Material)
BEGIN_OBJECT_REFLECTOR(osg::Material)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Material,
"",

2
src/osgWrappers/osg/MatrixTransform.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::MatrixTransform)
BEGIN_OBJECT_REFLECTOR(osg::MatrixTransform)
I_BaseType(osg::Transform);
I_Constructor0(____MatrixTransform,
"",

2
src/osgWrappers/osg/Matrixd.cpp
View File

@@ -492,7 +492,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixd)
__void__setTrans__C5_Vec3d_R1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::RefMatrixd)
BEGIN_OBJECT_REFLECTOR(osg::RefMatrixd)
I_BaseType(osg::Object);
I_BaseType(osg::Matrixd);
I_Constructor0(____RefMatrixd,

2
src/osgWrappers/osg/Matrixf.cpp
View File

@@ -492,7 +492,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixf)
__void__setTrans__C5_Vec3d_R1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::RefMatrixf)
BEGIN_OBJECT_REFLECTOR(osg::RefMatrixf)
I_BaseType(osg::Object);
I_BaseType(osg::Matrixf);
I_Constructor0(____RefMatrixf,

4
src/osgWrappers/osg/Multisample.cpp
View File

@@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osg::Multisample::Mode)
I_EnumLabel(osg::Multisample::DONT_CARE);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Multisample)
BEGIN_OBJECT_REFLECTOR(osg::Multisample)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Multisample,
"",
@@ -136,7 +136,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Multisample)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Multisample::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::Multisample::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

4
src/osgWrappers/osg/Node.cpp
View File

@@ -35,7 +35,7 @@ TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask);
TYPE_NAME_ALIAS(std::vector< std::string >, osg::Node::DescriptionList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Node)
BEGIN_OBJECT_REFLECTOR(osg::Node)
I_BaseType(osg::Object);
I_Constructor0(____Node,
"Construct a node. ",
@@ -396,7 +396,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Node)
__void__setUpdateCallback__NodeCallback_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback)
BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback)
I_BaseType(osg::Object);
I_Constructor0(____ComputeBoundingSphereCallback,
"",

2
src/osgWrappers/osg/NodeCallback.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeCallback)
BEGIN_OBJECT_REFLECTOR(osg::NodeCallback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____NodeCallback,
"",

4
src/osgWrappers/osg/NodeTrackerCallback.cpp
View File

@@ -24,7 +24,7 @@
TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeTrackerCallback)
BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback)
I_BaseType(osg::NodeCallback);
I_Constructor0(____NodeTrackerCallback,
"",
@@ -77,7 +77,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeTrackerCallback)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >)
BEGIN_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >)
I_BaseType(osg::Observer);
I_Constructor0(____observer_ptr,
"",

2
src/osgWrappers/osg/NodeVisitor.cpp
View File

@@ -67,7 +67,7 @@ BEGIN_ENUM_REFLECTOR(osg::NodeVisitor::VisitorType)
I_EnumLabel(osg::NodeVisitor::CULL_VISITOR);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeVisitor)
BEGIN_OBJECT_REFLECTOR(osg::NodeVisitor)
I_VirtualBaseType(osg::Referenced);
I_ConstructorWithDefaults1(IN, osg::NodeVisitor::TraversalMode, tm, osg::NodeVisitor::TRAVERSE_NONE,
Properties::NON_EXPLICIT,

5
src/osgWrappers/osg/Object.cpp
View File

@@ -92,6 +92,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object)
__DataVariance__getDataVariance,
"Get the data variance of this object. ",
"");
I_Method0(void, computeDataVariance,
Properties::VIRTUAL,
__void__computeDataVariance,
"Compute the DataVariance based on an assestment of callback etc. ",
"");
I_Method1(void, setUserData, IN, osg::Referenced *, obj,
Properties::NON_VIRTUAL,
__void__setUserData__Referenced_P1,

2
src/osgWrappers/osg/OccluderNode.cpp
View File

@@ -25,7 +25,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::OccluderNode)
BEGIN_OBJECT_REFLECTOR(osg::OccluderNode)
I_BaseType(osg::Group);
I_Constructor0(____OccluderNode,
"",

2
src/osgWrappers/osg/PagedLOD.cpp
View File

@@ -27,7 +27,7 @@
TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PagedLOD)
BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
I_BaseType(osg::LOD);
I_Constructor0(____PagedLOD,
"",

4
src/osgWrappers/osg/Point.cpp
View File

@@ -25,7 +25,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Point)
BEGIN_OBJECT_REFLECTOR(osg::Point)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Point,
"",
@@ -157,7 +157,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Point)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Point::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/PointSprite.cpp
View File

@@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::PointSprite::CoordOriginMode)
I_EnumLabel(osg::PointSprite::LOWER_LEFT);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PointSprite)
BEGIN_OBJECT_REFLECTOR(osg::PointSprite)
I_BaseType(osg::StateAttribute);
I_Constructor0(____PointSprite,
"",

2
src/osgWrappers/osg/PolygonMode.cpp
View File

@@ -36,7 +36,7 @@ BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Face)
I_EnumLabel(osg::PolygonMode::BACK);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PolygonMode)
BEGIN_OBJECT_REFLECTOR(osg::PolygonMode)
I_BaseType(osg::StateAttribute);
I_Constructor0(____PolygonMode,
"",

2
src/osgWrappers/osg/PolygonOffset.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PolygonOffset)
BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset)
I_BaseType(osg::StateAttribute);
I_Constructor0(____PolygonOffset,
"",

2
src/osgWrappers/osg/PolygonStipple.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PolygonStipple)
BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple)
I_BaseType(osg::StateAttribute);
I_Constructor0(____PolygonStipple,
"",

2
src/osgWrappers/osg/PositionAttitudeTransform.cpp
View File

@@ -26,7 +26,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PositionAttitudeTransform)
BEGIN_OBJECT_REFLECTOR(osg::PositionAttitudeTransform)
I_BaseType(osg::Transform);
I_Constructor0(____PositionAttitudeTransform,
"",

10
src/osgWrappers/osg/PrimitiveSet.cpp
View File

@@ -28,7 +28,7 @@
TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawArrayLengths)
BEGIN_OBJECT_REFLECTOR(osg::DrawArrayLengths)
I_BaseType(osg::PrimitiveSet);
I_BaseType(osg::VectorGLsizei);
I_ConstructorWithDefaults1(IN, GLenum, mode, 0,
@@ -127,7 +127,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawArrayLengths)
__void__setFirst__GLint);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawArrays)
BEGIN_OBJECT_REFLECTOR(osg::DrawArrays)
I_BaseType(osg::PrimitiveSet);
I_ConstructorWithDefaults1(IN, GLenum, mode, 0,
Properties::NON_EXPLICIT,
@@ -232,7 +232,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElementsUByte)
BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUByte)
I_BaseType(osg::PrimitiveSet);
I_BaseType(osg::VectorGLubyte);
I_ConstructorWithDefaults1(IN, GLenum, mode, 0,
@@ -347,7 +347,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(osg::VectorGLuint, osg::DrawElementsUInt::vector_type);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElementsUInt)
BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUInt)
I_BaseType(osg::PrimitiveSet);
I_BaseType(osg::VectorGLuint);
I_ConstructorWithDefaults1(IN, GLenum, mode, 0,
@@ -462,7 +462,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(osg::VectorGLushort, osg::DrawElementsUShort::vector_type);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElementsUShort)
BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUShort)
I_BaseType(osg::PrimitiveSet);
I_BaseType(osg::VectorGLushort);
I_ConstructorWithDefaults1(IN, GLenum, mode, 0,

4
src/osgWrappers/osg/Program.cpp
View File

@@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindi
TYPE_NAME_ALIAS(std::map< std::string COMMA osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Program)
BEGIN_OBJECT_REFLECTOR(osg::Program)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Program,
"",
@@ -208,7 +208,7 @@ BEGIN_VALUE_REFLECTOR(osg::Program::ActiveVarInfo)
I_PublicMemberProperty(GLint, _size);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
I_BaseType(osg::Referenced);
I_Constructor2(IN, const osg::Program *, program, IN, unsigned int, contextID,
____PerContextProgram__C5_Program_P1__unsigned_int,

2
src/osgWrappers/osg/Projection.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Projection)
BEGIN_OBJECT_REFLECTOR(osg::Projection)
I_BaseType(osg::Group);
I_Constructor0(____Projection,
"",

2
src/osgWrappers/osg/ProxyNode.cpp
View File

@@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode)
I_EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ProxyNode)
BEGIN_OBJECT_REFLECTOR(osg::ProxyNode)
I_BaseType(osg::Group);
I_Constructor0(____ProxyNode,
"",

2
src/osgWrappers/osg/Referenced.cpp
View File

@@ -22,7 +22,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Referenced)
BEGIN_OBJECT_REFLECTOR(osg::Referenced)
I_Constructor0(____Referenced,
"",
"");

2
src/osgWrappers/osg/Scissor.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Scissor)
BEGIN_OBJECT_REFLECTOR(osg::Scissor)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Scissor,
"",

2
src/osgWrappers/osg/Sequence.cpp
View File

@@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::Sequence::SequenceMode)
I_EnumLabel(osg::Sequence::RESUME);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Sequence)
BEGIN_OBJECT_REFLECTOR(osg::Sequence)
I_BaseType(osg::Group);
I_Constructor0(____Sequence,
"",

2
src/osgWrappers/osg/ShadeModel.cpp
View File

@@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::ShadeModel::Mode)
I_EnumLabel(osg::ShadeModel::SMOOTH);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShadeModel)
BEGIN_OBJECT_REFLECTOR(osg::ShadeModel)
I_BaseType(osg::StateAttribute);
I_Constructor0(____ShadeModel,
"",

2
src/osgWrappers/osg/Shader.cpp
View File

@@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::Shader::Type)
I_EnumLabel(osg::Shader::UNDEFINED);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Shader)
BEGIN_OBJECT_REFLECTOR(osg::Shader)
I_BaseType(osg::Object);
I_ConstructorWithDefaults1(IN, osg::Shader::Type, type, osg::Shader::UNDEFINED,
Properties::NON_EXPLICIT,

24
src/osgWrappers/osg/Shape.cpp
View File

@@ -27,7 +27,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Box)
BEGIN_OBJECT_REFLECTOR(osg::Box)
I_BaseType(osg::Shape);
I_Constructor0(____Box,
"",
@@ -140,7 +140,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Box)
__void__setRotation__C5_Quat_R1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Capsule)
BEGIN_OBJECT_REFLECTOR(osg::Capsule)
I_BaseType(osg::Shape);
I_Constructor0(____Capsule,
"",
@@ -264,7 +264,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shape > >, osg::CompositeShape::ChildList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CompositeShape)
BEGIN_OBJECT_REFLECTOR(osg::CompositeShape)
I_BaseType(osg::Shape);
I_Constructor0(____CompositeShape,
"",
@@ -365,7 +365,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CompositeShape)
__void__setShape__Shape_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Cone)
BEGIN_OBJECT_REFLECTOR(osg::Cone)
I_BaseType(osg::Shape);
I_Constructor0(____Cone,
"",
@@ -503,7 +503,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Cone)
__void__setRotation__C5_Quat_R1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstShapeVisitor)
BEGIN_VALUE_REFLECTOR(osg::ConstShapeVisitor)
I_Constructor0(____ConstShapeVisitor,
"",
"");
@@ -559,7 +559,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstShapeVisitor)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConvexHull)
BEGIN_OBJECT_REFLECTOR(osg::ConvexHull)
I_BaseType(osg::TriangleMesh);
I_Constructor0(____ConvexHull,
"",
@@ -605,7 +605,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConvexHull)
"Must be defined by derived classes. ");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Cylinder)
BEGIN_OBJECT_REFLECTOR(osg::Cylinder)
I_BaseType(osg::Shape);
I_Constructor0(____Cylinder,
"",
@@ -729,7 +729,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(std::vector< float >, osg::HeightField::HeightList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::HeightField)
BEGIN_OBJECT_REFLECTOR(osg::HeightField)
I_BaseType(osg::Shape);
I_Constructor0(____HeightField,
"",
@@ -925,7 +925,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::HeightField)
__void__setYInterval__float);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::InfinitePlane)
BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane)
I_BaseType(osg::Shape);
I_BaseType(osg::Plane);
I_Constructor0(____InfinitePlane,
@@ -1018,7 +1018,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Shape)
"Must be defined by derived classes. ");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShapeVisitor)
BEGIN_VALUE_REFLECTOR(osg::ShapeVisitor)
I_Constructor0(____ShapeVisitor,
"",
"");
@@ -1074,7 +1074,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShapeVisitor)
"");
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Sphere)
BEGIN_OBJECT_REFLECTOR(osg::Sphere)
I_BaseType(osg::Shape);
I_Constructor0(____Sphere,
"",
@@ -1160,7 +1160,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Sphere)
__void__setRadius__float);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TriangleMesh)
BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh)
I_BaseType(osg::Shape);
I_Constructor0(____TriangleMesh,
"",

4
src/osgWrappers/osg/ShapeDrawable.cpp
View File

@@ -28,7 +28,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShapeDrawable)
BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable)
I_BaseType(osg::Drawable);
I_Constructor0(____ShapeDrawable,
"",
@@ -139,7 +139,7 @@ BEGIN_ENUM_REFLECTOR(osg::TessellationHints::TessellationMode)
I_EnumLabel(osg::TessellationHints::USE_TARGET_NUM_FACES);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TessellationHints)
BEGIN_OBJECT_REFLECTOR(osg::TessellationHints)
I_BaseType(osg::Object);
I_Constructor0(____TessellationHints,
"",

2
src/osgWrappers/osg/State.cpp
View File

@@ -37,7 +37,7 @@ BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors)
I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::State)
BEGIN_OBJECT_REFLECTOR(osg::State)
I_BaseType(osg::Referenced);
I_Constructor0(____State,
"",

2
src/osgWrappers/osg/StateAttribute.cpp
View File

@@ -259,7 +259,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute)
__void__setUpdateCallback__Callback_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::Callback)
BEGIN_OBJECT_REFLECTOR(osg::StateAttribute::Callback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____Callback,
"",

9
src/osgWrappers/osg/StateSet.cpp
View File

@@ -54,7 +54,7 @@ BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode)
I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet)
BEGIN_OBJECT_REFLECTOR(osg::StateSet)
I_BaseType(osg::Object);
I_Constructor0(____StateSet,
"",
@@ -118,6 +118,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet)
__unsigned_int__getNumParents,
"Get the number of parents of this StateSet. ",
"the number of parents of this StateSet. ");
I_Method0(void, computeDataVariance,
Properties::VIRTUAL,
__void__computeDataVariance,
"Compute the DataVariance based on an assestment of callback etc. ",
"");
I_Method0(void, setGlobalDefaults,
Properties::NON_VIRTUAL,
__void__setGlobalDefaults,
@@ -546,7 +551,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet)
__void__setUpdateCallback__Callback_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet::Callback)
BEGIN_OBJECT_REFLECTOR(osg::StateSet::Callback)
I_VirtualBaseType(osg::Object);
I_Constructor0(____Callback,
"",

2
src/osgWrappers/osg/Stats.cpp
View File

@@ -26,7 +26,7 @@ TYPE_NAME_ALIAS(std::vector< osg::Stats::AttributeMap >, osg::Stats::AttributeMa
TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Stats)
BEGIN_OBJECT_REFLECTOR(osg::Stats)
I_BaseType(osg::Referenced);
I_Constructor1(IN, const std::string &, name,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/Stencil.cpp
View File

@@ -46,7 +46,7 @@ BEGIN_ENUM_REFLECTOR(osg::Stencil::Operation)
I_EnumLabel(osg::Stencil::DECR_WRAP);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Stencil)
BEGIN_OBJECT_REFLECTOR(osg::Stencil)
I_BaseType(osg::StateAttribute);
I_Constructor0(____Stencil,
"",

4
src/osgWrappers/osg/StencilTwoSided.cpp
View File

@@ -51,7 +51,7 @@ BEGIN_ENUM_REFLECTOR(osg::StencilTwoSided::Operation)
I_EnumLabel(osg::StencilTwoSided::DECR_WRAP);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StencilTwoSided)
BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided)
I_BaseType(osg::StateAttribute);
I_Constructor0(____StencilTwoSided,
"",
@@ -226,7 +226,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StencilTwoSided)
0);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StencilTwoSided::Extensions)
BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided::Extensions)
I_BaseType(osg::Referenced);
I_Constructor1(IN, unsigned int, contextID,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/Switch.cpp
View File

@@ -27,7 +27,7 @@
TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Switch)
BEGIN_OBJECT_REFLECTOR(osg::Switch)
I_BaseType(osg::Group);
I_Constructor0(____Switch,
"",

2
src/osgWrappers/osg/TexEnv.cpp
View File

@@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexEnv::Mode)
I_EnumLabel(osg::TexEnv::ADD);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexEnv)
BEGIN_OBJECT_REFLECTOR(osg::TexEnv)
I_BaseType(osg::StateAttribute);
I_ConstructorWithDefaults1(IN, osg::TexEnv::Mode, mode, osg::TexEnv::MODULATE,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/TexEnvCombine.cpp
View File

@@ -59,7 +59,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexEnvCombine::OperandParam)
I_EnumLabel(osg::TexEnvCombine::ONE_MINUS_SRC_ALPHA);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexEnvCombine)
BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine)
I_BaseType(osg::StateAttribute);
I_Constructor0(____TexEnvCombine,
"",

2
src/osgWrappers/osg/TexEnvFilter.cpp
View File

@@ -24,7 +24,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexEnvFilter)
BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter)
I_BaseType(osg::StateAttribute);
I_ConstructorWithDefaults1(IN, float, lodBias, 0.0f,
Properties::NON_EXPLICIT,

2
src/osgWrappers/osg/TexGen.cpp
View File

@@ -41,7 +41,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexGen::Coord)
I_EnumLabel(osg::TexGen::Q);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexGen)
BEGIN_OBJECT_REFLECTOR(osg::TexGen)
I_BaseType(osg::StateAttribute);
I_Constructor0(____TexGen,
"",

Some files were not shown because too many files have changed in this diff Show More