Merge pull request #957 from azeey/6_to_7

Merge ign-rendering6 ➡️  gz-rendering7

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ labels: bug
 ---
 
 <!-- If you're not sure whether your problem is a bug, please ask a question at
-http://answers.gazebosim.org instead.-->
+https://robotics.stackexchange.com instead.-->
 
 ## Environment
 * OS Version: <!-- e.g, Ubuntu 20.04 -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,7 +6,7 @@ labels: enhancement
 
 <!-- If you're not sure on the specifics of the feature or would like a broader
 discussion, please consider posting a proposal to
-http://community.gazebosim.org/ instead.-->
+https://robotics.stackexchange.com instead.-->
 
 ## Desired behavior
 <!-- Describe the current problem and the feature you want implemented.-->

.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:

.github/workflows/triage.yml

@@ -14,4 +14,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/gazebosim/projects/7
           github-token: ${{ secrets.TRIAGE_TOKEN }}
-

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.

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

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"
     }
   }