StelTextureMgr.hpp   StelTextureMgr.hpp 
skipping to change at line 35 skipping to change at line 35
class QNetworkReply; class QNetworkReply;
class QThread; 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:
//! Initialize some variable from the openGL context.
//! Must be called after the creation of the GLContext.
void init();
//! Load an image from a file and create a new texture from it //! Load an image from a file and create a new texture from it
//! @param filename the texture file name, can be absolute path if s tarts with '/' otherwise //! @param filename the texture file name, can be absolute path if s tarts with '/' otherwise
//! the file will be looked for in Stellarium's standard textures directories. //! the file will be looked for in Stellarium's standard textures directories.
//! @param params the texture creation parameters. //! @param params the texture creation parameters.
StelTextureSP createTexture(const QString& filename, const StelTextu re::StelTextureParams& params=StelTexture::StelTextureParams()); StelTextureSP createTexture(const QString& filename, const StelTextu re::StelTextureParams& params=StelTexture::StelTextureParams());
//! 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 for in Stellarium's standard textures directories. //! the file will be looked for in Stellarium's standard textures directories.
//! @param params the texture creation parameters. //! @param params the texture creation parameters.
//! @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(), bool lazyL oading=true); StelTextureSP createTextureThread(const QString& url, const StelText ure::StelTextureParams& params=StelTexture::StelTextureParams(), bool lazyL oading=true);
//! Returns the estimated memory usage of all textures currently loa
ded through StelTexture
int getGLMemoryUsage();
private: private:
friend class StelTexture; friend class StelTexture;
friend class ImageLoader; friend class ImageLoader;
friend class StelApp;
//! Private constructor, use StelApp::getTextureManager for the corr
ect instance
StelTextureMgr();
//! Initialize some variable from the openGL context.
//! Must be called after the creation of the GLContext.
void init();
int glMemoryUsage;
}; };
#endif // _STELTEXTUREMGR_HPP_ #endif // _STELTEXTUREMGR_HPP_
 End of changes. 3 change blocks. 
4 lines changed or deleted 15 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/