itdominator/SWBF2-Classic-Msh-Viewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save more material information,

Browse Source 
hold default material in geometry separated,
load diffuse color if texture cannot be opened,
fixed gamma correction on the texture,
This commit is contained in:
Anakin
2017-01-20 16:26:58 +01:00
parent abd9070e90
commit 9808cd03c0
5 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
QtMeshViewer/Header/FileInterface.h
View File

@@ -42,12 +42,14 @@ struct Model {
struct Material {
QString name;
QString textureName;
QOpenGLTexture* texture = Q_NULLPTR;
QVector4D specularColor = { 1.0, 1.0, 1.0, 1.0 };
QVector4D diffuseColor = { 1.0, 0.0, 0.0, 1.0 };
QVector4D ambientColor = { 1.0, 1.0, 1.0, 1.0 };
float shininess = 80;
bool flags[8] = { false };
bool transparent = false;
float shininess = 80; //TODO: read from file
QVector4D specularColor = {1.0,1.0,1.0, 1.0}; //TODO: read from file, change to 4D
QVector4D diffuseColor;
QVector4D ambientColor;
};
class FileInterface : public QObject
@@ -110,8 +112,8 @@ public:
virtual QVector<Material>* getMaterials() const { return m_materials; };
virtual BoundingBox getBoundingBox() const { return m_sceneBbox; };
static Material getDefaultMaterial() {
Material defMaterial;
static Material* getDefaultMaterial() {
Material* defMaterial = new Material;
QImage img(1, 1, QImage::Format_RGB32);
img.fill(Qt::red);
@@ -128,7 +130,8 @@ public:
// f.ex. texture coordinate (1.1, 1.2) is same as (0.1, 0.2)
new_texture->setWrapMode(QOpenGLTexture::Repeat);
defMaterial.texture = new_texture;
defMaterial->texture = new_texture;
defMaterial->name = "Default Material";
return defMaterial;
};

1
QtMeshViewer/Header/GeometryEngine.h
View File

@@ -28,6 +28,7 @@ private:
QVector<Material>* m_materials = Q_NULLPTR;
QVector<DrawInformation> m_drawList;
BoundingBox m_boundings;
Material* m_defaultMaterial;
void clearData();