fly/flightgear
1
0
Fork 0
Code Activity

Update camera inheritance masks because of OSG changeset 10838

Browse source
This commit is contained in:
Csaba Halasz 2009-11-29 01:57:03 +01:00 • committed by Tim Moore
parent 6fcd9f967b
commit 4fc7105675
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Main/CameraGroup.cxx
View file

@ -317,7 +317,8 @@ CameraInfo* CameraGroup::buildCamera(SGPropertyNode* cameraNode)
| CullSettings::VIEW_FRUSTUM_CULLING); | CullSettings::VIEW_FRUSTUM_CULLING);
camera->setInheritanceMask(CullSettings::ALL_VARIABLES camera->setInheritanceMask(CullSettings::ALL_VARIABLES
& ~(CullSettings::CULL_MASK & ~(CullSettings::CULL_MASK
| CullSettings::CULLING_MODE)); | CullSettings::CULLING_MODE
| CullSettings::CLEAR_MASK));
osg::Matrix pOff; osg::Matrix pOff;
osg::Matrix vOff; osg::Matrix vOff;
@ -418,7 +419,8 @@ CameraInfo* CameraGroup::buildGUICamera(SGPropertyNode* cameraNode,
camera->setClearMask(0); camera->setClearMask(0);
camera->setInheritanceMask(CullSettings::ALL_VARIABLES camera->setInheritanceMask(CullSettings::ALL_VARIABLES
& ~(CullSettings::COMPUTE_NEAR_FAR_MODE & ~(CullSettings::COMPUTE_NEAR_FAR_MODE
| CullSettings::CULLING_MODE)); | CullSettings::CULLING_MODE
| CullSettings::CLEAR_MASK));
camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR); camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
camera->setCullingMode(osg::CullSettings::NO_CULLING); camera->setCullingMode(osg::CullSettings::NO_CULLING);
camera->setProjectionResizePolicy(Camera::FIXED); camera->setProjectionResizePolicy(Camera::FIXED);