Merge lp:~georg-zotti/stellarium/gz_landscape-switch-lights into lp:stellarium

[gzotti]

[Alexander Wolf (alexwolf)]

Proposed solution is very good for people, who not want illumination layer for landscapes.

review: Approve

=== modified file 'data/default_config.ini.cmake'
--- data/default_config.ini.cmake	2014-09-10 13:15:56 +0000
+++ data/default_config.ini.cmake	2014-10-25 00:07:25 +0000
@@ -186,6 +186,7 @@
 flag_minimal_brightness             = false
 # This allows use of a minimum value even given in the respective landscape.ini
 flag_landscape_sets_minimal_brightness = false
+flag_enable_illumination_layer      = true
 
 [viewing]
 flag_constellation_drawing          = false

=== modified file 'src/core/modules/Landscape.cpp'
--- src/core/modules/Landscape.cpp	2014-09-07 23:49:52 +0000
+++ src/core/modules/Landscape.cpp	2014-10-25 00:07:25 +0000
@@ -517,11 +517,11 @@
 		drawGround(core, painter);
 	drawFog(core, painter);
 
-	// GZ: ALSO HERE - Self-luminous layer (Light pollution etc). This looks striking!
-	if (lightScapeBrightness>0.0f && core->getSkyDrawer()->getFlagHasAtmosphere())
+	// Self-luminous layer (Light pollution etc). This looks striking!
+	if (lightScapeBrightness>0.0f && illumFader.getInterstate())
 	{
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-		drawDecor(core, painter, true); // GZ: NEW
+		drawDecor(core, painter, true);
 	}
 
 	// If a horizon line also has been defined, draw it.
@@ -545,6 +545,10 @@
 {
 	if (!fogFader.getInterstate())
 		return;
+	if(!landFader.getInterstate())
+		return;
+	if (!(core->getSkyDrawer()->getFlagHasAtmosphere()))
+		return;
 
 	const float vpos = (tanMode||calibrated) ? radius*std::tan(fogAngleShift*M_PI/180.) : radius*std::sin(fogAngleShift*M_PI/180.);
 	StelProjector::ModelViewTranformP transfo = core->getAltAzModelViewTransform(StelCore::RefractionOff);
@@ -555,9 +559,9 @@
 	transfo->combine(Mat4d::translation(Vec3d(0.,0.,vpos)));
 	sPainter.setProjector(core->getProjection(transfo));
 	glBlendFunc(GL_ONE, GL_ONE);
-	sPainter.setColor(fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
-			  fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
-			  fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness));
+	sPainter.setColor(landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
+			  landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
+			  landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness), landFader.getInterstate());
 	fogTex->bind();
 	const float height = (calibrated?
 				radius*(std::tan((fogAltAngle+fogAngleShift)*M_PI/180.)  - std::tan(fogAngleShift*M_PI/180.))
@@ -576,7 +580,7 @@
 	if (!landFader.getInterstate())
 		return;
 	if (drawLight)
-		sPainter.setColor(lightScapeBrightness, lightScapeBrightness, lightScapeBrightness, landFader.getInterstate());
+		sPainter.setColor(illumFader.getInterstate()*lightScapeBrightness, illumFader.getInterstate()*lightScapeBrightness, illumFader.getInterstate()*lightScapeBrightness, landFader.getInterstate());
 	else
 		sPainter.setColor(landscapeBrightness, landscapeBrightness, landscapeBrightness, landFader.getInterstate());
 
@@ -815,21 +819,23 @@
 	mapTex->bind();
 	sPainter.sSphereMap(radius,cols,rows,texFov,1);
 	// NEW since 0.13: Fog also for fisheye...
-	if (mapTexFog)
+	if ((mapTexFog) && (core->getSkyDrawer()->getFlagHasAtmosphere()))
 	{
 		//glBlendFunc(GL_ONE, GL_ONE); // GZ: Take blending mode as found in the old_style landscapes...
 		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR); // GZ: better?
-		sPainter.setColor(fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
-				  fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
-				  fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness), fogFader.getInterstate());
+		sPainter.setColor(landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
+				  landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
+				  landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness), landFader.getInterstate());
 		mapTexFog->bind();
 		sPainter.sSphereMap(radius,cols,rows,texFov,1);
 	}
 
-	if (mapTexIllum && lightScapeBrightness>0.0f && core->getSkyDrawer()->getFlagHasAtmosphere())
+	if (mapTexIllum && lightScapeBrightness>0.0f && illumFader.getInterstate())
 	{
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-		sPainter.setColor(lightScapeBrightness, lightScapeBrightness, lightScapeBrightness, landFader.getInterstate());
+		sPainter.setColor(illumFader.getInterstate()*lightScapeBrightness,
+				  illumFader.getInterstate()*lightScapeBrightness,
+				  illumFader.getInterstate()*lightScapeBrightness, landFader.getInterstate());
 		mapTexIllum->bind();
 		sPainter.sSphereMap(radius, cols, rows, texFov, 1);
 	}
@@ -971,22 +977,23 @@
 	// seam is at East, except if angleRotateZ has been given.
 	sPainter.sSphere(radius, 1.0, cols, rows, 1, true, mapTexTop, mapTexBottom);
 	// Since 0.13: Fog also for sphericals...
-	if (mapTexFog)
+	if ((mapTexFog) && (core->getSkyDrawer()->getFlagHasAtmosphere()))
 	{
-		//glBlendFunc(GL_ONE, GL_ONE); // GZ: blending mode as found in the old_style landscapes...
-		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR); // GZ: better?
-		sPainter.setColor(fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
-						  fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
-						  fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness), fogFader.getInterstate());
+		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
+		sPainter.setColor(landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
+				  landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness),
+				  landFader.getInterstate()*fogFader.getInterstate()*(0.1f+0.1f*landscapeBrightness), landFader.getInterstate());
 		mapTexFog->bind();
 		sPainter.sSphere(radius, 1.0, cols, (int) ceil(rows*(fogTexTop-fogTexBottom)/(mapTexTop-mapTexBottom)), 1, true, fogTexTop, fogTexBottom);
 	}
 
 	// Self-luminous layer (Light pollution etc). This looks striking!
-	if (mapTexIllum && lightScapeBrightness>0.0f && core->getSkyDrawer()->getFlagHasAtmosphere())
+	if (mapTexIllum && (lightScapeBrightness>0.0f) && illumFader.getInterstate())
 	{
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-		sPainter.setColor(lightScapeBrightness, lightScapeBrightness, lightScapeBrightness, landFader.getInterstate());
+		sPainter.setColor(lightScapeBrightness*illumFader.getInterstate(),
+				  lightScapeBrightness*illumFader.getInterstate(),
+				  lightScapeBrightness*illumFader.getInterstate(), landFader.getInterstate());
 		mapTexIllum->bind();
 		sPainter.sSphere(radius, 1.0, cols, (int) ceil(rows*(illumTexTop-illumTexBottom)/(mapTexTop-mapTexBottom)), 1, true, illumTexTop, illumTexBottom);
 	}	

=== modified file 'src/core/modules/Landscape.hpp'
--- src/core/modules/Landscape.hpp	2014-09-07 23:49:52 +0000
+++ src/core/modules/Landscape.hpp	2014-10-25 00:07:25 +0000
@@ -42,11 +42,11 @@
 //! Don't use this class directly, use the LandscapeMgr.
 //! A landscape's most important element is a photo panorama.
 //! Optional components include:
-//!  - A fog texture that is displayed with the Fog [F] command.
+//!  - A fog texture that is displayed with the Fog [F] command (displayed only if atmosphere is on!).
 //!  - A location. It is possible to auto-move to the location when loading.
 //!  - Atmospheric conditions: temperature/pressure/extinction coefficients.
 //!  - Light pollution information (Bortle index)
-//!  - A night texture that gets blended over the dimmed daylight panorama. (Spherical and Fisheye only)
+//!  - A night texture that gets blended over the dimmed daylight panorama. (All landscapes except Polygonal.)
 //!  - A polygonal horizon line (required for PolygonalLandscape). If present, defines a measured horizon line, which can be plotted or queried for rise/set predictions.
 //!  - You can set a minimum brightness level to prevent too dark landscape. There is
 //!    a global activation setting (config.ini[landscape]flag_minimal_brightness),
@@ -71,6 +71,7 @@
 	{
 		landFader.update((int)(deltaTime*1000));
 		fogFader.update((int)(deltaTime*1000));
+		illumFader.update((int)(deltaTime*1000));
 	}
 
 	//! Set the brightness of the landscape plus brightness of optional add-on night lightscape.
@@ -85,6 +86,10 @@
 	void setFlagShowFog(const bool b) {fogFader=b;}
 	//! Get whether fog is displayed
 	bool getFlagShowFog() const {return (bool)fogFader;}
+	//! Set whether illumination is displayed
+	void setFlagShowIllumination(const bool b) {illumFader=b;}
+	//! Get whether illumination is displayed
+	bool getFlagShowIllumination() const {return (bool)illumFader;}
 	//! Get landscape name
 	QString getName() const {return name;}
 	//! Get landscape author name
@@ -126,7 +131,7 @@
 	//! can be used to find sunrise or visibility questions on the real-world landscape horizon.
 	//! Default implementation indicates the horizon equals math horizon.
 	virtual float getOpacity(Vec3d azalt) const {return (azalt[2]<0 ? 1.0f : 0.0f); }
-	//! The list of azimuths and altitudes can come in various formats. We read the first two elements, which can be of formats:
+	//! The list of azimuths (counted from True North towards East) and altitudes can come in various formats. We read the first two elements, which can be of formats:
 	enum horizonListMode {
 		azDeg_altDeg   = 0, //! azimuth[degrees] altitude[degrees]
 		azDeg_zdDeg    = 1, //! azimuth[degrees] zenithDistance[degrees]
@@ -163,11 +168,12 @@
 	bool validLandscape;   //! was a landscape loaded properly?
 	LinearFader landFader; //! Used to slowly fade in/out landscape painting.
 	LinearFader fogFader;  //! Used to slowly fade in/out fog painting.
+	LinearFader illumFader;//! Used to slowly fade in/out illumination painting.
 	int rows; //! horizontal rows.  May be given in landscape.ini:[landscape]tesselate_rows. More indicates higher accuracy, but is slower.
 	int cols; //! vertical columns. May be given in landscape.ini:[landscape]tesselate_cols. More indicates higher accuracy, but is slower.
 	float angleRotateZ;    //! [radians] if pano does not have its left border in the east, rotate in azimuth. Configured in landscape.ini[landscape]angle_rotatez (or decor_angle_rotatez for old_style landscapes)
 	float angleRotateZOffset; //! [radians] This is a rotation changeable at runtime via setZRotation (called by LandscapeMgr::setZRotation).
-							  //! Not in landscape.ini: Used in special cases where the horizon may rotate, e.g. on a ship.
+				  //! Not in landscape.ini: Used in special cases where the horizon may rotate, e.g. on a ship.
 
 	StelLocation location; //! OPTIONAL. If present, can be used to set location.
 	int defaultBortleIndex; //! May be given in landscape.ini:[location]light_pollution. Default: -1 (no change).
@@ -178,10 +184,10 @@
 
 	// Optional elements which, if present, describe a horizon polygon. They can be used to render a line or a filled region, esp. in LandscapePolygonal
 	SphericalRegionP horizonPolygon;   //! Optional element describing the horizon line.
-									   //! Data shall be read from the file given as landscape.ini[landscape]polygonal_horizon_list
-									   //! For LandscapePolygonal, this is the only horizon data item.
+					   //! Data shall be read from the file given as landscape.ini[landscape]polygonal_horizon_list
+					   //! For LandscapePolygonal, this is the only horizon data item.
 	Vec3f horizonPolygonLineColor ;    //! for all horizon types, the horizonPolygon line, if specified, will be drawn in this color
-									   //! specified in landscape.ini[landscape]horizon_line_color. Negative red (default) indicated "don't draw".
+					   //! specified in landscape.ini[landscape]horizon_line_color. Negative red (default) indicated "don't draw".
 };
 
 //! @class LandscapeOldStyle
@@ -218,7 +224,7 @@
 
 private:
 	void drawFog(StelCore* core, StelPainter&) const;
-	// GZ NEW: drawLight selects only the self-illuminating panels.
+	// drawLight==true for illumination layer, it then selects only the self-illuminating panels.
 	void drawDecor(StelCore* core, StelPainter&, const bool drawLight=false) const;
 	void drawGround(StelCore* core, StelPainter&) const;
 	QVector<double> groundVertexArr;
@@ -228,17 +234,15 @@
 	int nbSide;
 	landscapeTexCoord* sides;
 	StelTextureSP fogTex;
-	//landscapeTexCoord fogTexCoord; // GZ: UNUSED!
 	StelTextureSP groundTex;
-	QVector<QImage*> sidesImages; // GZ: Required for opacity lookup
-	//landscapeTexCoord groundTexCoord; // GZ: UNUSED!
+	QVector<QImage*> sidesImages; // Required for opacity lookup
 	int nbDecorRepeat;
 	float fogAltAngle;
 	float fogAngleShift;
 	float decorAltAngle; // vertical extent of the side panels
 	float decorAngleShift;
 	float groundAngleShift; //! [radians]: altitude of the bottom plane. Usually negative and equal to decorAngleShift
-	float groundAngleRotateZ; //! [radians]
+	float groundAngleRotateZ; //! [radians]: rotation to bring top of texture away from due east.
 	int drawGroundFirst;
 	bool tanMode;		// Whether the angles should be converted using tan instead of sin, i.e., for a cylindrical pano
 	bool calibrated;	// if true, the documented altitudes are indeed correct (the original code is buggy!)
@@ -302,9 +306,9 @@
 
 	StelTextureSP mapTex;      //!< The fisheye image, centered on the zenith.
 	StelTextureSP mapTexFog;   //!< Optional panorama of identical size (create as layer over the mapTex image in your favorite image processor).
-							   //!< can also be smaller, just the texture is again mapped onto the same geometry.
+				   //!< can also be smaller, just the texture is again mapped onto the same geometry.
 	StelTextureSP mapTexIllum; //!< Optional fisheye image of identical size (create as layer in your favorite image processor) or at least, proportions.
-							   //!< To simulate light pollution (skyglow), street lights, light in windows, ... at night
+				   //!< To simulate light pollution (skyglow), street lights, light in windows, ... at night
 	QImage *mapImage;          //!< The same image as mapTex, but stored in-mem for sampling.
 
 	float texFov;
@@ -350,16 +354,16 @@
 
 	StelTextureSP mapTex;      //!< The equirectangular panorama texture
 	StelTextureSP mapTexFog;   //!< Optional panorama of identical size (create as layer over the mapTex image in your favorite image processor).
-							   //!< can also be smaller, just the texture is again mapped onto the same geometry.
+				   //!< can also be smaller, just the texture is again mapped onto the same geometry.
 	StelTextureSP mapTexIllum; //!< Optional panorama of identical size (create as layer over the mapTex image in your favorite image processor).
-							   //!< To simulate light pollution (skyglow), street lights, light in windows, ... at night
+				   //!< To simulate light pollution (skyglow), street lights, light in windows, ... at night
 	// These vars are here to conserve texture memory. They must be allowed to be different: a landscape may have its highest elevations at 15°, fog may reach from -25 to +15°,
 	// light pollution may cover -5° (street lamps slightly below) plus parts of or even the whole sky. All have default values to simplify life.
 	float mapTexTop;           //!< zenithal top angle of the landscape texture, radians
-	float mapTexBottom;		   //!< zenithal bottom angle of the landscape texture, radians
-	float fogTexTop;		   //!< zenithal top angle of the fog texture, radians
-	float fogTexBottom;		   //!< zenithal bottom angle of the fog texture, radians
-	float illumTexTop;		   //!< zenithal top angle of the illumination texture, radians
+	float mapTexBottom;	   //!< zenithal bottom angle of the landscape texture, radians
+	float fogTexTop;	   //!< zenithal top angle of the fog texture, radians
+	float fogTexBottom;	   //!< zenithal bottom angle of the fog texture, radians
+	float illumTexTop;	   //!< zenithal top angle of the illumination texture, radians
 	float illumTexBottom;	   //!< zenithal bottom angle of the illumination texture, radians
 	QImage *mapImage;          //!< The same image as mapTex, but stored in-mem for opacity sampling.
 };

=== modified file 'src/core/modules/LandscapeMgr.cpp'
--- src/core/modules/LandscapeMgr.cpp	2014-08-10 10:34:05 +0000
+++ src/core/modules/LandscapeMgr.cpp	2014-10-25 00:07:25 +0000
@@ -295,7 +295,7 @@
 	}
 	else
 	{   float lightscapeBrightness=0.0f;
-		// night pollution brightness is mixed in at -3...-8 degrees.
+		// light pollution layer is mixed in at -3...-8 degrees.
 		if (sunPos[2]<-0.14f) lightscapeBrightness=1.0f;
 		else if (sunPos[2]<-0.05f) lightscapeBrightness = 1.0f-(sunPos[2]+0.14)/(-0.05+0.14);
 		landscape->setBrightness(landscapeBrightness, lightscapeBrightness);
@@ -337,7 +337,8 @@
 	setDefaultMinimalBrightness(conf->value("landscape/minimal_brightness", 0.01).toFloat());
 	setFlagLandscapeUseMinimalBrightness(conf->value("landscape/flag_minimal_brightness", false).toBool());
 	setFlagLandscapeSetsMinimalBrightness(conf->value("landscape/flag_landscape_sets_minimal_brightness",false).toBool());
-	setFlagAtmosphereAutoEnable(conf->value("viewing/flag_atmopshere_auto_enable",true).toBool());
+	setFlagAtmosphereAutoEnable(conf->value("viewing/flag_atmosphere_auto_enable",true).toBool());
+	setFlagIllumination(conf->value("landscape/flag_enable_illumination_layer", true).toBool());
 
 	bool ok =true;
 	setAtmosphereBortleLightPollution(conf->value("stars/init_bortle_scale",3).toInt(&ok));
@@ -356,6 +357,7 @@
 	addAction("actionShow_Fog", displayGroup, N_("Fog"), "fogDisplayed", "F");
 	addAction("actionShow_Cardinal_Points", displayGroup, N_("Cardinal points"), "cardinalsPointsDisplayed", "Q");
 	addAction("actionShow_Ground", displayGroup, N_("Ground"), "landscapeDisplayed", "G");
+	addAction("actionShow_LandscapeIllumination", displayGroup, N_("Illumination"), "illuminationDisplayed", "Shift+G");
 }
 
 void LandscapeMgr::setStelStyle(const QString& section)
@@ -386,6 +388,7 @@
 		// Copy display parameters from previous landscape to new one
 		newLandscape->setFlagShow(landscape->getFlagShow());
 		newLandscape->setFlagShowFog(landscape->getFlagShowFog());
+		newLandscape->setFlagShowIllumination(landscape->getFlagShowIllumination());
 		delete landscape;
 		landscape = newLandscape;
 	}
@@ -510,6 +513,19 @@
 	return landscape->getFlagShowFog();
 }
 
+void LandscapeMgr::setFlagIllumination(const bool displayed)
+{
+	if (landscape->getFlagShowIllumination() != displayed) {
+		landscape->setFlagShowIllumination(displayed);
+		emit illuminationDisplayedChanged(displayed);
+	}
+}
+
+bool LandscapeMgr::getFlagIllumination() const
+{
+	return landscape->getFlagShowIllumination();
+}
+
 void LandscapeMgr::setFlagLandscapeAutoSelection(bool enableAutoSelect)
 {
 	flagLandscapeAutoSelection = enableAutoSelect;
@@ -637,8 +653,10 @@
 		atmosphere->setFlagShow(displayed);
 		StelApp::getInstance().getCore()->getSkyDrawer()->setFlagHasAtmosphere(displayed);
 		emit atmosphereDisplayedChanged(displayed);
-		if (StelApp::getInstance().getSettings()->value("landscape/flag_fog", true).toBool())
-			setFlagFog(displayed); // sync of visibility of fog because this is atmospheric phenomena
+		//if (StelApp::getInstance().getSettings()->value("landscape/flag_fog", true).toBool())
+		//	setFlagFog(displayed); // sync of visibility of fog because this is atmospheric phenomena
+		// GZ This did not work as it may have been intended. Switch off fog, switch off atmosphere. Switch on atmosphere, and you have fog?
+		// --> Fog is only drawn in Landscape if atmosphere is switched on!
 	}
 }
 

=== modified file 'src/core/modules/LandscapeMgr.hpp'
--- src/core/modules/LandscapeMgr.hpp	2014-10-13 12:57:39 +0000
+++ src/core/modules/LandscapeMgr.hpp	2014-10-25 00:07:25 +0000
@@ -57,6 +57,10 @@
 			   READ getFlagLandscape
 			   WRITE setFlagLandscape
 			   NOTIFY landscapeDisplayedChanged)
+	Q_PROPERTY(bool illuminationDisplayed
+			   READ getFlagIllumination
+			   WRITE setFlagIllumination
+			   NOTIFY illuminationDisplayedChanged)
 	Q_PROPERTY(bool databaseUsage
 			READ getFlagUseLightPollutionFromDatabase
 			WRITE setFlagUseLightPollutionFromDatabase
@@ -172,6 +176,10 @@
 	bool getFlagFog() const;
 	//! Set flag for displaying Fog.
 	void setFlagFog(const bool displayed);
+	//! Get flag for displaying illumination layer
+	bool getFlagIllumination() const;
+	//! Set flag for displaying illumination layer
+	void setFlagIllumination(const bool on);
 
 	//! Return the value of the flag determining if a change of landscape will update the observer location.
 	bool getFlagLandscapeSetsLocation() const {return flagLandscapeSetsLocation;}
@@ -312,11 +320,14 @@
 	//! Set flag for auto-enable atmosphere for planets with atmospheres in location window
 	void setFlagAtmosphereAutoEnable(bool b);
 
+
+
 signals:
 	void atmosphereDisplayedChanged(const bool displayed);
 	void cardinalsPointsDisplayedChanged(const bool displayed);
 	void fogDisplayedChanged(const bool displayed);
 	void landscapeDisplayedChanged(const bool displayed);
+	void illuminationDisplayedChanged(const bool displayed);
 	void lightPollutionUsageChanged(const bool usage);
 
 	//! Emitted when a landscape has been installed or un-installed.
@@ -359,6 +370,7 @@
 	//! Set light pollution luminance level.
 	void setAtmosphereLightPollutionLuminance(const float f);
 
+
 	//! For a given landscape name, return the landscape ID.
 	//! This takes a name of the landscape, as described in the landscape:name item in the
 	//! landscape.ini, and returns the landscape ID which corresponds to that name.

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2014-10-12 16:44:56 +0000
+++ src/gui/ConfigurationDialog.cpp	2014-10-25 00:07:25 +0000
@@ -546,7 +546,7 @@
 	conf->setValue("viewing/flag_constellation_isolate_selected", cmgr->getFlagIsolateSelected());
 	conf->setValue("viewing/flag_landscape_autoselection", lmgr->getFlagLandscapeAutoSelection());
 	conf->setValue("viewing/flag_light_pollution_database", lmgr->getFlagUseLightPollutionFromDatabase());
-	conf->setValue("viewing/flag_atmopshere_auto_enable", lmgr->getFlagAtmosphereAutoEnable());
+	conf->setValue("viewing/flag_atmosphere_auto_enable", lmgr->getFlagAtmosphereAutoEnable());
 	conf->setValue("viewing/constellation_art_intensity", cmgr->getArtIntensity());
 	conf->setValue("viewing/flag_night", StelApp::getInstance().getVisionModeNight());
 	conf->setValue("astro/flag_star_name", smgr->getFlagLabels());
@@ -564,6 +564,7 @@
 	conf->setValue("landscape/flag_atmosphere", lmgr->getFlagAtmosphere());
 	conf->setValue("landscape/flag_brightness", lmgr->getFlagLandscapeSetsMinimalBrightness());
 	conf->setValue("landscape/flag_fog", lmgr->getFlagFog());
+	conf->setValue("landscape/flag_enable_illumination_layer", lmgr->getFlagIllumination());
 	conf->setValue("stars/init_bortle_scale", core->getSkyDrawer()->getBortleScaleIndex());
         conf->setValue("landscape/atmospheric_extinction_coefficient", core->getSkyDrawer()->getExtinctionCoefficient());
         conf->setValue("landscape/pressure_mbar", core->getSkyDrawer()->getAtmospherePressure());

=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2014-09-10 13:15:56 +0000
+++ src/gui/ViewDialog.cpp	2014-10-25 00:07:25 +0000
@@ -222,6 +222,7 @@
 	connectCheckBox(ui->showGroundCheckBox, "actionShow_Ground");
 	connectCheckBox(ui->showFogCheckBox, "actionShow_Fog");
 	connectGroupBox(ui->atmosphereGroupBox, "actionShow_Atmosphere");
+	connectCheckBox(ui->landscapeIlluminationCheckBox, "actionShow_LandscapeIllumination");
 
 	ui->landscapePositionCheckBox->setChecked(lmgr->getFlagLandscapeSetsLocation());
 	connect(ui->landscapePositionCheckBox, SIGNAL(toggled(bool)), lmgr, SLOT(setFlagLandscapeSetsLocation(bool)));

=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui	2014-09-10 13:15:56 +0000
+++ src/gui/viewDialog.ui	2014-10-25 00:07:25 +0000
@@ -346,7 +346,7 @@
       <item alignment="Qt::AlignTop">
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="currentIndex">
-         <number>1</number>
+         <number>2</number>
         </property>
         <widget class="QWidget" name="page">
          <layout class="QGridLayout" name="gridLayout">
@@ -1643,22 +1643,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="pushButtonAddRemoveLandscapes">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>37</height>
-             </size>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">margin-left: 10px; margin-right: 10px; margin-bottom:10px;</string>
-            </property>
-            <property name="text">
-             <string>Add/remove landscapes...</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
            <widget class="QGroupBox" name="landscapeOptionsGroupBox">
             <property name="sizePolicy">
@@ -1721,9 +1705,35 @@
                </property>
               </widget>
              </item>
+             <item row="5" column="0">
+              <widget class="QCheckBox" name="landscapeIlluminationCheckBox">
+               <property name="text">
+                <string>Show illumination layer (bright windows, light pollution, etc.)</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="pushButtonAddRemoveLandscapes">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>37</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">margin-left: 10px; margin-right: 10px; margin-bottom:10px;</string>
+            </property>
+            <property name="text">
+             <string>Add/remove landscapes...</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="page_4">