Skip to content

Commit

Permalink
Merge branch 'gz-rendering8' into fix_wide_angle_cam_sky
Browse files Browse the repository at this point in the history
  • Loading branch information
iche033 authored Sep 21, 2023
2 parents ccdf769 + 4190ff6 commit 99e90ef
Show file tree
Hide file tree
Showing 31 changed files with 320 additions and 3,777 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(VERSION_SUFFIX pre1)
gz_configure_project(VERSION_SUFFIX pre2)

#============================================================================
# Set project-specific options
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-rendering/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-rendering/branch/default)
Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-focal-amd64)
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-jammy-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/ign_rendering-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_rendering-ci-win/)

Expand Down Expand Up @@ -47,12 +47,12 @@ of libraries designed to rapidly develop robot applications.

# Install

See the [installation tutorial](https://gazebosim.org/api/rendering/5.0/installation.html).
See the [installation tutorial](https://gazebosim.org/api/rendering/8/installation.html).

# Usage

The Gazebo Rendering API can be found in the documentation. See the
[installation tutorial](https://gazebosim.org/api/rendering/5.0/installation.html)
[installation tutorial](https://gazebosim.org/api/rendering/8/installation.html)
on how to build the documentation files using Doxygen.

You can also take a look at the sample applications in the `examples` folder.
Expand All @@ -74,7 +74,7 @@ Rendering engine plugin implementation code is stored in their own folders

* `ogre` : OGRE 1.x rendering engine plugin

* `ogre2` : OGRE 2.x rendering engine plugin (available in versions >= gz-rendering1)
* `ogre2` : OGRE-Next 2.x rendering engine plugin

* `optix` : OptiX rendering engine plugin

Expand Down
53 changes: 0 additions & 53 deletions examples/gazebo_scene_viewer/CMakeLists.txt

This file was deleted.

213 changes: 0 additions & 213 deletions examples/gazebo_scene_viewer/CameraWindow.cc

This file was deleted.

Loading

0 comments on commit 99e90ef

Please sign in to comment.