diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9fa3ba7da..7bdc02251 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: 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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4d4a0301..73c10b4e5 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: focal-ci: diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 2c94852da..2332244bf 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -14,4 +14,3 @@ jobs: with: project-url: https://github.com/orgs/gazebosim/projects/7 github-token: ${{ secrets.TRIAGE_TOKEN }} - diff --git a/Changelog.md b/Changelog.md index d89c1fc0b..ae54c9a5e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1300,6 +1300,16 @@ 1. Add support for transparency based on textures alpha channel for ogre1 and ogre2 * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/229) +### 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) + ### Gazebo Rendering 3.7.1 (2023-02-03) 1. Remove fini to resolve segfault at shutdown. diff --git a/include/gz/rendering/base/BaseGizmoVisual.hh b/include/gz/rendering/base/BaseGizmoVisual.hh index 13b18d905..0cb4d4915 100644 --- a/include/gz/rendering/base/BaseGizmoVisual.hh +++ b/include/gz/rendering/base/BaseGizmoVisual.hh @@ -495,6 +495,8 @@ namespace gz 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 gz 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 diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc index 14c20a47b..b9c77a4a9 100644 --- a/ogre2/src/Ogre2GpuRays.cc +++ b/ogre2/src/Ogre2GpuRays.cc @@ -1013,9 +1013,13 @@ void Ogre2GpuRays::Setup1stPass() compoChannels.push_back(this->dataPtr->depthTexture); compoChannels.push_back(this->dataPtr->particleTexture); compoChannels.push_back(this->dataPtr->particleDepthTexture); + passScene->mEnableForwardPlus = false; + passScene->setLightVisibilityMask(0x0); // Create 1st pass compositor Ogre::CompositorManager2 *ogreCompMgr = ogreRoot->getCompositorManager2(); + passScene->mEnableForwardPlus = false; + passScene->setLightVisibilityMask(0x0); // Cache main pass definition so we can alter its visibility mask Ogre::CompositorNodeDef *nodeDef =