Merge lp:~stellarium/stellarium/textures-cleanup into lp:stellarium

[Guillaume Chereau]

Clean the threaded texture loading, using QtConcurrent.

QtConcurrent will automatically use the global Qt threads pool to balance the load. The number of threads in the pool is chosen by Qt depending on the number of CPU available on the machine. This is nice when we have many textures loaded at the same time.

To see the improvement, check the fading of the constellation arts the first time we show them. It should be smoother.

[Alexander Wolf (alexwolf)]

Displaying textures of constellations was really smoothly. But I found one regress in general for Stellarium/Qt5 - zooming is not smoothly and if area contains many textures then I catch "steps" zooming.

Possible that regress can be fixed within this branch.

review: Needs Fixing

[Guillaume Chereau (guillaume-chereau)]

On Wed, Oct 2, 2013 at 10:43 PM, Alexander Wolf <email address hidden> wrote:
> Review: Needs Fixing
>
> Displaying textures of constellations was really smoothly. But I found one regress in general for Stellarium/Qt5 - zooming is not smoothly and if area contains many textures then I catch "steps" zooming.

Since the Qt5 port, the actual loading of the QImage into an opengl
texture is indeed much slower. This branch does not really address
the issue, but I can already try to move the slow conversion from
QImage to opengl compatible data into the loading thread, maybe it
will make things a little bit better. I'll do some tests.

--
Guillaume
<email address hidden>
[phone]

[lp:~stellarium/stellarium/textures-cleanup]

6270. By Guillaume Chereau on 2013-10-03

convert QImage to opengl compatible data in the loading threads

This might improve the fluidity of the application, even though on my machine
it is hard to tell if there is much difference.

[barrykgerdes (barrygastro)]

Back in revision 6257 Fabien announced that sound was now switched to Qmultimedia in lieu of phonon.

Sound now compiles without any bother but does not play sound from any of the old sound test scripts.

Do I need to change the calls

"core.loadSound( "file name", "type")

"core.playSound ("type")

"core.dropSound("type")

Barry

>

[Fabien Chéreau (xalioth)]

Hi Barry,
when I run the regular test script for sound, it works just fine on my
linux computer. Which are the "old" sound test script?
Fabien

On Wed, Oct 9, 2013 at 5:40 AM, barrykgerdes <email address hidden>wrote:

> Back in revision 6257 Fabien announced that sound was now switched to
> Qmultimedia in lieu of phonon.
>
>
>
> Sound now compiles without any bother but does not play sound from any of
> the old sound test scripts.
>
>
>
> Do I need to change the calls
>
> "core.loadSound( "file name", "type")
>
> "core.playSound ("type")
>
> "core.dropSound("type")
>
>
>
> Barry
>
>
> >
> --
>
> https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> You are subscribed to branch lp:stellarium.
>

[barrykgerdes (barrygastro)]

Hi Fab

The standard sound test "audiotest.ssc" ,"audiotest.wav" ,"audiotest. ogg" and "audiotest.mp3" as distributed with Stellarium.

I am compiling in Windows on five different computers XP, 2x Win 7 , win 8 and Win 8.1. I also have a (79.4 seconds) script that plays a timelapsed video of the sky from dask to dawn with background music that goes great in Stellarium 0.12.4. I would love to be able to run it in 0.13.0

I can't get a Linux compile to work yet. I have Qt5 installed on one computer but the install program does not work on the other computers and I still need to export the paths etc yet. I have not had trouble on linux before, even when I had to compile Qt 4 myself.

Barry

> To: <email address hidden>
> From: <email address hidden>
> Subject: Re: Sound in 0.13.0
> Date: Wed, 9 Oct 2013 08:45:36 +0000
>
> Hi Barry,
> when I run the regular test script for sound, it works just fine on my
> linux computer. Which are the "old" sound test script?
> Fabien
>
>
> On Wed, Oct 9, 2013 at 5:40 AM, barrykgerdes <email address hidden>wrote:
>
> > Back in revision 6257 Fabien announced that sound was now switched to
> > Qmultimedia in lieu of phonon.
> >
> >
> >
> > Sound now compiles without any bother but does not play sound from any of
> > the old sound test scripts.
> >
> >
> >
> > Do I need to change the calls
> >
> > "core.loadSound( "file name", "type")
> >
> > "core.playSound ("type")
> >
> > "core.dropSound("type")
> >
> >
> >
> > Barry
> >
> >
> > >
> > --
> >
> > https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> > You are subscribed to branch lp:stellarium.
> >
>
> --
> https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> Your team Stellarium is subscribed to branch lp:~stellarium/stellarium/textures-cleanup.

[gzotti (georg-zotti)]

Dear Barry,

I have it working on Win7.

There is a nuisance in the Qt/cmake build system: In the top-level
CMakeLists.txt, line 157, you have to SET_ENABLE_SOUND 1...
I would have expected that re-running cmake config steps, the next build
would include sound support. But one apparently has to clean the whole
builds directory manually before running cmake and building the project.
(check the logfile if in doubt whether it's activated.)

With this enabled all three files play within the script.

HTH, G.

On Mi, 9.10.2013, 11:21, barrykgerdes wrote:
> Hi Fab
>
>
>
> The standard sound test "audiotest.ssc" ,"audiotest.wav" ,"audiotest. ogg"
> and "audiotest.mp3" as distributed with Stellarium.
>
> I am compiling in Windows on five different computers XP, 2x Win 7 , win 8
> and Win 8.1. I also have a (79.4 seconds) script that plays a timelapsed
> video of the sky from dask to dawn with background music that goes great
> in Stellarium 0.12.4. I would love to be able to run it in 0.13.0
>
>
>
> I can't get a Linux compile to work yet. I have Qt5 installed on one
> computer but the install program does not work on the other computers and
> I still need to export the paths etc yet. I have not had trouble on linux
> before, even when I had to compile Qt 4 myself.
>
>
>
> Barry
>
>
>
>
>
>> To: <email address hidden>
>> From: <email address hidden>
>> Subject: Re: Sound in 0.13.0
>> Date: Wed, 9 Oct 2013 08:45:36 +0000
>>
>> Hi Barry,
>> when I run the regular test script for sound, it works just fine on my
>> linux computer. Which are the "old" sound test script?
>> Fabien
>>
>>
>> On Wed, Oct 9, 2013 at 5:40 AM, barrykgerdes
>> <email address hidden>wrote:
>>
>> > Back in revision 6257 Fabien announced that sound was now switched to
>> > Qmultimedia in lieu of phonon.
>> >
>> >
>> >
>> > Sound now compiles without any bother but does not play sound from any
>> of
>> > the old sound test scripts.
>> >
>> >
>> >
>> > Do I need to change the calls
>> >
>> > "core.loadSound( "file name", "type")
>> >
>> > "core.playSound ("type")
>> >
>> > "core.dropSound("type")
>> >
>> >
>> >
>> > Barry
>> >
>> >
>> > >
>> > --
>> >
>> > https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
>> > You are subscribed to branch lp:stellarium.
>> >
>>
>> --
>> https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
>> Your team Stellarium is subscribed to branch
>> lp:~stellarium/stellarium/textures-cleanup.
>
> --
> https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> Your team Stellarium is subscribed to branch
> lp:~stellarium/stellarium/textures-cleanup.
>

[barrykgerdes (barrygastro)]

Hi Georg
I tried it again on win8. This time I changed the cmakelists.txt to 1
I cleaned the build folder as before
the cmakecache txt was then automatically set to sound =1

Still no sound. just the text that accompanies it.
tested 0.12.4:- works OK

Barry

> To: <email address hidden>
> From: <email address hidden>
> Subject: RE: Sound in 0.13.0
> Date: Wed, 9 Oct 2013 11:21:39 +0000
>
> Dear Barry,
>
> I have it working on Win7.
>
> There is a nuisance in the Qt/cmake build system: In the top-level
> CMakeLists.txt, line 157, you have to SET_ENABLE_SOUND 1...
> I would have expected that re-running cmake config steps, the next build
> would include sound support. But one apparently has to clean the whole
> builds directory manually before running cmake and building the project.
> (check the logfile if in doubt whether it's activated.)
>
> With this enabled all three files play within the script.
>
> HTH, G.
>
>
> On Mi, 9.10.2013, 11:21, barrykgerdes wrote:
> > Hi Fab
> >
> >
> >
> > The standard sound test "audiotest.ssc" ,"audiotest.wav" ,"audiotest. ogg"
> > and "audiotest.mp3" as distributed with Stellarium.
> >
> > I am compiling in Windows on five different computers XP, 2x Win 7 , win 8
> > and Win 8.1. I also have a (79.4 seconds) script that plays a timelapsed
> > video of the sky from dask to dawn with background music that goes great
> > in Stellarium 0.12.4. I would love to be able to run it in 0.13.0
> >
> >
> >
> > I can't get a Linux compile to work yet. I have Qt5 installed on one
> > computer but the install program does not work on the other computers and
> > I still need to export the paths etc yet. I have not had trouble on linux
> > before, even when I had to compile Qt 4 myself.
> >
> >
> >
> > Barry
> >
> >
> >
> >
> >
> >> To: <email address hidden>
> >> From: <email address hidden>
> >> Subject: Re: Sound in 0.13.0
> >> Date: Wed, 9 Oct 2013 08:45:36 +0000
> >>
> >> Hi Barry,
> >> when I run the regular test script for sound, it works just fine on my
> >> linux computer. Which are the "old" sound test script?
> >> Fabien
> >>
> >>
> >> On Wed, Oct 9, 2013 at 5:40 AM, barrykgerdes
> >> <email address hidden>wrote:
> >>
> >> > Back in revision 6257 Fabien announced that sound was now switched to
> >> > Qmultimedia in lieu of phonon.
> >> >
> >> >
> >> >
> >> > Sound now compiles without any bother but does not play sound from any
> >> of
> >> > the old sound test scripts.
> >> >
> >> >
> >> >
> >> > Do I need to change the calls
> >> >
> >> > "core.loadSound( "file name", "type")
> >> >
> >> > "core.playSound ("type")
> >> >
> >> > "core.dropSound("type")
> >> >
> >> >
> >> >
> >> > Barry
> >> >
> >> >
> >> > >
> >> > --
> >> >
> >> > https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> >> > You are subscribed to branch lp:stellarium.
> >> >
> >>
> >> --
> >> https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> >> Your team Stellarium is subscribed to branch
> >> lp:~stellarium/stellarium/textures-cleanup.
> >
> > --
> > https://code.launchpad.net/~stellarium/stellarium/textures-cleanup/+merge/188775
> > Your team Stellarium is subscrib...

[lp:~stellarium/stellarium/textures-cleanup]

6271. By Guillaume Chereau on 2013-10-12

merge from trunk

6272. By Guillaume Chereau on 2013-10-13

reintroduce texture mipmap support

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-10 20:18:24 +0000
+++ CMakeLists.txt	2013-10-13 08:07:31 +0000
@@ -248,10 +248,26 @@
 FIND_PACKAGE(Qt5Svg REQUIRED)
 FIND_PACKAGE(Qt5Network REQUIRED)
 FIND_PACKAGE(Qt5Declarative REQUIRED)
-IF(WIN32)
-    # This modules need for Windows (WTF???)
-    FIND_PACKAGE(Qt5Sql REQUIRED)
-    FIND_PACKAGE(Qt5XmlPatterns REQUIRED)
+FIND_PACKAGE(Qt5Concurrent REQUIRED)
+FIND_PACKAGE(Qt5Test)
+IF(WIN32)
+  # This modules need for Windows (WTF???)
+  FIND_PACKAGE(Qt5Sql REQUIRED)
+  FIND_PACKAGE(Qt5XmlPatterns REQUIRED)
+ENDIF()
+
+INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Network_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Concurrent_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+IF(WIN32)
+  INCLUDE_DIRECTORIES(${Qt5XmlPatterns_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES(${Qt5Test_INCLUDE_DIRS})
 ENDIF()
 
 # Tell CMake to run moc when necessary:

=== modified file 'src/core/StelTexture.cpp'
--- src/core/StelTexture.cpp	2013-09-03 07:30:08 +0000
+++ src/core/StelTexture.cpp	2013-10-13 08:07:31 +0000
@@ -25,80 +25,17 @@
 #include "StelUtils.hpp"
 #include "StelPainter.hpp"
 
-#include <QThread>
-#include <QMutexLocker>
-#include <QSemaphore>
 #include <QImageReader>
-#include <QDir>
-#include <QFile>
-#include <QTemporaryFile>
 #include <QSize>
 #include <QDebug>
 #include <QUrl>
 #include <QImage>
 #include <QNetworkReply>
-#include <QTimer>
 #include <QtEndian>
-
-ImageLoader::ImageLoader(const QString& path, int delay)
-	: QObject(), path(path), networkReply(NULL)
-{
-	QTimer::singleShot(delay, this, SLOT(start()));
-}
-
-void ImageLoader::abort()
-{
-	// XXX: Assert that we are in the main thread.
-	if (networkReply != NULL)
-	{
-		networkReply->abort();
-	}
-}
-
-void ImageLoader::start()
-{
-	if (path.startsWith("http://")) {
-		QNetworkRequest req = QNetworkRequest(QUrl(path));
-		// Define that preference should be given to cached files (no etag checks)
-		req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-		req.setRawHeader("User-Agent", StelUtils::getApplicationName().toLatin1());
-		networkReply = StelApp::getInstance().getNetworkAccessManager()->get(req);
-		connect(networkReply, SIGNAL(finished()), this, SLOT(onNetworkReply()));
-	} else {
-		// At next loop iteration we start to load from the file.
-		QTimer::singleShot(0, this, SLOT(directLoad()));
-	}
-
-	// Move this object outside of the main thread.
-	StelTextureMgr* textureMgr = &StelApp::getInstance().getTextureManager();
-	moveToThread(textureMgr->loaderThread);
-}
-
-
-void ImageLoader::onNetworkReply()
-{
-	if (networkReply->error() != QNetworkReply::NoError) {
-		emit error(networkReply->errorString());
-	} else {
-		QByteArray data = networkReply->readAll();
-		QImage image = QImage::fromData(data);
-		if (image.isNull()) {
-			emit error("Unable to parse image data");
-		} else {
-			emit finished(image);
-		}
-	}
-	networkReply->deleteLater();
-	networkReply = NULL;
-}
-
-void ImageLoader::directLoad() {
-	QImage image = QImage(path);
-	emit finished(image);
-}
-
-StelTexture::StelTexture() : loader(NULL), downloaded(false), isLoadingImage(false),
-				   errorOccured(false), id(0), avgLuminance(-1.f)
+#include <QFuture>
+#include <QtConcurrent>
+
+StelTexture::StelTexture() : networkReply(NULL), loader(NULL), errorOccured(false), id(0), avgLuminance(-1.f)
 {
 	width = -1;
 	height = -1;
@@ -119,10 +56,13 @@
 		}
 		id = 0;
 	}
+	if (networkReply != NULL)
+	{
+		networkReply->abort();
+		networkReply->deleteLater();
+	}
 	if (loader != NULL) {
-		loader->abort();
-		// Don't forget that the loader has no parent.
-		loader->deleteLater();
+		delete loader;
 		loader = NULL;
 	}
 }
@@ -134,18 +74,40 @@
 {
 	errorOccured = true;
 	errorMessage = aerrorMessage;
-	isLoadingImage = false;
 	// Report failure of texture loading
 	emit(loadingProcessFinished(true));
 }
 
+StelTexture::GLData StelTexture::imageToGLData(const QImage &image)
+{
+	GLData ret;
+	if (image.isNull())
+		return ret;
+	ret.width = image.width();
+	ret.height = image.height();
+	ret.data = convertToGLFormat(image, &ret.format, &ret.type);
+	return ret;
+}
+
+/*************************************************************************
+ Defined to be passed to QtConcurrent::run
+ *************************************************************************/
+StelTexture::GLData StelTexture::loadFromPath(const QString &path)
+{
+	return imageToGLData(QImage(path));
+}
+
+StelTexture::GLData StelTexture::loadFromData(const QByteArray& data)
+{
+	return imageToGLData(QImage::fromData(data));
+}
+
 /*************************************************************************
  Bind the texture so that it can be used for openGL drawing (calls glBindTexture)
  *************************************************************************/
 
 bool StelTexture::bind()
 {
-	// qDebug() << "TEST bind" << fullPath;
 	if (id != 0)
 	{
 		// The texture is already fully loaded, just bind and return true;
@@ -156,24 +118,49 @@
 	if (errorOccured)
 		return false;
 
-	if (!isLoadingImage && loader == NULL) {
-		isLoadingImage = true;
-		loader = new ImageLoader(fullPath, 100);
-		connect(loader, SIGNAL(finished(QImage)), this, SLOT(onImageLoaded(QImage)));
-		connect(loader, SIGNAL(error(QString)), this, SLOT(onLoadingError(QString)));
-	}
-
-	return false;
-}
-
-void StelTexture::onImageLoaded(QImage image)
-{
-	qImage = image;
-	Q_ASSERT(!qImage.isNull());
-	glLoad();
-	isLoadingImage = false;
-	loader->deleteLater();
+	// If the file is remote, start a network connection.
+	if (loader == NULL && networkReply == NULL && fullPath.startsWith("http://")) {
+		QNetworkRequest req = QNetworkRequest(QUrl(fullPath));
+		// Define that preference should be given to cached files (no etag checks)
+		req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
+		req.setRawHeader("User-Agent", StelUtils::getApplicationName().toLatin1());
+		networkReply = StelApp::getInstance().getNetworkAccessManager()->get(req);
+		connect(networkReply, SIGNAL(finished()), this, SLOT(onNetworkReply()));
+		return false;
+	}
+	// The network connection is still running.
+	if (networkReply != NULL)
+		return false;
+	// Not a remote file, start a loader from local file.
+	if (loader == NULL)
+	{
+		loader = new QFuture<GLData>(QtConcurrent::run(loadFromPath, fullPath));
+		return false;
+	}
+	// Wait until the loader finish.
+	if (!loader->isFinished())
+		return false;
+	// Finally load the data in the main thread.
+	glLoad(loader->result());
+	delete loader;
 	loader = NULL;
+	return true;
+}
+
+void StelTexture::onNetworkReply()
+{
+	Q_ASSERT(loader == NULL);
+	if (networkReply->error() != QNetworkReply::NoError)
+	{
+		reportError(networkReply->errorString());
+	}
+	else
+	{
+		QByteArray data = networkReply->readAll();
+		loader = new QFuture<GLData>(QtConcurrent::run(loadFromData, data));
+	}
+	networkReply->deleteLater();
+	networkReply = NULL;
 }
 
 /*************************************************************************
@@ -183,25 +170,15 @@
 {
 	if (width<0 || height<0)
 	{
-
-		if (!qImage.isNull())
-		{
-			width = qImage.width();
-			height = qImage.height();
-		}
-		else
-		{
-			// Try to get the size from the file without loading data
-			QImageReader im(fullPath);
-			if (!im.canRead())
-			{
-				return false;
-			}
-			QSize size = im.size();
-			width = size.width();
-			height = size.height();
-		}
-
+		// Try to get the size from the file without loading data
+		QImageReader im(fullPath);
+		if (!im.canRead())
+		{
+			return false;
+		}
+		QSize size = im.size();
+		width = size.width();
+		height = size.height();
 	}
 	awidth = width;
 	aheight = height;
@@ -274,37 +251,33 @@
 	return ret;
 }
 
-
-// Actually load the texture to openGL memory
-bool StelTexture::glLoad()
+bool StelTexture::glLoad(const GLData& data)
 {
-	if (qImage.isNull())
+	if (data.data.isEmpty())
 	{
-		errorOccured = true;
 		reportError("Unknown error");
 		return false;
 	}
+	width = data.width;
+	height = data.height;
 	glActiveTexture(GL_TEXTURE0);
 	glGenTextures(1, &id);
 	glBindTexture(GL_TEXTURE_2D, id);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, loadParams.filtering);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, loadParams.filtering);
-
-	GLint format, type;
-	QByteArray data = convertToGLFormat(qImage, &format, &type);
-	glTexImage2D(GL_TEXTURE_2D, 0, format, qImage.width(), qImage.height(), 0, format,
-				 type, data.constData());
-	bool genMipmap = false;
-	if (genMipmap)
-		glGenerateMipmap(GL_TEXTURE_2D);
-	
+	glTexImage2D(GL_TEXTURE_2D, 0, data.format, width, height, 0, data.format,
+				 data.type, data.data.constData());
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, loadParams.wrapMode);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, loadParams.wrapMode);
-
-	// Release shared memory
-	qImage = QImage();
-
+	if (loadParams.generateMipmaps)
+		glGenerateMipmap(GL_TEXTURE_2D);
 	// Report success of texture loading
 	emit(loadingProcessFinished(false));
 	return true;
 }
+
+// Actually load the texture to openGL memory
+bool StelTexture::glLoad(const QImage& image)
+{
+	return glLoad(imageToGLData(image));
+}

=== modified file 'src/core/StelTexture.hpp'
--- src/core/StelTexture.hpp	2013-09-03 07:30:08 +0000
+++ src/core/StelTexture.hpp	2013-10-13 08:07:31 +0000
@@ -29,39 +29,12 @@
 class QFile;
 class StelTextureMgr;
 class QNetworkReply;
+template <class T> class QFuture;
 
 #ifndef GL_CLAMP_TO_EDGE
 #define GL_CLAMP_TO_EDGE 0x812F
 #endif
 
-// This class is just used internally to load the texture data.
-class ImageLoader : QObject
-{
-	Q_OBJECT
-
-private:
-	friend class StelTextureMgr;
-	friend class StelTexture;
-
-	ImageLoader(const QString& path, int delay);
-	void abort();
-
-signals:
-	void finished(QImage);
-	void error(const QString& errorMsg);
-
-public slots:
-	void start();
-
-private slots:
-	void onNetworkReply();
-	void directLoad();
-
-private:
-	QString path;
-	QNetworkReply* networkReply;
-};
-
 //! @class StelTexture
 //! Base texture class. For creating an instance, use StelTextureMgr::createTexture() and StelTextureMgr::createTextureThread()
 //! @sa StelTextureSP
@@ -109,12 +82,7 @@
 	const QString& getFullPath() const {return fullPath;}
 
 	//! Return whether the image is currently being loaded
-	bool isLoading() const {return isLoadingImage && !canBind();}
-
-	//! Load the texture already in the RAM to the openGL memory
-	//! This function uses openGL routines and must be called in the main thread
-	//! @return false if an error occured
-	bool glLoad();
+	bool isLoading() const {return (loader || networkReply) && !canBind();}
 
 signals:
 	//! Emitted when the texture is ready to be bind(), i.e. when downloaded, imageLoading and	glLoading is over
@@ -124,14 +92,25 @@
 	void loadingProcessFinished(bool error);
 
 private slots:
-	//! Called by the loader when the data has finished loading
-	void onImageLoaded(QImage image);
-	//! Called by the loader in case of an error
-	void onLoadingError(const QString& errorMessage) {reportError(errorMessage);}
+	void onNetworkReply();
 
 private:
 	friend class StelTextureMgr;
-	friend class TextureLoader;
+
+	//! structure returned by the loader threads, containing all the
+	//! data and information to create the OpenGL texture.
+	struct GLData
+	{
+		QByteArray data;
+		int width;
+		int height;
+		GLint format;
+		GLint type;
+	};
+	//! Those static methods can be called by QtConcurrent::run
+	static GLData imageToGLData(const QImage &image);
+	static GLData loadFromPath(const QString &path);
+	static GLData loadFromData(const QByteArray& data);
 
 	//! Private constructor
 	StelTexture();
@@ -143,25 +122,25 @@
 	//! @param errorMessage the human friendly error message
 	void reportError(const QString& errorMessage);
 
+	//! Load the texture already in the RAM to the openGL memory
+	//! This function uses openGL routines and must be called in the main thread
+	//! @return false if an error occured
+	bool glLoad(const QImage& image);
+	//! Same as glLoad(QImage), but with an image already in OpenGl format
+	bool glLoad(const GLData& data);
+
 	StelTextureParams loadParams;
 
+	//! Used to handle the connection for remote textures.
+	QNetworkReply *networkReply;
+
 	//! The loader object
-	ImageLoader* loader;
+	QFuture<GLData>* loader;
 
-	//! Define if the texture was already downloaded if it was a remote one
-	bool downloaded;
-	//! Define whether the image is already loading
-	bool isLoadingImage;
 
 	//! The URL where to download the file
 	QString fullPath;
 
-	//! The data that was loaded from http
-	QImage qImage;
-
-	//! Used ony when creating temporary file
-	QString fileExtension;
-
 	//! True when something when wrong in the loading process
 	bool errorOccured;
 

=== modified file 'src/core/StelTextureMgr.cpp'
--- src/core/StelTextureMgr.cpp	2013-09-22 20:28:42 +0000
+++ src/core/StelTextureMgr.cpp	2013-10-13 08:07:31 +0000
@@ -33,25 +33,10 @@
 #include <QOpenGLContext>
 
 
-StelTextureMgr::StelTextureMgr()
-{
-	// This thread is doing nothing but will contains all the loader objects.
-	loaderThread = new QThread(this);
-	loaderThread->start(QThread::LowestPriority);
-}
-
-StelTextureMgr::~StelTextureMgr()
-{
-	// Hopefully this doesn't take much time.
-	loaderThread->quit();
-	loaderThread->wait();
-}
-
 void StelTextureMgr::init()
 {
 }
 
-
 StelTextureSP StelTextureMgr::createTexture(const QString& afilename, const StelTexture::StelTextureParams& params)
 {
 	if (afilename.isEmpty())
@@ -60,46 +45,26 @@
 	StelTextureSP tex = StelTextureSP(new StelTexture());
 	tex->fullPath = afilename;
 
-	tex->qImage = QImage(tex->fullPath);
-	if (tex->qImage.isNull())
+	QImage image(tex->fullPath);
+	if (image.isNull())
 		return StelTextureSP();
 
 	tex->loadParams = params;
-	tex->downloaded = true;
-
-	if (tex->glLoad())
+	if (tex->glLoad(image))
 		return tex;
 	else
 		return StelTextureSP();
 }
 
 
-StelTextureSP StelTextureMgr::createTextureThread(const QString& url, const StelTexture::StelTextureParams& params, const QString& fileExtension, bool lazyLoading)
+StelTextureSP StelTextureMgr::createTextureThread(const QString& url, const StelTexture::StelTextureParams& params, bool lazyLoading)
 {
 	if (url.isEmpty())
 		return StelTextureSP();
 
 	StelTextureSP tex = StelTextureSP(new StelTexture());
 	tex->loadParams = params;
-	if (!url.startsWith("http://"))
-	{
-		// Assume a local file
-		tex->fullPath = url;
-		tex->downloaded = true;
-	}
-	else
-	{
-		tex->fullPath = url;
-		if (fileExtension.isEmpty())
-		{
-			const int idx = url.lastIndexOf('.');
-			if (idx!=-1)
-				tex->fileExtension = url.right(url.size()-idx-1);
-		}
-	}
-	if (!fileExtension.isEmpty())
-		tex->fileExtension = fileExtension;
-
+	tex->fullPath = url;
 	if (!lazyLoading)
 	{
 		tex->bind();

=== modified file 'src/core/StelTextureMgr.hpp'
--- src/core/StelTextureMgr.hpp	2013-08-25 21:13:39 +0000
+++ src/core/StelTextureMgr.hpp	2013-10-13 08:07:31 +0000
@@ -33,9 +33,6 @@
 class StelTextureMgr : QObject
 {
 public:
-	StelTextureMgr();
-	virtual ~StelTextureMgr();
-
 	//! Initialize some variable from the openGL contex.
 	//! Must be called after the creation of the GLContext.
 	void init();
@@ -50,16 +47,12 @@
 	//! @param url the texture file name or URL, can be absolute path if starts with '/' otherwise
 	//!    the file will be looked in stellarium standard textures directories.
 	//! @param params the texture creation parameters.
-	//! @param fileExtension the file extension to assume. If not set the extension is determined from url
 	//! @param lazyLoading define whether the texture should be actually loaded only when needed, i.e. when bind() is called the first time.
-	StelTextureSP createTextureThread(const QString& url, const StelTexture::StelTextureParams& params=StelTexture::StelTextureParams(), const QString& fileExtension=QString(), bool lazyLoading=true);
+	StelTextureSP createTextureThread(const QString& url, const StelTexture::StelTextureParams& params=StelTexture::StelTextureParams(), bool lazyLoading=true);
 
 private:
 	friend class StelTexture;
 	friend class ImageLoader;
-
-	//! A thread that is used by the TextureLoader object to avoid pausing the main thread too long.
-	QThread* loaderThread;
 };