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.

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

Refactor: Utilizes function to load animations #1568

Merged
merged 9 commits into from
Jul 4, 2022

Conversation

onurtore
Copy link
Contributor

Utilizes new LoadAnimations function to load animations trajectories during actor creation.

Part of three PR for the #1564 (comment) for slimming down the CreateActor function.

@onurtore
Copy link
Contributor Author

@ahcorde,
Sorry for the old version, this must be a better.

src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

linters are also failing

   /github/workspace/src/rendering/SceneManager.cc:2311:  Lines should be <= 80 characters long  [whitespace/line_length] [2]
  /github/workspace/src/rendering/SceneManager.cc:2312:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
  /github/workspace/src/rendering/SceneManager.cc:2315:  Lines should be <= 80 characters long  [whitespace/line_length] [2]
  /github/workspace/src/rendering/SceneManager.cc:2346:  Should have a space between // and comment  [whitespace/comments] [4]
  /github/workspace/src/rendering/SceneManager.cc:2352:  Lines should be <= 80 characters long  [whitespace/line_length] [2]
  /github/workspace/src/rendering/SceneManager.cc:2352:  Should have a space between // and comment  [whitespace/comments] [4]

src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
Signed-off-by: Onur Berk Tore <[email protected]>
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

   /github/workspace/include/ignition/gazebo/rendering/SceneManager.hh:206:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
  /github/workspace/include/ignition/gazebo/rendering/SceneManager.hh:206:  Add #include <unordered_map> for unordered_map<>  [build/include_what_you_use] [4]
  /github/workspace/src/rendering/SceneManager.cc:2284:  Lines should be <= 80 characters long  [whitespace/line_length] [2]

Long lines with more than 80 charecters fixes. Extra spaces
are removed. underored_map included

Signed-off-by: Onur Berk Tore <[email protected]>
@onurtore onurtore requested a review from ahcorde June 30, 2022 20:22
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

Signed-off-by: Onur Berk Tore <[email protected]>
@onurtore onurtore requested a review from ahcorde June 30, 2022 20:31
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

there are some conflicts too

Fixes compilation error by returning empty
mapAnimNameId.

Signed-off-by: Onur Berk Tore <[email protected]>
@onurtore onurtore requested a review from ahcorde July 2, 2022 10:58
@onurtore
Copy link
Contributor Author

onurtore commented Jul 2, 2022

there are some conflicts too

Fixed the compilation error, did not see any other problems in the Build. Am i missing somewhere?

@onurtore onurtore changed the title Utilizes function to load animations Refactor: Utilizes function to load animations Jul 2, 2022
Signed-off-by: Onur Berk Tore <[email protected]>
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

There are some conflicts with ign-gazebo6 too

include/ignition/gazebo/rendering/SceneManager.hh Outdated Show resolved Hide resolved
src/rendering/SceneManager.cc Outdated Show resolved Hide resolved
@onurtore onurtore requested a review from ahcorde July 4, 2022 14:32
@codecov
Copy link

codecov bot commented Jul 4, 2022

Codecov Report

Merging #1568 (84a6c2f) into ign-gazebo6 (e826c71) will increase coverage by 0.00%.
The diff coverage is 65.07%.

❗ Current head 84a6c2f differs from pull request most recent head f6b1317. Consider uploading reports for the commit f6b1317 to get more accurate results

@@             Coverage Diff              @@
##           ign-gazebo6    #1568   +/-   ##
============================================
  Coverage        64.01%   64.02%           
============================================
  Files              317      317           
  Lines            25638    25649   +11     
============================================
+ Hits             16413    16422    +9     
- Misses            9225     9227    +2     
Impacted Files Coverage Δ
include/ignition/gazebo/rendering/SceneManager.hh 100.00% <ø> (ø)
src/rendering/SceneManager.cc 28.66% <65.07%> (+0.49%) ⬆️

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 e826c71...f6b1317. Read the comment docs.

@ahcorde ahcorde merged commit d6e69d0 into gazebosim:ign-gazebo6 Jul 4, 2022
liamhan0905 pushed a commit that referenced this pull request Jul 25, 2022
Signed-off-by: Onur Berk Tore <[email protected]>
Signed-off-by: Liam Han <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants