StelTextureMgr.hpp   StelTextureMgr.hpp 
skipping to change at line 27 skipping to change at line 27
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#ifndef _STELTEXTUREMGR_HPP_ #ifndef _STELTEXTUREMGR_HPP_
#define _STELTEXTUREMGR_HPP_ #define _STELTEXTUREMGR_HPP_
#include <QtOpenGL> #include <QtOpenGL>
#include "StelTexture.hpp" #include "StelTexture.hpp"
#include <QObject> #include <QObject>
class QNetworkReply;
class QThread;
//! @class StelTextureMgr //! @class StelTextureMgr
//! Manage textures loading. //! Manage textures loading.
//! It provides method for loading images in a separate thread. //! It provides method for loading images in a separate thread.
class StelTextureMgr : QObject class StelTextureMgr : QObject
{ {
public: public:
StelTextureMgr(); StelTextureMgr();
virtual ~StelTextureMgr(); virtual ~StelTextureMgr();
//! Initialize some variable from the openGL contex. //! Initialize some variable from the openGL contex.
skipping to change at line 56 skipping to change at line 59
//! Load an image from a file and create a new texture from it in a new thread. //! Load an image from a file and create a new texture from it in a new thread.
//! @param url the texture file name or URL, can be absolute path if starts with '/' otherwise //! @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 direc tories. //! the file will be looked in stellarium standard textures direc tories.
//! @param params the texture creation parameters. //! @param params the texture creation parameters.
//! @param fileExtension the file extension to assume. If not set th e extension is determined from url //! @param fileExtension the file extension to assume. If not set th e 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. //! @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 StelText ure::StelTextureParams& params=StelTexture::StelTextureParams(), const QStr ing& fileExtension=QString(), bool lazyLoading=true); StelTextureSP createTextureThread(const QString& url, const StelText ure::StelTextureParams& params=StelTexture::StelTextureParams(), const QStr ing& fileExtension=QString(), bool lazyLoading=true);
private: private:
friend class StelTexture; friend class StelTexture;
friend class ImageLoader;
//! Whether ARB_texture_non_power_of_two is supported on this card //! A thread that is used by the TextureLoader object to avoid pausi
bool isNoPowerOfTwoAllowed; ng the main thread too long.
QThread* loaderThread;
}; };
#endif // _STELTEXTUREMGR_HPP_ #endif // _STELTEXTUREMGR_HPP_
 End of changes. 3 change blocks. 
2 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/