Skip to content
Open
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
28 changes: 14 additions & 14 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -26,7 +26,7 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.43.0
rev: v0.48.0
hooks:
- id: markdownlint
args: [-c, .markdownlint.yaml, --fix]
Expand All @@ -37,17 +37,17 @@ repos:
- id: prettier

- repo: https://github.com/adrienverge/yamllint
rev: v1.35.1
rev: v1.38.0
hooks:
- id: yamllint

- repo: https://github.com/autowarefoundation/autoware-guideline-check
rev: 0.1.0
rev: 0.2.0
hooks:
- id: check-package-depends

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.10.0
rev: v0.10.2
hooks:
- id: flake8-ros
- id: prettier-xacro
Expand All @@ -57,42 +57,42 @@ repos:
- id: sort-package-xml

- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.10.0.1
rev: v0.11.0.1
hooks:
- id: shellcheck

- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.10.0-2
rev: v3.13.0-1
hooks:
- id: shfmt
args: [-w, -s, -i=4]

- repo: https://github.com/pycqa/isort
rev: 5.13.2
rev: 8.0.1
hooks:
- id: isort

- repo: https://github.com/psf/black
rev: 24.10.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.3.1
hooks:
- id: black
args: [--line-length=100]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v19.1.6
rev: v22.1.2
hooks:
- id: clang-format
types_or: [c++, c, cuda]

- repo: https://github.com/cpplint/cpplint
rev: 2.0.0
rev: 2.0.2
hooks:
- id: cpplint
args: [--quiet]
exclude: .cu

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.30.0
rev: 0.37.1
hooks:
- id: check-metaschema
files: ^.+/schema/.*schema\.json$
Expand All @@ -108,7 +108,7 @@ repos:
additional_dependencies: [prettier@2.7.1, "@prettier/plugin-xml@2.2.0"]

- repo: https://github.com/AleksaC/hadolint-py
rev: v2.12.1b3
rev: v2.14.0
hooks:
- id: hadolint
exclude: .svg$
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,9 @@ void PoseWithCovarianceHistory::update_shapes()
lines_->setColor(color_line.r, color_line.g, color_line.b, color_line.a);

while (spheres_.size() < history_.size()) {
spheres_.emplace_back(std::make_unique<rviz_rendering::Shape>(
rviz_rendering::Shape::Sphere, scene_manager_, scene_node_));
spheres_.emplace_back(
std::make_unique<rviz_rendering::Shape>(
rviz_rendering::Shape::Sphere, scene_manager_, scene_node_));
}
while (arrows_.size() < history_.size()) {
arrows_.emplace_back(std::make_unique<rviz_rendering::Arrow>(scene_manager_, scene_node_));
Expand Down Expand Up @@ -260,13 +261,14 @@ void PoseWithCovarianceHistory::update_shapes()
sphere->setPosition(position);
sphere->setOrientation(orientation);
sphere->setColor(color_sphere.r, color_sphere.g, color_sphere.b, color_sphere.a);
sphere->setScale(Ogre::Vector3(
static_cast<float>(
property_sphere_scale_->getFloat() * 2 * std::sqrt(covariance_3d_base_link(0, 0))),
static_cast<float>(
property_sphere_scale_->getFloat() * 2 * std::sqrt(covariance_3d_base_link(1, 1))),
static_cast<float>(
property_sphere_scale_->getFloat() * 2 * std::sqrt(covariance_3d_base_link(2, 2)))));
sphere->setScale(
Ogre::Vector3(
static_cast<float>(
property_sphere_scale_->getFloat() * 2 * std::sqrt(covariance_3d_base_link(0, 0))),
static_cast<float>(
property_sphere_scale_->getFloat() * 2 * std::sqrt(covariance_3d_base_link(1, 1))),
static_cast<float>(
property_sphere_scale_->getFloat() * 2 * std::sqrt(covariance_3d_base_link(2, 2)))));
}

if (property_path_view_->getBool()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,10 @@ void TrafficLightDisplay::updateTrafficLightBulbs(
}
bulb_display->setColor(color);

bulb_display->setPosition(Ogre::Vector3(
static_cast<float>(bulb.position.x), static_cast<float>(bulb.position.y),
static_cast<float>(bulb.position.z)));
bulb_display->setPosition(
Ogre::Vector3(
static_cast<float>(bulb.position.x), static_cast<float>(bulb.position.y),
static_cast<float>(bulb.position.z)));
const float radius = bulb_radius_property_->getFloat();
bulb_display->setScale(Ogre::Vector3(radius, radius, radius));
traffic_light_bulb_displays_[bulb.id] = std::move(bulb_display);
Expand Down
Loading