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 - Fix GLTF Export Materials for edges #341

Browse Source 
Fixed issue with edge colors
This commit is contained in:
Zernova Marina 2025-02-04 09:22:45 +00:00 committed by GitHub
parent 4b318b8bf6
commit 6c77143364
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/RWGltf/RWGltf_CafWriter.cxx
View File

@ -1935,6 +1935,19 @@ void RWGltf_CafWriter::writeImages(const RWGltf_GltfSceneNodeMap& theSceneNodeMa
//================================================================================================= //=================================================================================================
void RWGltf_CafWriter::writeMaterial(RWMesh_ShapeIterator& theShapeIter,
Standard_Boolean& theIsStarted,
Standard_Integer& theAddedMaterialsNb)
{
for (; theShapeIter.More(); theShapeIter.Next())
{
myMaterialMap->AddMaterial(myWriter.get(), theShapeIter.Style(), theIsStarted);
theAddedMaterialsNb++;
}
}
//=================================================================================================
void RWGltf_CafWriter::writeMaterials(const RWGltf_GltfSceneNodeMap& theSceneNodeMap) void RWGltf_CafWriter::writeMaterials(const RWGltf_GltfSceneNodeMap& theSceneNodeMap)
{ {
#ifdef HAVE_RAPIDJSON #ifdef HAVE_RAPIDJSON
@ -1947,11 +1960,20 @@ void RWGltf_CafWriter::writeMaterials(const RWGltf_GltfSceneNodeMap& theSceneNod
aSceneNodeIter.Next()) aSceneNodeIter.Next())
{ {
const XCAFPrs_DocumentNode& aDocNode = aSceneNodeIter.Value(); const XCAFPrs_DocumentNode& aDocNode = aSceneNodeIter.Value();
for (RWMesh_FaceIterator aFaceIter(aDocNode.RefLabel, TopLoc_Location(), true, aDocNode.Style); Standard_Integer anAddedMaterialsNb = 0;
aFaceIter.More();
aFaceIter.Next())
{ {
myMaterialMap->AddMaterial(myWriter.get(), aFaceIter.Style(), anIsStarted); RWMesh_FaceIterator aFaceIter(aDocNode.RefLabel, TopLoc_Location(), true, aDocNode.Style);
writeMaterial(aFaceIter, anIsStarted, anAddedMaterialsNb);
}
if (anAddedMaterialsNb == 0)
{
RWMesh_EdgeIterator anEdgeIter(aDocNode.RefLabel, TopLoc_Location(), true, aDocNode.Style);
writeMaterial(anEdgeIter, anIsStarted, anAddedMaterialsNb);
}
if (anAddedMaterialsNb == 0)
{
RWMesh_VertexIterator VertexIter(aDocNode.RefLabel, TopLoc_Location(), true, aDocNode.Style);
writeMaterial(VertexIter, anIsStarted, anAddedMaterialsNb);
} }
} }
if (anIsStarted) if (anIsStarted)

8
src/RWGltf/RWGltf_CafWriter.hxx
View File

@ -353,6 +353,14 @@ protected:
//! @param[out] theMaterialMap map of materials, filled with materials //! @param[out] theMaterialMap map of materials, filled with materials
Standard_EXPORT virtual void writeMaterials(const RWGltf_GltfSceneNodeMap& theSceneNodeMap); Standard_EXPORT virtual void writeMaterials(const RWGltf_GltfSceneNodeMap& theSceneNodeMap);
//! Write RWGltf_GltfRootElement_Materials section.
//! @param[in] theShapeIter Shape iterator to traverse shapes
//! @param[out] theIsStarted Flag indicating that writing material has been started
//! @param[out] theAddedMaterialsNb Number of added materials
Standard_EXPORT virtual void writeMaterial(RWMesh_ShapeIterator& theShapeIter,
Standard_Boolean& theIsStarted,
Standard_Integer& theAddedMaterialsNb);
//! Write RWGltf_GltfRootElement_Meshes section. //! Write RWGltf_GltfRootElement_Meshes section.
//! @param[in] theSceneNodeMap ordered map of scene nodes //! @param[in] theSceneNodeMap ordered map of scene nodes
//! @param[in] theMaterialMap map of materials //! @param[in] theMaterialMap map of materials

6
src/RWGltf/RWGltf_GltfMaterialMap.cxx
View File

@ -269,7 +269,7 @@ void RWGltf_GltfMaterialMap::AddMaterial(RWGltf_GltfOStreamWriter* theWriter,
#ifdef HAVE_RAPIDJSON #ifdef HAVE_RAPIDJSON
if (theWriter == NULL if (theWriter == NULL
|| ((theStyle.Material().IsNull() || theStyle.Material()->IsEmpty()) || ((theStyle.Material().IsNull() || theStyle.Material()->IsEmpty())
&& !theStyle.IsSetColorSurf())) && !theStyle.IsSetColorSurf() && !theStyle.IsSetColorCurv()))
{ {
return; return;
} }
@ -387,6 +387,10 @@ void RWGltf_GltfMaterialMap::DefineMaterial(const XCAFPrs_Style& theStyle,
aPbrMat.BaseColor.SetAlpha(theStyle.GetColorSurfRGBA().Alpha()); aPbrMat.BaseColor.SetAlpha(theStyle.GetColorSurfRGBA().Alpha());
} }
} }
else if (theStyle.IsSetColorCurv())
{
aPbrMat.BaseColor.SetRGB(theStyle.GetColorCurv());
}
myWriter->StartObject(); myWriter->StartObject();
{ {
myWriter->Key("name"); myWriter->Key("name");