From 778cc4c4352484a3d4d9191c7b19d51512565bda Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Sun, 18 Sep 2011 08:10:36 +0200 Subject: [PATCH] clouds: remove unused bump mapping flags. --- simgear/scene/sky/cloud.cxx | 15 --------------- simgear/scene/sky/cloud.hxx | 2 -- 2 files changed, 17 deletions(-) diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx index 19d5c70c..a3cf4ffe 100644 --- a/simgear/scene/sky/cloud.cxx +++ b/simgear/scene/sky/cloud.cxx @@ -78,9 +78,6 @@ static osg::ref_ptr layer_states[SGCloudLayer::SG_MAX_CLOUD_COVER static osg::ref_ptr layer_states2[SGCloudLayer::SG_MAX_CLOUD_COVERAGES]; static osg::ref_ptr 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 diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx index fa65a6ad..95f6dbbe 100644 --- a/simgear/scene/sky/cloud.hxx +++ b/simgear/scene/sky/cloud.hxx @@ -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; } -- 2.39.5