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

Logging fix #976

Merged
merged 3 commits into from
Jan 9, 2024
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
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ WarningsAsErrors: >
-readability-identifier-length,
-readability-suspicious-call-argument
HeaderFilterRegex: '.*'
AnalyzeTemporaryDtors: false
FormatStyle: none
CheckOptions:
- key: modernize-use-override.AllowOverrideAndFinal
Expand Down
14 changes: 7 additions & 7 deletions tesseract_collision/vhacd/src/convex_decomposition_vhacd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ class ProgressCallback : public VHACD::IVHACD::IUserCallback
const char* const stage,
const char* operation) override
{
std::cout << std::setfill(' ') << std::setw(3) << std::lround(overallProgress + 0.5) << "% "
<< "[ " << stage << " " << std::setfill(' ') << std::setw(3) << lround(stageProgress + 0.5) << "% ] "
<< operation << std::endl;
std::cout << std::setfill(' ') << std::setw(3) << ceil(overallProgress) << "% "
<< "[ " << stage << " " << std::setfill(' ') << std::setw(3) << ceil(stageProgress) << "% ] " << operation
<< std::endl;
}
};

Expand Down Expand Up @@ -75,9 +75,9 @@ ConvexDecompositionVHACD::compute(const tesseract_common::VectorVector3d& vertic
par.m_findBestPlane = params_.find_best_plane;
par.m_callback = &progress_callback;

bool res = interfaceVHACD->Compute(&points_local[0],
bool res = interfaceVHACD->Compute(points_local.data(),
static_cast<unsigned int>(points_local.size() / 3),
(const uint32_t*)(&triangles_local[0]),
triangles_local.data(),
static_cast<unsigned int>(triangles_local.size() / 3),
par);

Expand All @@ -92,9 +92,9 @@ ConvexDecompositionVHACD::compute(const tesseract_common::VectorVector3d& vertic

auto vhacd_vertices = std::make_shared<tesseract_common::VectorVector3d>();
vhacd_vertices->reserve(ch.m_points.size());
for (std::size_t i = 0; i < ch.m_points.size(); ++i)
for (const auto& m_point : ch.m_points)
{
Eigen::Vector3d v(ch.m_points[i].mX, ch.m_points[i].mY, ch.m_points[i].mZ);
Eigen::Vector3d v(m_point.mX, m_point.mY, m_point.mZ);
vhacd_vertices->push_back(v);
}

Expand Down
Loading