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

Added osg::RenderInfo::pushRenderBin()/popRenderBin() and RenderInfo::getRenderBinStack() and getCameraStack() access methods for getting access to the current RenderBin/RenderStage.

Browse Source
This commit is contained in:
Robert Osfield 2013-08-01 07:19:45 +00:00
parent 364e2765e7
commit 07365c1073
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/osg/RenderInfo
View File

@ -17,6 +17,11 @@
#include <osg/State> #include <osg/State>
#include <osg/View> #include <osg/View>
namespace osgUtil {
// forward declare RenderBin so we can refer to it in RenderInfo
class RenderBin;
}
namespace osg { namespace osg {
class RenderInfo class RenderInfo
@ -29,7 +34,8 @@ public:
RenderInfo(const RenderInfo& rhs): RenderInfo(const RenderInfo& rhs):
_state(rhs._state), _state(rhs._state),
_view(rhs._view), _view(rhs._view),
_cameras(rhs._cameras), _cameraStack(rhs._cameraStack),
_renderBinStack(rhs._renderBinStack),
_userData(rhs._userData) {} _userData(rhs._userData) {}
RenderInfo(State* state, View* view): RenderInfo(State* state, View* view):
@ -40,7 +46,8 @@ public:
{ {
_state = rhs._state; _state = rhs._state;
_view = rhs._view; _view = rhs._view;
_cameras = rhs._cameras; _cameraStack = rhs._cameraStack;
_renderBinStack = rhs._renderBinStack;
_userData = rhs._userData; _userData = rhs._userData;
return *this; return *this;
} }
@ -55,10 +62,19 @@ public:
View* getView() { return _view; } View* getView() { return _view; }
const View* getView() const { return _view; } const View* getView() const { return _view; }
void pushCamera(Camera* camera) { _cameras.push_back(camera); } void pushCamera(Camera* camera) { _cameraStack.push_back(camera); }
void popCamera() { if (!_cameras.empty()) _cameras.pop_back(); } void popCamera() { if (!_cameraStack.empty()) _cameraStack.pop_back(); }
Camera* getCurrentCamera() { return _cameras.empty() ? 0 : _cameras.back(); } typedef std::vector<Camera*> CameraStack;
CameraStack& getCameraStack() { return _cameraStack; }
Camera* getCurrentCamera() { return _cameraStack.empty() ? 0 : _cameraStack.back(); }
void pushRenderBin(osgUtil::RenderBin* bin) { _renderBinStack.push_back(bin); }
void popRenderBin() { _renderBinStack.pop_back(); }
typedef std::vector<osgUtil::RenderBin*> RenderBinStack;
RenderBinStack& getRenderBinStack() { return _renderBinStack; }
void setUserData(Referenced* userData) { _userData = userData; } void setUserData(Referenced* userData) { _userData = userData; }
Referenced* getUserData() { return _userData.get(); } Referenced* getUserData() { return _userData.get(); }
@ -66,11 +82,11 @@ public:
protected: protected:
typedef std::vector<Camera*> Cameras;
ref_ptr<State> _state; ref_ptr<State> _state;
View* _view; View* _view;
Cameras _cameras; CameraStack _cameraStack;
RenderBinStack _renderBinStack;
ref_ptr<Referenced> _userData; ref_ptr<Referenced> _userData;
}; };

4
src/osgUtil/RenderBin.cpp
View File

@ -421,11 +421,15 @@ RenderBin* RenderBin::find_or_insert(int binNum,const std::string& binName)
void RenderBin::draw(osg::RenderInfo& renderInfo,RenderLeaf*& previous) void RenderBin::draw(osg::RenderInfo& renderInfo,RenderLeaf*& previous)
{ {
renderInfo.pushRenderBin(this);
if (_drawCallback.valid()) if (_drawCallback.valid())
{ {
_drawCallback->drawImplementation(this,renderInfo,previous); _drawCallback->drawImplementation(this,renderInfo,previous);
} }
else drawImplementation(renderInfo,previous); else drawImplementation(renderInfo,previous);
renderInfo.popRenderBin();
} }
void RenderBin::drawImplementation(osg::RenderInfo& renderInfo,RenderLeaf*& previous) void RenderBin::drawImplementation(osg::RenderInfo& renderInfo,RenderLeaf*& previous)