3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1665 from hroncok/admesh

Browse Source 
Rename some admesh functions to preserve compatibility with oiriginal admesh #1525
This commit is contained in:
Alessandro Ranellucci 2014-01-02 06:33:15 -08:00
commit 380a083a3e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xs/src/TriangleMesh.cpp
View File

@ -139,12 +139,12 @@ void TriangleMesh::scale(std::vector<double> versor)
fversor[0] = versor[0]; fversor[0] = versor[0];
fversor[1] = versor[1]; fversor[1] = versor[1];
fversor[2] = versor[2]; fversor[2] = versor[2];
stl_scale(&this->stl, fversor); stl_scale_versor(&this->stl, fversor);
} }
void TriangleMesh::translate(float x, float y, float z) void TriangleMesh::translate(float x, float y, float z)
{ {
stl_translate(&(this->stl), x, y, z); stl_translate_relative(&(this->stl), x, y, z);
} }
void TriangleMesh::align_to_origin() void TriangleMesh::align_to_origin()

4
xs/src/admesh/stl.h
View File

@ -154,8 +154,8 @@ extern void stl_fill_holes(stl_file *stl);
extern void stl_fix_normal_directions(stl_file *stl); extern void stl_fix_normal_directions(stl_file *stl);
extern void stl_fix_normal_values(stl_file *stl); extern void stl_fix_normal_values(stl_file *stl);
extern void stl_reverse_all_facets(stl_file *stl); extern void stl_reverse_all_facets(stl_file *stl);
extern void stl_translate(stl_file *stl, float x, float y, float z); extern void stl_translate_relative(stl_file *stl, float x, float y, float z);
extern void stl_scale(stl_file *stl, float versor[3]); extern void stl_scale_versor(stl_file *stl, float versor[3]);
extern void stl_scale(stl_file *stl, float factor); extern void stl_scale(stl_file *stl, float factor);
extern void stl_rotate_x(stl_file *stl, float angle); extern void stl_rotate_x(stl_file *stl, float angle);
extern void stl_rotate_y(stl_file *stl, float angle); extern void stl_rotate_y(stl_file *stl, float angle);

6
xs/src/admesh/util.c
View File

@ -77,7 +77,7 @@ stl_verify_neighbors(stl_file *stl)
} }
void void
stl_translate(stl_file *stl, float x, float y, float z) stl_translate_relative(stl_file *stl, float x, float y, float z)
{ {
int i; int i;
int j; int j;
@ -102,7 +102,7 @@ stl_translate(stl_file *stl, float x, float y, float z)
} }
void void
stl_scale(stl_file *stl, float versor[3]) stl_scale_versor(stl_file *stl, float versor[3])
{ {
int i; int i;
int j; int j;
@ -145,7 +145,7 @@ stl_scale(stl_file *stl, float factor)
versor[0] = factor; versor[0] = factor;
versor[1] = factor; versor[1] = factor;
versor[2] = factor; versor[2] = factor;
stl_scale(stl, versor); stl_scale_versor(stl, versor);
} }
static void calculate_normals(stl_file *stl) static void calculate_normals(stl_file *stl)