Merge branch 'main' into particle_emitter_todo

gazebosim · Jul 25, 2023 · 47c8aa4 · 47c8aa4
2 parents 85d037b + 54e6140
commit 47c8aa4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,26 +3,17 @@ name: Ubuntu CI
 on: [push, pull_request]
 
 jobs:
- focal-ci:
+ jammy-ci:
  runs-on: ubuntu-latest
- name: Ubuntu Focal CI
+ name: Ubuntu Jammy CI
  steps:
  - name: Checkout
  uses: actions/checkout@v3
  - name: Compile and test
  id: ci
- uses: gazebo-tooling/action-gz-ci@focal
+ uses: gazebo-tooling/action-gz-ci@jammy
  with:
  codecov-enabled: true
  cppcheck-enabled: true
  cpplint-enabled: true
  doxygen-enabled: true
- jammy-ci:
- runs-on: ubuntu-latest
- name: Ubuntu Jammy CI
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- - name: Compile and test
- id: ci
- uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/include/gz/rendering/Camera.hh b/include/gz/rendering/Camera.hh
@@ -111,7 +111,7 @@ namespace gz
  /// Setting a value <= 0.0 indicates the aspect ratio will be
  /// automatically calculated based on width & height.
  ///
- /// \return The camera's aspect ratio
+ /// \param[in] _ratio The camera's aspect ratio
  public: virtual void SetAspectRatio(const double _ratio) = 0;
 
  // TODO(anyone): add auto-aspect ratio

diff --git a/include/gz/rendering/LidarVisual.hh b/include/gz/rendering/LidarVisual.hh
@@ -121,7 +121,7 @@ namespace gz
  public: virtual unsigned int VerticalRayCount() const = 0;
 
  /// \brief Set number of horizontal rays
- /// \return _horizontalRayCount Number of vertical rays
+ /// \param[in] _horizontalRayCount Number of vertical rays
  public: virtual void SetHorizontalRayCount(
  unsigned int _horizontalRayCount) = 0;
 

diff --git a/include/gz/rendering/RenderEngine.hh b/include/gz/rendering/RenderEngine.hh
@@ -55,7 +55,6 @@ namespace gz
  /// \brief Destroys all scenes created by render-engine and releases all
  /// loaded resources. This should be called when the given render-engine
  /// will no longer be used during runtime.
- /// \return True if the render-engine was successfully destroyed
  public: virtual void Destroy() = 0;
 
  // TODO(anyone): merge with Destroy