Skip to content

RWMesh - Fix lossy encoding of non-ASCII node names in glTF export #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Clonephaze wants to merge 2 commits into
base: master
Choose a base branch
from
Open

RWMesh - Fix lossy encoding of non-ASCII node names in glTF export #1321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cd547e
Fix UTF-8 encoding of non-ASCII node names in RWMesh
Clonephaze Jun 23, 2026
0abe5bc
Apply clang-format
Clonephaze Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/DataExchange/TKRWMesh/RWMesh/RWMesh.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,26 @@

#include <RWMesh.hxx>

#include <NCollection_UtfString.hxx>
#include <TDataStd_Name.hxx>
#include <TDF_Tool.hxx>

namespace
{
static TCollection_AsciiString ExtendedToUtf8(const TCollection_ExtendedString& theStr)
{
NCollection_UtfString<char> utf8(reinterpret_cast<const char16_t*>(theStr.ToExtString()));
return TCollection_AsciiString(utf8.ToCString());
}
} // namespace

//=================================================================================================

TCollection_AsciiString RWMesh::ReadNameAttribute(const TDF_Label& theLabel)
{
occ::handle<TDataStd_Name> aNodeName;
return theLabel.FindAttribute(TDataStd_Name::GetID(), aNodeName)
? TCollection_AsciiString(aNodeName->Get())
? ExtendedToUtf8(aNodeName->Get())
: TCollection_AsciiString();
}

Expand All @@ -40,38 +50,38 @@ TCollection_AsciiString RWMesh::FormatName(RWMesh_NameFormat theFormat,
case RWMesh_NameFormat_Product: {
occ::handle<TDataStd_Name> aRefNodeName;
return theRefLabel.FindAttribute(TDataStd_Name::GetID(), aRefNodeName)
? TCollection_AsciiString(aRefNodeName->Get())
? ExtendedToUtf8(aRefNodeName->Get())
: TCollection_AsciiString();
}
case RWMesh_NameFormat_Instance: {
occ::handle<TDataStd_Name> aNodeName;
return theLabel.FindAttribute(TDataStd_Name::GetID(), aNodeName)
? TCollection_AsciiString(aNodeName->Get())
? ExtendedToUtf8(aNodeName->Get())
: TCollection_AsciiString();
}
case RWMesh_NameFormat_InstanceOrProduct: {
occ::handle<TDataStd_Name> aNodeName;
if (theLabel.FindAttribute(TDataStd_Name::GetID(), aNodeName) && !aNodeName->Get().IsEmpty())
{
return TCollection_AsciiString(aNodeName->Get());
return ExtendedToUtf8(aNodeName->Get());
}

occ::handle<TDataStd_Name> aRefNodeName;
return theRefLabel.FindAttribute(TDataStd_Name::GetID(), aRefNodeName)
? TCollection_AsciiString(aRefNodeName->Get())
? ExtendedToUtf8(aRefNodeName->Get())
: TCollection_AsciiString();
}
case RWMesh_NameFormat_ProductOrInstance: {
occ::handle<TDataStd_Name> aRefNodeName;
if (theRefLabel.FindAttribute(TDataStd_Name::GetID(), aRefNodeName)
&& !aRefNodeName->Get().IsEmpty())
{
return TCollection_AsciiString(aRefNodeName->Get());
return ExtendedToUtf8(aRefNodeName->Get());
}

occ::handle<TDataStd_Name> aNodeName;
return theLabel.FindAttribute(TDataStd_Name::GetID(), aNodeName)
? TCollection_AsciiString(aNodeName->Get())
? ExtendedToUtf8(aNodeName->Get())
: TCollection_AsciiString();
}
case RWMesh_NameFormat_ProductAndInstance: {
Expand Down
Loading