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

Updates to clean up wrapper generation, and to update wrappers

Browse Source
This commit is contained in:
Robert Osfield 2005-05-24 15:34:23 +00:00
parent 58962475f1
commit e229a8cb67
7 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgTerrain/DataSet
View File

@ -626,7 +626,7 @@ class OSGTERRAIN_EXPORT DataSet : public osg::Referenced
{ {
DefaultSourceAdvancer() {} DefaultSourceAdvancer() {}
bool isActive(const CompositeSource& composite,int index) bool isActive(const CompositeSource& /*composite*/,int /*index*/)
{ {
return true; return true;
} }

4
include/osgUtil/RenderBin
View File

@ -57,7 +57,9 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
RenderBin(SortMode mode=getDefaultRenderBinSortMode()); RenderBin();
RenderBin(SortMode mode);
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/ /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
RenderBin(const RenderBin& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); RenderBin(const RenderBin& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);

3
include/osgUtil/RenderStage
View File

@ -36,7 +36,8 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
public: public:
RenderStage(SortMode mode=getDefaultRenderBinSortMode()); RenderStage();
RenderStage(SortMode mode);
RenderStage(const RenderStage& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); RenderStage(const RenderStage& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);

8
src/osgUtil/RenderBin.cpp
View File

@ -114,6 +114,14 @@ RenderBin::SortMode RenderBin::getDefaultRenderBinSortMode()
return s_defaultBinSortMode; return s_defaultBinSortMode;
} }
RenderBin::RenderBin()
{
_binNum = 0;
_parent = NULL;
_stage = NULL;
_sortMode = getDefaultRenderBinSortMode();
}
RenderBin::RenderBin(SortMode mode) RenderBin::RenderBin(SortMode mode)
{ {
_binNum = 0; _binNum = 0;

15
src/osgUtil/RenderStage.cpp
View File

@ -23,6 +23,21 @@ using namespace osgUtil;
// register a RenderStage prototype with the RenderBin prototype list. // register a RenderStage prototype with the RenderBin prototype list.
//RegisterRenderBinProxy<RenderStage> s_registerRenderStageProxy; //RegisterRenderBinProxy<RenderStage> s_registerRenderStageProxy;
RenderStage::RenderStage():
RenderBin(getDefaultRenderBinSortMode())
{
// point RenderBin's _stage to this to ensure that references to
// stage don't go tempted away to any other stage.
_stage = this;
_stageDrawnThisFrame = false;
_clearMask = GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT;
_clearColor.set(0.0f,0.0f,0.0f,0.0f);
_clearAccum.set(0.0f,0.0f,0.0f,0.0f);
_clearDepth = 1.0;
_clearStencil = 0;
}
RenderStage::RenderStage(SortMode mode): RenderStage::RenderStage(SortMode mode):
RenderBin(mode) RenderBin(mode)
{ {

3
src/osgWrappers/osgUtil/RenderBin.cpp
View File

@ -45,7 +45,8 @@ END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin)
I_BaseType(osg::Object); I_BaseType(osg::Object);
I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::getDefaultRenderBinSortMode()); I_Constructor0();
I_Constructor1(IN, osgUtil::RenderBin::SortMode, mode);
I_ConstructorWithDefaults2(IN, const osgUtil::RenderBin &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_ConstructorWithDefaults2(IN, const osgUtil::RenderBin &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
I_Method0(osg::Object *, cloneType); I_Method0(osg::Object *, cloneType);
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);

3
src/osgWrappers/osgUtil/RenderStage.cpp
View File

@ -33,7 +33,8 @@
BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
I_BaseType(osgUtil::RenderBin); I_BaseType(osgUtil::RenderBin);
I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::getDefaultRenderBinSortMode()); I_Constructor0();
I_Constructor1(IN, osgUtil::RenderBin::SortMode, mode);
I_ConstructorWithDefaults2(IN, const osgUtil::RenderStage &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_ConstructorWithDefaults2(IN, const osgUtil::RenderStage &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
I_Method0(osg::Object *, cloneType); I_Method0(osg::Object *, cloneType);
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);