Skip to content

Commit fa1b0e7

Browse files
committed
Use different function names to try to unconfuse the Win compiler
CURA-12743
1 parent 548abb6 commit fa1b0e7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/project.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ using Polygon = std::vector<Point2F>;
3232
* \param face_id The ID of the initial face to project onto, other will be propagated using connectivity information.
3333
* \return A vector of polygons in UV space resulting from the projection.
3434
*/
35-
std::vector<Polygon> project(
35+
std::vector<Polygon> doProject(
3636
const std::span<Point2F>& stroke_polygon,
3737
const std::span<Point3F>& mesh_vertices,
3838
const std::span<Face>& mesh_indices,

pyUvula/pyUvula.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace py = pybind11;
1515

16-
py::tuple unwrap(const py::array_t<float>& vertices_array, const py::array_t<int32_t>& indices_array)
16+
py::tuple pyUnwrap(const py::array_t<float>& vertices_array, const py::array_t<int32_t>& indices_array)
1717
{
1818
// input shaping
1919
const pybind11::buffer_info vertices_buf = vertices_array.request();
@@ -86,7 +86,7 @@ py::list pyProject(
8686
const float* camera_normal_ptr = static_cast<float*>(camera_normal_buf.ptr);
8787
const Vector3F camera_normal(camera_normal_ptr[0], camera_normal_ptr[1], camera_normal_ptr[2]);
8888

89-
std::vector<Polygon> result = project(
89+
std::vector<Polygon> result = doProject(
9090
stroke_polygon,
9191
mesh_vertices,
9292
mesh_indices,
@@ -122,6 +122,6 @@ PYBIND11_MODULE(pyUvula, module)
122122
module.doc() = "UV-unwrapping library (or bindings to library), segmentation uses a classic normal-based grouping and charts packing uses xatlas";
123123
module.attr("__version__") = PYUVULA_VERSION;
124124

125-
module.def("unwrap", &unwrap, "Given the vertices, indices of a mesh, unwrap UV for texture-coordinates.");
125+
module.def("unwrap", &pyUnwrap, "Given the vertices, indices of a mesh, unwrap UV for texture-coordinates.");
126126
module.def("project", &pyProject, "Projects a stroke polygon into an object texture.");
127127
}

src/project.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ std::vector<Polygon> toPolygons(const ClipperLib::Paths& paths)
155155
return result;
156156
}
157157

158-
std::vector<Polygon> project(
158+
std::vector<Polygon> doProject(
159159
const std::span<Point2F>& stroke_polygon,
160160
const std::span<Point3F>& mesh_vertices,
161161
const std::span<Face>& mesh_indices,

0 commit comments

Comments
 (0)