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

Jump to bottom

[port] 3 ➡️ 4 #104

Merged
merged 38 commits into from
Oct 29, 2020
Merged

[port] 3 ➡️ 4 #104

merged 38 commits into from
Oct 29, 2020

Conversation

mjcarroll
Copy link
Contributor

@mjcarroll mjcarroll commented Oct 14, 2020 •
edited
Loading

Intended to supercede #84.

I combined a few of the commits to more closely align with how they landed on bitbucket. This should be the last time that doing a forward port will be complicated by that!

@chapulina chapulina mentioned this pull request Oct 14, 2020
Closed
@mjcarroll
Copy link
Contributor Author

Same tests are failing for me locally, I'm looking at them right now.

@chapulina chapulina mentioned this pull request Oct 16, 2020
Merged
scpeters and others added 25 commits October 19, 2020 14:01
@scpeters @mjcarroll
changelog
f20ac25 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@luca-della-vedova @mjcarroll
Merged in transparent_texture_common3 (pull request #221)
f92d592 
Support for alpha based texture rendering

Approved-by: Louise Poubel <lupoubel@hotmail.com>
Approved-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
prepare for 3.4.0 pre1 release
e751b6d 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
Merged in node_anim (pull request #223)
ff3c4d3 
Add function to get NodeAnimation

Approved-by: Louise Poubel <lupoubel@hotmail.com>
Approved-by: Steve Peters <scpeters@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Merged in findFileCb (pull request #226)
cdb135d 
Support custom callbacks to find files on global interface

Approved-by: Ian Chen <ichen@osrfoundation.org>
Approved-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Merged in custom_paths_uri (pull request #210)
adee179 
[Proposal] Custom paths for file URIs

Approved-by: Nate Koenig <natekoenig@gmail.com>
Approved-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
Merged in pbr_common3 (pull request #227)
edb6d0f 
Add PBR material class

Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Merged in collada_catch_errors (pull request #218)
7245613 
Handle unexpected COLLADA more gracefully

Approved-by: Steve Peters <scpeters@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Bump to 3.4.0
c6f457c 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
Merged in port_obj_invalid_mtl (pull request #230)
cfac772 
Port obj invalid mtl fix from gazebo

Approved-by: Ian Chen
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@luca-della-vedova @mjcarroll
Merged in pbr_common3 (pull request #231)
ea290c2 
Set default PBR metalness value

Approved-by: Louise Poubel <lupoubel@hotmail.com>
Approved-by: Luca Della Vedova <lucadellavr@gmail.com>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@luca-della-vedova @mjcarroll
Merged in animation_interpolatex_common3 (pull request #232)
49f79b8 
Add interpolateX member to the Animation class

Approved-by: Ian Chen <ichen@osrfoundation.org>
Approved-by: Louise Poubel <lupoubel@hotmail.com>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
bump ign-common 3.5.0
377eac1 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mabelzhang @mjcarroll
[ign-common3] Update BitBucket links (#57)
2dab74f 
* [ign-common3] Update BitBucket links

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [ign-common3] Update BitBucket links

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Fix osrf/gazebo URLs to point to ign-common instead

Signed-off-by: Mabel Zhang <mabel@openrobotics.org>

* [ign-common3] Update BitBucket links

Signed-off-by: Louise Poubel <louise@openrobotics.org>

Fix osrf/gazebo URLs to point to ign-common instead

Signed-off-by: Mabel Zhang <mabel@openrobotics.org>

* correct link

Signed-off-by: Mabel Zhang <mabel@openrobotics.org>

* remove unnecessary suffix in URL

Signed-off-by: Mabel Zhang <mabel@openrobotics.org>

Co-authored-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@scpeters @mjcarroll
Update to gtest 1.10.0 with patch for gcc warnings (#67)
a8b8388 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
Fix ColladaLoader loading <transparent> tag when <transparency> does …
6ca1106 
…not exist (#68)

* fix loading <transparent> when <transparency> does not exist

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@traversaro @mjcarroll
Remove unused included headers (#71)
0236017 
Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it>
Signed-off-by: Silvio <silvio.traversaro@iit.it>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@scpeters @mjcarroll
Refactor Image::MaxColor to reduce computation time (#66)
3c896d7 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
More file path APIs (#70)
0639597 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Bump to 3.6.0 (#72)
39e8f51 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@nkoenig @mjcarroll
Fix hierarchical submesh processing in the ColladaLoader. (#78)
e7fee23 
Fix hierarchical submesh processing in the ColladaLoader. #78

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@adlarkin @mjcarroll
Fixed the AudioDecoder class (#81)
a8661ca 
* fixed existing AudioDecoder unit tests

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* handled possible seg fault by using AudioDecoder without calling SetFile

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Fix actions CI ✨ (#83)
46c4a82 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@claireyywang @mjcarroll
Add more detail to profiler tutorial (#86)
d4b1fe4 
* add to profiler tutorials
* address review comments
* fix typo and port

Signed-off-by: claireyywang <22240514+claireyywang@users.noreply.github.com>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@claireyywang @mjcarroll
fix profiler tutorial image link (#87)
1c29154 
Signed-off-by: claireyywang <22240514+claireyywang@users.noreply.github.com>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
John Shepherd and others added 9 commits October 19, 2020 14:01
@mjcarroll
small tutorials fixes (#92)
e4d88b0 
Signed-off-by: John Shepherd <john@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Fix trajectory info memory leak (#93)
ea545b7 
Signed-off-by: John Shepherd <john@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Add fix
d8b32b7 
Signed-off-by: John Shepherd <john@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
⬆️ 3.6.1 (#95)
2fd8145 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Fix env behavior to return true on empty vars (#97)
b43336a 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @mjcarroll
Fix more Animation memory leak (#98)
ac2c4b6 
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@iche033 @chapulina @mjcarroll
Fix loading dae file with hierarchical node that does not have a name (…
ba80f90 
…#101)

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
[ign-common3] Support fuel URLs for textures (#102)
f5ee75a 
Resolves gazebosim/gz-sim#343

Signed-off-by: John Shepherd <john@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@chapulina @mjcarroll
Add Console example (#106)
6253679 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@codecov
Copy link

codecov bot commented Oct 19, 2020 •
edited
Loading

Codecov Report

Merging #104 into main will increase coverage by 0.52%.
The diff coverage is 77.50%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #104      +/-   ##
==========================================
+ Coverage   73.78%   74.30%   +0.52%     
==========================================
  Files          68       70       +2     
  Lines        9209     9626     +417     
==========================================
+ Hits         6795     7153     +358     
- Misses       2414     2473      +59
Impacted Files Coverage Δ
av/src/VideoEncoder.cc 48.32% <ø> (ø)
include/ignition/common/Util.hh 100.00% <ø> (ø)
src/Filesystem.cc 79.43% <ø> (ø)
graphics/src/Image.cc 57.20% <44.44%> (-2.90%) ⬇️
graphics/src/Skeleton.cc 42.72% <50.00%> (-0.33%) ⬇️
graphics/src/ColladaLoader.cc 84.06% <51.26%> (-2.86%) ⬇️
graphics/src/SkeletonAnimation.cc 43.83% <57.14%> (+2.04%) ⬆️
src/Util.cc 83.75% <88.00%> (+0.42%) ⬆️
graphics/src/OBJLoader.cc 93.10% <92.00%> (+5.00%) ⬆️
graphics/src/Animation.cc 91.83% <95.83%> (+0.28%) ⬆️
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 526c2ac...68d9445. Read the comment docs.

@mjcarroll
Copy link
Contributor Author

@osrf-jenkins retest this please

@chapulina chapulina self-requested a review October 26, 2020 18:57
chapulina and others added 4 commits October 27, 2020 13:39
@chapulina @mjcarroll
Improve fork experience (#103)
77eab3e 
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
[ign-common3] Miscellaneous Cleanups (#107)
dfc3f10 
* Use variable substitution to prevent forward port issues
* Add string Join functionality
* Replace all uses of env with Ignition functions

Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
⬆️ 3.7.0 (#108)
466164e 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Fix API differences between URI in 3 and 4
68d9445 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Copy link
Contributor Author

@osrf-jenkins retest this please

chapulina
chapulina approved these changes Oct 27, 2020
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

Nice cleanup! I just have a couple of comments which don't need to be addressed on this PR.

graphics/include/ignition/common/Animation.hh Show resolved Hide resolved
graphics/include/ignition/common/Material.hh Show resolved Hide resolved
@mjcarroll mjcarroll merged commit 29c142c into main Oct 29, 2020
@mjcarroll mjcarroll deleted the ports/3_to_4 branch October 29, 2020 19:59
@mjcarroll mjcarroll mentioned this pull request Oct 29, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chapulina chapulina chapulina approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@mjcarroll @chapulina @scpeters @luca-della-vedova @iche033 @traversaro @nkoenig @adlarkin @claireyywang