fly/flightgear
1
0
Fork 0
Code Activity

Since we require OSG 3.0 now, this check is obsolete.

Browse source
This commit is contained in:
James Turner 2012-05-15 23:10:53 +01:00
parent e06b3df11e
commit 77cd7b39f7
4 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -254,19 +254,6 @@ check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(sys/time.h HAVE_SYS_TIME_H) check_include_file(sys/time.h HAVE_SYS_TIME_H)
check_include_file(windows.h HAVE_WINDOWS_H) check_include_file(windows.h HAVE_WINDOWS_H)
# definition depends on OSG version
set(CMAKE_REQUIRED_INCLUDES ${OPENSCENEGRAPH_INCLUDE_DIRS})
check_cxx_source_compiles(
"#include <osg/CullSettings>
int main()
{
osg::CullSettings::VariablesMask mask = osg::CullSettings::CLEAR_MASK;
return 0;
}
"
HAVE_CULLSETTINGS_CLEAR_MASK)
if(ENABLE_RTI) if(ENABLE_RTI)
find_package(RTI) find_package(RTI)
if(RTI_FOUND) if(RTI_FOUND)

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

@ -164,8 +164,6 @@
#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

1
src/Include/config_cmake.h.in
View file

@ -18,7 +18,6 @@
#cmakedefine HAVE_SYS_TIME_H #cmakedefine HAVE_SYS_TIME_H
#cmakedefine HAVE_WINDOWS_H #cmakedefine HAVE_WINDOWS_H
#cmakedefine HAVE_CULLSETTINGS_CLEAR_MASK
#cmakedefine HAVE_MKFIFO #cmakedefine HAVE_MKFIFO
#define VERSION "@FLIGHTGEAR_VERSION@" #define VERSION "@FLIGHTGEAR_VERSION@"

4
src/Viewer/CameraGroup.cxx
View file

@ -750,9 +750,7 @@ CameraInfo* CameraGroup::buildCamera(SGPropertyNode* cameraNode)
camera->setInheritanceMask(CullSettings::ALL_VARIABLES camera->setInheritanceMask(CullSettings::ALL_VARIABLES
& ~(CullSettings::CULL_MASK & ~(CullSettings::CULL_MASK
| CullSettings::CULLING_MODE | CullSettings::CULLING_MODE
#if defined(HAVE_CULLSETTINGS_CLEAR_MASK)
| CullSettings::CLEAR_MASK | CullSettings::CLEAR_MASK
#endif
)); ));
osg::Matrix vOff; osg::Matrix vOff;
@ -999,9 +997,7 @@ CameraInfo* CameraGroup::buildGUICamera(SGPropertyNode* cameraNode,
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
#if defined(HAVE_CULLSETTINGS_CLEAR_MASK)
| CullSettings::CLEAR_MASK | CullSettings::CLEAR_MASK
#endif
)); ));
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);