Skip to content

Commit

Permalink
⬆️ Bump main to 8.0.0~pre1 (#699)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
chapulina authored Aug 8, 2022
1 parent f5101c4 commit 1694f3f
Show file tree
Hide file tree
Showing 34 changed files with 38 additions and 34 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-rendering7 VERSION 7.0.0)
project(gz-rendering8 VERSION 8.0.0)

#============================================================================
# Find gz-cmake
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Gazebo Rendering

### Gazebo Rendering 8.X

### Gazebo Rendering 8.0.0 (202X-XX-XX)

### Gazebo Rendering 7.X

### Gazebo Rendering 7.0.0 (202X-XX-XX)
Expand Down
2 changes: 1 addition & 1 deletion examples/actor_animation/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-actor-animation)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/boundingbox_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-boundingbox-camera)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/camera_tracking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-camera-tracking)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-custom-scene-viewer)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders_uniforms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(gz-rendering7)
find_package(gz-rendering8)

set(TARGET_THIRD_PARTY_DEPENDS "")

Expand Down
2 changes: 1 addition & 1 deletion examples/depth_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-depth-camera)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/gazebo_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-gazebo-scene-viewer)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)
find_package(gazebo REQUIRED)

include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/heightmap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-heightmap)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

find_package(gz-rendering7 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering7_VERSION_MAJOR})
find_package(gz-rendering8 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})

find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion examples/lidar_visual/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-lidar_visual)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/mesh_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-mesh-viewer)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/mouse_picking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-mouse-picking)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/ogre2_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(gz-rendering-ogre2-demo)

find_package(gz-rendering7)
find_package(gz-rendering8)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/particles_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-particles-demo)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/render_pass/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-render-pass)

find_package(gz-rendering7)
find_package(gz-rendering8)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/segmentation_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-segmentation-camera)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-simple-demo)

find_package(gz-rendering7)
find_package(gz-rendering8)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo_qml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})

#------------------------------------------------------------------------
# Find gz-rendering
find_package(gz-rendering7)
find_package(gz-rendering8)

#======================================
# Find Qt
Expand Down
2 changes: 1 addition & 1 deletion examples/text_geom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-text-geom)

find_package(gz-rendering7)
find_package(gz-rendering8)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/thermal_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-thermal-camera)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/transform_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-transform-control)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/view_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-view-control)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/visualization_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-visualization-demo)

find_package(gz-rendering7)
find_package(gz-rendering8)

if (APPLE OR UNIX)
find_package(GLUT REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion examples/waves/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(gz-rendering7)
find_package(gz-rendering8)

set(TARGET_THIRD_PARTY_DEPENDS "")

Expand Down
2 changes: 1 addition & 1 deletion examples/wide_angle_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-wide-angle-camera)
find_package(gz-rendering7 REQUIRED)
find_package(gz-rendering8 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion tutorials/17_render_pass_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering7-ogre]
[Msg] Loading plugin [gz-rendering8-ogre]
Engine 'optix' is not supported
===============================
TAB - Switch render engines
Expand Down
2 changes: 1 addition & 1 deletion tutorials/18_simple_demo_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering7-ogre]
[Msg] Loading plugin [gz-rendering8-ogre]
Engine 'optix' is not supported
===============================
TAB - Switch render engines
Expand Down
2 changes: 1 addition & 1 deletion tutorials/19_text_geom_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering7-ogre]
[Msg] Loading plugin [gz-rendering8-ogre]
Engine 'optix' is not supported
===============================
TAB - Switch render engines
Expand Down
2 changes: 1 addition & 1 deletion tutorials/20_particles_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering7-ogre2]
[Msg] Loading plugin [gz-rendering8-ogre2]
===============================
TAB - Switch render engines
ESC - Exit
Expand Down
2 changes: 1 addition & 1 deletion tutorials/21_heightmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Example 1 (image heightmap):
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering7-ogre]
[Msg] Loading plugin [gz-rendering8-ogre]
[Msg] Loading heightmap: scene::Heightmap(65528)
[Msg] Heightmap loaded. Process took 217 ms.
===============================
Expand Down
2 changes: 1 addition & 1 deletion tutorials/23_depth_camera_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ depth camera to a memory reserved in a globally scoped `Image`.

\snippet examples/depth_camera/GlutWindow.cc convert depth to image

The other option is the [ConnectNewRgbPointCloud](https://github.com/gazebosim/gz-rendering/blob/ign-rendering7/include/gz/rendering/DepthCamera.hh#L58) call that receives colored point cloud data on callback.
The other option is the [ConnectNewRgbPointCloud](https://github.com/gazebosim/gz-rendering/blob/main/include/gz/rendering/DepthCamera.hh#L58) call that receives colored point cloud data on callback.

The reason for setting the camera image format to `PixelFormat::PF_FLOAT32_RGBA`
is to ensure that when the `Image` is created it reserves a buffer of the
Expand Down

0 comments on commit 1694f3f

Please sign in to comment.