From 2ed7f997e3d493aad6fc3e1d1da096859ccfb0b8 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 17 Feb 2016 10:44:15 -0800 Subject: [PATCH] A few changes in the material call back --- libraries/fbx/src/FBXReader.cpp | 2 ++ libraries/model/src/model/Material.slh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index daaa2d94be..f4225e6e73 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -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; diff --git a/libraries/model/src/model/Material.slh b/libraries/model/src/model/Material.slh index 1f9a290fe7..a190a1c552 100644 --- a/libraries/model/src/model/Material.slh +++ b/libraries/model/src/model/Material.slh @@ -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@>