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

Revert the Camera::setInheritanceMask(0x) calls that were added as workaround to a bug introduced by a bug fix to the way the inhertiance mask was handled in CullVisito::apply(Camera&)

Browse Source
This commit is contained in:
Robert Osfield
2008-03-19 11:41:21 +00:00
parent 027b4b0986
commit 207a0e8610
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgShadow/ParallelSplitShadowMap.cpp
View File

@@ -239,7 +239,6 @@ void ParallelSplitShadowMap::init(){
{
// create the camera
pssmShadowSplitTexture._camera = new osg::Camera;
pssmShadowSplitTexture._camera->setInheritanceMask(0x0);
pssmShadowSplitTexture._camera->setCullCallback(new CameraCullCallback(this));
#ifndef SHADOW_TEXTURE_DEBUG
@@ -442,7 +441,6 @@ void ParallelSplitShadowMap::init(){
pssmShadowSplitTexture._debug_texture->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::LINEAR);
// create the camera
pssmShadowSplitTexture._debug_camera = new osg::Camera;
pssmShadowSplitTexture._debug_camera->setInheritanceMask(0x0);
pssmShadowSplitTexture._debug_camera->setCullCallback(new CameraCullCallback(this));
pssmShadowSplitTexture._debug_camera->setClearMask(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT);
pssmShadowSplitTexture._debug_camera->setClearColor(osg::Vec4(1.0,1.0,1.0,1.0));

4
src/osgShadow/ShadowMap.cpp
View File

@@ -182,8 +182,6 @@ void ShadowMap::init()
// create the camera
_camera = new osg::Camera;
_camera->setInheritanceMask(0x0);
_camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
_camera->setCullCallback(new CameraCullCallback(this));
@@ -551,8 +549,6 @@ osg::ref_ptr<osg::Camera> ShadowMap::makeDebugHUD()
osg::ref_ptr<osg::Camera> camera = new osg::Camera;
camera->setInheritanceMask(0x0);
osg::Vec2 size(1280, 1024);
// set the projection matrix
camera->setProjectionMatrix(osg::Matrix::ortho2D(0,size.x(),0,size.y()));

2
src/osgShadow/ShadowTexture.cpp
View File

@@ -56,8 +56,6 @@ void ShadowTexture::init()
// create the camera
_camera = new osg::Camera;
// _camera->setInheritanceMask(0x0);
_camera->setClearColor(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
_camera->setCullCallback(new CameraCullCallback(this));