SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@375 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2018-04-19 20:10:15 +00:00
parent 79d1654f07
commit 11302ac363
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qglview/glmaterial.h
View File

@@ -78,8 +78,11 @@ class GLTextureManagerBase {
public:
static void addSearchPath(const QString & path) {search_pathes << path;}
static QStringList searchPathes() {return search_pathes;}
static QString findFile(const QString & path);
static GLuint loadTexture(const QString & path, bool ownership = true, bool bump = false);
static GLuint loadTexture(const QImage & image, bool ownership = true, bool bump = false);
static void reloadTexture(GLuint tid, const QString & path);
static void reloadTexture(GLuint tid, const QImage & image);
int textureID(const QString & path, bool bump = false) {return tex_ids[bump ? 1 : 0][path];}
protected: