merge-in of trunk r8081

ChangeLog

@@ -1,18 +1,65 @@
+0.14.1 [2015-12-02]
+Bugfix release:
+- Added support for side-by-side assembly technology (LP: #1400045)
+- Enhancements of the Ocular plugin: add OAG support (LP: #1354427)
+- Added Belarusian translation for landscapes and sky cultures (LP: #1520303)
+- Added designations for few stars in Scorpius (LP: #1518437)
+- Fixed constellation art brightness and zooming (LP: #1520783)
+- Fixed number of satellite orbit segments resets (LP: #1510592)
+- Fixed certain outplanet moons with wrong Longitudes (LP: #1509693, #1509692)
+- Fixed saving settings for some View panel options (LP: #1509639)
+- Fixed fails to run up on Windows when invoked from a different directory (LP: #1410529)
+- Fixed wrong value of ecliptic obliquity (LP: #1520792)
+- Fixed segmentation fault (core dumped) while try update stars catalog (LP: #1514542)
+- Tentative fix for support 4K resolution (GUI scaling) (LP: #1372781)
+
+0.14.0 [2015-10-24]
+A big leap forward in astronomical accuracy for historical applications:
+ - Precession now follows the IAU2006 model in the long-time version from Vondrak 
+   et al. 2011.
+ - Nutation is applied (IAU2000B solution). Given that nobody has observed it without 
+   telescope and the model does not give limits of applicability, we limit its application 
+   to 1500..2500
+ - Application of DeltaT has been simplified and made a bit more intuitive.
+
+We now dare to add another coordinate system: Ecliptic coordinates of date.
+
+We can therefore now show that planetary positions given by the commonly used solution 
+VSOP87 is applicable to -4000..+8000 only, and its use outside this range will give 
+somewhat artificial results. There is more to follow in future versions.
+
+The other big addition is a greatly improved collection of DSO data with lots of 
+possibilities in a new GUI tab to select for object type and/or catalog. In total, 
+15 catalogs are now built-in!
+
+Also the Meteor Shower, Satellites, Telescope Control and 3D Sceneries plugins have 
+been improved.
+
+Landscapes can have switchable labels, so you can e.g. indicate mountain peaks.
+
+In total 83 bugs and wishlist items were fixed or at least decided.
+
+A platform-specific change for Windows: OpenGL binding is now dynamic. That means, there are 
+no more separate OpenGL/ANGLE/MESA downloads, but after installation you will have separate 
+commands in the start menu which force ANGLE or MESA modes.
+
+Full list of changes: https://launchpad.net/stellarium/0.14/0.14.0
+
 0.13.3 [2015-04-25]
 Bugfix release with few new features.
 
-This version is contains over 30 closed bugs, who include some wishes and new nice features - like 
+This version is contains over 30 closed bugs, who include some wishes and new nice features - like
 visualization of the 3D landscapes and extra DSO catalogs.
 
-Full list of changes: https://launchpad.net/stellarium/+milestone/0.13.3
+Full list of changes: https://launchpad.net/stellarium/0.13/0.13.3
 
 0.13.2 [2015-01-20]
 Major bugfix release with few new features.
 
-This version is contains over 70 closed bugs, who include some wishes and new nice features - like 
+This version is contains over 70 closed bugs, who include some wishes and new nice features - like
 visualization of the zodiacal light and new sky cultures.
 
-Full list of changes: https://launchpad.net/stellarium/+milestone/0.13.2
+Full list of changes: https://launchpad.net/stellarium/0.13/0.13.2
 
 0.13.1 [2014-10-19]
 Bugfix release with few new features.
@@ -37,7 +84,7 @@ Bugfix release with few new features.
 - Fixed: Various GUI/rendering improvements (LP: #1380502, #1320065, #1338252, #1096050, #1376550, #1382689)
 - Fixed: "missing disk in drive <whatever>" (LP: #1371183)
 
-Full list of changes: https://launchpad.net/stellarium/+milestone/0.13.1
+Full list of changes: https://launchpad.net/stellarium/0.13/0.13.1
 
 0.13.0 [2014-07-19]
 This version based on Qt 5 and has new modulated core, and new features (example: normal mapping) and fixes for 115 bugs, including:

README

@@ -210,7 +210,10 @@ for more details on the location of the user data directory for your OS.
 	1.5 An accurate long-time precession model compatible with P03:
 		J. Vondrak, N. Capitaine, P. Wallace: New precession expressions, valid for long time intervals.
 		Astronomy&Astrophysics 534, A22 (2011); DOI: 10.1051/0004-6361/201117274
-
+	1.6 Nutation: 
+		Dennis D. McCarthy and Brian J. Lizum: An Abridged Model of the Precession-Nutation of the Celestial Pole.
+		Celestial Mechanics and Dynamical Astronomy 85: 37-49, 2003.
+		This model provides accuracy better than 1 milli-arcsecond in the time 1995-2050. It is applied for years 1500..2500 only.
 
 2. Included source code
 	2.1 Some computation of the sideral time (sidereal_time.h/c) and pluto
@@ -320,6 +323,7 @@ for more details on the location of the user data directory for your OS.
 		DeepSkyPedia
 		http://deepskypedia.com/wiki/List:Melotte
 
+
 4. Graphics
 	4.1 All graphics are copyrighted by the Stellarium's Team (GPL) except
 		the ones mentioned below :
@@ -446,11 +450,12 @@ for more details on the location of the user data directory for your OS.
 		from Peter Vasey, Plover Hill Observatory
 		http://www.madpc.co.uk/~peterv/
 	4.26 Image of IC434 from Marc Aragnou
+	4.27 Image of solar corona from eclipse 2008-08-01 by Georg Zotti
 
 --------------------------------------------------------------------------------
 9. LICENSE
 --------------------------------------------------------------------------------
-   Copyright (C) 2004-2012 Fabien Chereau et al.
+   Copyright (C) 2004-2015 Fabien Chereau et al.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

data/CMakeLists.txt

@@ -1,13 +1,17 @@
 ########### install files ###############
 
-INSTALL(FILES stellarium.ico ssystem.ini ssystem_1000comets.ini base_locations.bin.gz DejaVuSans.ttf default_config.ini updates.json DejaVuSansMono.ttf iso639-1.utf8 iso3166-1-alpha-2.utf8 countryCodes.dat constellations_boundaries.dat DESTINATION share/${PACKAGE}/data)
+INSTALL(FILES stellarium.ico ssystem.ini ssystem_1000comets.ini base_locations.bin.gz DejaVuSans.ttf default_config.ini DejaVuSansMono.ttf iso639-1.utf8 iso3166-1-alpha-2.utf8 countryCodes.dat constellations_boundaries.dat DESTINATION share/${PACKAGE}/data)
 
 # install Scenery3d shaders
 IF(USE_PLUGIN_SCENERY3D)
 INSTALL(DIRECTORY shaders/ DESTINATION share/${PACKAGE}/data/shaders FILES_MATCHING 
 	PATTERN "s3d_*.vert" 
 	PATTERN "s3d_*.geom" 
 	PATTERN "s3d_*.frag")
+# install Scenery3D docs for Windows
+IF(WIN32)
+	INSTALL(FILES ../plugins/Scenery3d/doc/Scenery3d.pdf DESTINATION share/${PACKAGE}/data)
+ENDIF(WIN32)
 ENDIF()
 
 # install RemoteControl plugin stuff
@@ -23,25 +27,25 @@ IF(USE_PLUGIN_REMOTECONTROL)
 ENDIF()
 
 IF (BUILD_FOR_MAEMO)
-  INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
-  INSTALL(FILES maemo/stellarium.png DESTINATION /usr/share/icons/hicolor/48x48/apps)
+	INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
+	INSTALL(FILES maemo/stellarium.png DESTINATION /usr/share/icons/hicolor/48x48/apps)
 ENDIF()
 
 IF(UNIX AND NOT APPLE)
-  INSTALL(FILES stellarium.desktop DESTINATION share/applications)
-  INSTALL(FILES stellarium.xpm DESTINATION share/pixmaps)
-  INSTALL(FILES stellarium.appdata.xml DESTINATION share/appdata)
-  INSTALL(FILES icons/16x16/stellarium.png DESTINATION share/icons/hicolor/16x16/apps)
-  INSTALL(FILES icons/32x32/stellarium.png DESTINATION share/icons/hicolor/32x32/apps)
-  INSTALL(FILES icons/48x48/stellarium.png DESTINATION share/icons/hicolor/48x48/apps)
-  INSTALL(FILES icons/64x64/stellarium.png DESTINATION share/icons/hicolor/64x64/apps)
-  INSTALL(FILES icons/128x128/stellarium.png DESTINATION share/icons/hicolor/128x128/apps)
-  INSTALL(FILES icons/256x256/stellarium.png DESTINATION share/icons/hicolor/256x256/apps)
-  INSTALL(FILES icons/512x512/stellarium.png DESTINATION share/icons/hicolor/512x512/apps)
+	INSTALL(FILES stellarium.desktop DESTINATION share/applications)
+	INSTALL(FILES stellarium.xpm DESTINATION share/pixmaps)
+	INSTALL(FILES stellarium.appdata.xml DESTINATION share/appdata)
+	INSTALL(FILES icons/16x16/stellarium.png DESTINATION share/icons/hicolor/16x16/apps)
+	INSTALL(FILES icons/32x32/stellarium.png DESTINATION share/icons/hicolor/32x32/apps)
+	INSTALL(FILES icons/48x48/stellarium.png DESTINATION share/icons/hicolor/48x48/apps)
+	INSTALL(FILES icons/64x64/stellarium.png DESTINATION share/icons/hicolor/64x64/apps)
+	INSTALL(FILES icons/128x128/stellarium.png DESTINATION share/icons/hicolor/128x128/apps)
+	INSTALL(FILES icons/256x256/stellarium.png DESTINATION share/icons/hicolor/256x256/apps)
+	INSTALL(FILES icons/512x512/stellarium.png DESTINATION share/icons/hicolor/512x512/apps)
 ENDIF()
 
 IF(MACOSX)
-  INSTALL(FILES Icon.icns DESTINATION share )
-  INSTALL(FILES Info.plist PkgInfo DESTINATION . )
+	INSTALL(FILES Icon.icns DESTINATION share )
+	INSTALL(FILES Info.plist PkgInfo DESTINATION . )
 ENDIF(MACOSX)
 

data/default_config.ini.cmake

@@ -120,42 +120,34 @@ flag_enable_kinetic_scrolling       = true
 
 [color]
 default_color                       = 0.5,0.5,0.7
-gui_base_color                      = 0.5,0.5,0.7
-gui_text_color                      = 0.8,0.9,0.9
 azimuthal_color                     = 0.3,0.2,0.1
 daylight_text_color                 = 0.0,0.0,0.0
-# 
-#equatorial_color                    = 0.1,0.2,0.3
-#equatorial_J2000_color              = 0.1,0.3,0.4
-#equator_color                       = 0.2,0.2,0.6
-#ecliptic_color                      = 0.6,0.2,0.2
-#ecliptic_J2000_color                = 0.3,0.3,0.1
-# GZ instead: Note -al colors go to the grids.
-ecliptic_J2000_color                   = 0.7,0.2,0.2
-ecliptic_color                         = 0.9,0.6,0.2
-ecliptical_J2000_color                 = 0.4,0.1,0.1
-ecliptical_color                       = 0.6,0.3,0.1
+ecliptic_J2000_color                = 0.7,0.2,0.2
+ecliptic_color                      = 0.9,0.6,0.2
+ecliptical_J2000_color              = 0.4,0.1,0.1
+ecliptical_color                    = 0.6,0.3,0.1
 # default: same as ecliptic_color
-precession_circle_color                = 0.9,0.6,0.2
-equator_J2000_color                    = 0.2,0.2,0.6
-equator_color                          = 0.3,0.5,1.0
-equatorial_J2000_color                 = 0.1,0.1,0.5
-equatorial_color                       = 0.2,0.3,0.8
-#
+precession_circle_color             = 0.9,0.6,0.2
+equator_J2000_color                 = 0.2,0.2,0.6
+equator_color                       = 0.3,0.5,1.0
+equatorial_J2000_color              = 0.1,0.1,0.5
+equatorial_color                    = 0.2,0.3,0.8
 galactic_color                      = 0.0,0.3,0.2
 galactic_equator_color              = 0.5,0.3,0.1
 meridian_color                      = 0.2,0.6,0.2
+prime_vertical_color                = 0.18,0.54,0.18
+colures_color                       = 0.5,0.0,0.5
 longitude_color                     = 0.2,0.4,0.4
 horizon_color                       = 0.2,0.6,0.2
 const_lines_color                   = 0.2,0.2,0.6
 const_names_color                   = 0.4,0.6,0.9
 const_boundary_color                = 0.3,0.1,0.1
-nebula_label_color                  = 0.2,0.6,0.7
-nebula_circle_color                 = 1.0,0.7,0.2
-nebula_galaxy_color                 = 1.0,0.2,0.2
-nebula_brightneb_color              = 0.1,1.0,0.1
-nebula_darkneb_color                = 0.3,0.3,0.3
-nebula_cluster_color                = 1.0,1.0,0.1
+dso_label_color                     = 0.2,0.6,0.7
+dso_circle_color                    = 1.0,0.7,0.2
+dso_galaxy_color                    = 1.0,0.2,0.2
+dso_nebula_color                    = 0.1,1.0,0.1
+dso_dark_nebula_color               = 0.3,0.3,0.3
+dso_cluster_color                   = 1.0,1.0,0.1
 star_label_color                    = 0.4,0.3,0.5
 cardinal_color                      = 0.8,0.2,0.1
 planet_names_color                  = 0.5,0.5,0.7
@@ -268,6 +260,8 @@ labels_amount                       = 3.0
 nebula_hints_amount                 = 3.0
 flag_star_magnitude_limit           = false
 star_magnitude_limit                = 6.5
+flag_planet_magnitude_limit         = false
+planet_magnitude_limit              = 6.5
 flag_nebula_magnitude_limit         = false
 nebula_magnitude_limit              = 8.5
 

data/gui/guiRes.qrc

@@ -32,6 +32,7 @@
         <file>tabicon-logs.png</file>
         <file>tabicon-starlore.png</file>
         <file>tabicon-sky.png</file>
+        <file>tabicon-deep-sky.png</file>
         <file>tabicon-markings.png</file>
         <file>btFlipHorizontal-on.png</file>
         <file>btFlipVertical-off.png</file>

data/maemo/stellarium.desktop

@@ -21,6 +21,7 @@ Name[cy]=Stellarium
 Name[da]=Stellarium
 Name[de]=Stellarium
 Name[el]=Stellarium
+Name[en_CA]=Stellarium
 Name[en_GB]=Stellarium
 Name[eo]=Stellarium
 Name[es]=Stellarium

data/shaders/s3d_pixellit.frag

@@ -45,6 +45,7 @@ Note: This shader currently requires some #version 120 features!
 #define FILTER_STEPS 64
 //NOTE: Intel does NOT like it for some reason if this is a const array, so we set it as uniform
 uniform vec2 poissonDisk[FILTER_STEPS] = vec2[](
+/* GZ This disk is bad. Taken from online repo, but bad.
    vec2(-0.613392, 0.617481),
    vec2(0.170019, -0.040254),
    vec2(-0.299417, 0.791925),
@@ -109,11 +110,78 @@ uniform vec2 poissonDisk[FILTER_STEPS] = vec2[](
    vec2(0.789239, -0.419965),
    vec2(-0.545396, 0.538133),
    vec2(-0.178564, -0.596057)
+*/
+
+   vec2(-0.610470, -0.702763),
+   vec2( 0.609267,  0.765488),
+   vec2(-0.817537, -0.412950),
+   vec2( 0.777710, -0.446717),
+   vec2(-0.668764, -0.524195),
+   vec2( 0.425181,  0.797780),
+   vec2(-0.766728, -0.065185),
+   vec2( 0.266692,  0.917346),
+   vec2(-0.578028, -0.268598),
+   vec2( 0.963767,  0.079058),
+   vec2(-0.968971, -0.039291),
+   vec2( 0.174263, -0.141862),
+   vec2(-0.348933, -0.505110),
+   vec2( 0.837686, -0.083142),
+   vec2(-0.462722, -0.072878),
+   vec2( 0.701887, -0.281632),
+   vec2(-0.377209, -0.247278),
+   vec2( 0.765589,  0.642157),
+   vec2(-0.678950,  0.128138),
+   vec2( 0.418512, -0.186050),
+   vec2(-0.442419,  0.242444),
+   vec2( 0.442748, -0.456745),
+   vec2(-0.196461,  0.084314),
+   vec2( 0.536558, -0.770240),
+   vec2(-0.190154, -0.268138),
+   vec2( 0.643032, -0.584872),
+   vec2(-0.160193, -0.457076),
+   vec2( 0.089220,  0.855679),
+   vec2(-0.200650, -0.639838),
+   vec2( 0.220825,  0.710969),
+   vec2(-0.330313, -0.812004),
+   vec2(-0.046886,  0.721859),
+   vec2( 0.070102, -0.703208),
+   vec2(-0.161384,  0.952897),
+   vec2( 0.034711, -0.432054),
+   vec2(-0.508314,  0.638471),
+   vec2(-0.026992, -0.163261),
+   vec2( 0.702982,  0.089288),
+   vec2(-0.004114, -0.901428),
+   vec2( 0.656819,  0.387131),
+   vec2(-0.844164,  0.526829),
+   vec2( 0.843124,  0.220030),
+   vec2(-0.802066,  0.294509),
+   vec2( 0.863563,  0.399832),
+   vec2( 0.268762, -0.576295),
+   vec2( 0.465623,  0.517930),
+   vec2( 0.340116, -0.747385),
+   vec2( 0.223493,  0.516709),
+   vec2( 0.240980, -0.942373),
+   vec2(-0.689804,  0.649927),
+   vec2( 0.272309, -0.297217),
+   vec2( 0.378957,  0.162593),
+   vec2( 0.061461,  0.067313),
+   vec2( 0.536957,  0.249192),
+   vec2(-0.252331,  0.265096),
+   vec2( 0.587532, -0.055223),
+   vec2( 0.034467,  0.289122),
+   vec2( 0.215271,  0.278700),
+   vec2(-0.278059,  0.615201),
+   vec2(-0.369530,  0.791952),
+   vec2(-0.026918,  0.542170),
+   vec2( 0.274033,  0.010652),
+   vec2(-0.561495,  0.396310),
+   vec2(-0.367752,  0.454260)
 );
 #elif SHADOW_FILTER
 #define FILTER_STEPS 16
 //NOTE: Intel does NOT like it for some reason if this is a const array, so we set it as uniform
 uniform vec2 poissonDisk[FILTER_STEPS] = vec2[]( 
+/* GZ This old solution is in a square. Rather use a disk of radius 1!
    vec2( -0.94201624, -0.39906216 ), 
    vec2( 0.94558609, -0.76890725 ), 
    vec2( -0.094184101, -0.92938870 ), 
@@ -130,6 +198,24 @@ uniform vec2 poissonDisk[FILTER_STEPS] = vec2[](
    vec2( -0.81409955, 0.91437590 ), 
    vec2( 0.19984126, 0.78641367 ), 
    vec2( 0.14383161, -0.14100790 ) 
+*/
+
+   vec2(0.9000000, -0.400000),
+   vec2(0.399595 ,  0.786532),
+   vec2(-0.262009,  0.408517),
+   vec2(0.628532 , -0.032680),
+   vec2(0.137324 , -0.084276),
+   vec2(-0.698111,  0.091123),
+   vec2(0.221654 ,  0.309229),
+   vec2(0.381427 , -0.563157),
+   vec2(-0.571974, -0.663951),
+   vec2(-0.721133,  0.495191),
+   vec2(-0.224557,  0.948409),
+   vec2(-0.924346, -0.305464),
+   vec2(-0.078683, -0.793631),
+   vec2(0.371462 , -0.926405),
+   vec2(-0.374038, -0.136753), 
+   vec2(0.767156 ,  0.425900)
 );
 #else
 #define FILTER_STEPS 0
@@ -252,7 +338,10 @@ float depthToViewZ(float depth, float nearPlane, float farPlane)
 	return depth * (farPlane - nearPlane) + nearPlane;
 }
 
-#define LIGHT_SCALE 0.003
+// GZ 20150911: increase LIGHT_SCALE, to fit a light source's diameter of 1/2 degree.
+//#define LIGHT_SCALE 0.003
+// assumption: should be 0.25deg/180*pi
+#define LIGHT_SCALE 0.00436
 #define SEARCH_WIDTH 0.08
 
 float PenumbraSize(in float zReceiver, in float zBlocker)
@@ -466,7 +555,7 @@ void main(void)
 	vec3 eye = normalize(-v_viewPos);
 
 	#if HEIGHT
-	//pertube texture coords with heightmap
+	//perturb texture coords with heightmap
 	float height = texture2D(u_texHeight, texCoords).r;
 	//*scale +bias
 	height = height * heightScale - 0.5*heightScale;