Merge pull request #942 from gazebosim/azeey/3_to_6

Merge ign-rendering3 ➡️  ign-rendering6

.github/workflows/ci.yml

@@ -1,14 +1,20 @@
 name: Ubuntu CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ign-rendering[0-9]'
+      - 'gz-rendering[0-9]?'
+      - 'main'
 
 jobs:
   bionic-ci:
     runs-on: ubuntu-latest
     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

.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/[email protected]
         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 }}

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