From fda6905a374994318261f7d8b9abf3ffb91d4a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 25 Sep 2019 17:42:47 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@600 a8b55f48-bf90-11e4-a774-851b48703e85 --- qglview/glmaterial.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qglview/glmaterial.h b/qglview/glmaterial.h index 57fb96d..4f79a23 100644 --- a/qglview/glmaterial.h +++ b/qglview/glmaterial.h @@ -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;} QString bitmap_path; GLuint bitmap_id; @@ -108,7 +109,8 @@ struct Map { float animation_frame_rate; }; -struct Material { +class Material { +public: Material(); void apply(QOpenGLShaderProgram * prog); void loadTextures(GLTextureManagerBase * tm);