From 3c84ca45d8f5c589ebf6e76289f049ab6087761f Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 6 Sep 2023 06:34:26 -0700 Subject: [PATCH 1/3] Fix wide angle camera visibility flags (#900) Signed-off-by: Ian Chen --- ogre2/src/Ogre2WideAngleCamera.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ogre2/src/Ogre2WideAngleCamera.cc b/ogre2/src/Ogre2WideAngleCamera.cc index cb70297bd..f0b9015ea 100644 --- a/ogre2/src/Ogre2WideAngleCamera.cc +++ b/ogre2/src/Ogre2WideAngleCamera.cc @@ -979,7 +979,9 @@ void Ogre2WideAngleCamera::CreateWideAngleTexture() ////////////////////////////////////////////////// void Ogre2WideAngleCamera::Render() { - const uint32_t currVisibilityMask = this->VisibilityMask(); + // make sure we do not alter the reserved visibility flags + const uint32_t currVisibilityMask = this->VisibilityMask() & + Ogre::VisibilityFlags::RESERVED_VISIBILITY_FLAGS; this->dataPtr->cubePassSceneDef->mVisibilityMask = currVisibilityMask; this->scene->StartRendering(this->dataPtr->ogreCamera); From 890cc29d9a9b323b7d7e6ce7c5357ca46264eacd Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 12 Sep 2023 14:56:41 -0700 Subject: [PATCH 2/3] Prepare from 8.0.0 pre2 release (#904) Signed-off-by: Ian Chen --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc62a163f..8bcf7b794 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 From 98c5978e9f543c4d64177f6d1fa80b9ba0c777a7 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 14 Sep 2023 05:22:44 -0700 Subject: [PATCH 3/3] Update installation instructions (#906) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ian Chen Signed-off-by: Michael Carroll Co-authored-by: Michael Carroll Co-authored-by: Alejandro Hernández Cordero --- tutorials/02_install.md | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/tutorials/02_install.md b/tutorials/02_install.md index 47829748f..a5beb4118 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -34,7 +34,7 @@ sudo apt-get update sudo apt-get install libgz-rendering<#>-dev ``` -Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on which version you need. +Be sure to replace `<#>` with a number value, such as `7` or `8`, depending on which version you need. ## Source Installation @@ -70,11 +70,11 @@ build the relevant plugins if dependencies are found. **OGRE 1.x** ``` -# this installs ogre 1.9. Alternatively, you can install 1.8 +# this installs ogre 1.9 sudo apt-get install libogre-1.9-dev ``` -**OGRE 2.x (supported in Versions >= gz-rendering1)** +**OGRE-Next 2.x** Add OSRF packages if you have not done so already: ``` @@ -84,9 +84,9 @@ wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - sudo apt update ``` -Install OGRE 2.2 debs +Install OGRE-Next 2.3 debs ``` -sudo apt install libogre-2.2-dev +sudo apt install libogre-next-dev ``` **OptiX (experimental)** @@ -114,7 +114,7 @@ sdk 4.0.2, comment out lines 167-206). 1. Clone the repository ``` - # Optionally, append `-b ign-rendering#` (replace # with a number) to check out a specific version + # Optionally, append `-b gz-rendering#` (replace # with a number) to check out a specific version git clone http://github.com/gazebosim/gz-rendering ``` @@ -151,7 +151,12 @@ conda activate gz-ws ## Binary Installation -`libgz-rendering<#>` Conda feedstock is not yet available, pending [conda-forge/staged-recipes#13551](https://github.com/conda-forge/staged-recipes/issues/13551). +```bash +conda install libgz-rendering<#> --channel conda-forge +``` + +Be sure to replace `<#>` with a number value, such as 7 or 8, depending on +which version you need. ## Source Installation @@ -176,7 +181,7 @@ This assumes you have created and activated a Conda environment while installing 3. Navigate to where you would like to build the library, and clone the repository. ``` - # Optionally, append `-b ign-rendering#` (replace # with a number) to check out a specific version + # Optionally, append `-b gz-rendering#` (replace # with a number) to check out a specific version git clone https://github.com/gazebosim/gz-rendering.git ``` @@ -209,23 +214,23 @@ Install Gazebo Rendering: brew install gz-rendering<#> ``` -Be sure to replace `<#>` with a number value, such as 5 or 6, depending on +Be sure to replace `<#>` with a number value, such as 7 or 8, depending on which version you need. ## Source Installation 1. Clone the repository ``` - git clone https://github.com/gazebosim/gz-rendering -b ign-rendering<#> + git clone https://github.com/gazebosim/gz-rendering -b gz-rendering<#> ``` - Be sure to replace `<#>` with a number value, such as 5 or 6, depending on + Be sure to replace `<#>` with a number value, such as 7 or 8, depending on which version you need. 2. Install dependencies ``` brew install --only-dependencies gz-rendering<#> ``` - Be sure to replace `<#>` with a number value, such as 5 or 6, depending on + Be sure to replace `<#>` with a number value, such as 7 or 8, depending on which version you need. 3. Configure and build @@ -273,7 +278,7 @@ To control the testing configuration, use the following environment variables: ``` # Specify the rendering engine to use (ogre, ogre2, optix) - GZ_ENGINE_TO_TEST=ogre2 + GZ_ENGINE_TO_TEST=ogre2 # Specify the ogre2 backend to use (vulkan, gl3plus, metal (macOS)) GZ_ENGINE_BACKEND=vulkan