Skip to content

Commit

Permalink
Updated exchange module to use sample size
Browse files Browse the repository at this point in the history
  • Loading branch information
Onur R. Bingol committed Apr 19, 2018
1 parent 54ccb1d commit 13f4c26
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions geomdl/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 13f4c26

Please sign in to comment.