Skip to content

Commit

Permalink
Merge pull request #828 from ignitionrobotics/3-to-4-2021-05-20
Browse files Browse the repository at this point in the history
3 to 4 2021 05 20
  • Loading branch information
nkoenig authored May 20, 2021
2 parents b18f6ca + 20abc25 commit 6619271
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 6,510 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
id: ci
uses: ignition-tooling/action-ignition-ci@bionic
with:
codecov-token: ${{ secrets.CODECOV_TOKEN }}
codecov-enabled: true
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project(ignition-gazebo4 VERSION 4.8.0)
# Find ignition-cmake
#============================================================================
# If you get an error at this line, you need to install ignition-cmake
find_package(ignition-cmake2 2.3 REQUIRED)
find_package(ignition-cmake2 2.8.0 REQUIRED)

#============================================================================
# Configure the project
Expand Down
12 changes: 8 additions & 4 deletions include/ignition/gazebo/EntityComponentManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,11 @@ namespace ignition
/// return false to stop subsequent calls to the callback, otherwise
/// a true value should be returned.
/// \tparam ComponentTypeTs All the desired component types.
/// \warning This function should not be called outside of System's
/// PreUpdate, callback. The result of call after PreUpdate is invalid
/// \warning Since entity creation occurs during PreUpdate, this function
/// should not be called in a System's PreUpdate callback (it's okay to
/// call this function in the Update callback). If you need to call this
/// function in a system's PostUpdate callback, you should use the const
/// version of this method.
public: template <typename... ComponentTypeTs>
void EachNew(typename identity<std::function<
bool(const Entity &_entity,
Expand All @@ -425,8 +428,9 @@ namespace ignition
/// return false to stop subsequent calls to the callback, otherwise
/// a true value should be returned.
/// \tparam ComponentTypeTs All the desired component types.
/// \warning This function should not be called outside of System's
/// PreUpdate, callback. The result of call after PreUpdate is invalid
/// \warning Since entity creation occurs during PreUpdate, this function
/// should not be called in a System's PreUpdate callback (it's okay to
/// call this function in the Update or PostUpdate callback).
public: template <typename... ComponentTypeTs>
void EachNew(typename identity<std::function<
bool(const Entity &_entity,
Expand Down
6 changes: 6 additions & 0 deletions src/gui/plugins/component_inspector/ComponentInspector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,12 @@ void ComponentInspector::Update(const UpdateInfo &,
continue;
}

if (typeId == components::Light::typeId)
{
this->SetType("light");
continue;
}

if (typeId == components::Actor::typeId)
{
this->SetType("actor");
Expand Down
81 changes: 0 additions & 81 deletions tools/check_test_ran.py

This file was deleted.

129 changes: 0 additions & 129 deletions tools/code_check.sh

This file was deleted.

10 changes: 0 additions & 10 deletions tools/cppcheck_rules/header_guard.rule

This file was deleted.

9 changes: 0 additions & 9 deletions tools/cppcheck_rules/namespace_AZ.rule

This file was deleted.

Loading

0 comments on commit 6619271

Please sign in to comment.