From 9fc2aa8a82d43ea36a1ef61e40fae1d3c88ffa36 Mon Sep 17 00:00:00 2001 From: Michael Kirsch Date: Sat, 25 May 2019 01:52:42 +0200 Subject: [PATCH] rename IO transform function --- xs/src/admesh/stl.h | 2 +- xs/src/admesh/util.c | 2 +- xs/src/libslic3r/TriangleMesh.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xs/src/admesh/stl.h b/xs/src/admesh/stl.h index 033e3f5eb..3596e5de4 100644 --- a/xs/src/admesh/stl.h +++ b/xs/src/admesh/stl.h @@ -202,7 +202,7 @@ extern void stl_mirror_xy(stl_file *stl); extern void stl_mirror_yz(stl_file *stl); extern void stl_mirror_xz(stl_file *stl); extern void stl_transform(stl_file *stl, float const *trafo3x4); -extern void stl_transform(stl_file const *stl_src, stl_file *stl_dst, float const *trafo3x4); +extern void stl_get_transform(stl_file const *stl_src, stl_file *stl_dst, float const *trafo3x4); extern void stl_open_merge(stl_file *stl, ADMESH_CHAR *file); extern void stl_invalidate_shared_vertices(stl_file *stl); extern void stl_generate_shared_vertices(stl_file *stl); diff --git a/xs/src/admesh/util.c b/xs/src/admesh/util.c index 3330ca5b6..8797db0fe 100644 --- a/xs/src/admesh/util.c +++ b/xs/src/admesh/util.c @@ -203,7 +203,7 @@ void stl_transform(stl_file *stl, float const *trafo3x4) { calculate_normals(stl); } -void stl_transform(stl_file const *stl_src, stl_file *stl_dst, float const *trafo3x4) { +void stl_get_transform(stl_file const *stl_src, stl_file *stl_dst, float const *trafo3x4) { int i_face, i_vertex, i, j; if (stl_src->error || stl_dst->error) return; diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp index 66a2b42ca..9f43b9141 100644 --- a/xs/src/libslic3r/TriangleMesh.cpp +++ b/xs/src/libslic3r/TriangleMesh.cpp @@ -284,7 +284,7 @@ TriangleMesh TriangleMesh::get_transformed_mesh(TransformationMatrix const & tra { TriangleMesh mesh; std::vector trafo_arr = trafo.matrix3x4f(); - stl_transform(&(this->stl), &(mesh.stl), trafo_arr.data()); + stl_get_transform(&(this->stl), &(mesh.stl), trafo_arr.data()); stl_invalidate_shared_vertices(&(mesh.stl)); return mesh; }