4 to main

Signed-off-by: Ashton Larkin <[email protected]>
liuyoupei · Nov 14, 2020 · 1972d09 · 1972d09
2 parents ebdb59e a5abacf
commit 1972d09
Show file tree

Hide file tree

Showing 160 changed files with 10,587 additions and 3,705 deletions.
diff --git a/.github/workflows/pr-collection-labeler.yml b/.github/workflows/pr-collection-labeler.yml
@@ -1,6  1,6 @@
 name: PR Collection Labeler
 
-on: pull_request
 on: pull_request_target
 
 jobs:
   pr_collection_labeler:

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -1,7  1,7 @@
 on:
   issues:
     types: [opened]
-  pull_request:
   pull_request_target:
     types: [opened]
 name: Ticket opened
 jobs:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7  14,7 @@ find_package(ignition-cmake2 2.3 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX pre1)
 ign_configure_project(VERSION_SUFFIX)
 
 #============================================================================
 # Set project-specific options
@@ -87,7  87,7 @@ ign_find_package (Qt5
 
 #--------------------------------------
 # Find ignition-physics
-ign_find_package(ignition-physics3
 ign_find_package(ignition-physics3 VERSION 3.1
   COMPONENTS
     mesh
     sdf
@@ -171,3  171,7 @@ ign_create_docs(
    "${IGNITION-SENSORS_DOXYGEN_TAGFILE} = ${IGNITION-SENSORS_API_URL}"
    "${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}"
 )
 
 if(TARGET doc)
   file(COPY ${CMAKE_SOURCE_DIR}/tutorials/files/ DESTINATION ${CMAKE_BINARY_DIR}/doxygen/html/files/)
 endif()
diff --git a/Changelog.md b/Changelog.md
@@ -1,15  1,76 @@
 ## Ignition Gazebo 4.x
 
-### Ignition Gazebo 4.X.X
 ### Ignition Gazebo 4.X.X (20XX-XX-XX)
 
-### Ignition Gazebo 4.0.0 (20XX-XX-XX)
 ### Ignition Gazebo 4.0.0 (2020-09-30)
 
 1. Names with spaces: add string serializer
     * [pull request 244](https://github.com/ignitionrobotics/ign-gazebo/pull/244)
 
 1. Filter mesh collision based on `collide_bitmask` property
     * [pull request 160](https://github.com/ignitionrobotics/ign-gazebo/pull/160)
 
 1. Add force focus when mouse enters render window
     * [pull request 97](https://github.com/ignitionrobotics/ign-gazebo/pull/97)
 
 1. Fixed docblock showGrid
     * [pull request 152](https://github.com/ignitionrobotics/ign-gazebo/pull/152)
 
 1. More actor components and follow plugin
     * [pull request 157](https://github.com/ignitionrobotics/ign-gazebo/pull/157)
 
 1. Filter the record menu and write the format to the file according to which button the user pushed (mp4 or ogv)
     * [pull request 153](https://github.com/ignitionrobotics/ign-gazebo/pull/153)
 
 1. Fix scene manager losing header file
     * [pull request 211](https://github.com/ignitionrobotics/ign-gazebo/pull/211)
 
 1. Fixed left menu events
     * [pull request 218](https://github.com/ignitionrobotics/ign-gazebo/pull/218)
 
 1. Fix yaw units typo in Component Inspector plugin
     * [pull request 238](https://github.com/ignitionrobotics/ign-gazebo/pull/238)
 
 1. Enable alpha based transparency on PBR materials by default
     * [pull request 249](https://github.com/ignitionrobotics/ign-gazebo/pull/249)
 
 1. Qt auto scale factor for HiDPI displays
     * [pull request 291](https://github.com/ignitionrobotics/ign-gazebo/pull/291)
 
 1. Sync components removal
     * [pull request 272](https://github.com/ignitionrobotics/ign-gazebo/pull/272)
 
 1. Add error handling for JointAxis::SetXyz and remove use of use_parent_model_frame
     * [pull request 288](https://github.com/ignitionrobotics/ign-gazebo/pull/288)
 
 1. Make some tests more robust
     * [pull request 314](https://github.com/ignitionrobotics/ign-gazebo/pull/314)
 
 1. Fix Qt5 warnings for using anchors
     * [pull request 363](https://github.com/ignitionrobotics/ign-gazebo/pull/363)
 
 1. Plotting Components Plugin
     * [pull request 270](https://github.com/ignitionrobotics/ign-gazebo/pull/270)
 
 1. Visualize Lidar Plugin
     * [pull request 301](https://github.com/ignitionrobotics/ign-gazebo/pull/301)
     * [pull request 391](https://github.com/ignitionrobotics/ign-gazebo/pull/391)
 
 1. Replaced common::Time for std::chrono
     * [pull request 309](https://github.com/ignitionrobotics/ign-gazebo/pull/309)
 
 1. Tutorial, examples and documentation updates
     * [pull request 380](https://github.com/ignitionrobotics/ign-gazebo/pull/380)
     * [pull request 386](https://github.com/ignitionrobotics/ign-gazebo/pull/386)
     * [pull request 387](https://github.com/ignitionrobotics/ign-gazebo/pull/387)
     * [pull request 390](https://github.com/ignitionrobotics/ign-gazebo/pull/390)
 
 1. Migration from BitBucket to GitHub
     * [pull request 73](https://github.com/ignitionrobotics/ign-gazebo/pull/73)
     * [pull request 68](https://github.com/ignitionrobotics/ign-gazebo/pull/68)
     * [pull request 67](https://github.com/ignitionrobotics/ign-gazebo/pull/67)
     * [pull request 130](https://github.com/ignitionrobotics/ign-gazebo/pull/130)
 
 1. Use interpolate\_x sdf parameter for actor animations
     * [BitBucket pull request 536](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/536)
 
@@ -36,6  97,131 @@
 
 ## Ignition Gazebo 3.x
 
 ### Ignition Gazebo 3.X.X (20XX-XX-XX)
 
 ### Ignition Gazebo 3.5.0 (2020-11-03)
 
 1. Updated source build instructions
     * [Pull Request 403](https://github.com/ignitionrobotics/ign-gazebo/pull/403)
 
 1. More world APIs, helper function ComponentData
     * [Pull Request 378](https://github.com/ignitionrobotics/ign-gazebo/pull/378)
 
 1. Improve fork experience
     * [Pull Request 411](https://github.com/ignitionrobotics/ign-gazebo/pull/411)
 
 1. Fix a crash in the grid config plugin, set grid material
     * [Pull Request 412](https://github.com/ignitionrobotics/ign-gazebo/pull/412)
 
 1. Document deprecation of log playback `<path>` SDF param
     * [Pull Request 424](https://github.com/ignitionrobotics/ign-gazebo/pull/424)
     * [Pull Request 425](https://github.com/ignitionrobotics/ign-gazebo/pull/425)
 
 1. Enable mouse highlighting selection on resource spawner
     * [Pull Request 402](https://github.com/ignitionrobotics/ign-gazebo/pull/402)
 
 1. Add support for custom render engines
     * [Pull Request 373](https://github.com/ignitionrobotics/ign-gazebo/pull/373)
 
 1. Component Vector -> Map ECM Optimization
     * [Pull Request 416](https://github.com/ignitionrobotics/ign-gazebo/pull/416)
 
 ### Ignition Gazebo 3.4.0 (2020-10-14)
 
 1. Fix gui sendEvent memory leaks
     * [Pull Request 365](https://github.com/ignitionrobotics/ign-gazebo/pull/365)
 
 1. Support nested models
     * [Pull Request 258](https://github.com/ignitionrobotics/ign-gazebo/pull/258)
 
 1. Generalize actor count and pose in actor population erb SDF
     * [Pull Request 336](https://github.com/ignitionrobotics/ign-gazebo/pull/336)
 
 1. Add more link APIs, with tutorial
     * [Pull Request 375](https://github.com/ignitionrobotics/ign-gazebo/pull/375)
 
 1. Add screenshots to GUI config tutorial
     * [Pull Request 406](https://github.com/ignitionrobotics/ign-gazebo/pull/406)
 
 1. Fix adding performers to entity tree
     * [Pull Request 374](https://github.com/ignitionrobotics/ign-gazebo/pull/374)
 
 1. Remove sidebar and put world control in bottom left for joint controller examples
     * [Pull Request 384](https://github.com/ignitionrobotics/ign-gazebo/pull/384)
 
 1. Allow executing a blocking single Server run in both paused and unpaused states
     * [Pull Request 297](https://github.com/ignitionrobotics/ign-gazebo/pull/297)
 
 1. Add camera video recorder system
     * [Pull Request 316](https://github.com/ignitionrobotics/ign-gazebo/pull/316)
 
 1. Decrease time step for quadcopter world
     * [Pull Request 372](https://github.com/ignitionrobotics/ign-gazebo/pull/372)
 
 1. Add support for moving the GUI camera to a pose
     * [Pull Request 352](https://github.com/ignitionrobotics/ign-gazebo/pull/352)
 
 1. Remove `lib` `.so` from plugin's name
     * [Pull Request 279](https://github.com/ignitionrobotics/ign-gazebo/pull/279)
     * [Pull Request 335](https://github.com/ignitionrobotics/ign-gazebo/pull/335)
 
 1. EntityComponentManager::EachRemoved documentation fix.
     * [Pull Request 348](https://github.com/ignitionrobotics/ign-gazebo/pull/348)
 
 1. Add more model APIs.
     * [Pull Request 349](https://github.com/ignitionrobotics/ign-gazebo/pull/349)
 
 1. Update dimensions of the grid config.
     * [Pull Request 383](https://github.com/ignitionrobotics/ign-gazebo/pull/383)
 
 1. Fix top-left toolbar layout so magnet shows.
     * [Pull Request 381](https://github.com/ignitionrobotics/ign-gazebo/pull/381)
 
 1. Add instructions to bitmask world.
     * [Pull Request 377](https://github.com/ignitionrobotics/ign-gazebo/pull/377)
 
 1. Add search and sort for resource spawner.
     * [Pull Request 359](https://github.com/ignitionrobotics/ign-gazebo/pull/359)
 
 1. Fix source build instructions for ign-gazebo3.
     * [Pull Request 395](https://github.com/ignitionrobotics/ign-gazebo/pull/395)
 
 1. Added playback scrubber GUI
     * [Pull Request 299](https://github.com/ignitionrobotics/ign-gazebo/pull/299)
     * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
 
 1. Added wheel slip system plugin.
     * [Pull Request 134](https://github.com/ignitionrobotics/ign-gazebo/pull/134)
     * [Pull Request 357](https://github.com/ignitionrobotics/ign-gazebo/pull/357)
     * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
 
 1. Enhanced log playback performance.
     * [Pull Request 351](https://github.com/ignitionrobotics/ign-gazebo/pull/351)
     * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
 
 1. Tests & Warnings: Qt 5.14, breadcrumbs, Gui, ign_TEST
     * [Pull Request 327](https://github.com/ignitionrobotics/ign-gazebo/pull/327)
 
 1. Added support for specifying topics to record.
     * [Pull Request 315](https://github.com/ignitionrobotics/ign-gazebo/pull/315)
 
 1. Make sure OpenGL core profile context is used by GzScene3D.
     * [Pull Request 339](https://github.com/ignitionrobotics/ign-gazebo/pull/339)
 
 1. Support relative paths for PBR materials
     * [Pull Request 328](https://github.com/ignitionrobotics/ign-gazebo/pull/328)
     * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
 
 1. Add file extension automatically for record plugin.
     * [Pull Request 303](https://github.com/ignitionrobotics/ign-gazebo/pull/303)
     * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
 
 1. Support spawning during log playback.
     * [Pull Request 346](https://github.com/ignitionrobotics/ign-gazebo/pull/346)
 
 1. Add Render Engine Cmd Line option
     * [Pull Request 331](https://github.com/ignitionrobotics/ign-gazebo/pull/331)
 
 ### Ignition Gazebo 3.3.0 (2020-08-31)
 
 1. Added marker array service.
@@ -145,6  331,33 @@
 
 ## Ignition Gazebo 2.x
 
 ### Ignition Gazebo 2.25.0 (2020-09-17)
 
 1. Added wheel slip system plugin.
     * [Pull Request 134](https://github.com/ignitionrobotics/ign-gazebo/pull/134)
     * [Pull Request 357](https://github.com/ignitionrobotics/ign-gazebo/pull/357)
 
 1. Enhanced log playback performance.
     * [Pull Request 351](https://github.com/ignitionrobotics/ign-gazebo/pull/351)
 
 1. Tests & Warnings: Qt 5.14, breadcrumbs, Gui, ign_TEST
     * [Pull Request 327](https://github.com/ignitionrobotics/ign-gazebo/pull/327)
 
 1. Added support for specifying topics to record.
     * [Pull Request 315](https://github.com/ignitionrobotics/ign-gazebo/pull/315)
 
 1. Make sure OpenGL core profile context is used by GzScene3D.
     * [Pull Request 339](https://github.com/ignitionrobotics/ign-gazebo/pull/339)
 
 1. Support relative paths for PBR materials
     * [Pull Request 328](https://github.com/ignitionrobotics/ign-gazebo/pull/328)
 
 1. Add file extension automatically for record plugin.
     * [Pull Request 303](https://github.com/ignitionrobotics/ign-gazebo/pull/303)
 
 1. Support spawning during log playback.
     * [Pull Request 346](https://github.com/ignitionrobotics/ign-gazebo/pull/346)
 
 ### Ignition Gazebo 2.24.0 (2020-09-03)
 
 1. Resource env var, with transport interface.

diff --git a/Migration.md b/Migration.md
@@ -48,6  48,9 @@ Gazebo 2  for playback. [BitBucket pull request
 #257](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/257)
 added an SDF message to the start of log files.
 
 * Log playback using `<path>` SDF parameter is deprecated. Use `--playback`
   command line argument instead.
 
 ## Ignition Gazebo 1.0.2 to 1.1.0
 
 * All headers in `gazebo/network` are no longer installed.

diff --git a/README.md b/README.md
@@ -139,13  139,7 @@ for dependency installation instructions for each supported operating system.
 
 **[Ubuntu Bionic](http://releases.ubuntu.com/18.04/)**
 
-1. Install third-party libraries:
-
-    ```
-    sudo apt-get -y install cmake build-essential curl cppcheck g  -8 libbenchmark-dev libgflags-dev doxygen ruby-ronn libtinyxml2-dev libtinyxml-dev software-properties-common libeigen3-dev qtdeclarative5-models-plugin
-    ```
-
-2. Install required Ignition libraries:
 1. Enable the Ignition software repositories:
 
     ```
     sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
@@ -163,8  157,16 @@ for dependency installation instructions for each supported operating system.
     sudo apt-get update
     ```
 
 2. Install package dependencies:
 
     ```
     git clone https://github.com/ignitionrobotics/ign-gazebo -b main
     ```
 
     ```
-    sudo apt-get -y install libignition-cmake2-dev libignition-common3-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-physics3-dev libignition-sensors5-dev libignition-rendering5-dev libignition-tools-dev libignition-transport9-dev libignition-gui5-dev libignition-msgs6-dev libsdformat10-dev
     export SYSTEM_VERSION=bionic
     sudo apt -y install \
       $(sort -u $(find . -iname 'packages-'$SYSTEM_VERSION'.apt' -o -iname 'packages.apt') | tr '\n' ' ')
     ```
 
 ### Building from source
@@ -175,17  177,21 @@ for dependency installation instructions for each supported operating system.
 
     * Ubuntu
 
         ```
         sudo apt-get install g  -8
         ```
 
         ```
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g   g   /usr/bin/g  -8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8
         ```
 
-1. Clone the repository.
 3. Clone the repository if you haven't already.
 
     ```
-    git clone https://github.com/ignitionrobotics/ign-gazebo -b master
     git clone https://github.com/ignitionrobotics/ign-gazebo -b main
     ```
 
-2. Configure and  build.
 4. Configure and build.
 
     ```
     cd ign-gazebo
@@ -276,7  282,7 @@ You can also generate the documentation from a clone of this repository by follo
 
 Follow these steps to run tests and static code analysis in your clone of this repository.
 
-1. Follow the [source install instruction](#source-install).
 1. Follow the [source install instructions](#source-install).
 
 2. Run tests.
 
@@ -286,6  292,10 @@ Follow these steps to run tests and static code analysis in your clone of this r
 
 3. Static code checker.
 
     ```
     sudo apt-get update && sudo apt-get -y install cppcheck
     ```
 
     ```
     make codecheck
     ```

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
@@ -1,4  1,4 @@
-FROM ubuntu:bionic
 FROM ubuntu:focal
 
 RUN apt-get update \
  && apt-get install -y \

diff --git a/docker/Dockerfile.ignition b/docker/Dockerfile.ignition
@@ -3,8  3,8 @@
 #   This docker file is used by build.bash and run.bash to build and run
 #   an Ignition distribution based on binaries. See the README.md file.
 
-# Ubuntu 18.04 with nvidia-docker2 beta opengl support
-FROM nvidia/opengl:1.0-glvnd-devel-ubuntu18.04
 # Ubuntu 20.04 with nvidia opengl support
 FROM nvidia/opengl:1.2-glvnd-devel-ubuntu20.04
 
 # Name of the Ignition distribution
 ARG ign_distribution