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

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

Browse Source
This commit is contained in:
Бычков Андрей
2019-05-24 19:06:35 +00:00
parent 1082db07c6
commit 58fce3cd81
29 changed files with 394 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglview/glmaterial.h
View File

@@ -92,7 +92,7 @@ protected:
};
extern GLTextureManager * currentGLTextureManager;
//extern GLTextureManager * currentGLTextureManager;
struct Map {
Map() {bitmap_id = 0; color_amount = 1.f; color_offset = 0.f; animation_frame_rate = -1.f;}
@@ -107,7 +107,7 @@ struct Map {
struct Material {
Material();
void apply(__GLShaderProgram__ * prog);
void apply(QOpenGLShaderProgram * prog);
void loadTextures(GLTextureManagerBase * tm = 0);
QString name;
QColor color_diffuse;