StelTexture.hpp   StelTexture.hpp 
skipping to change at line 124 skipping to change at line 124
int height; int height;
GLint format; GLint format;
GLint type; GLint type;
}; };
//! Those static methods can be called by QtConcurrent::run //! Those static methods can be called by QtConcurrent::run
static GLData imageToGLData(const QImage &image); static GLData imageToGLData(const QImage &image);
static GLData loadFromPath(const QString &path); static GLData loadFromPath(const QString &path);
static GLData loadFromData(const QByteArray& data); static GLData loadFromData(const QByteArray& data);
//! Private constructor //! Private constructor
StelTexture(); StelTexture(StelTextureMgr* mgr);
//! Convert a QImage into opengl compatible format. //! Convert a QImage into opengl compatible format.
static QByteArray convertToGLFormat(const QImage& image, GLint* form at, GLint* type); static QByteArray convertToGLFormat(const QImage& image, GLint* form at, GLint* type);
//! This method should be called if the texture loading failed for a ny reasons //! This method should be called if the texture loading failed for a ny reasons
//! @param errorMessage the human friendly error message //! @param errorMessage the human friendly error message
void reportError(const QString& errorMessage); void reportError(const QString& errorMessage);
//! Load the texture already in the RAM to the openGL memory //! Load the texture already in the RAM to the openGL memory
//! This function uses openGL routines and must be called in the mai n thread //! This function uses openGL routines and must be called in the mai n thread
//! @return false if an error occured //! @return false if an error occured
bool glLoad(const QImage& image); bool glLoad(const QImage& image);
//! Same as glLoad(QImage), but with an image already in OpenGl form at //! Same as glLoad(QImage), but with an image already in OpenGl form at
bool glLoad(const GLData& data); bool glLoad(const GLData& data);
//! The parent texture manager
StelTextureMgr* textureMgr;
StelTextureParams loadParams; StelTextureParams loadParams;
//! Used to handle the connection for remote textures. //! Used to handle the connection for remote textures.
QNetworkReply *networkReply; QNetworkReply *networkReply;
//! The loader object //! The loader object
QFuture<GLData>* loader; QFuture<GLData>* loader;
//! The URL where to download the file //! The URL where to download the file
QString fullPath; QString fullPath;
skipping to change at line 168 skipping to change at line 171
QString errorMessage; QString errorMessage;
//! OpenGL id //! OpenGL id
GLuint id; GLuint id;
//! Cached average luminance //! Cached average luminance
float avgLuminance; float avgLuminance;
GLsizei width; //! Texture image width GLsizei width; //! Texture image width
GLsizei height; //! Texture image height GLsizei height; //! Texture image height
//! Size in GL memory
int glSize;
}; };
#endif // _STELTEXTURE_HPP_ #endif // _STELTEXTURE_HPP_
 End of changes. 3 change blocks. 
1 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/