Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 17:26:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

A few changes in the material call back

Browse source
This commit is contained in:
samcake 2016-02-17 10:44:15 -08:00
parent b03f639e2c
commit 2ed7f997e3
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -867,6 +867,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
FBXMaterial material;
if (object.properties.at(1).toByteArray().contains("StingrayPBS1")) {
material.isPBSMaterial = true;
} else if (object.properties.at(1).toByteArray().contains("StingrayPBS2")) {
material.isPBSMaterial = true;
}
foreach (const FBXNode& subobject, object.children) {
bool properties = false;

2
libraries/model/src/model/Material.slh
View file

@ -29,6 +29,6 @@ Material getMaterial() {
float getMaterialOpacity(Material m) { return m._albedoOpacity.a; }
vec3 getMaterialAlbedo(Material m) { return m._albedoOpacity.rgb; }
vec3 getMaterialSpecular(Material m) { return m._specular.rgb; }
float getMaterialShininess(Material m) { return m._specular.a; }
float getMaterialShininess(Material m) { return (1 - m._specular.a); }
<@endif@>