From 13f4c2619c57b592065cb4d4f2cd960ef14c2545 Mon Sep 17 00:00:00 2001 From: "Onur R. Bingol" Date: Thu, 19 Apr 2018 01:21:11 -0500 Subject: [PATCH] Updated exchange module to use sample size --- geomdl/exchange.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/geomdl/exchange.py b/geomdl/exchange.py index 316c1d28..4014f396 100644 --- a/geomdl/exchange.py +++ b/geomdl/exchange.py @@ -176,8 +176,7 @@ def save_obj_single(surface=None, **kwargs): with open(file_name, 'w') as fp: fp.write("# Generated by NURBS-Python\n") vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) # Write vertices @@ -245,8 +244,7 @@ def save_obj_multi(surface_list=(), **kwargs): # Generate triangles vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) # Collect vertices @@ -310,8 +308,7 @@ def save_stl_ascii_single(surface=None, **kwargs): try: with open(file_name, 'w') as fp: vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) fp.write("solid Surface\n") @@ -365,9 +362,9 @@ def save_stl_ascii_multi(surface_list=(), **kwargs): surface.delta = surface_list.delta vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) + for t in triangles: line = "\tfacet normal " + str(t.normal[0]) + " " + str(t.normal[1]) + " " + str(t.normal[2]) + "\n" fp.write(line) @@ -410,8 +407,7 @@ def save_stl_binary_single(surface=None, **kwargs): try: with open(file_name, 'wb') as fp: vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) # Write triangle list to the binary STL file @@ -461,8 +457,7 @@ def save_stl_binary_multi(surface_list=(), **kwargs): surface.delta = surface_list.delta vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) triangles_list += triangles @@ -504,8 +499,7 @@ def save_off_single(surface=None, **kwargs): with open(file_name, 'w') as fp: fp.write("OFF\n") vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) line = str(len(vertices) * len(vertices[0])) + " " + str(len(triangles)) + " 0\n" @@ -566,8 +560,7 @@ def save_off_multi(surface_list=(), **kwargs): # Generate triangles vertices, triangles = _gen_triangles_vertices(surface.surfpts, - int((1.0 / surface.delta) + 1), - int((1.0 / surface.delta) + 1), + surface.sample_size, surface.sample_size, vertex_spacing) # Collect vertices