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

Bumps in harmonic : ci_matching_branch/bump_harmonic_gz-sim8 #2062

Merged
merged 2 commits into from
Aug 8, 2023
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
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ libgz-fuel-tools9-dev
libgz-gui8-dev
libgz-math7-eigen3-dev
libgz-msgs10-dev
libgz-physics6-dev
libgz-physics7-dev
libgz-plugin2-dev
libgz-rendering8-dev
libgz-sensors8-dev
Expand All @@ -24,7 +24,7 @@ libogre-1.9-dev
libogre-next-2.3-dev
libprotobuf-dev
libprotoc-dev
libsdformat13-dev
libsdformat14-dev
libtinyxml2-dev
libxi-dev
libxmu-dev
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
# as protobuf could be find transitively by any dependency
set(protobuf_MODULE_COMPATIBLE TRUE)

gz_find_package(sdformat13 REQUIRED)
set(SDF_VER ${sdformat13_VERSION_MAJOR})
gz_find_package(sdformat14 REQUIRED)
set(SDF_VER ${sdformat14_VERSION_MAJOR})

#--------------------------------------
# Find gz-plugin
Expand Down Expand Up @@ -118,14 +118,14 @@ gz_find_package (Qt5

#--------------------------------------
# Find gz-physics
gz_find_package(gz-physics6
gz_find_package(gz-physics7
COMPONENTS
heightmap
mesh
sdf
REQUIRED
)
set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR})
set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})

#--------------------------------------
# Find gz-sensors
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ RUN apt-get update \
libgz-fuel-tools9-dev \
libgz-math7-eigen3-dev \
libgz-plugin2-dev \
libgz-physics6-dev \
libgz-physics7-dev \
libgz-rendering8-dev \
libgz-tools2-dev \
libgz-transport13-dev \
libgz-gui8-dev \
libgz-msgs10-dev \
libgz-sensors8-dev \
libsdformat13-dev
libsdformat14-dev

COPY . gz-sim
RUN cd gz-sim \
Expand Down
2 changes: 1 addition & 1 deletion examples/scripts/python_api/testFixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import os

from gz.common import set_verbosity
from gz.sim7 import TestFixture, World, world_entity
from gz.sim8 import TestFixture, World, world_entity
from gz.math7 import Vector3d

set_verbosity(4)
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/joy_to_twist/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ project(gz-sim-joy-to-twist)
find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})

find_package(sdformat13 REQUIRED)
set(SDF_VER ${sdformat13_VERSION_MAJOR})
find_package(sdformat14 REQUIRED)
set(SDF_VER ${sdformat14_VERSION_MAJOR})

add_executable(joy_to_twist joy_to_twist.cc)
target_link_libraries(joy_to_twist
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/joystick/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})

find_package(sdformat13 REQUIRED)
set(SDF_VER ${sdformat13_VERSION_MAJOR})
find_package(sdformat14 REQUIRED)
set(SDF_VER ${sdformat14_VERSION_MAJOR})

add_executable(joystick joystick.cc)
target_link_libraries(joystick
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/keyboard/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})

find_package(sdformat13 REQUIRED)
set(SDF_VER ${sdformat13_VERSION_MAJOR})
find_package(sdformat14 REQUIRED)
set(SDF_VER ${sdformat14_VERSION_MAJOR})

find_package(gz-msgs10 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion src/SdfEntityCreator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static Entity FindDescendentLinkEntityByName(const std::string &_name,
const Entity &_model,
const EntityComponentManager &_ecm)
{
auto ind = _name.find(sdf::kSdfScopeDelimiter);
auto ind = _name.find(sdf::kScopeDelimiter);
std::vector<Entity> candidates;
if (ind != std::string::npos)
{
Expand Down
2 changes: 1 addition & 1 deletion tutorials/blender_distort_meshes.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ If newer versions do not work for you, Blender 2.92 can be found
## Usage

Locate or download the Blender Python
[script](https://github.com/gazebosim/gz-sim/blob/gz-sim7/examples/scripts/blender/distort_mesh.py).
[script](https://github.com/gazebosim/gz-sim/blob/gz-sim8/examples/scripts/blender/distort_mesh.py).

Launch the Blender GUI.

Expand Down
2 changes: 1 addition & 1 deletion tutorials/blender_sdf_exporter.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mesh/materials/lights feature set. As such feel free to customize the script as

## Using the Blender SDF Exporter

1. Download the blender script in [sdf_exporter.py](https://github.com/gazebosim/gz-sim/tree/gz-sim7/examples/scripts/blender/sdf_exporter.py).
1. Download the blender script in [sdf_exporter.py](https://github.com/gazebosim/gz-sim/tree/gz-sim8/examples/scripts/blender/sdf_exporter.py).

2. Open the script under Blender's Scripting tab and run it.

Expand Down
4 changes: 2 additions & 2 deletions tutorials/migrating_ardupilot_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -729,12 +729,12 @@ In the new code we explicitly reference each Gazebo package that we use:

```
# NEW
find_package(sdformat13 REQUIRED)
find_package(sdformat14 REQUIRED)
find_package(gz-common5-all REQUIRED)
find_package(gz-sim8-all REQUIRED)
find_package(gz-math7-all REQUIRED)
find_package(gz-msgs10-all REQUIRED)
find_package(gz-physics6-all REQUIRED)
find_package(gz-physics7-all REQUIRED)
find_package(gz-sensors8-all REQUIRED)
find_package(gz-transport13-all REQUIRED)
```
Expand Down
2 changes: 1 addition & 1 deletion tutorials/python_interfaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ server.run(True, 1000, False)
# Run the example

In the
[examples/scripts/python_api](https://github.com/gazebosim/gz-sim/tree/gz-sim7/examples/scripts/python_api)
[examples/scripts/python_api](https://github.com/gazebosim/gz-sim/tree/gz-sim8/examples/scripts/python_api)
folder there is a Python script that shows how to make use of this API.

If you compiled Gazebo from source you should modify your `PYTHONPATH`:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/reset_simulation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ In addition to the API, we have also expanded the simulation system API with a R
System authors may now choose to implement the Reset interface to have a more intelligent
reset process (avoiding reloading assets or regenerating scene graphs being the motivating examples).
Since this interface is opt-in, systems that don't implement the API will still be reset via destruction and reconstruction.
The [physics](https://github.com/gazebosim/gz-sim/blob/gz-sim7/src/systems/physics/Physics.cc#L928-L937) and [rendering systems](https://github.com/gazebosim/gz-sim/blob/gz-sim7/src/systems/scene_broadcaster/SceneBroadcaster.cc#L452-L458) are the first two to implement this optimized reset functionality, with more to come as it makes sense to.
The [physics](https://github.com/gazebosim/gz-sim/blob/gz-sim8/src/systems/physics/Physics.cc#L928-L937) and [rendering systems](https://github.com/gazebosim/gz-sim/blob/gz-sim8/src/systems/scene_broadcaster/SceneBroadcaster.cc#L452-L458) are the first two to implement this optimized reset functionality, with more to come as it makes sense to.

Following the tutorial \subpage createsystemplugins we should implement `ISystemReset` interface.

Expand Down