Skip to content

Commit 9f5250c

Browse files
authored
Merge pull request #695 from gazebosim/merge_8_main_20241009
Merge 8 -> main
2 parents ff3c531 + 00a3812 commit 9f5250c

11 files changed

+99
-207
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ find_package(gz-cmake4 REQUIRED)
1616
set(CMAKE_CXX_STANDARD 17)
1717
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1818

19-
gz_configure_project(VERSION_SUFFIX pre1)
19+
gz_configure_project(VERSION_SUFFIX)
2020

2121
#============================================================================
2222
# Set project-specific options

Changelog.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
## Gazebo Physics 8.x
22

3-
### Gazebo Physics 8.0.0 (2024-09-XX)
3+
### Gazebo Physics 8.0.0 (2024-09-25)
44

55
1. **Baseline:** this includes all changes from 7.3.0 and earlier.
66

7+
1. Miscellaneous documentation fixes
8+
* [Pull request #691](https://github.com/gazebosim/gz-physics/pull/691)
9+
* [Pull request #689](https://github.com/gazebosim/gz-physics/pull/689)
10+
* [Pull request #690](https://github.com/gazebosim/gz-physics/pull/690)
11+
* [Pull request #688](https://github.com/gazebosim/gz-physics/pull/688)
12+
* [Pull request #686](https://github.com/gazebosim/gz-physics/pull/686)
13+
* [Pull request #684](https://github.com/gazebosim/gz-physics/pull/684)
14+
* [Pull request #683](https://github.com/gazebosim/gz-physics/pull/683)
15+
* [Pull request #682](https://github.com/gazebosim/gz-physics/pull/682)
16+
* [Pull request #681](https://github.com/gazebosim/gz-physics/pull/681)
17+
718
1. Remove deprecated functions
819
* [Pull request #673](https://github.com/gazebosim/gz-physics/pull/673)
920

README.md

+22-14
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
Build | Status
1111
-- | --
12-
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-physics/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-physics/branch/main)
12+
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-physics/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-physics/tree/main)
1313
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_physics-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_physics-ci-main-noble-amd64)
1414
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_physics-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_physics-ci-main-homebrew-amd64)
1515
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_physics-main-win)](https://build.osrfoundation.org/job/gz_physics-main-win)
@@ -69,37 +69,43 @@ Gazebo Physics provides the following functionality:
6969

7070
# Install
7171

72-
See the [installation tutorial](https://gazebosim.org/api/physics/5.0/installation.html).
72+
See the [installation tutorial](https://gazebosim.org/api/physics/8/installation.html).
7373

7474
# Usage
7575

76-
Please refer to the [examples directory](https://github.com/gazebosim/gz-physics/raw/main/examples/).
76+
Please refer to the [examples directory](https://github.com/gazebosim/gz-physics/raw/gz-physics8/examples/).
7777

7878
# Documentation
7979

8080
API and tutorials can be found at [https://gazebosim.org/libs/physics](https://gazebosim.org/libs/physics).
8181

82-
You can also generate the documentation from a clone of this repository by following these steps.
82+
On Ubuntu, you can also generate the documentation from a clone of this repository by following these steps.
8383

84-
1. You will need Doxygen. On Ubuntu Doxygen can be installed using
84+
1. You will need Doxygen, which can be installed using
8585

8686
```
8787
sudo apt-get install doxygen
8888
```
8989
90-
2. Clone the repository
90+
2. Install dependencies
91+
```
92+
sudo apt-add-repository -s "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -c -s) main"
93+
sudo apt-get build-dep -y libgz-physics8-dev
94+
```
95+
96+
3. Clone the repository
9197
9298
```
93-
git clone https://github.com/gazebosim/gz-physics -b main
99+
git clone https://github.com/gazebosim/gz-physics -b gz-physics8
94100
```
95101
96-
3. Configure and build the documentation.
102+
4. Configure and build the documentation.
97103
98104
```
99-
cd gz-physics; mkdir build; cd build; cmake ../; make doc
105+
cd gz-physics; mkdir build; cd build; cmake ..; make doc
100106
```
101107
102-
4. View the documentation by running the following command from the build directory.
108+
5. View the documentation by running the following command from the build directory.
103109
104110
```
105111
firefox doxygen/html/index.html
@@ -109,7 +115,7 @@ You can also generate the documentation from a clone of this repository by follo
109115
110116
Follow these steps to run tests and static code analysis in your clone of this repository.
111117
112-
1. Follow the [source install instruction](#source-install).
118+
1. Follow the "Source Installation" instructions in the [installation tutorial](https://gazebosim.org/api/physics/8/installation.html).
113119
114120
2. Run tests.
115121
@@ -132,19 +138,21 @@ gz-physics
132138
├── bullet Files for bullet plugin component.
133139
├── bullet-featherstone Files for bullet-featherstone plugin component.
134140
├── dartsim Files for dartsim plugin component.
135-
├── example Examples about how to use the library
141+
├── examples Examples about how to use the library.
136142
├── heightmap Heightmap related header files.
137143
├── include/gz/physics Header files.
138144
├── mesh Files for mesh component.
139-
├── resources Model and mesh resource files used by tests.
140145
├── sdf Files for sdf component.
141146
├── src Source files and unit tests.
142147
├── test
143148
│ ├── benchmark Benchmark tests.
149+
│ ├── common_test Tests common to multiple physics plugins.
150+
│ ├── include Header files for tests.
144151
│ ├── integration Integration tests.
145152
│ ├── performance Performance tests.
146153
│ ├── plugins Plugins used in tests.
147154
│ ├── regression Regression tests.
155+
│ ├── resources Models and mesh resource files.
148156
│ └── static_assert Tests involving compilation failures.
149157
├── tpe
150158
│ ├── lib Implementation of TPE engine.
@@ -164,7 +172,7 @@ Please see
164172
165173
# Versioning
166174
167-
This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the [Gazebo project](https://gazebosim.org) which periodically releases a versioned set of compatible and complimentary libraries. See the [Gazebo website](https://gazebosim.org) for version and release information.
175+
This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the [Gazebo project](https://gazebosim.org) which periodically releases a versioned set of compatible and complementary libraries. See the [Gazebo website](https://gazebosim.org) for version and release information.
168176
169177
# License
170178

tutorials/01_intro.md

+1-29
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Users can request for physics engines that support a set of features and the plu
1313
loading mechanism loads only the engines that implement the requested features.
1414
Besides, a user-selected physics engine can be integrated into the existing
1515
code-base by writing a compatible plugin interface, which enables
16-
Gazebo Physics extensibility and modularity.
16+
Gazebo Physics extensibility and modularity.
1717

1818
## Overview
1919

@@ -56,31 +56,3 @@ different physics engines.
5656

5757
For a list of supported physics engines and their descriptions, please refer
5858
to \ref physicsplugin
59-
60-
## Development timeline
61-
62-
### Features logs
63-
64-
**Gazebo Physics 1.x**
65-
66-
- Initial release
67-
- Define base concepts: Entity, FeaturePolicy, Feature and FeatureList.
68-
- Add features for `dartsim` physics engines (more detail in \ref physicsplugin).
69-
- Add RequestFeatures API for casting the features of an entity to a new feature set when possible.
70-
- Enforce joint effort limit in `dartsim-plugin`.
71-
72-
**Gazebo Physics 2.x**
73-
74-
- Support SDFormat 1.7 frame semantics.
75-
- Support compiling against DART 6.9.
76-
- Trivial Physics Engine (TPE)- partial implementation
77-
- Add features for TPE physics engines (more detail in \ref physicsplugin).
78-
- Extend contact data with force, normal, and penetration depth.
79-
- Add Base and EntityManagement to `tpeplugin`
80-
81-
**Gazebo Physics 3.x**
82-
83-
### Future roadmap
84-
85-
Gazebo Physics evolves closely with the Gazebo ecosystem.
86-
For a broader overview, please visit [Gazebo's roadmap](https://gazebosim.org/about).

tutorials/02_installation.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,8 @@ system requirements.
8383

8484
## Binary Installation
8585

86-
1. Install Homebrew, which should also prompt you to install the XCode
87-
command-line tools:
88-
```
89-
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
90-
```
86+
1. Install [Homebrew](https://brew.sh/), which should also prompt you to install the XCode
87+
command-line tools.
9188

9289
2. Run the following commands
9390
```

tutorials/04-switching-physics-engines.md

-136
This file was deleted.

tutorials/04_physics_engines.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
\page physicsengine Use different physics engines
22

3-
See [Physics engines tutorial](https://gazebosim.org/api/gazebo/3.8/physics.html) in Gazebo.
3+
See [Physics engines tutorial](https://gazebosim.org/api/sim/9/physics.html) in Gazebo.

tutorials/05_plugin_loading.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ And you'll see the engine info:
114114

115115
```bash
116116
Testing plugin: gz::physics::dartsim::Plugin
117-
engine name: dartsim-6.10.0
117+
engine name: dartsim-6.13.2
118118
```
119119

120120
At the time of writing, Gazebo Physics is shipped with

0 commit comments

Comments
 (0)