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

⬆️ Bump main to 7.0.0~pre1 #399

Merged
merged 2 commits into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-physics6 VERSION 6.0.0)
project(gz-physics7 VERSION 7.0.0)

#============================================================================
# Find gz-cmake
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Gazebo Physics 7.x

### Gazebo Physics 7.x.x (202X-XX-XX)

## Gazebo Physics 6.x

### Gazebo Physics 6.x.x (202X-XX-XX)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ See the [installation tutorial](https://gazebosim.org/api/physics/5.0/installati

# Usage

Please refer to the [examples directory](https://github.com/gazebosim/gz-physics/raw/ign-physics6/examples/).
Please refer to the [examples directory](https://github.com/gazebosim/gz-physics/raw/main/examples/).

# Documentation

Expand All @@ -90,7 +90,7 @@ You can also generate the documentation from a clone of this repository by follo
2. Clone the repository

```
git clone https://github.com/gazebosim/gz-physics -b ign-physics6
git clone https://github.com/gazebosim/gz-physics -b main
```

3. Configure and build the documentation.
Expand Down
4 changes: 2 additions & 2 deletions examples/hello_world_loader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ project(gz-physics-hello-world-loader)
find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-physics6 REQUIRED)
set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR})
find_package(gz-physics7 REQUIRED)
set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})

add_executable(hello_world_loader hello_world_loader.cc)
target_link_libraries(hello_world_loader
Expand Down
4 changes: 2 additions & 2 deletions examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ project(gz-physics-hello-world-plugin)
find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-physics6 REQUIRED)
set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR})
find_package(gz-physics7 REQUIRED)
set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})

add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
target_link_libraries(HelloWorldPlugin
Expand Down
4 changes: 2 additions & 2 deletions examples/simple_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ project(gz-physics-simple-plugin)
find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-physics6 REQUIRED)
set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR})
find_package(gz-physics7 REQUIRED)
set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})

add_library(SimplePlugin SHARED plugin.cc EntityManagementFeatures.cc)
target_link_libraries(SimplePlugin
Expand Down
6 changes: 3 additions & 3 deletions tutorials/03_physics_plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ Users do not need to organize their own plugin implementations this way.

Dart ([Dynamic Animation and Robotics Toolkit](https://dartsim.github.io/)) is an open source library that provides data structures and algorithms for kinematic and dynamic applications in robotics and computer animation.
It is the default physics engine used in Gazebo Simulation.
The source code for Dartsim plugin can be found in [Gazebo Physics repository](https://github.com/gazebosim/gz-physics/tree/ign-physics6) under `dartsim` directory.
The source code for Dartsim plugin can be found in [Gazebo Physics repository](https://github.com/gazebosim/gz-physics/tree/main) under `dartsim` directory.

TPE ([Trivial Physics Engine](https://github.com/gazebosim/gz-physics/tree/ign-physics6/tpe)) is an open source library created by Open Robotics that enables fast, inexpensive kinematics simulation for entities at large scale.
TPE ([Trivial Physics Engine](https://github.com/gazebosim/gz-physics/tree/main/tpe)) is an open source library created by Open Robotics that enables fast, inexpensive kinematics simulation for entities at large scale.
It supports higher-order fleet dynamics without real physics (eg. gravity, force, constraint etc.) and multi-machine synchronization.
Gazebo support for TPE targets [Citadel](https://gazebosim.org/docs/citadel) and onward releases.
The source code for TPE plugin can be found in [Gazebo Physics repository](https://github.com/gazebosim/gz-physics/tree/ign-physics6) under the `tpe/plugin` directory.
The source code for TPE plugin can be found in [Gazebo Physics repository](https://github.com/gazebosim/gz-physics/tree/main) under the `tpe/plugin` directory.

The following is a list of features supported by each physics engine to help users select one that fits their needs.

Expand Down
2 changes: 1 addition & 1 deletion tutorials/05_plugin_loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ cd hello_world_loader
Then download the example loader into your current directory by:

```bash
wget https://raw.githubusercontent.com/gazebosim/gz-physics/ign-physics6/examples/hello_world_loader/hello_world_loader.cc
wget https://raw.githubusercontent.com/gazebosim/gz-physics/main/examples/hello_world_loader/hello_world_loader.cc
```

### Examine the code
Expand Down
2 changes: 1 addition & 1 deletion tutorials/07-implementing-a-physics-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ a plugin.
- The third argument is the `FeatureList`, specifying all the features that this
plugin provides, i.e. `HelloWorldFeatureList`

### Setup CMakeLists.txt for building (Version: gz-physics6)
### Setup CMakeLists.txt for building (Version: gz-physics7)

Now create a file named `CMakeLists.txt` with your favorite editor and add these
lines for finding `gz-plugin` and `gz-physics` dependencies for the Fortress release:
Expand Down