Merge lp:~stellarium/stellarium/gz_spout into lp:stellarium

[gzotti]

See branch description.
Spout can send the Sky window to DirectX graphics applications under Windows, apparently similar to what can be done via Syphon on a Mac. This enables new ways of interoperability, at least on this platform.

This must be tested on a fairly recent Windows system. I have seen it running on Win7+10 notebooks with NVidia GPUs, small Win10 netbook (AMD) and desktop PC (Intel HD4600). Virtual machines or Angle-only systems do not work, but should fall-back to regular operation, so it should never cause Stellarium itself to fail.

On Non-Windows systems, everything should be excluded, so it should not disturb compilation.

[Alexander Wolf (alexwolf)]

Please add shortcut "Stellarium (Spout)" in stellarium.iss.cmake file

review: Needs Fixing

[lp:~stellarium/stellarium/gz_spout]

8944. By gzotti on 2016-12-13

Added startup link to Inno configuration; added German translation to Inno setup; Fix a misnomer in English Inno setup.

[Alexander Wolf (alexwolf)]

It's seems ok now

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-11-20 17:15:43 +0000
+++ CMakeLists.txt	2016-12-13 10:58:20 +0000
@@ -181,6 +181,26 @@
 # Activate media support
 SET(ENABLE_MEDIA 1 CACHE BOOL "Define whether media support should be activated.")
 
+# SPOUT allows relaying the Stellarium OpenGL framebuffer as DirectX texture in other programs.
+# It exists on Windows only. Syphon is a similar system for MacOS, this might be added by a Mac developer.
+# Note that we may also link with the real OpenGL library in this case!
+# or find a way to define all of Spout's OpenGL calls to Qt5's version?
+IF(WIN32)
+     SET(ENABLE_SPOUT 1 CACHE BOOL "Define whether SPOUT support should be activated.")
+ELSE()
+     SET(ENABLE_SPOUT 0)
+ENDIF()
+IF(ENABLE_SPOUT)
+	ADD_DEFINITIONS(-DENABLE_SPOUT)
+#    FIND_PACKAGE(OpenGL REQUIRED) # maybe we don't need it. Then remove part of comment above.
+	IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") # 32bit build?
+		LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/util/spout2/Win32/)
+	ELSEIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # 64bit build?
+		LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/util/spout2/x64/)
+	ENDIF()
+ENDIF(ENABLE_SPOUT)
+
+
 SET(ENABLE_SCRIPTING 1 CACHE BOOL "Define whether scripting features should be activated.")
 IF(ENABLE_SCRIPTING)
      # (De-)Activate the script edit console
@@ -490,7 +510,15 @@
     IF(ENABLE_MEDIA)
     	SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins/mediaservice/dsengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_LIBS}/../plugins/mediaservice/qtmedia_audioengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_LIBS}/../plugins/playlistformats/qtmultimedia_m3u.dll\"; DestDir: \"{app}/playlistformats/\";")
     ENDIF()
-ENDIF()
+    IF(ENABLE_SPOUT)
+        IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") # 32bit build?
+            SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${CMAKE_SOURCE_DIR}/util/spout2/Win32/SpoutLibrary.dll\"; DestDir: \"{app}\";")
+        ELSEIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # 64bit build?
+            SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${CMAKE_SOURCE_DIR}/util/spout2/x64/SpoutLibrary.dll\"; DestDir: \"{app}\";")
+        ENDIF()
+    ENDIF(ENABLE_SPOUT)
+
+ENDIF(WIN32)
 
 
 IF(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")

=== modified file 'README'
--- README	2016-10-20 13:54:17 +0000
+++ README	2016-12-13 10:58:20 +0000
@@ -229,6 +229,8 @@
     2.5 OBJ loader in the Scenery3D plugin based on glObjViewer (c) 2007 dhpoware
     2.6 Parts of the code to work with DE430 and DE431 data files have been 
         taken from Project Pluto (GPL license).
+    2.7 The SpoutLibrary.dll and header from the SpoutSDK version 2.005 
+        available at http://spout.zeal.co (BSD license).
 
 3. Data
 	3.1 The Hipparcos star catalog

=== modified file 'cmake/stellarium.iss.cmake'
--- cmake/stellarium.iss.cmake	2016-11-25 10:47:10 +0000
+++ cmake/stellarium.iss.cmake	2016-12-13 10:58:20 +0000
@@ -103,6 +103,7 @@
 ; Name: "{group}\Stellarium {cm:AngleWarpMode}"; Filename: "{app}\stellarium.exe"; Parameters: "--angle-warp"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
 Name: "{group}\Stellarium {cm:AngleMode}"; Filename: "{app}\stellarium.exe"; Parameters: "--angle-d3d9"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
 Name: "{group}\Stellarium {cm:MesaMode}"; Filename: "{app}\stellarium.exe"; Parameters: "--mesa-mode"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
+Name: "{group}\Stellarium {cm:SpoutMode}"; Filename: "{app}\stellarium.exe"; Parameters: "--spout=sky"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
 Name: "{group}\{cm:UninstallProgram,Stellarium}"; Filename: "{uninstallexe}"
 Name: "{group}\config.ini"; Filename: "{userappdata}\Stellarium\config.ini"
 Name: "{group}\{cm:LastRunLog}"; Filename: "{userappdata}\Stellarium\log.txt"
@@ -130,7 +131,7 @@
 Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
 Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl"
 Name: "fr"; MessagesFile: "compiler:Languages\French.isl,@CMAKE_SOURCE_DIR@\util\ISL\FrenchCM.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl,@CMAKE_SOURCE_DIR@\util\ISL\GermanCM.isl"
 Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
 Name: "he"; MessagesFile: "compiler:Languages\Hebrew.isl"
 Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl"

=== modified file 'guide/ch_advanced_use.tex'
--- guide/ch_advanced_use.tex	2016-07-25 17:24:49 +0000
+++ guide/ch_advanced_use.tex	2016-12-13 10:58:20 +0000
@@ -313,15 +313,18 @@
 -\/-startup-script   & script name & The name of a script to run after the program has started. \\\midrule
 -\/-fov              & angle      & The initial field of view in degrees. \\\midrule
 -\/-projection-type  & ptype      & The initial projection type (e.g. \texttt{perspective}). \\\midrule
+-\/-spout  or -S     & all or sky & Act as Spout sender (See section \ref{sec:CommandLineOptions:Special:Spout}).%
+                                    \footnote{On Windows only}\footnote{This function requires running in OpenGL mode.}\\\midrule
+-\/-spout-name       & name       & Use \texttt{name} as name of the Spout sender. Default name: \texttt{Stellarium}.\footnotemark[1]\\\midrule									
 -\/-dump-opengl-details or -d     & {[}none{]} & Dump information about OpenGL support to logfile. 
                                                  Use this is you have graphics problems and want to send a bug report. \\\midrule
--\/-angle-mode or -a & {[}none{]} & Use ANGLE as OpenGL ES2 rendering engine (autodetect Direct3D version).\footnote{On Windows only}\\\midrule
+-\/-angle-mode or -a & {[}none{]} & Use ANGLE as OpenGL ES2 rendering engine (autodetect Direct3D version).\footnotemark[1]\\\midrule
 -\/-angle-d3d9 or -9 & {[}none{]} & Force use Direct3D 9 for ANGLE OpenGL ES2 rendering engine.\footnotemark[1]\\\midrule
 -\/-angle-d3d11      & {[}none{]} & Force use Direct3D 11 for ANGLE OpenGL ES2 rendering engine.\footnotemark[1]\\\midrule
 -\/-angle-warp       & {[}none{]} & Force use the Direct3D 11 software rasterizer for ANGLE OpenGL ES2 rendering engine.\footnotemark[1]\\\midrule
 -\/-mesa-mode or -m  & {[}none{]} & Use MESA as software OpenGL rendering engine.\footnotemark[1]\\\midrule
 -\/-safe-mode or -s  & {[}none{]} & Synonymous to -\/-mesa-mode.\footnotemark[1]\\\midrule
--\/-fix-text or -t   & {[}none{]} & Alternative way of creating the Info text, required on some systems.\footnote{E.g., Raspberry Pi 2 with Raspbian Jessie and VC4 drivers from February 2016. A bugfix should be available later in 2016.}\\\bottomrule
+-\/-fix-text or -t   & {[}none{]} & Alternative way of creating the Info text, required on some systems.\footnote{E.g., Raspberry Pi 2 with Raspbian Jessie and VC4 drivers from February 2016. A driver update which makes this unnecessary should be available later in 2016.}\\\bottomrule
 \end{longtabu}
 
 \noindent \newFeature{0.15} If you want to avoid adding the same
@@ -353,6 +356,25 @@
 %% GZ found in 2015:
 \noindent Note that console output (like \command{-\/-list-landscapes}) on Windows is not possible. 
 
+\section{Special Options}
+\label{sec:CommandLineOptions:Special}
+\subsection{Spout}\newFeature{0.15.1} 
+\label{sec:CommandLineOptions:Special:Spout}
+Apart from stand-alone use, Stellarium can be used as multimedia source in larger installations, in museums or science exhibitions. 
+\program{Spout}\footnote{\url{http://spout.zeal.co/}} is a technology which enables use of Stellarium's 
+output window as texture in DirectX applications on Windows. Simply start Stellarium with 
+the \texttt{-\/-spout=sky} command line option. (Currently \program{Spout} output is limited to the main window 
+without GUI panels, but this may change in future versions.) 
+Your master application must obviously embed a \program{Spout} receiver. 
+The default name of the \program{Spout} sender is \texttt{Stellarium}. If you need more than one instance of Stellarium acting as source, 
+you can use option \texttt{-\/-spout-name=StelSpout2} in addition to create another \program{Spout} sender without a name conflict. 
+In such cases, it may be useful to also have separate user data directories and use option \texttt{-\/-user-dir}. 
+
+This mode does not work in ANGLE mode and requires modern graphics hardware with the \texttt{WGL\_NV\_DX\_interop} 
+driver extension running in OpenGL mode. Some NVidia GPUs work without this extension listed explicitly. 
+On a notebook with NVidia Optimus technology, make sure to launch Stellarium on the NVidia hardware. 
+For permanent setting, use the NVidia configuration dialog to configure Stellarium explicitly to run always on the NVidia card.
+
 %%% Local Variables: 
 %%% mode: latex
 %%% TeX-master: "guide"

=== modified file 'src/CLIProcessor.cpp'
--- src/CLIProcessor.cpp	2016-04-12 15:30:38 +0000
+++ src/CLIProcessor.cpp	2016-12-13 10:58:20 +0000
@@ -72,6 +72,12 @@
 			  << "                          and want to send a bug report\n"
 			  << "--full-screen (or -f)   : With argument \"yes\" or \"no\" over-rides\n"
 			  << "                          the full screen setting in the config file\n"
+			#ifdef Q_OS_WIN
+			#ifdef ENABLE_SPOUT
+			  << "--spout (or -S) <sky|all> : Act as SPOUT sender (Sky only/including GUI)\n"
+			  << "--spout-name <name>     : Set particular name for SPOUT sender.\n"
+			#endif
+			#endif
 			  << "--screenshot-dir        : Specify directory to save screenshots\n"
 			  << "--startup-script        : Specify name of startup script\n"
 			  << "--home-planet           : Specify observer planet (English name)\n"
@@ -160,13 +166,16 @@
 }
 
 void CLIProcessor::parseCLIArgsPostConfig(const QStringList& argList, QSettings* confSettings)
-{
+{	
 	// Over-ride config file options with command line options
 	// We should catch exceptions from argsGetOptionWithArg...
 	int fullScreen, altitude;
 	float fov;
 	QString landscapeId, homePlanet, longitude, latitude, skyDate, skyTime;
 	QString projectionType, screenshotDir, multiresImage, startupScript;
+#ifdef ENABLE_SPOUT
+	QString spoutStr, spoutName;
+#endif
 	try
 	{
 		bool dumpOpenGLDetails = argsGetOption(argList, "-d", "--dump-opengl-details");
@@ -184,6 +193,12 @@
 		screenshotDir = argsGetOptionWithArg(argList, "", "--screenshot-dir", "").toString();
 		multiresImage = argsGetOptionWithArg(argList, "", "--multires-image", "").toString();
 		startupScript = argsGetOptionWithArg(argList, "", "--startup-script", "").toString();
+#ifdef ENABLE_SPOUT
+		// For now, we default to spout=sky when no extra option is given. Later, we should also accept "all".
+		// Unfortunately, this still throws an exception when no optarg string is given.
+		spoutStr  = argsGetOptionWithArg(argList, "-S", "--spout", "sky").toString();
+		spoutName = argsGetOptionWithArg(argList, "", "--spout-name", "").toString();
+#endif
 	}
 	catch (std::runtime_error& e)
 	{
@@ -299,6 +314,21 @@
 			}
 		}
 	}
+
+#ifdef ENABLE_SPOUT
+	if (!spoutStr.isEmpty())
+	{
+		if (spoutStr=="all")
+			qApp->setProperty("spout", "all");
+		else
+			qApp->setProperty("spout", "sky");
+	}
+	else
+		qApp->setProperty("spout", "none");
+	if (!spoutName.isEmpty())
+		qApp->setProperty("spoutName", spoutName);
+#endif
+
 }
 
 
@@ -351,7 +381,15 @@
 		{
 			if (i+1>=lastOptIdx)
 			{
-				throw (std::runtime_error(qPrintable("optarg_missing ("+longOpt+")")));
+				// i.e., option given as last option, but without arguments. Last chance: default value!
+				if (defaultValue.isValid())
+				{
+					return defaultValue;
+				}
+				else
+				{
+					throw (std::runtime_error(qPrintable("optarg_missing ("+longOpt+")")));
+				}
 			}
 			else
 			{

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-13 09:27:45 +0000
+++ src/CMakeLists.txt	2016-12-13 10:58:20 +0000
@@ -57,6 +57,12 @@
      core/external/zlib/zutil.h
 )
 
+IF(ENABLE_SPOUT)
+    SET(spout_SRCS
+     core/external/SpoutLibrary.h
+	 )
+ENDIF()
+
 SET(stellarium_lib_SRCS
      core/StelAudioMgr.hpp
      core/StelAudioMgr.cpp
@@ -166,6 +172,8 @@
      ${gl_lib_SRCS}
 
      ${glues_lib_SRCS}
+	 
+     ${spout_SRCS}
 
      core/planetsephems/calc_interpolated_elements.c
      core/planetsephems/calc_interpolated_elements.h
@@ -491,6 +499,10 @@
      IF(USE_PLUGIN_TELESCOPECONTROL)
           QT5_USE_MODULES(stelMain SerialPort)
      ENDIF()
+     IF(ENABLE_SPOUT)
+          TARGET_LINK_LIBRARIES(stelMain SpoutLibrary)
+     ENDIF(ENABLE_SPOUT)
+
      INSTALL(TARGETS stelMain DESTINATION lib)
      ADD_EXECUTABLE(stellarium ${stellarium_exe_SRCS})
      #stelMain should be after the plug-ins, otherwise the build crashes
@@ -511,6 +523,9 @@
      IF(USE_PLUGIN_TELESCOPECONTROL)
           QT5_USE_MODULES(stellarium SerialPort)
      ENDIF()
+     IF(ENABLE_SPOUT)
+          TARGET_LINK_LIBRARIES(stellarium SpoutLibrary)
+     ENDIF(ENABLE_SPOUT)
 
      IF(APPLE)
           SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framework Cocoa -framework OpenGL")

=== modified file 'src/StelMainView.cpp'
--- src/StelMainView.cpp	2016-11-20 20:45:14 +0000
+++ src/StelMainView.cpp	2016-12-13 10:58:20 +0000
@@ -426,7 +426,8 @@
 
 
 StelMainView::StelMainView(QWidget* parent)
-	: QGraphicsView(parent), guiItem(NULL), gui(NULL),
+	: QGraphicsView(parent), guiItem(NULL),
+	  gui(NULL),
 	  flagInvertScreenShotColors(false),
 	  flagOverwriteScreenshots(false),
 	  screenShotPrefix("stellarium-"),
@@ -569,6 +570,7 @@
 
 	stelApp= new StelApp();
 	stelApp->setGui(gui);
+
 	stelApp->init(conf);
 	StelActionMgr *actionMgr = stelApp->getStelActionManager();
 	actionMgr->addAction("actionSave_Screenshot_Global", N_("Miscellaneous"), N_("Save screenshot"), this, "saveScreenShot()", "Ctrl+S");
@@ -588,7 +590,7 @@
 	rootItem->setLayout(l);
 	scene()->addItem(rootItem);
 	nightModeEffect = new NightModeGraphicsEffect(this);
-	updateNightModeProperty();
+	updateNightModeProperty(StelApp::getInstance().getVisionModeNight());
 	rootItem->setGraphicsEffect(nightModeEffect);
 
 	QSize size = glWidget->windowHandle()->screen()->size();
@@ -648,7 +650,7 @@
 	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 	if (gui!=NULL)
 		setStyleSheet(gui->getStelStyle().qtStyleSheet);
-	connect(&StelApp::getInstance(), SIGNAL(visionNightModeChanged(bool)), this, SLOT(updateNightModeProperty()));
+	connect(&StelApp::getInstance(), SIGNAL(visionNightModeChanged(bool)), this, SLOT(updateNightModeProperty(bool)));
 
 	QThread::currentThread()->setPriority(QThread::HighestPriority);
 #ifndef NDEBUG
@@ -665,11 +667,11 @@
 	startMainLoop();
 }
 
-void StelMainView::updateNightModeProperty()
+void StelMainView::updateNightModeProperty(bool b)
 {
 	// So that the bottom bar tooltips get properly rendered in night mode.
-	setProperty("nightMode", StelApp::getInstance().getVisionModeNight());
-	nightModeEffect->setEnabled(StelApp::getInstance().getVisionModeNight());
+	setProperty("nightMode", b);
+	nightModeEffect->setEnabled(b);
 }
 
 // This is a series of various diagnostics based on "bugs" reported for 0.13.0 and 0.13.1.
@@ -732,7 +734,7 @@
 		if ((!isANGLE) && (!isMesa))
 			qWarning() << "Oops... Insufficient OpenGL version. Please update drivers, graphics hardware, or use --angle-mode (or even --mesa-mode) option.";
 		else if (isANGLE)
-			qWarning() << "Oops... Insufficient OpenGL version in ANGLE. Please update drivers, graphics hardware, or use --mesa-mode option.";
+			qWarning() << "Oops... Insufficient OpenGLES version in ANGLE. Please update drivers, graphics hardware, or use --mesa-mode option.";
 		else
 			qWarning() << "Oops... Insufficient OpenGL version. Mesa failed! Please send a bug report.";
 
@@ -1160,7 +1162,7 @@
 
 void StelMainView::mouseMoveEvent(QMouseEvent* event)
 {
-	// We notify the applicatio to increase the fps if a button has been
+	// We notify the application to increase the fps if a button has been
 	// clicked, but also if the cursor is currently hidden, so that it gets
 	// restored.
 	if (event->buttons() || QGuiApplication::overrideCursor()!=0)
@@ -1190,7 +1192,7 @@
 {
 	Q_UNUSED(event);
 
-	// We use the glWidget instead of the even, as we want the screen that shows most of the widget.
+	// We use the glWidget instead of the event, as we want the screen that shows most of the widget.
 	StelApp::getInstance().setDevicePixelsPerPixel(glWidget->windowHandle()->devicePixelRatio());
 }
 

=== modified file 'src/StelMainView.hpp'
--- src/StelMainView.hpp	2016-06-14 14:56:19 +0000
+++ src/StelMainView.hpp	2016-12-13 10:58:20 +0000
@@ -162,7 +162,7 @@
 	// Do the actual screenshot generation in the main thread with this method.
 	void doScreenshot(void);
 	void minFpsChanged();
-	void updateNightModeProperty();
+	void updateNightModeProperty(bool b);
 
 private:
 	//! Start the display loop

=== modified file 'src/core/StelApp.cpp'
--- src/core/StelApp.cpp	2016-11-21 21:04:36 +0000
+++ src/core/StelApp.cpp	2016-12-13 10:58:20 +0000
@@ -79,6 +79,9 @@
 #include <QCoreApplication>
 #include <QScreen>
 #include <QDateTime>
+#ifdef ENABLE_SPOUT
+#include <QMessageBox>
+#endif
 
 #ifdef USE_STATIC_PLUGIN_HELLOSTELMODULE
 Q_IMPORT_PLUGIN(HelloStelModuleStelPluginInterface)
@@ -200,8 +203,16 @@
 *************************************************************************/
 StelApp::StelApp(QObject* parent)
 	: QObject(parent)
-	, core(NULL)
+	, core(NULL)	
+	, moduleMgr(NULL)
+	, localeMgr(NULL)
+	, skyCultureMgr(NULL)
+	, actionMgr(NULL)
+	, propMgr(NULL)
+	, textureMgr(NULL)
+	, stelObjectMgr(NULL)
 	, planetLocationMgr(NULL)
+	, networkAccessManager(NULL)
 	, audioMgr(NULL)
 	, videoMgr(NULL)
 	, skyImageMgr(NULL)
@@ -221,29 +232,23 @@
 	, initialized(false)
 	, saveProjW(-1)
 	, saveProjH(-1)
+	, nbDownloadedFiles(0)
+	, totalDownloadedSize(0)
+	, nbUsedCache(0)
+	, totalUsedCacheSize(0)
 	, baseFontSize(13)
 	, renderBuffer(NULL)
 	, viewportEffect(NULL)
 	, flagShowDecimalDegrees(false)
 	, flagUseAzimuthFromSouth(false)
+	#ifdef ENABLE_SPOUT
+	, spoutSender(NULL)
+	, spoutTexID(0)
+	, spoutValid(false)
+	#endif
 {
-	// Stat variables
-	nbDownloadedFiles=0;
-	totalDownloadedSize=0;
-	nbUsedCache=0;
-	totalUsedCacheSize=0;
-
 	setObjectName("StelApp");
 
-	skyCultureMgr=NULL;
-	localeMgr=NULL;
-	stelObjectMgr=NULL;
-	textureMgr=NULL;
-	moduleMgr=NULL;
-	networkAccessManager=NULL;
-	actionMgr = NULL;
-	propMgr = NULL;
-
 	// Can't create 2 StelApp instances
 	Q_ASSERT(!singleton);
 	singleton = this;
@@ -531,6 +536,61 @@
 	// Animation
 	animationScale = confSettings->value("gui/pointer_animation_speed", 1.f).toFloat();
 	
+#ifdef ENABLE_SPOUT
+	//qDebug() << "Property spout is" << qApp->property("spout").toString();
+	//qDebug() << "Property spoutName is" << qApp->property("spoutName").toString();
+	if (qApp->property("spout").toString() != "none")
+	{
+		QString glRenderer(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
+		bool isANGLE=glRenderer.startsWith("ANGLE", Qt::CaseSensitive);
+
+		if (isANGLE)
+		{
+			qDebug() << "SPOUT: Does not run in ANGLE mode!";
+		}
+		else
+		{
+			// Initialize the SpoutSender object. This does not create a spout sender yet.
+			memset(spoutName, 0, sizeof(spoutName));
+			if (qApp->property("spoutName").toString().isEmpty())
+				sprintf(spoutName, "Stellarium");
+			else
+				sprintf(spoutName, qApp->property("spoutName").toString().toLocal8Bit());
+
+			qDebug() << "SPOUT name is: " << spoutName;
+			spoutSender = GetSpout();
+			int numAdapters=spoutSender->GetNumAdapters();
+			qDebug() << "SPOUT: Found " << numAdapters << "GPUs";
+			for (int i=0; i<numAdapters; i++){
+				char name[256]; // 256 chars min required by Spout specs!
+				spoutSender->GetAdapterName(i, name, 255);
+				qDebug() << "       GPU" << i << ": " << name;
+			}
+			qDebug() << "       Currently used: GPU" << spoutSender->GetAdapter();
+			// Now try to create the SpoutSender.
+			spoutValid=spoutSender->CreateSender(spoutName, 500, 500); // try any size, will be resized later.
+		}
+		if (spoutValid)
+		{
+			qDebug() << "       Sender has been created in" << (spoutSender->GetMemoryShareMode() ? "Memory Share Mode" : "OpenGL/DirectX interop mode");
+			qDebug() << "       Sender is" << (spoutSender->GetDX9()? "working" : "not working") << "with DX9 textures";
+		}
+		else
+		{
+			qDebug() << "       Sender creation failed!";
+			qDebug() << "       You may need a better GPU for this function, see Spout docs.";
+			qDebug() << "       On a notebook with NVidia Optimus, force running Stellarium on the NVidia GPU.";
+			QMessageBox::warning(0, "Stellarium SPOUT", q_("Cannot create Spout sender. See log for details."), QMessageBox::Ok);
+			qDebug() << "       Continuing without SPOUT sender.";
+			qApp->setProperty("spout", "");
+		}
+	}
+	else
+	{
+		qApp->setProperty("spout", "");
+	}
+#endif
+
 	initialized = true;
 }
 
@@ -554,6 +614,16 @@
 
 void StelApp::deinit()
 {
+#ifdef 	ENABLE_SPOUT
+	if (spoutValid)
+	{
+		//qDebug() << "SPOUT: Releasing ...";
+		spoutSender->ReleaseSender();
+		spoutSender->Release();
+		spoutValid=false;
+		//qDebug() << "SPOUT: Releasing ... DONE.";
+	}
+#endif
 #ifndef DISABLE_SCRIPTING
 	if (scriptMgr->scriptIsRunning())
 		scriptMgr->stopScript();
@@ -561,7 +631,6 @@
 	QCoreApplication::processEvents();
 	getModuleMgr().unloadAllPlugins();
 	QCoreApplication::processEvents();
-	
 	StelPainter::deinitGLShaders();
 }
 
@@ -650,7 +719,28 @@
 		module->draw(core);
 	}
 	core->postDraw();
+#ifdef ENABLE_SPOUT
+	// At this point, the sky scene has been drawn, but no GUI panels.
+	// GZ: It is rather unclear to me how to draw also the GUI into the Spout texture.
+	//if (qApp->property("spout")=="sky")
+	if (qApp->property("spout")!="") // first version.
+	{
+		if (spoutValid)
+		{
+			StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
+			int w = params.viewportXywh[2];
+			int h = params.viewportXywh[3];
+
+			initSpoutTexture(w, h);
+			glBindTexture(GL_TEXTURE_2D, spoutTexID);
+			glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, w, h);
+			glBindTexture(GL_TEXTURE_2D, 0);
+			spoutSender->SendTexture(spoutTexID, GL_TEXTURE_2D, w, h, true, drawFbo);
+		}
+	}
+#endif
 	applyRenderBuffer(drawFbo);
+
 }
 
 /*************************************************************************
@@ -670,6 +760,15 @@
 		delete renderBuffer;
 		renderBuffer = NULL;
 	}
+#ifdef ENABLE_SPOUT
+	if (spoutValid)
+	{
+		// UpdateSender does not seem to work and keep the name,
+		// it creates a new Sender entry and keeps a dead old texture. Better recreate.
+		spoutSender->ReleaseSender();
+		spoutSender->CreateSender(spoutName, w, h);
+	}
+#endif
 }
 
 // Handle mouse clics
@@ -901,3 +1000,19 @@
 		qDebug() << " -- " << module->getCallOrder(actionName) << "Module: " << module->objectName();
 	}
 }
+
+#ifdef ENABLE_SPOUT
+void StelApp::initSpoutTexture(unsigned int width, unsigned int height)
+{
+    if(spoutTexID != 0) glDeleteTextures(1, &spoutTexID);
+
+	glGenTextures(1, &spoutTexID);
+	glBindTexture(GL_TEXTURE_2D, spoutTexID);
+	glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glBindTexture(GL_TEXTURE_2D, 0);
+}
+#endif

=== modified file 'src/core/StelApp.hpp'
--- src/core/StelApp.hpp	2016-11-20 20:45:14 +0000
+++ src/core/StelApp.hpp	2016-12-13 10:58:20 +0000
@@ -23,6 +23,9 @@
 #include <QString>
 #include <QObject>
 #include "StelModule.hpp"
+#ifdef 	ENABLE_SPOUT
+#include "SpoutLibrary.h"
+#endif
 
 // Predeclaration of some classes
 class StelCore;
@@ -176,7 +179,7 @@
 
 	//! Get the GUI instance implementing the abstract GUI interface.
 	StelGuiBase* getGui() const {return stelGui;}
-	//! Tell the StelApp instance which GUI si currently being used.
+	//! Tell the StelApp instance which GUI is currently being used.
 	//! The caller is responsible for destroying the GUI.
 	void setGui(StelGuiBase* b) {stelGui=b;}
 
@@ -390,6 +393,14 @@
 	bool flagShowDecimalDegrees;
 	// flag to indicate we want calculate azimuth from south towards west (as in old astronomical literature)
 	bool flagUseAzimuthFromSouth;
+#ifdef 	ENABLE_SPOUT
+	SPOUTLIBRARY * spoutSender;
+	char spoutName[256];
+	GLuint spoutTexID;
+	bool spoutValid; // true when the named sender instance has been created.
+	//void initSpoutTexture(GLuint &texID, unsigned int width, unsigned int height);
+	void initSpoutTexture(unsigned int width, unsigned int height);
+#endif
 
 };
 

=== modified file 'src/core/StelOpenGL.hpp'
--- src/core/StelOpenGL.hpp	2016-07-05 21:52:42 +0000
+++ src/core/StelOpenGL.hpp	2016-12-13 10:58:20 +0000
@@ -53,6 +53,7 @@
 #define glCompileShader(...)        GLFUNC_(glCompileShader(__VA_ARGS__))
 #define glCompressedTexImage2D(...) GLFUNC_(glCompressedTexImage2D(__VA_ARGS__))
 #define glCompressedTexSubImage2D(...)  GLFUNC_(glCompressedTexSubImage2D(__VA_ARGS__))
+#define glCopyTexSubImage2D(...)    GLFUNC_(glCopyTexSubImage2D(__VA_ARGS__)) // new for spout
 #define glCreateProgram(...)        GLFUNC_(glCreateProgram(__VA_ARGS__))
 #define glCreateShader(...)         GLFUNC_(glCreateShader(__VA_ARGS__))
 #define glDeleteBuffers(...)        GLFUNC_(glDeleteBuffers(__VA_ARGS__))

=== added file 'src/core/external/SpoutLibrary.h'
--- src/core/external/SpoutLibrary.h	1970-01-01 00:00:00 +0000
+++ src/core/external/SpoutLibrary.h	2016-12-13 10:58:20 +0000
@@ -0,0 +1,90 @@
+//
+//	SpoutLibrary.dll
+//
+//	Spout SDK dll compatible with any C++ compiler
+//
+
+#include <windows.h>
+#include <GL/GL.h>
+
+#define SPOUTLIBRARY_EXPORTS // defined for this DLL. The application imports rather than exports
+
+#ifdef SPOUTLIBRARY_EXPORTS
+#define SPOUTAPI __declspec(dllexport)
+#else
+#define SPOUTAPI __declspec(dllimport)
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// COM-Like abstract interface.
+// This interface doesn't require __declspec(dllexport/dllimport) specifier.
+// Method calls are dispatched via virtual table.
+// Any C++ compiler can use it.
+// Instances are obtained via factory function.
+//
+struct SPOUTLIBRARY
+{
+	// Sender
+	virtual bool CreateSender(const char *Sendername, unsigned int width, unsigned int height, DWORD dwFormat = 0) = 0;
+	virtual void ReleaseSender(DWORD dwMsec = 0) = 0;
+	virtual bool UpdateSender(const char* Sendername, unsigned int width, unsigned int height) = 0;
+	virtual bool SendTexture(GLuint TextureID, GLuint TextureTarget, unsigned int width, unsigned int height, bool bInvert = true, GLuint HostFBO = 0) = 0;
+	virtual bool SendImage(const unsigned char* pixels, unsigned int width, unsigned int height, GLenum glFormat = GL_RGBA, bool bInvert=false) = 0;
+
+	// Receiver
+	virtual bool CreateReceiver(char* Sendername, unsigned int &width, unsigned int &height, bool bUseActive = false) = 0;
+	virtual void ReleaseReceiver() = 0;
+	virtual bool ReceiveTexture(char* Sendername, unsigned int &width, unsigned int &height, GLuint TextureID = 0, GLuint TextureTarget = 0, bool bInvert = false, GLuint HostFBO = 0) = 0;
+	virtual bool ReceiveImage(char* Sendername, unsigned int &width, unsigned int &height, unsigned char* pixels, GLenum glFormat = GL_RGBA, bool bInvert = false, GLuint HostFBO=0) = 0;
+	virtual bool CheckReceiver(char* Sendername, unsigned int &width, unsigned int &height, bool &bConnected) = 0;
+	virtual bool GetImageSize(char* sendername, unsigned int &width, unsigned int &height, bool &bMemoryMode) = 0;	
+
+	virtual bool BindSharedTexture() = 0;
+	virtual bool UnBindSharedTexture() = 0;
+	
+	virtual bool DrawSharedTexture(float max_x = 1.0, float max_y = 1.0, float aspect = 1.0, bool bInvert = true) = 0;
+	virtual bool DrawToSharedTexture(GLuint TextureID, GLuint TextureTarget, unsigned int width, unsigned int height, float max_x = 1.0, float max_y = 1.0, float aspect = 1.0, bool bInvert = false, GLuint HostFBO = 0) = 0;
+
+	virtual int  GetSenderCount() = 0;
+	virtual bool GetSenderName(int index, char* sendername, int MaxSize = 256) = 0;
+	virtual bool GetSenderInfo(const char* sendername, unsigned int &width, unsigned int &height, HANDLE &dxShareHandle, DWORD &dwFormat) = 0;
+	virtual bool GetActiveSender(char* Sendername) = 0;
+	virtual bool SetActiveSender(const char* Sendername) = 0;
+	
+	// Utilities
+	virtual bool SetDX9(bool bDX9 = true) = 0; // User request to use DirectX 9 (default is DirectX 11)
+	virtual bool GetDX9() = 0; // Return the flag that has been set
+	virtual bool SetMemoryShareMode(bool bMem = true) = 0;
+	virtual bool GetMemoryShareMode() = 0;
+	virtual int  GetMaxSenders() = 0; // Get maximum senders allowed
+	virtual void SetMaxSenders(int maxSenders) = 0; // Set maximum senders allowed
+	virtual bool GetHostPath(const char *sendername, char *hostpath, int maxchars) = 0; // The path of the host that produced the sender
+	virtual int  GetVerticalSync() = 0;
+	virtual bool SetVerticalSync(bool bSync = true) = 0;
+	virtual bool SelectSenderPanel(const char* message = NULL) = 0;
+
+	// Access to globals
+	virtual bool GetSpoutSenderName(char * sendername, int maxchars) = 0; // get the global sender name
+	virtual bool IsSpoutInitialized() = 0; // has the class been initialized
+	
+	// Adapter functions
+	virtual int  GetNumAdapters() = 0; // Get the number of graphics adapters in the system
+	virtual bool GetAdapterName(int index, char *adaptername, int maxchars) = 0; // Get an adapter name
+	virtual bool SetAdapter(int index = 0) = 0; // Set required graphics adapter for output
+	virtual int  GetAdapter() = 0; // Get the SpoutDirectX global adapter index
+	
+	// Library release function
+    virtual void Release() = 0;
+
+};
+
+
+// Handle type. In C++ language the interface type is used.
+typedef SPOUTLIBRARY* SPOUTHANDLE;
+
+// Factory function that creates instances of the SPOUT object.
+extern "C" SPOUTAPI SPOUTHANDLE WINAPI GetSpout(VOID);
+
+
+////////////////////////////////////////////////////////////////////////////////

=== modified file 'util/ISL/EnglishCM.isl'
--- util/ISL/EnglishCM.isl	2016-11-25 10:47:10 +0000
+++ util/ISL/EnglishCM.isl	2016-12-13 10:58:20 +0000
@@ -31,5 +31,6 @@
 AngleD3D11Mode=(ANGLE Direct3D 11 mode)
 AngleWarpMode=(ANGLE WARP mode)
 MesaMode=(MESA mode)
-DebugMode=(debug mode)
+DebugMode=(with OpenGL diagnostics)
+SpoutMode=(with Spout sender)
 RedistRun=Installing Microsoft's C/C++ runtime...

=== added file 'util/ISL/GermanCM.isl'
--- util/ISL/GermanCM.isl	1970-01-01 00:00:00 +0000
+++ util/ISL/GermanCM.isl	2016-12-13 10:58:20 +0000
@@ -0,0 +1,36 @@
+; *** Inno Setup version 5.5.3+ German messages for Stellarium ***
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+LanguageName=Deutsch
+LanguageID=$0407
+LanguageCodePage=1252
+
+[CustomMessages]
+ForAllUsers=Für alle Benutzer
+ForCurrentUserOnly=Nur für den aktuellen Benutzer
+RemoveFromPreviousInstallation=Dateien früherer Installationen entfernen:
+RemoveMainConfig=Entferne Haupt-Konfigurationsdatei
+RemovePluginsConfig=Entferne Plugin-Konfigurationsdateien
+RemoveSolarConfig=Entferne Sonnensystem-Datei
+RemoveUILandscapes=Lösche benutzer-installierte Landschaften
+RemoveShortcutsConfig=Lösche Tastaturkürzel
+RemoveCache=Lösche Cache-Dateien
+UserGuide=Stellarium User Guide (englisch)
+DevelopersDocsOnTheWeb=Stellarium Entwickler-Dokumentation am Web
+LastRunLog=Logfile des letzten Durchlaufs
+OutputDataFile=Ausgabe-Datei
+ChangeLog=Change log (Änderungsprotokoll)
+FallbackMode=(Fallback-Modus)
+AngleMode=(ANGLE-Modus)
+AngleD3D9Mode=(ANGLE Direct3D 9 Modus)
+AngleD3D11Mode=(ANGLE Direct3D 11 Modus)
+AngleWarpMode=(ANGLE WARP Modus)
+MesaMode=(MESA-Modus)
+DebugMode=(mit OpenGL Diagnostik)
+SpoutMode=(mit Spout-Sender)
+RedistRun=Installiere Microsofts C/C++ Runtime...

=== added directory 'util/spout2'
=== added file 'util/spout2/README.txt'
--- util/spout2/README.txt	1970-01-01 00:00:00 +0000
+++ util/spout2/README.txt	2016-12-13 10:58:20 +0000
@@ -0,0 +1,4 @@
+This is the Binaries directory of the SPOUT_LIBRARY part of the Spout SDK retrieved 2016-12-08 from https://github.com/leadedge/Spout2. This version is preferred because it should be usable with non-MS compilers.
+
+More information: http://spout.zeal.co/
+ 
\ No newline at end of file

=== added directory 'util/spout2/Win32'
=== added file 'util/spout2/Win32/SpoutLibrary.dll'
Binary files util/spout2/Win32/SpoutLibrary.dll	1970-01-01 00:00:00 +0000 and util/spout2/Win32/SpoutLibrary.dll	2016-12-13 10:58:20 +0000 differ
=== added file 'util/spout2/Win32/SpoutLibrary.lib'
Binary files util/spout2/Win32/SpoutLibrary.lib	1970-01-01 00:00:00 +0000 and util/spout2/Win32/SpoutLibrary.lib	2016-12-13 10:58:20 +0000 differ
=== added file 'util/spout2/licence.txt'
--- util/spout2/licence.txt	1970-01-01 00:00:00 +0000
+++ util/spout2/licence.txt	2016-12-13 10:58:20 +0000
@@ -0,0 +1,24 @@
+SpoutSDK is released under the Simplified BSD licence.
+
+Copyright (C) 2014-2016. Lynn Jarvis. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

=== added directory 'util/spout2/x64'
=== added file 'util/spout2/x64/SpoutLibrary.dll'
Binary files util/spout2/x64/SpoutLibrary.dll	1970-01-01 00:00:00 +0000 and util/spout2/x64/SpoutLibrary.dll	2016-12-13 10:58:20 +0000 differ
=== added file 'util/spout2/x64/SpoutLibrary.lib'
Binary files util/spout2/x64/SpoutLibrary.lib	1970-01-01 00:00:00 +0000 and util/spout2/x64/SpoutLibrary.lib	2016-12-13 10:58:20 +0000 differ