Skip to content

Commit

Permalink
Bumps in garden : ign-rendering7
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Apr 13, 2022
1 parent 7b4b3ee commit c10676c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ libignition-cmake2-dev
libignition-common5-dev
libignition-math7-dev
libignition-math7-eigen3-dev
libignition-plugin-dev
libignition-utils1-dev
libignition-plugin2-dev
libignition-utils2-dev
libogre-1.9-dev
libxi-dev
libxmu-dev
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-plugin
ign_find_package(ignition-plugin1 REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
ign_find_package(ignition-plugin2 REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})

#--------------------------------------
# Find ignition-utils
ign_find_package(ignition-utils1 REQUIRED)
set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})
ign_find_package(ignition-utils2 REQUIRED)
set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})

#--------------------------------------
# Find FreeImage
Expand Down
4 changes: 2 additions & 2 deletions examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
find_package(ignition-rendering7 REQUIRED)
set(IGN_RENDERING_VER ${ignition-rendering7_VERSION_MAJOR})

find_package(ignition-plugin1 REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
find_package(ignition-plugin2 REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})

find_package(ignition-common5 REQUIRED)
set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion src/Utils_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void UtilTest::ClickToScene(const std::string &_renderEngine)
result = screenToScene(centerClick, camera, rayQuery, rayResult);

// high tol is used for z due to depth buffer precision.
// Do not merge the tol changes forward to ign-rendering6.
// Do not merge the tol changes forward to ign-rendering7.
EXPECT_NEAR(0.5, result.Z(), 1e-3);
EXPECT_NEAR(0.0, result.X(), 2e-6);
EXPECT_NEAR(0.0, result.Y(), 2e-6);
Expand Down
2 changes: 1 addition & 1 deletion test/integration/depth_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void DepthCameraTest::DepthCameraBoxes(
// Note: internal texture format used is RGB with no alpha channel
// We observed the values can be either 255 or 0 but graphics card
// drivers are free to fill it with any value they want.
// This should be fixed in ogre 2.2 in ign-rendering6 which forbids
// This should be fixed in ogre 2.2 in ign-rendering7 which forbids
// the use of RGB format.
// see https://github.com/ignitionrobotics/ign-rendering/issues/315
EXPECT_TRUE(255u == ma || 0u == ma);
Expand Down
2 changes: 1 addition & 1 deletion test/integration/render_pass.cc
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ void RenderPassTest::DepthGaussianNoise(const std::string &_renderEngine)
// Note: internal texture format used is RGB with no alpha channel
// We observed the values can be either 255 or 0 but graphics card
// drivers are free to fill it with any value they want.
// This should be fixed in ogre 2.2 in ign-rendering6 which forbids
// This should be fixed in ogre 2.2 in ign-rendering7 which forbids
// the use of RGB format.
// see https://github.com/ignitionrobotics/ign-rendering/issues/315
EXPECT_TRUE(255u == ma || 0u == ma);
Expand Down
2 changes: 1 addition & 1 deletion tutorials/02_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ sudo apt install -y \
libignition-cmake2-dev \
libignition-math7-dev \
libignition-common5-dev \
libignition-plugin-dev
libignition-plugin2-dev
```

### Supported Rendering Engines
Expand Down

0 comments on commit c10676c

Please sign in to comment.