Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-05 06:05:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix material colors for OBJ models

Browse source
This commit is contained in:
Seth Alves 2015-09-28 17:02:00 -07:00
parent 8f02ffb76a
commit a8b135b5ca
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/fbx/src/OBJReader.cpp
View file

@ -537,18 +537,18 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
qCDebug(modelformat) << "OBJ reader fail: " << e.what();
}
qDebug() << "---------------------- -------------------------";
foreach (QString materialID, materials.keys()) {
OBJMaterial& objMaterial = materials[materialID];
qDebug() << "materialID =" << materialID << "diffuseColor =" << objMaterial.diffuseColor;
geometry.materials[materialID] = FBXMaterial(objMaterial.diffuseColor, // glm::vec3(1.0f, 1.0f, 1.0f)
objMaterial.specularColor, // glm::vec3(1.0f)
glm::vec3(), // glm::vec3()
glm::vec2(0.f, 1.0f), // glm::vec2(0.f, 1.0f)
objMaterial.shininess, // 96.0f
objMaterial.opacity); // 1.0f
FBXMaterial& material = geometry.materials[materialID];
material._material = std::make_shared<model::Material>();
geometry.materials[materialID] = FBXMaterial(objMaterial.diffuseColor,
objMaterial.specularColor,
glm::vec3(0.0f),
glm::vec2(0.0f, 1.0f),
objMaterial.shininess,
objMaterial.opacity);
FBXMaterial& fbxMaterial = geometry.materials[materialID];
fbxMaterial.materialID = materialID;
fbxMaterial._material = std::make_shared<model::Material>();
model::MaterialPointer modelMaterial = fbxMaterial._material;
if (!objMaterial.diffuseTextureFilename.isEmpty()) {
FBXTexture texture;
@ -556,17 +556,16 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
// TODO -- something to get textures working again
}
material._material->setEmissive(material.emissiveColor);
material._material->setDiffuse(material.diffuseColor);
material._material->setMetallic(glm::length(material.specularColor));
material._material->setGloss(material.shininess);
modelMaterial->setEmissive(fbxMaterial.emissiveColor);
modelMaterial->setDiffuse(fbxMaterial.diffuseColor);
modelMaterial->setMetallic(glm::length(fbxMaterial.specularColor));
modelMaterial->setGloss(fbxMaterial.shininess);
if (material.opacity <= 0.0f) {
material._material->setOpacity(1.0f);
if (fbxMaterial.opacity <= 0.0f) {
modelMaterial->setOpacity(1.0f);
} else {
material._material->setOpacity(material.opacity);
modelMaterial->setOpacity(fbxMaterial.opacity);
}
}
return geometryPtr;