StelTextureMgr.hpp   StelTextureMgr.hpp 
skipping to change at line 23 skipping to change at line 23
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* 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 <config.h>
#include <QtOpenGL> #include <QtOpenGL>
#include "StelTexture.hpp" #include "StelTexture.hpp"
#include <QObject> #include <QObject>
//! @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.
//! Must be called after the creation of the GLContext. //! Must be called after the creation of the GLContext.
void init(); 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 in stellarium standard textures direc tories. //! the file will be looked in stellarium standard textures direc tories.
//! @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 in stellarium standard textures direc tories. //! the file will be looked in stellarium standard textures direc tories.
//! @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;
//! Whether ARB_texture_non_power_of_two is supported on this card //! Whether ARB_texture_non_power_of_two is supported on this card
bool isNoPowerOfTwoAllowed; bool isNoPowerOfTwoAllowed;
}; };
 End of changes. 3 change blocks. 
2 lines changed or deleted 2 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/