OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

0032524: Data Exchange, RWGltf_CafWriter - avoid writing translucent metallic materials

Browse Source 
RWGltf_GltfMaterialMap::DefineMaterial() and XCAFDoc_VisMaterial::ConvertToPbrMaterial()
now reset matallic factor to 0.0f in case of transparent color.
This commit is contained in:
kgv 2021-08-10 17:23:44 +03:00 committed by bugmaster
parent 45fc824bac
commit aeef9e2c13
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/RWGltf/RWGltf_GltfMaterialMap.cxx
View File

@ -420,6 +420,7 @@ void RWGltf_GltfMaterialMap::DefineMaterial (const XCAFPrs_Style& theStyle,
aPbrMat.BaseColor.SetRGB (theStyle.GetColorSurf()); aPbrMat.BaseColor.SetRGB (theStyle.GetColorSurf());
if (theStyle.GetColorSurfRGBA().Alpha() < 1.0f) if (theStyle.GetColorSurfRGBA().Alpha() < 1.0f)
{ {
aPbrMat.Metallic = 0.0f;
aPbrMat.BaseColor.SetAlpha (theStyle.GetColorSurfRGBA().Alpha()); aPbrMat.BaseColor.SetAlpha (theStyle.GetColorSurfRGBA().Alpha());
} }
} }

8
src/XCAFDoc/XCAFDoc_VisMaterial.cxx
View File

@ -191,7 +191,9 @@ XCAFDoc_VisMaterialPBR XCAFDoc_VisMaterial::ConvertToPbrMaterial()
aPbrMat.BaseColorTexture = myCommonMat.DiffuseTexture; aPbrMat.BaseColorTexture = myCommonMat.DiffuseTexture;
aPbrMat.BaseColor.SetRGB (myCommonMat.DiffuseColor); aPbrMat.BaseColor.SetRGB (myCommonMat.DiffuseColor);
aPbrMat.BaseColor.SetAlpha (1.0f - myCommonMat.Transparency); aPbrMat.BaseColor.SetAlpha (1.0f - myCommonMat.Transparency);
aPbrMat.Metallic = Graphic3d_PBRMaterial::MetallicFromSpecular (myCommonMat.SpecularColor); aPbrMat.Metallic = myCommonMat.Transparency <= ShortRealEpsilon()
? Graphic3d_PBRMaterial::MetallicFromSpecular (myCommonMat.SpecularColor)
: 0.0f;
aPbrMat.Roughness = Graphic3d_PBRMaterial::RoughnessFromSpecular (myCommonMat.SpecularColor, myCommonMat.Shininess); aPbrMat.Roughness = Graphic3d_PBRMaterial::RoughnessFromSpecular (myCommonMat.SpecularColor, myCommonMat.Shininess);
aPbrMat.EmissiveFactor = myCommonMat.EmissiveColor; aPbrMat.EmissiveFactor = myCommonMat.EmissiveColor;
return aPbrMat; return aPbrMat;
@ -218,7 +220,9 @@ void XCAFDoc_VisMaterial::FillMaterialAspect (Graphic3d_MaterialAspect& theAspec
{ {
Graphic3d_PBRMaterial aPbr; Graphic3d_PBRMaterial aPbr;
aPbr.SetColor (myCommonMat.DiffuseColor); aPbr.SetColor (myCommonMat.DiffuseColor);
aPbr.SetMetallic (Graphic3d_PBRMaterial::MetallicFromSpecular (myCommonMat.SpecularColor)); aPbr.SetMetallic (myCommonMat.Transparency <= ShortRealEpsilon()
? Graphic3d_PBRMaterial::MetallicFromSpecular (myCommonMat.SpecularColor)
: 0.0f);
aPbr.SetRoughness (Graphic3d_PBRMaterial::RoughnessFromSpecular (myCommonMat.SpecularColor, myCommonMat.Shininess)); aPbr.SetRoughness (Graphic3d_PBRMaterial::RoughnessFromSpecular (myCommonMat.SpecularColor, myCommonMat.Shininess));
aPbr.SetEmission (myCommonMat.EmissiveColor); aPbr.SetEmission (myCommonMat.EmissiveColor);
theAspect.SetPBRMaterial (aPbr); theAspect.SetPBRMaterial (aPbr);