OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

Data Exchange, GLTF Import - Fix visualization of colors

Browse Source
This commit is contained in:
mzernova 2025-02-05 21:17:39 +00:00
parent 62e085c5ed
commit 12f9019180
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/RWGltf/RWGltf_GltfJsonParser.cxx
View File

@ -1989,9 +1989,14 @@ bool RWGltf_GltfJsonParser::gltfParsePrimArray(TopoDS_Shape& th
aShapeAttribs.RawName = theMeshName; aShapeAttribs.RawName = theMeshName;
// assign material and not color // assign material and not color
// aShapeAttribs.Style.SetColorSurf (aMeshData->BaseColor()); if (aMode == RWGltf_GltfPrimitiveMode_Lines)
aShapeAttribs.Style.SetMaterial(aMat); {
aShapeAttribs.Style.SetColorCurv(aMeshData->BaseColor().GetRGB());
}
else
{
aShapeAttribs.Style.SetMaterial(aMat);
}
myAttribMap->Bind(aShape, aShapeAttribs); myAttribMap->Bind(aShape, aShapeAttribs);
} }
myShapeMap[ShapeMapGroup_PrimArray].Bind(aPrimArrayId, aShape); myShapeMap[ShapeMapGroup_PrimArray].Bind(aPrimArrayId, aShape);
@ -2379,12 +2384,21 @@ void RWGltf_GltfJsonParser::bindNamedShape(TopoDS_Shape& the
{ {
aShapeAttribs.RawName = theId; aShapeAttribs.RawName = theId;
} }
if (theShape.ShapeType() == TopAbs_FACE) if (theShape.ShapeType() == TopAbs_FACE || theShape.ShapeType() == TopAbs_EDGE
|| theShape.ShapeType() == TopAbs_VERTEX)
{ {
RWMesh_NodeAttributes aFaceAttribs; RWMesh_NodeAttributes aFaceAttribs;
if (myAttribMap->Find(aShape, aFaceAttribs)) if (myAttribMap->Find(aShape, aFaceAttribs))
{ {
aShapeAttribs.Style.SetMaterial(aFaceAttribs.Style.Material()); aShapeAttribs.Style.SetMaterial(aFaceAttribs.Style.Material());
if (aFaceAttribs.Style.IsSetColorCurv())
{
aShapeAttribs.Style.SetColorCurv(aFaceAttribs.Style.GetColorCurv());
}
if (aFaceAttribs.Style.IsSetColorSurf())
{
aShapeAttribs.Style.SetColorSurf(aFaceAttribs.Style.GetColorSurf());
}
if (aShapeAttribs.Name.IsEmpty() && myUseMeshNameAsFallback) if (aShapeAttribs.Name.IsEmpty() && myUseMeshNameAsFallback)
{ {
// fallback using Mesh name // fallback using Mesh name

5
src/XCAFDoc/XCAFDoc_VisMaterial.cxx
View File

@ -139,7 +139,7 @@ XCAFDoc_VisMaterialCommon XCAFDoc_VisMaterial::ConvertToCommonMaterial()
aComMat.IsDefined = true; aComMat.IsDefined = true;
aComMat.DiffuseTexture = myPbrMat.BaseColorTexture; aComMat.DiffuseTexture = myPbrMat.BaseColorTexture;
aComMat.DiffuseColor = myPbrMat.BaseColor.GetRGB(); aComMat.DiffuseColor = myPbrMat.BaseColor.GetRGB();
aComMat.SpecularColor = Quantity_Color(Graphic3d_Vec3(myPbrMat.Metallic)); aComMat.SpecularColor = Quantity_Color(myPbrMat.BaseColor.GetRGB().Rgb() * myPbrMat.Metallic);
aComMat.Transparency = 1.0f - myPbrMat.BaseColor.Alpha(); aComMat.Transparency = 1.0f - myPbrMat.BaseColor.Alpha();
aComMat.Shininess = 1.0f - myPbrMat.Roughness; aComMat.Shininess = 1.0f - myPbrMat.Roughness;
if (myPbrMat.EmissiveTexture.IsNull()) if (myPbrMat.EmissiveTexture.IsNull())
@ -214,7 +214,8 @@ void XCAFDoc_VisMaterial::FillMaterialAspect(Graphic3d_MaterialAspect& theAspect
theAspect = Graphic3d_MaterialAspect(Graphic3d_NameOfMaterial_UserDefined); theAspect = Graphic3d_MaterialAspect(Graphic3d_NameOfMaterial_UserDefined);
theAspect.SetDiffuseColor(myPbrMat.BaseColor.GetRGB()); theAspect.SetDiffuseColor(myPbrMat.BaseColor.GetRGB());
theAspect.SetAlpha(myPbrMat.BaseColor.Alpha()); theAspect.SetAlpha(myPbrMat.BaseColor.Alpha());
theAspect.SetSpecularColor(Quantity_Color(Graphic3d_Vec3(myPbrMat.Metallic))); theAspect.SetSpecularColor(
Quantity_Color(myPbrMat.BaseColor.GetRGB().Rgb() * myPbrMat.Metallic));
theAspect.SetShininess(1.0f - myPbrMat.Roughness); theAspect.SetShininess(1.0f - myPbrMat.Roughness);
if (theAspect.Shininess() < 0.01f) if (theAspect.Shininess() < 0.01f)
{ {