Skip to content
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

Fixed usd2sdf when import from model:// #1023

Closed
wants to merge 1 commit into from
Closed

Fixed usd2sdf when import from model:// #1023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions usd/src/sdf_parser/Geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,36 @@ namespace usd
fullName =
ignition::common::findFile(uri.Str());
}
else if (uri.Scheme() == "model")
{
fullName =
ignition::common::findFile(_geometry.MeshShape()->Uri());

std::function<void(const std::string)> addSubFolders =
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you comment why this is adding the subfolders?

[&](const std::string &_dir)
{
for (ignition::common::DirIter file(_dir);
file != ignition::common::DirIter(); ++file)
{
std::string current(*file);
if (ignition::common::isDirectory(current))
{
auto systemPaths = ignition::common::systemPaths();
systemPaths->AddFilePaths(current);
addSubFolders(current);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't get why this needs to be recursive. My understanding was that you add the directories that are siblings of the model directory so that a model can reference meshes in other models, but this shouldn't require recursing to subdirectories of the model.

}
}
};
auto fileExtensionIndex = fullName.rfind(
ignition::common::basename(fullName));
if (fileExtensionIndex != std::string::npos)
{
std::string dirName = fullName;
dirName.erase(fileExtensionIndex,
ignition::common::basename(fullName).length() + 1);
addSubFolders(ignition::common::parentPath(dirName));
}
}
else
{
fullName =
Expand Down