Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge gz-rendering8 ➡️ main #934

Merged
merged 45 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6ea5ede
Fixed light visual in OGRE (#862) (#864)
ahcorde Jun 12, 2023
6712d55
Fix Github project automation for new project board (#878)
azeey Aug 1, 2023
71765a0
Use `pull_request_target` for triage workflow (#879)
azeey Aug 2, 2023
a50cd70
Prepare for 7.4.1 release (#883)
iche033 Aug 17, 2023
8515267
Merge gz-rendering7 into gz-rendering8
azeey Aug 29, 2023
ac83c54
Merge pull request #887 from azeey/7_to_8
iche033 Aug 29, 2023
837b2fe
remove bionic and focal apt (#888)
iche033 Aug 29, 2023
c2c5fdf
Prepare for 6.6.1 Release (#891)
azeey Sep 1, 2023
2901ec2
Do not load optix engine in examples (#893)
iche033 Sep 1, 2023
077e1e7
remove more references to optix (#895)
iche033 Sep 3, 2023
9385897
Revert mesh viewer background color back to gray (#894)
iche033 Sep 5, 2023
41f80fd
Fix arrow visual indexing (#889)
iche033 Sep 5, 2023
b16a396
Fix typo in bounding box camera tutorial (#896)
iche033 Sep 5, 2023
3c84ca4
Fix wide angle camera visibility flags (#900)
iche033 Sep 6, 2023
6fa1fc1
Minor updates to README file in the hello_world_plugin example (#892)
iche033 Sep 6, 2023
59417ba
Disable setting color range in particle emitter (#903)
iche033 Sep 8, 2023
890cc29
Prepare from 8.0.0 pre2 release (#904)
iche033 Sep 12, 2023
98c5978
Update installation instructions (#906)
iche033 Sep 14, 2023
0795e09
Fixed build on MSVC. (#897)
peci1 Sep 14, 2023
c108afb
Update README (#907)
iche033 Sep 15, 2023
8c1fd27
ogre2: use CMAKE_INSTALL_RPATH (#909)
scpeters Sep 15, 2023
9d524c2
Include the CGL header on macOS (#911)
mjcarroll Sep 18, 2023
da675f6
ogre2: use CMAKE_INSTALL_RPATH (#909)
scpeters Sep 15, 2023
5655566
Fix projector FOV, orientation, and crashes (#913)
iche033 Sep 18, 2023
4190ff6
Remove gazebo scene viewer example (#915)
iche033 Sep 20, 2023
b6f5d22
[backport fortress] Calculate camera intrinsics : Refactor (#905)
ahcorde Sep 22, 2023
c896a9a
Merge ign-rendering6 into gz-rendering7
azeey Sep 26, 2023
1876bc6
Merge pull request #921 from azeey/6_to_7
azeey Sep 26, 2023
61bf635
Prepare for 7.4.2 release (#922)
azeey Sep 26, 2023
62e45a2
Merge from gz-rendering7
iche033 Sep 26, 2023
9e6d8ac
Merge pull request #923 from gazebosim/merge_7_8_20230926
iche033 Sep 27, 2023
d3807fe
Update changelog and prepare for pre3 (#924)
azeey Sep 27, 2023
dad0364
Prepare for 8.0.0 Release (#926)
azeey Sep 29, 2023
4cf24f7
Fix float comparison warnings in test (#929)
iche033 Oct 3, 2023
4e49945
Prepare for 6.6.2 release (#930)
iche033 Oct 4, 2023
93841e1
Update ci.yml (#925)
mosfet80 Oct 4, 2023
5892355
Fix use of srgb format for texture map data (#931)
iche033 Oct 4, 2023
c1af6fd
Minor fix for projector visibility flags (#920)
iche033 Oct 5, 2023
22b2bbf
Support skybox in wide angle cam view (#901)
iche033 Oct 5, 2023
70e2fe4
Extend ogre 1.x custom shaders support (#908)
iche033 Oct 5, 2023
9344fac
Merge from ign-rendering6
iche033 Oct 10, 2023
adb0f1c
Merge pull request #932 from gazebosim/merge_6_7_20231010
iche033 Oct 10, 2023
c27ebce
merge from gz-rendering7
iche033 Oct 10, 2023
c42123e
Merge pull request #933 from gazebosim/merge_7_8_20231010
azeey Oct 10, 2023
3637c76
Merge gz-rendering8 into main
azeey Oct 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/ci/packages-bionic.apt

This file was deleted.

2 changes: 0 additions & 2 deletions .github/ci/packages-focal.apt

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ 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 }}

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(VERSION_SUFFIX pre1)
gz_configure_project(VERSION_SUFFIX)

#============================================================================
# Set project-specific options
Expand Down
186 changes: 185 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,162 @@

### Gazebo Rendering 8.X

### Gazebo Rendering 8.0.0 (202X-XX-XX)
### Gazebo Rendering 8.0.0 (2023-09-29)

1. Remove gazebo scene viewer example
* [Pull request #915](https://github.com/gazebosim/gz-rendering/pull/915)

1. Fix projector FOV, orientation, and crashes
* [Pull request #913](https://github.com/gazebosim/gz-rendering/pull/913)

1. Include the CGL header on macOS
* [Pull request #911](https://github.com/gazebosim/gz-rendering/pull/911)

1. ogre2: use CMAKE_INSTALL_RPATH
* [Pull request #909](https://github.com/gazebosim/gz-rendering/pull/909)

1. Fixed build on MSVC.
* [Pull request #897](https://github.com/gazebosim/gz-rendering/pull/897)

1. Documentation fixes
* [Pull request #895](https://github.com/gazebosim/gz-rendering/pull/895)
* [Pull request #906](https://github.com/gazebosim/gz-rendering/pull/906)
* [Pull request #907](https://github.com/gazebosim/gz-rendering/pull/907)

1. Fix wide angle camera visibility flags
* [Pull request #900](https://github.com/gazebosim/gz-rendering/pull/900)

1. Fix arrow visual indexing
* [Pull request #889](https://github.com/gazebosim/gz-rendering/pull/889)

1. Do not load optix engine in examples
* [Pull request #893](https://github.com/gazebosim/gz-rendering/pull/893)

1. Infrastructure
* [Pull request #888](https://github.com/gazebosim/gz-rendering/pull/888)
* [Pull request #868](https://github.com/gazebosim/gz-rendering/pull/868)

1. Clean up internal resources on Destroy
* [Pull request #886](https://github.com/gazebosim/gz-rendering/pull/886)

1. ign -> gz
* [Pull request #877](https://github.com/gazebosim/gz-rendering/pull/877)

1. Remove inheritance from Singleton class.
* [Pull request #876](https://github.com/gazebosim/gz-rendering/pull/876)
* [Pull request #874](https://github.com/gazebosim/gz-rendering/pull/874)

1. Add private data class to Image
* [Pull request #875](https://github.com/gazebosim/gz-rendering/pull/875)

1. Override PreRender function in Ogre2ParticleEnitter
* [Pull request #871](https://github.com/gazebosim/gz-rendering/pull/871)

1. Fix calling GpuRays::Destroy more than once
* [Pull request #860](https://github.com/gazebosim/gz-rendering/pull/860)

1. Use std::vector instead of std::map in BaseStorage
* [Pull request #831](https://github.com/gazebosim/gz-rendering/pull/831)

1. Limit Global Illumination CI CVT method to vulkan backend
* [Pull request #798](https://github.com/gazebosim/gz-rendering/pull/798)

1. Global illumination VCT & CI VCT
* [Pull request #675](https://github.com/gazebosim/gz-rendering/pull/675)

1. Add LensFlare to ogre1
* [Pull request #775](https://github.com/gazebosim/gz-rendering/pull/775)

1. Cleanup config.hh.in and deprecate public HAVE_ macros
* [Pull request #791](https://github.com/gazebosim/gz-rendering/pull/791)

1. Add GZ_RENDERING_HAVE_VULKAN to guard vulkan code in header
* [Pull request #790](https://github.com/gazebosim/gz-rendering/pull/790)

1. Look for vulkan in CMakeLists
* [Pull request #782](https://github.com/gazebosim/gz-rendering/pull/782)

1. Add LensFlarePass (ogre2 engine)
* [Pull request #752](https://github.com/gazebosim/gz-rendering/pull/752)

1. Add Support for wide-angle cameras in ogre2
* [Pull request #733](https://github.com/gazebosim/gz-rendering/pull/733)

1. Fix wrong Z check in OgreWideAngleCamera::Project3d
* [Pull request #746](https://github.com/gazebosim/gz-rendering/pull/746)

1. Add necessary headers for Vulkan QML GUI backend
* [Pull request #706](https://github.com/gazebosim/gz-rendering/pull/706)

1. Revert "Expose camera intrinsic matrix API (#700)"
* [Pull request #756](https://github.com/gazebosim/gz-rendering/pull/756)

1. Expose camera intrinsic matrix API
* [Pull request #700](https://github.com/gazebosim/gz-rendering/pull/700)

1. ⬆️ Bump main to 8.0.0~pre1
* [Pull request #699](https://github.com/gazebosim/gz-rendering/pull/699)


### Gazebo Rendering 7.X

### Gazebo Rendering 7.4.2 (2023-09-26)

1. ogre2: use CMAKE_INSTALL_RPATH
* [Pull request #909](https://github.com/gazebosim/gz-rendering/pull/909)

1. Disable setting color range in particle emitter
* [Pull request #903](https://github.com/gazebosim/gz-rendering/pull/903)

1. Documentation updates
* [Pull request #892](https://github.com/gazebosim/gz-rendering/pull/892)
* [Pull request #896](https://github.com/gazebosim/gz-rendering/pull/896)

1. Revert mesh viewer background color back to gray
* [Pull request #894](https://github.com/gazebosim/gz-rendering/pull/894)

### Gazebo Rendering 7.4.1 (2023-08-17)

1. Infrastructure
* [Pull request #879](https://github.com/gazebosim/gz-rendering/pull/879)
* [Pull request #878](https://github.com/gazebosim/gz-rendering/pull/878)

1. Restore missing Ogre2Heightmap::DestroyImpl implementation
* [Pull request #870](https://github.com/gazebosim/gz-rendering/pull/870)

1. Destroy sensor node on exit
* [Pull request #869](https://github.com/gazebosim/gz-rendering/pull/869)

1. Parse `OGRE2_RESOURCE_PATH` as a list of strings
* [Pull request #867](https://github.com/gazebosim/gz-rendering/pull/867)

1. Fix a leak in ogre2 ray query
* [Pull request #866](https://github.com/gazebosim/gz-rendering/pull/866)

1. Fixed light visual in OGRE
* [Pull request #862](https://github.com/gazebosim/gz-rendering/pull/862)

1. Removed unused parameter warning
* [Pull request #861](https://github.com/gazebosim/gz-rendering/pull/861)

1. Replace ignerr with gzerr
* [Pull request #857](https://github.com/gazebosim/gz-rendering/pull/857)

1. Minor cleanup of ogre/ogre2: fix namespace, unused variable, missing header
* [Pull request #858](https://github.com/gazebosim/gz-rendering/pull/858)

1. Fix missing header in CameraLens
* [Pull request #855](https://github.com/gazebosim/gz-rendering/pull/855)

1. Fix missing cstdint header in latest gcc build
* [Pull request #853](https://github.com/gazebosim/gz-rendering/pull/853)

1. OgreNext: Fix shaders compilation on d3d12 mesa driver (WSLg)
* [Pull request #851](https://github.com/gazebosim/gz-rendering/pull/851)

1. Fix visibility decorator of Ogre2Projector
* [Pull request #850](https://github.com/gazebosim/gz-rendering/pull/850)

### Gazebo Rendering 7.4.0 (2023-05-18)

1. Add optional binary relocatability
Expand Down Expand Up @@ -327,6 +479,38 @@

### Gazebo Rendering 6.X

### Gazebo Rendering 6.6.2 (2023-10-03)

1. Backport camera intrinsics calculation : Refactor
* [Pull request #905](https://github.com/gazebosim/gz-rendering/pull/905)
* [Pull request #929](https://github.com/gazebosim/gz-rendering/pull/929)

1. Revert mesh viewer background color back to gray
* [Pull request #894](https://github.com/gazebosim/gz-rendering/pull/894)

### Gazebo Rendering 6.6.1 (2023-09-01)

1. Fixed light visual in OGRE
* [Pull request #864](https://github.com/gazebosim/gz-rendering/pull/864)

1. Lower severity level for ogre2 visibility mask msgs and unavailable render passes
* [Pull request #830](https://github.com/gazebosim/gz-rendering/pull/830)

1. Infrastructure
* [Pull request #834](https://github.com/gazebosim/gz-rendering/pull/834)

1. Rename COPYING to LICENSE
* [Pull request #833](https://github.com/gazebosim/gz-rendering/pull/833)

1. Add message to see troubleshooting page when render engine fails to create dummy window
* [Pull request #829](https://github.com/gazebosim/gz-rendering/pull/829)

1. Tweak max camera position limit
* [Pull request #827](https://github.com/gazebosim/gz-rendering/pull/827)

1. Limit max camera position vector length
* [Pull request #824](https://github.com/gazebosim/gz-rendering/pull/824)

### Gazebo Rendering 6.6.0 (2023-02-02)

1. Backport Composite BaseVisual destroy fix to 6
Expand Down
4 changes: 3 additions & 1 deletion Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ release will remove the deprecated code.
BaseStore APIs such as `IterByIndex` may now be different from before since
the order of objects stored in maps and vectors are different. The iterators
returned may also change or become invalid when objects are added or removed
from the store.
from the store. This impacts users using APIs to access nodes / visuals by
index, e.g. `Node::ChildByIndex` and `Scene::VisualByIndex` may now
return a different node pointer.

## Gazebo Rendering 6.x to 7.x

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-rendering/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-rendering/branch/default)
Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-focal-amd64)
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-jammy-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/ign_rendering-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_rendering-ci-win/)

Expand Down Expand Up @@ -47,12 +47,12 @@ of libraries designed to rapidly develop robot applications.

# Install

See the [installation tutorial](https://gazebosim.org/api/rendering/5.0/installation.html).
See the [installation tutorial](https://gazebosim.org/api/rendering/8/installation.html).

# Usage

The Gazebo Rendering API can be found in the documentation. See the
[installation tutorial](https://gazebosim.org/api/rendering/5.0/installation.html)
[installation tutorial](https://gazebosim.org/api/rendering/8/installation.html)
on how to build the documentation files using Doxygen.

You can also take a look at the sample applications in the `examples` folder.
Expand All @@ -74,7 +74,7 @@ Rendering engine plugin implementation code is stored in their own folders

* `ogre` : OGRE 1.x rendering engine plugin

* `ogre2` : OGRE 2.x rendering engine plugin (available in versions >= gz-rendering1)
* `ogre2` : OGRE-Next 2.x rendering engine plugin

* `optix` : OptiX rendering engine plugin

Expand Down
1 change: 0 additions & 1 deletion examples/camera_tracking/Main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ int main(int _argc, char** _argv)
std::vector<NodePtr> nodes;

engineNames.push_back(ogreEngineName);
engineNames.push_back("optix");

for (auto engineName : engineNames)
{
Expand Down
1 change: 0 additions & 1 deletion examples/custom_scene_viewer/ManualSceneDemo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ int main(int _argc, char** _argv)
sceneDemo->AddScene(SceneBuilderPtr(new ShadowSceneBuilder(5)));
//! [add scenes]
sceneDemo->AddCamera(ogreEngineName, params);
sceneDemo->AddCamera("optix");
sceneDemo->Run();
return 0;
}
Expand Down
53 changes: 0 additions & 53 deletions examples/gazebo_scene_viewer/CMakeLists.txt

This file was deleted.

Loading
Loading