From 09099dba8855c52693af0f2344660f41b9f84d18 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 1 Nov 2023 16:57:33 -0700 Subject: [PATCH 1/6] Update github issue template (#939) Signed-off-by: Ian Chen --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8e30646e3..62e9a50bd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -5,7 +5,7 @@ labels: bug --- +https://robotics.stackexchange.com instead.--> ## Environment * OS Version: @@ -47,9 +47,9 @@ http://answers.gazebosim.org instead.--> - On Mac OS, open a terminal and type `system_profiler SPDisplaysDataType`. Copy the output here. - [ ] Please, attach the ogre.log or ogre2.log file from `~/.ignition/rendering` - +
- + ``` # paste log here ``` diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 87233a479..52b56e336 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -6,7 +6,7 @@ labels: enhancement +https://robotics.stackexchange.com instead.--> ## Desired behavior From 79acfe44ea18b6a037d716c25a8ac5df2600cd55 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 2 Nov 2023 16:04:38 -0700 Subject: [PATCH 2/6] Add minor comments to BaseGizmoVisual (#881) Signed-off-by: Ian Chen --- include/gz/rendering/base/BaseGizmoVisual.hh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/gz/rendering/base/BaseGizmoVisual.hh b/include/gz/rendering/base/BaseGizmoVisual.hh index ccc329941..0fa9e19c7 100644 --- a/include/gz/rendering/base/BaseGizmoVisual.hh +++ b/include/gz/rendering/base/BaseGizmoVisual.hh @@ -495,6 +495,8 @@ namespace ignition this->visuals[TransformAxis::TA_TRANSLATION_X] = transXVis; this->visuals[TransformAxis::TA_TRANSLATION_Y] = transYVis; this->visuals[TransformAxis::TA_TRANSLATION_Z] = transZVis; + // Store the translation origin visual in this->visuals using a key + // that's not already occupied by the TransformAxis enum this->visuals[TransformAxis::TA_TRANSLATION_Z << 1] = transOrigin; // translation handles @@ -584,6 +586,8 @@ namespace ignition this->visuals[TransformAxis::TA_ROTATION_X] = rotXVis; this->visuals[TransformAxis::TA_ROTATION_Y] = rotYVis; this->visuals[TransformAxis::TA_ROTATION_Z] = rotZVis; + // Store the full rotation visual in this->visuals using a key + // that's not already occupied by the TransformAxis enum this->visuals[TransformAxis::TA_ROTATION_Z << 1] = rotFullVis; // rotation handles From c2fdbcdef28b790adfee869e12bded13ec63935f Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 13 Nov 2023 08:54:33 -0600 Subject: [PATCH 3/6] Update github action workflows (#940) * Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 12 +++++++++--- .github/workflows/triage.yml | 9 +++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2e4d6192..41b5ac4ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: Ubuntu CI -on: [push, pull_request] +on: + pull_request: + push: + branches: + - 'ign-rendering[0-9]' + - 'gz-rendering[0-9]?' + - 'main' jobs: bionic-ci: @@ -8,7 +14,7 @@ jobs: name: Ubuntu Bionic CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@bionic @@ -20,7 +26,7 @@ jobs: name: Ubuntu Focal CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@focal diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 736670e0e..2332244bf 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -10,10 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Add ticket to inbox - uses: technote-space/create-project-card-action@v1 + uses: actions/add-to-project@v0.5.0 with: - PROJECT: Core development - COLUMN: Inbox - GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }} - CHECK_ORG_PROJECT: true - + project-url: https://github.com/orgs/gazebosim/projects/7 + github-token: ${{ secrets.TRIAGE_TOKEN }} From 2c996aebe33f095c707ab1444c8bea0c9aeffc6c Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Fri, 5 Jan 2024 15:29:59 -0800 Subject: [PATCH 4/6] Prepare for 3.7.2 release (#952) * bump 3.7.2 --------- Signed-off-by: Ian Chen --- CMakeLists.txt | 2 +- Changelog.md | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b14c7d02..99f3ed8f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-rendering3 VERSION 3.7.1) +project(ignition-rendering3 VERSION 3.7.2) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index b73f00f11..238b98c64 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,15 @@ ## Ignition Rendering +### Gazebo Rendering 3.7.2 (2024-01-05) + +1. Update github action workflows + * [Pull request #940](https://github.com/gazebosim/gz-rendering/pull/940) + * [Pull request #834](https://github.com/gazebosim/gz-rendering/pull/834) + * [Pull request #833](https://github.com/gazebosim/gz-rendering/pull/833) + +1. Add minor comments to BaseGizmoVisual + * [Pull request #881](https://github.com/gazebosim/gz-rendering/pull/881) + ### Ignition Rendering 3.7.1 (2023-02-03) 1. Remove fini to resolve segfaault at shutdown. From 34fdfb787cc3a303600d3a0ffa85ed4a911adeb3 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 17 Jan 2024 12:23:53 -0800 Subject: [PATCH 5/6] Backport ogre2 lidar performance improvement (#956) Signed-off-by: Ian Chen --- ogre2/src/Ogre2GpuRays.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc index 46f74728b..b117814fe 100644 --- a/ogre2/src/Ogre2GpuRays.cc +++ b/ogre2/src/Ogre2GpuRays.cc @@ -968,6 +968,8 @@ void Ogre2GpuRays::Setup1stPass() passScene->setVisibilityMask( this->VisibilityMask() & ~Ogre2ParticleEmitter::kParticleVisibilityFlags); + passScene->mEnableForwardPlus = false; + passScene->setLightVisibilityMask(0x0); } Ogre::CompositorTargetDef *particleTargetDef = @@ -983,6 +985,8 @@ void Ogre2GpuRays::Setup1stPass() // set camera custom visibility mask when rendering particles passScene->mVisibilityMask = Ogre2ParticleEmitter::kParticleVisibilityFlags; + passScene->mEnableForwardPlus = false; + passScene->setLightVisibilityMask(0x0); } // rt_input target - converts depth to range From 860cfd47158cf36cf944d982da68890cec95bb2d Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 16 Jan 2024 17:45:32 -0800 Subject: [PATCH 6/6] Improve Ogre2GpuRays performance (#955) * improve ogre2 gpu rays perf --------- Signed-off-by: Ian Chen --- ogre2/src/media/materials/scripts/GpuRays.compositor | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ogre2/src/media/materials/scripts/GpuRays.compositor b/ogre2/src/media/materials/scripts/GpuRays.compositor index da6305118..c3d2417e0 100644 --- a/ogre2/src/media/materials/scripts/GpuRays.compositor +++ b/ogre2/src/media/materials/scripts/GpuRays.compositor @@ -33,9 +33,12 @@ compositor_node GpuRays1stPass // kLaserRetroMainDepthPassId identifier 9525 - // IGN_VISIBILITY_ALL & ~Ogre2ParticleEmitter::kParticleVisibilityFlags + // GZ_VISIBILITY_ALL & ~Ogre2ParticleEmitter::kParticleVisibilityFlags visibility_mask 0xFEFFFFF + enable_forwardplus no + light_visibility_mask 0x0 + profiling_id "GpuRays1stPass Color" } } @@ -53,6 +56,9 @@ compositor_node GpuRays1stPass // Ogre2ParticleEmitter::kParticleVisibilityFlags visibility_mask 0x00100000 + enable_forwardplus no + light_visibility_mask 0x0 + profiling_id "GpuRays1stPass Particle" } }