fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'zan/stencil2' into next

Browse source
This commit is contained in:
Tim Moore 2010-02-10 15:55:11 +01:00
commit 571f7301f2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Include/config.h-msvc71
View file

@ -163,6 +163,8 @@
#define NOMINMAX 1 #define NOMINMAX 1
#define HAVE_CULLSETTINGS_CLEAR_MASK 1
#ifndef ENABLE_AUDIO_SUPPORT #ifndef ENABLE_AUDIO_SUPPORT
#define ENABLE_AUDIO_SUPPORT #define ENABLE_AUDIO_SUPPORT
#endif #endif

2
src/Main/CameraGroup.cxx
View file

@ -202,7 +202,7 @@ void CameraGroup::update(const osg::Vec3d& position,
camera->setProjectionMatrix(projectionMatrix); camera->setProjectionMatrix(projectionMatrix);
camera->setCullMask(camera->getCullMask() camera->setCullMask(camera->getCullMask()
| simgear::BACKGROUND_BIT); | simgear::BACKGROUND_BIT);
camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
farCamera->setNodeMask(0); farCamera->setNodeMask(0);
} else { } else {
Matrix nearProj, farProj; Matrix nearProj, farProj;