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

Added overriding of CullSettings::inheritCullSettings() into osg::Camera to

Browse Source 
properly inherit the clear colour.
This commit is contained in:
Robert Osfield
2008-06-16 20:22:16 +00:00
parent 4e7dd7f0db
commit 7cfe00d3d9
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/Camera
View File

@@ -508,6 +508,9 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
/** Transform method that must be defined to provide generic interface for scene graph traversals.*/
virtual bool computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const;
/** Inherit the local cull settings variable from specified CullSettings object, according to the inheritance mask.*/
virtual void inheritCullSettings(const CullSettings& settings, unsigned int inheritanceMask);
protected :
virtual ~Camera();

12
src/osg/Camera.cpp
View File

@@ -341,6 +341,18 @@ bool Camera::computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const
return true;
}
void Camera::inheritCullSettings(const CullSettings& settings, unsigned int inheritanceMask)
{
CullSettings::inheritCullSettings(settings, inheritanceMask);
if (inheritanceMask & CLEAR_COLOR)
{
//osg::notify(osg::NOTICE)<<"Inheriting slave Camera"<<std::endl;
const Camera* camera = dynamic_cast<const Camera*>(&settings);
_clearColor = camera->_clearColor;
}
}
void Camera::createCameraThread()
{
if (!_cameraThread)

3
src/osg/View.cpp
View File

@@ -157,8 +157,7 @@ void View::updateSlave(unsigned int i)
slave._camera->setViewMatrix(_camera->getViewMatrix() * slave._viewOffset);
}
slave._camera->inheritCullSettings(*_camera);
if (slave._camera->getInheritanceMask() & osg::CullSettings::CLEAR_COLOR) slave._camera->setClearColor(_camera->getClearColor());
slave._camera->inheritCullSettings(*_camera, slave._camera->getInheritanceMask());
}
bool View::addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, const osg::Matrix& viewOffset, bool useMastersSceneData)

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

@@ -14,6 +14,7 @@
#include <osg/Camera>
#include <osg/ColorMask>
#include <osg/CopyOp>
#include <osg/CullSettings>
#include <osg/DisplaySettings>
#include <osg/GraphicsContext>
#include <osg/GraphicsThread>
@@ -637,6 +638,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera)
__bool__computeWorldToLocalMatrix__Matrix_R1__NodeVisitor_P1,
"Transform method that must be defined to provide generic interface for scene graph traversals. ",
"");
I_Method2(void, inheritCullSettings, IN, const osg::CullSettings &, settings, IN, unsigned int, inheritanceMask,
Properties::VIRTUAL,
__void__inheritCullSettings__C5_CullSettings_R1__unsigned_int,
"Inherit the local cull settings variable from specified CullSettings object, according to the inheritance mask. ",
"");
I_SimpleProperty(bool, AllowEventFocus,
__bool__getAllowEventFocus,
__void__setAllowEventFocus__bool);