SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2015-11-23 17:07:25 +00:00
parent 104a7f99ad
commit 48addec20f
32 changed files with 738 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qglview/loader_obj.cpp
View File

@@ -156,7 +156,7 @@ QVector<Material> readMTL(QString obj_path, QString path) {
}
if (line.startsWith("Ks")) {
Vector3d v = readVector3d(line.mid(2).trimmed());
mat.specular = v.length();
mat.map_specular.color_amount = v.length();
double mc = qMax(v.x, qMax(v.y, v.z));
if (mc > 0.) v /= mc;
mat.color_specular = QColor::fromRgbF(v.x, v.y, v.z);
@@ -164,7 +164,7 @@ QVector<Material> readMTL(QString obj_path, QString path) {
continue;
}
if (line.startsWith("Ns")) {
mat.roughness = 2. / exp(line.mid(2).trimmed().toDouble());
mat.map_specularity.color_amount = 2. / exp(line.mid(2).trimmed().toDouble());
continue;
}
if (line.startsWith("d")) {
@@ -181,9 +181,9 @@ QVector<Material> readMTL(QString obj_path, QString path) {
line = line.mid(3).trimmed();
QString sv = line.left(line.indexOf(" "));
line = line.mid(sv.size()).trimmed();
mat.map_bump.color_amount = sv.toDouble();
mat.map_normal.color_amount = sv.toDouble();
}
mat.map_bump.bitmap_path = findFile(line, sp);
mat.map_normal.bitmap_path = findFile(line, sp);
//qDebug() << "BUMP" << mat.name << mat.bump_scale << mat.bump.bitmap_path;
continue;
}