Skip to content

Commit

Permalink
Merge 6 into 7
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Chen <ichen@openrobotics.org>
  • Loading branch information
azeey authored and iche033 committed Jan 18, 2024
2 parents d323506 + 34fdfb7 commit e57c84a
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.-->
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ jobs:
with:
project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}

10 changes: 10 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions include/gz/rendering/base/BaseGizmoVisual.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e57c84a

Please sign in to comment.