Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-05 19:57:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix material colors for glTF

Browse source 
Co-authored-by: Julian Groß <julian.g@posteo.de>
This commit is contained in:
ksuprynowicz 2023-01-10 00:08:45 +01:00 committed by Julian Groß
parent c5d866a866
commit 56de0f8d56
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/model-serializers/src/GLTFSerializer.cpp
View file

@ -1886,7 +1886,8 @@ void GLTFSerializer::setHFMMaterial(HFMMaterial& hfmMat, const GLTFMaterial& mat
} }
if (material.defined["emissiveFactor"] && material.emissiveFactor.size() == 3) { if (material.defined["emissiveFactor"] && material.emissiveFactor.size() == 3) {
glm::vec3 emissive = glm::vec3(material.emissiveFactor[0], material.emissiveFactor[1], material.emissiveFactor[2]); glm::vec3 emissiveLinear = glm::vec3(material.emissiveFactor[0], material.emissiveFactor[1], material.emissiveFactor[2]);
glm::vec3 emissive = ColorUtils::tosRGBVec3(emissiveLinear);
hfmMat._material->setEmissive(emissive); hfmMat._material->setEmissive(emissive);
} }
@ -1930,9 +1931,9 @@ void GLTFSerializer::setHFMMaterial(HFMMaterial& hfmMat, const GLTFMaterial& mat
} }
if (material.pbrMetallicRoughness.defined["baseColorFactor"] && if (material.pbrMetallicRoughness.defined["baseColorFactor"] &&
material.pbrMetallicRoughness.baseColorFactor.size() == 4) { material.pbrMetallicRoughness.baseColorFactor.size() == 4) {
glm::vec3 dcolor = glm::vec3 lcolor = glm::vec3(material.pbrMetallicRoughness.baseColorFactor[0], material.pbrMetallicRoughness.baseColorFactor[1],
glm::vec3(material.pbrMetallicRoughness.baseColorFactor[0], material.pbrMetallicRoughness.baseColorFactor[1], material.pbrMetallicRoughness.baseColorFactor[2]);
material.pbrMetallicRoughness.baseColorFactor[2]); glm::vec3 dcolor = ColorUtils::tosRGBVec3(lcolor);
hfmMat.diffuseColor = dcolor; hfmMat.diffuseColor = dcolor;
hfmMat._material->setAlbedo(dcolor); hfmMat._material->setAlbedo(dcolor);
hfmMat._material->setOpacity(material.pbrMetallicRoughness.baseColorFactor[3]); hfmMat._material->setOpacity(material.pbrMetallicRoughness.baseColorFactor[3]);