Remove pre-OSG 'enable/disable-textures' option.
These have been non-functional for a long time, remove to avoid further confusion.
This commit is contained in:
parent
b0dcb657e7
commit
b76d255d82
3 changed files with 2 additions and 26 deletions
|
@ -112,9 +112,6 @@ Disable fuel freeze (enabling fuel consumption).
|
||||||
.B "--disable-fullscreen"
|
.B "--disable-fullscreen"
|
||||||
Disable fullscreen mode.
|
Disable fullscreen mode.
|
||||||
.TP
|
.TP
|
||||||
.B "--disable-game-mode"
|
|
||||||
Disable fullscreen game mode.
|
|
||||||
.TP
|
|
||||||
.B "--disable-horizon-effect"
|
.B "--disable-horizon-effect"
|
||||||
Disable celestial body growth illusion near the horizon..
|
Disable celestial body growth illusion near the horizon..
|
||||||
.TP
|
.TP
|
||||||
|
@ -124,9 +121,6 @@ Disable 2D HUD.
|
||||||
.B "--disable-hud-3d"
|
.B "--disable-hud-3d"
|
||||||
Disable 3D HUD.
|
Disable 3D HUD.
|
||||||
.TP
|
.TP
|
||||||
.B "--disable-intro-music"
|
|
||||||
Disable introduction music.
|
|
||||||
.TP
|
|
||||||
.B "--disable-mouse-pointer"
|
.B "--disable-mouse-pointer"
|
||||||
Disable extra mouse pointer.
|
Disable extra mouse pointer.
|
||||||
.TP
|
.TP
|
||||||
|
@ -145,9 +139,6 @@ Disable specular reflections on textured objects.
|
||||||
.B "--disable-splash-screen"
|
.B "--disable-splash-screen"
|
||||||
Disable splash screen.
|
Disable splash screen.
|
||||||
.TP
|
.TP
|
||||||
.B "--disable-textures"
|
|
||||||
Disable textures.
|
|
||||||
.TP
|
|
||||||
.B "--disable-wireframe"
|
.B "--disable-wireframe"
|
||||||
Disable wireframe drawing mode.
|
Disable wireframe drawing mode.
|
||||||
.TP
|
.TP
|
||||||
|
@ -178,9 +169,6 @@ Enable fuel freeze (disabling fuel consumption).
|
||||||
.B "--enable-fullscreen"
|
.B "--enable-fullscreen"
|
||||||
Enable fullscreen mode.
|
Enable fullscreen mode.
|
||||||
.TP
|
.TP
|
||||||
.B "--enable-game-mode"
|
|
||||||
Enable fullscreen game mode.
|
|
||||||
.TP
|
|
||||||
.B "--enable-horizon-effect"
|
.B "--enable-horizon-effect"
|
||||||
Enable celestial body growth illusion near the horizon.
|
Enable celestial body growth illusion near the horizon.
|
||||||
.TP
|
.TP
|
||||||
|
@ -190,9 +178,6 @@ Enable 2D HUD.
|
||||||
.B "--enable-hud-3d"
|
.B "--enable-hud-3d"
|
||||||
Enable 3D HUD.
|
Enable 3D HUD.
|
||||||
.TP
|
.TP
|
||||||
.B "--enable-intro-music"
|
|
||||||
Enable introduction music.
|
|
||||||
.TP
|
|
||||||
.B "--enable-mouse-pointer"
|
.B "--enable-mouse-pointer"
|
||||||
Enable extra mouse pointer (i.e. for full screen voodoo/voodoo-II
|
Enable extra mouse pointer (i.e. for full screen voodoo/voodoo-II
|
||||||
based cards.)
|
based cards.)
|
||||||
|
@ -212,9 +197,6 @@ Enable specular reflections on textured objects.
|
||||||
.B "--enable-splash-screen"
|
.B "--enable-splash-screen"
|
||||||
Enable splash screen.
|
Enable splash screen.
|
||||||
.TP
|
.TP
|
||||||
.B "--enable-textures"
|
|
||||||
Enable textures.
|
|
||||||
.TP
|
|
||||||
.B "--enable-wireframe"
|
.B "--enable-wireframe"
|
||||||
Enable wireframe drawing mode.
|
Enable wireframe drawing mode.
|
||||||
.TP
|
.TP
|
||||||
|
|
|
@ -185,7 +185,6 @@ void fgSetDefaults ()
|
||||||
fgSetBool("/environment/clouds/status", true);
|
fgSetBool("/environment/clouds/status", true);
|
||||||
fgSetBool("/sim/startup/fullscreen", false);
|
fgSetBool("/sim/startup/fullscreen", false);
|
||||||
fgSetBool("/sim/rendering/shading", true);
|
fgSetBool("/sim/rendering/shading", true);
|
||||||
fgSetBool("/sim/rendering/textures", true);
|
|
||||||
fgTie( "/sim/rendering/filtering", SGGetTextureFilter, SGSetTextureFilter, false);
|
fgTie( "/sim/rendering/filtering", SGGetTextureFilter, SGSetTextureFilter, false);
|
||||||
fgSetInt("/sim/rendering/filtering", 1);
|
fgSetInt("/sim/rendering/filtering", 1);
|
||||||
fgSetBool("/sim/rendering/wireframe", false);
|
fgSetBool("/sim/rendering/wireframe", false);
|
||||||
|
@ -1532,8 +1531,6 @@ struct OptionDesc {
|
||||||
{"restore-defaults", false, OPTION_BOOL, "/sim/startup/restore-defaults", true, "", 0 },
|
{"restore-defaults", false, OPTION_BOOL, "/sim/startup/restore-defaults", true, "", 0 },
|
||||||
{"shading-flat", false, OPTION_BOOL, "/sim/rendering/shading", false, "", 0 },
|
{"shading-flat", false, OPTION_BOOL, "/sim/rendering/shading", false, "", 0 },
|
||||||
{"shading-smooth", false, OPTION_BOOL, "/sim/rendering/shading", true, "", 0 },
|
{"shading-smooth", false, OPTION_BOOL, "/sim/rendering/shading", true, "", 0 },
|
||||||
{"disable-textures", false, OPTION_BOOL, "/sim/rendering/textures", false, "", 0 },
|
|
||||||
{"enable-textures", false, OPTION_BOOL, "/sim/rendering/textures", true, "", 0 },
|
|
||||||
{"texture-filtering", false, OPTION_INT, "/sim/rendering/filtering", 1, "", 0 },
|
{"texture-filtering", false, OPTION_INT, "/sim/rendering/filtering", 1, "", 0 },
|
||||||
{"disable-wireframe", false, OPTION_BOOL, "/sim/rendering/wireframe", false, "", 0 },
|
{"disable-wireframe", false, OPTION_BOOL, "/sim/rendering/wireframe", false, "", 0 },
|
||||||
{"enable-wireframe", false, OPTION_BOOL, "/sim/rendering/wireframe", true, "", 0 },
|
{"enable-wireframe", false, OPTION_BOOL, "/sim/rendering/wireframe", true, "", 0 },
|
||||||
|
|
|
@ -551,7 +551,6 @@ FGRenderer::init( void )
|
||||||
_enhanced_lighting = fgGetNode("/sim/rendering/enhanced-lighting", true);
|
_enhanced_lighting = fgGetNode("/sim/rendering/enhanced-lighting", true);
|
||||||
_distance_attenuation = fgGetNode("/sim/rendering/distance-attenuation", true);
|
_distance_attenuation = fgGetNode("/sim/rendering/distance-attenuation", true);
|
||||||
_horizon_effect = fgGetNode("/sim/rendering/horizon-effect", true);
|
_horizon_effect = fgGetNode("/sim/rendering/horizon-effect", true);
|
||||||
_textures = fgGetNode("/sim/rendering/textures", true);
|
|
||||||
|
|
||||||
_altitude_ft = fgGetNode("/position/altitude-ft", true);
|
_altitude_ft = fgGetNode("/position/altitude-ft", true);
|
||||||
|
|
||||||
|
@ -1618,10 +1617,8 @@ FGRenderer::update( ) {
|
||||||
|
|
||||||
osg::Camera *camera = viewer->getCamera();
|
osg::Camera *camera = viewer->getCamera();
|
||||||
|
|
||||||
if ( _textures->getBoolValue() ) {
|
SGVec4f clearColor(l->adj_fog_color());
|
||||||
SGVec4f clearColor(l->adj_fog_color());
|
camera->setClearColor(toOsg(clearColor));
|
||||||
camera->setClearColor(toOsg(clearColor));
|
|
||||||
}
|
|
||||||
|
|
||||||
updateSky();
|
updateSky();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue