Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

investigating the semi transparent textured bug

Browse source
This commit is contained in:
Sam Gateau 2015-05-01 13:37:04 -07:00
parent 67b923eb89
commit 1b558e7390
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/fbx/src/FBXReader.cpp
View file

@ -1746,8 +1746,12 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping,
material.id = getID(object.properties);
material._material = model::MaterialPointer(new model::Material());
material._material->setEmissive(material.emissive);
material._material->setDiffuse(material.diffuse);
material._material->setEmissive(material.emissive);
if (glm::all(glm::equal(material.diffuse, glm::vec3(0.0f)))) {
material._material->setDiffuse(material.diffuse);
} else {
material._material->setDiffuse(material.diffuse);
}
material._material->setSpecular(material.specular);
material._material->setShininess(material.shininess);

2
libraries/render-utils/src/model.slf
View file

@ -33,7 +33,7 @@ void main(void) {
packDeferredFragment(
normalize(interpolatedNormal.xyz),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), diffuse.a),
getMaterialDiffuse(mat) * diffuse.rgb * color,
/*getMaterialDiffuse(mat) **/ diffuse.rgb /** color*/,
getMaterialSpecular(mat),
getMaterialShininess(mat));
}