FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Björn Blissing, "Fix to support correct shininess and transparency in FBX plugin"

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14272 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2014-06-25 08:18:05 +00:00
parent 82a34a2546
commit 81c23564b5
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgPlugins/fbx/fbxMaterialToOsgStateSet.cpp
View File

@ -50,10 +50,20 @@ FbxMaterialToOsgStateSet::convert(const FbxSurfaceMaterial* pFbxMat)
} }
} }
double transparencyColorFactor = 1.0;
bool useTransparencyColorFactor = false;
// opacity map... // opacity map...
const FbxProperty lOpacityProperty = pFbxMat->FindProperty(FbxSurfaceMaterial::sTransparentColor); const FbxProperty lOpacityProperty = pFbxMat->FindProperty(FbxSurfaceMaterial::sTransparentColor);
if (lOpacityProperty.IsValid()) if (lOpacityProperty.IsValid())
{ {
FbxDouble3 transparentColor = lOpacityProperty.Get<FbxDouble3>();
// If transparent color is defined set the transparentFactor to gray scale value of transparentColor
if (transparentColor[0] < 1.0 || transparentColor[1] < 1.0 || transparentColor[2] < 1.0) {
transparencyColorFactor = transparentColor[0]*0.30 + transparentColor[1]*0.59 + transparentColor[2]*0.11;
useTransparencyColorFactor = true;
}
int lNbTex = lOpacityProperty.GetSrcObjectCount<FbxFileTexture>(); int lNbTex = lOpacityProperty.GetSrcObjectCount<FbxFileTexture>();
for (int lTextureIndex = 0; lTextureIndex < lNbTex; lTextureIndex++) for (int lTextureIndex = 0; lTextureIndex < lNbTex; lTextureIndex++)
{ {
@ -121,11 +131,12 @@ FbxMaterialToOsgStateSet::convert(const FbxSurfaceMaterial* pFbxMat)
{ {
FbxDouble3 color = pFbxLambert->Diffuse.Get(); FbxDouble3 color = pFbxLambert->Diffuse.Get();
double factor = pFbxLambert->DiffuseFactor.Get(); double factor = pFbxLambert->DiffuseFactor.Get();
double transparencyFactor = useTransparencyColorFactor ? transparencyColorFactor : pFbxLambert->TransparencyFactor.Get();
pOsgMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4( pOsgMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4(
static_cast<float>(color[0] * factor), static_cast<float>(color[0] * factor),
static_cast<float>(color[1] * factor), static_cast<float>(color[1] * factor),
static_cast<float>(color[2] * factor), static_cast<float>(color[2] * factor),
static_cast<float>(1.0 - pFbxLambert->TransparencyFactor.Get()))); static_cast<float>(1.0 - transparencyFactor)));
color = pFbxLambert->Ambient.Get(); color = pFbxLambert->Ambient.Get();
factor = pFbxLambert->AmbientFactor.Get(); factor = pFbxLambert->AmbientFactor.Get();
@ -155,9 +166,12 @@ FbxMaterialToOsgStateSet::convert(const FbxSurfaceMaterial* pFbxMat)
static_cast<float>(color[1] * factor), static_cast<float>(color[1] * factor),
static_cast<float>(color[2] * factor), static_cast<float>(color[2] * factor),
1.0f)); 1.0f));
// Since Maya and 3D studio Max stores their glossiness values in exponential format (2^(log2(x))
// We need to linearize to values between 0-100 and then scale to values between 0-128.
// Glossiness values above 100 will result in shininess larger than 128.0 and will be clamped
double shininess = (64.0 * log (pFbxPhong->Shininess.Get())) / (5.0 * log(2.0));
pOsgMat->setShininess(osg::Material::FRONT_AND_BACK, pOsgMat->setShininess(osg::Material::FRONT_AND_BACK,
static_cast<float>(pFbxPhong->Shininess.Get())); static_cast<float>(shininess));
// get maps factors... // get maps factors...
result.reflectionFactor = pFbxPhong->ReflectionFactor.Get(); result.reflectionFactor = pFbxPhong->ReflectionFactor.Get();