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

more ka

Browse source
This commit is contained in:
David Back 2017-12-27 16:55:45 -08:00
parent c3801fee7e
commit 5e45ee456c
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/qml/js/Utils.jsc
View file

Binary file not shown.

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

@ -277,7 +277,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
#ifdef WANT_DEBUG
qCDebug(modelformat) << "OBJ Reader Starting new material definition " << matName;
#endif
//currentMaterial.emissiveTextureFilename = "";
currentMaterial.diffuseTextureFilename = "";
//currentMaterial.specularTextureFilename = "";
} else if (token == "Ns") {
currentMaterial.shininess = tokenizer.getFloat();
} else if ((token == "d") || (token == "Tr")) {
@ -745,6 +747,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
if (!objMaterial.specularTextureFilename.isEmpty()) {
fbxMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
}
if (!objMaterial.emissiveTextureFilename.isEmpty()) {
fbxMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
}
modelMaterial->setEmissive(fbxMaterial.emissiveColor);
modelMaterial->setAlbedo(fbxMaterial.diffuseColor);