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.

Sign up for GitHub

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

Minor changes #9

Open
wants to merge 1 commit into
base: gsoc2021-Barycentric_coordinates_3-antoniospg
Choose a base branch
from
Open

Minor changes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ...ic_coordinates_3/include/CGAL/Barycentric_coordinates_3/Discrete_harmonic_coordinates_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ namespace Barycentric_coordinates {
/// \endcond

/// Number type.
typedef typename GeomTraits::FT FT;
using FT = typename GeomTraits::FT;

/// Point type.
typedef typename GeomTraits::Point_3 Point_3;
using Point_3 = typename GeomTraits::Point_3;

/// %Vector type.
typedef typename GeomTraits::Vector_3 Vector_3;
/// Vector type.
using Vector_3 = typename GeomTraits::Vector_3;

/// @}

Expand Down
8 changes: 4 additions & 4 deletions Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Mean_value_coordinates_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ namespace Barycentric_coordinates {
/// \endcond

/// Number type.
typedef typename GeomTraits::FT FT;
using FT = typename GeomTraits::FT;

/// Point type.
typedef typename GeomTraits::Point_3 Point_3;
using Point_3 = GeomTraits::Point_3;

/// %Vector type.
typedef typename GeomTraits::Vector_3 Vector_3;
/// Vector type.
using Vector_3 = typename GeomTraits::Vector_3;

/// @}

Expand Down
10 changes: 5 additions & 5 deletions Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Wachspress_coordinates_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ namespace Barycentric_coordinates {
/// \endcond

/// Number type.
typedef typename GeomTraits::FT FT;
using FT = typename GeomTraits::FT;

/// Point type.
typedef typename GeomTraits::Point_3 Point_3;
using Point_3 = typename GeomTraits::Point_3;

/// %Vector type.
typedef typename GeomTraits::Vector_3 Vector_3;
/// Vector type.
using Vector_3 = typename GeomTraits::Vector_3;

/// @}

Expand Down Expand Up @@ -286,7 +286,7 @@ namespace Barycentric_coordinates {

CGAL::Face_around_target_circulator<Polygon_mesh>
done(face_circulator);
done--; done --;
done-=2;

// Vector connecting query point to vertex;
const Vector_3 query_vertex = m_construct_vector_3(query, vertex_val);
Expand Down
12 changes: 4 additions & 8 deletions Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/tetrahedron_coordinates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ namespace Barycentric_coordinates{
OutIterator c_begin,
const GeomTraits& traits) {

return internal::tetrahedron_coordinates_impl(
p0, p1, p2, p3, query, c_begin, traits);
return internal::tetrahedron_coordinates_impl(p0, p1, p2, p3, query, c_begin, traits);
}

//return iterator(infer from point_3)
Expand All @@ -97,8 +96,7 @@ namespace Barycentric_coordinates{

using GeomTraits = typename Kernel_traits<Point_3>::Kernel;
const GeomTraits traits;
return tetrahedron_coordinates(
p0, p1, p2, p3, query, c_begin, traits);
return tetrahedron_coordinates(p0, p1, p2, p3, query, c_begin, traits);
}

/*!
Expand Down Expand Up @@ -153,8 +151,7 @@ namespace Barycentric_coordinates{
using FT = typename GeomTraits::FT;
std::vector<FT> coordinates;
coordinates.reserve(4);
internal::tetrahedron_coordinates_impl(
p0, p1, p2, p3, query, std::back_inserter(coordinates), traits);
internal::tetrahedron_coordinates_impl(p0, p1, p2, p3, query, std::back_inserter(coordinates), traits);
CGAL_assertion(coordinates.size() == 4);
return {coordinates[0], coordinates[1], coordinates[2], coordinates[3]};
}
Expand All @@ -171,8 +168,7 @@ namespace Barycentric_coordinates{

using GeomTraits = typename Kernel_traits<Point_3>::Kernel;
const GeomTraits traits;
return tetrahedron_coordinates_in_array(
p0, p1, p2, p3, query, traits);
return tetrahedron_coordinates_in_array(p0, p1, p2, p3, query, traits);
}

}
Expand Down