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

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

Browse Source
This commit is contained in:
Бычков Андрей
2019-09-25 17:42:47 +00:00
parent f2ee4cf5a5
commit fda6905a37
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qglview/glmaterial.h
View File

@@ -97,7 +97,8 @@ protected:
}; };
struct Map { class Map {
public:
Map() {bitmap_id = 0; color_amount = 1.f; color_offset = 0.f; animation_frame_rate = -1.f;} Map() {bitmap_id = 0; color_amount = 1.f; color_offset = 0.f; animation_frame_rate = -1.f;}
QString bitmap_path; QString bitmap_path;
GLuint bitmap_id; GLuint bitmap_id;
@@ -108,7 +109,8 @@ struct Map {
float animation_frame_rate; float animation_frame_rate;
}; };
struct Material { class Material {
public:
Material(); Material();
void apply(QOpenGLShaderProgram * prog); void apply(QOpenGLShaderProgram * prog);
void loadTextures(GLTextureManagerBase * tm); void loadTextures(GLTextureManagerBase * tm);