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

clouds: remove unused bump mapping flags.

Browse Source
This commit is contained in:
Mathias Froehlich 2011-09-18 08:10:36 +02:00
parent bd999ca090
commit 778cc4c435
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
simgear/scene/sky/cloud.cxx
View File

@ -78,9 +78,6 @@ static osg::ref_ptr<osg::StateSet> layer_states[SGCloudLayer::SG_MAX_CLOUD_COVER
static osg::ref_ptr<osg::StateSet> layer_states2[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
static osg::ref_ptr<osg::TextureCubeMap> cubeMap;
static bool state_initialized = false;
static bool bump_mapping = false;
bool SGCloudLayer::enable_bump_mapping = false;
const std::string SGCloudLayer::SG_CLOUD_OVERCAST_STRING = "overcast";
const std::string SGCloudLayer::SG_CLOUD_BROKEN_STRING = "broken";
@ -381,18 +378,6 @@ SGCloudLayer::rebuild()
SG_LOG(SG_ASTRO, SG_INFO, "initializing cloud layers");
osg::Texture::Extensions* extensions;
extensions = osg::Texture::getExtensions(0, true);
// OSGFIXME
bump_mapping = extensions->isMultiTexturingSupported() &&
(2 <= extensions->numTextureUnits()) &&
SGIsOpenGLExtensionSupported("GL_ARB_texture_env_combine") &&
SGIsOpenGLExtensionSupported("GL_ARB_texture_env_dot3");
osg::TextureCubeMap::Extensions* extensions2;
extensions2 = osg::TextureCubeMap::getExtensions(0, true);
bump_mapping = bump_mapping && extensions2->isCubeMapSupported();
// This bump mapping code was inspired by the tutorial available at
// http://www.paulsprojects.net/tutorials/simplebump/simplebump.html
// and a NVidia white paper

2
simgear/scene/sky/cloud.hxx
View File

@ -227,8 +227,6 @@ public:
osg::Switch* getNode() { return cloud_root.get(); }
static bool enable_bump_mapping;
/** return the 3D layer cloud associated with this 2D layer */
SGCloudField *get_layer3D(void) { return layer3D; }