Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

[Forward port] Support spaces in resource files, upgrade TinyOBJLoader #2888

Merged
merged 2 commits into from
Nov 25, 2020
Merged

[Forward port] Support spaces in resource files, upgrade TinyOBJLoader #2888

merged 2 commits into from
Nov 25, 2020

Conversation

chapulina
Copy link
Contributor

Ports #2877 and #2885 from gazebo9 to gazebo11.

@chapulina
Support resource files with spaces (#2877)
74e027a 
Mainly adds tests to make sure we continue to support files with spaces.

Support encoded file names inside COLLADA files.

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Update TinyOBJLoader to v2.0.0rc8 (#2885)
f0be2a8 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina added the 11 Gazebo 11 label Nov 23, 2020
@chapulina chapulina requested a review from j-rivero November 23, 2020 20:23
j-rivero
j-rivero reviewed Nov 23, 2020
View reviewed changes
Copy link
Contributor

@j-rivero j-rivero left a comment

Choose a reason for hiding this comment

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

Changelog and migration has been forwarded for gazebo9, we probably want the same for gazebo11. I'm waiting for the CI and local compilation, changes look good to me.

@chapulina
Copy link
Contributor Author

Changelog and migration has been forwarded for gazebo9, we probably want the same for gazebo11

Good point. How about I add those when I open a PR to bump the version and make the release? To save on CI. I can do that as soon as this is merged.

@j-rivero
Copy link
Contributor

Good point. How about I add those when I open a PR to bump the version and make the release? To save on CI. I can do that as soon as this is merged.

perfect. My compilation won't finish before I leave the work by today. If you need to merge, I think it's fine to do it with a clear CI on affected tests. I can comment afterwards if I find something locally.

@j-rivero
Copy link
Contributor

@osrf-jenkins run tests please . We lost them after a bug in the buildfarm.

@j-rivero
Copy link
Contributor

Can not find any problem in manual testing. Let's wait a little bit for the Linux/Mac results on CI, but I think this mostly ready to go.

@chapulina chapulina added the enhancement New feature or request label Nov 24, 2020
@chapulina chapulina merged commit 92248a7 into gazebo11 Nov 25, 2020
@chapulina chapulina deleted the chapulina/11/spaces branch November 25, 2020 17:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@j-rivero j-rivero j-rivero approved these changes

Assignees
No one assigned
Labels
11 Gazebo 11 enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chapulina @j-rivero