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

Improved the sort callback support in osgUtil::RenderBin, and removed the

Browse Source 
now rendundent DepthSortedBin class.
This commit is contained in:
Robert Osfield
2002-09-17 15:47:23 +00:00
parent 91df37b5c8
commit ed43d97ed3
9 changed files with 133 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/osgUtil/DepthSortedBin
View File

@@ -1,52 +0,0 @@
//C++ header - Open Scene Graph - Copyright (C) 1998-2002 Robert Osfield
//Distributed under the terms of the GNU Library General Public License (LGPL)
//as published by the Free Software Foundation.
#ifndef OSGUTIL_DEPTHSORTEDBIN
#define OSGUTIL_DEPTHSORTEDBIN 1
#include <osgUtil/RenderBin>
namespace osgUtil {
class OSGUTIL_EXPORT DepthSortedBin : public RenderBin
{
public:
DepthSortedBin();
virtual osg::Object* cloneType() const { return osgNew DepthSortedBin(); }
virtual osg::Object* clone(const osg::CopyOp&) const { return osgNew DepthSortedBin(); } // note only implements a clone of type.
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const DepthSortedBin*>(obj)!=0L; }
virtual const char* libraryName() const { return "osgUtil"; }
virtual const char* className() const { return "DepthSortedBin"; }
virtual void reset();
virtual void sort_local();
virtual void draw_local(osg::State& state,RenderLeaf*& previous);
enum DrawOrder
{
FRONT_TO_BACK,
BACK_TO_FRONT
};
void setDrawOrder(const DrawOrder drawOrder) { _drawOrder = drawOrder; }
const DrawOrder getDrawOrder() const { return _drawOrder; }
protected:
virtual ~DepthSortedBin();
DrawOrder _drawOrder;
//RenderLeafList _renderLeafList;
};
}
#endif

39
include/osgUtil/RenderBin
View File

@@ -31,14 +31,25 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
// static methods.
static RenderBin* createRenderBin(const std::string& binName);
static void addRenderBinPrototype(RenderBin* proto);
static RenderBin* getRenderBinPrototype(const std::string& binName);
static void addRenderBinPrototype(const std::string& binName,RenderBin* proto);
static void removeRenderBinPrototype(RenderBin* proto);
enum SortMode
{
SORT_BY_STATE,
SORT_FRONT_TO_BACK,
SORT_BACK_TO_FRONT
};
RenderBin();
RenderBin(SortMode mode=SORT_BY_STATE);
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
RenderBin(const RenderBin& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
virtual osg::Object* cloneType() const { return osgNew RenderBin(); }
virtual osg::Object* clone(const osg::CopyOp&) const { return osgNew RenderBin(); } // note only implements a clone of type.
virtual osg::Object* clone(const osg::CopyOp& copyop) const { return osgNew RenderBin(*this,copyop); } // note only implements a clone of type.
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const RenderBin*>(obj)!=0L; }
virtual const char* libraryName() const { return "osgUtil"; }
virtual const char* className() const { return "RenderBin"; }
@@ -51,18 +62,14 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
{
_renderGraphList.push_back(rg);
}
bool getRequiresDepthValueForSort() const { return _requiresDepthValueForSort; }
void setRequiresDepthValueForSort(bool flag) { _requiresDepthValueForSort=flag; }
void sort();
enum SortMode
{
SORT_BY_STATE,
SORT_FRONT_TO_BACK,
SORT_BACK_TO_FONT
};
void setSortMode(SortMode mode) { _sortMode = mode; }
void setSortMode(SortMode mode);
SortMode getSortMode() const { return _sortMode; }
virtual void sort_local();
@@ -95,6 +102,7 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
void copyLeavesFromRenderGraphListToRenderLeafList();
bool _requiresDepthValueForSort;
int _binNum;
RenderBin* _parent;
RenderStage* _stage;
@@ -117,14 +125,13 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
};
/** Proxy class for automatic registration of renderbins with the RenderBin prototypelist.*/
template<class T>
class RegisterRenderBinProxy
{
public:
RegisterRenderBinProxy()
RegisterRenderBinProxy(const std::string& binName,RenderBin* proto)
{
_rb = osgNew T;
RenderBin::addRenderBinPrototype(_rb.get());
_rb = proto;
RenderBin::addRenderBinPrototype(binName,_rb.get());
}
~RegisterRenderBinProxy()
@@ -133,7 +140,7 @@ class RegisterRenderBinProxy
}
protected:
osg::ref_ptr<T> _rb;
osg::ref_ptr<RenderBin> _rb;
};

7
include/osgUtil/RenderStage
View File

@@ -27,9 +27,12 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
public:
RenderStage();
RenderStage(SortMode mode=SORT_BY_STATE);
RenderStage(const RenderStage& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
virtual osg::Object* cloneType() const { return osgNew RenderStage(); }
virtual osg::Object* clone(const osg::CopyOp&) const { return osgNew RenderStage(); } // note only implements a clone of type.
virtual osg::Object* clone(const osg::CopyOp& copyop) const { return osgNew RenderStage(*this,copyop); } // note only implements a clone of type.
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const RenderStage*>(obj)!=0L; }
virtual const char* className() const { return "RenderStage"; }