Skip to content

Commit a017346

Browse files
orbingolorbingol
committed
Rename function that is responsible for generating triangle and vertex objects
1 parent 4c5fcf6 commit a017346

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

‎docs/module_exchange.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ This module allows users to export NURBS surfaces in common CAD exchange formats
55

66
.. automodule:: geomdl.exchange
77
:members:
8-
:exclude-members: _make_triangles, save_obj_single, save_obj_multi, save_stl_ascii_single, save_stl_ascii_multi, save_stl_binary_single, save_stl_binary_multi, save_off_single, save_off_multi
8+
:exclude-members: _gen_triangles_vertices, save_obj_single, save_obj_multi, save_stl_ascii_single, save_stl_ascii_multi, save_stl_binary_single, save_stl_binary_multi, save_off_single, save_off_multi
99
:undoc-members:

‎geomdl/exchange.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ def save_off(surf_in=None, file_name=None, **kwargs):
8686
save_off_single(surf_in, file_name=file_name, vertex_spacing=vertex_spacing)
8787

8888

89-
# Generates triangles for saving as a Wavefront OBJ file
90-
def _make_triangles(points, row_size, col_size, vertex_spacing):
89+
# Generates triangles
90+
def _gen_triangles_vertices(points, row_size, col_size, vertex_spacing):
9191
points2d = []
9292
for i in range(0, col_size):
9393
row_list = []
@@ -174,10 +174,10 @@ def save_obj_single(surface=None, **kwargs):
174174
try:
175175
with open(file_name, 'w') as fp:
176176
fp.write("# Generated by NURBS-Python\n")
177-
vertices, triangles = _make_triangles(surface.surfpts,
178-
int((1.0 / surface.delta) + 1),
179-
int((1.0 / surface.delta) + 1),
180-
vertex_spacing)
177+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
178+
int((1.0 / surface.delta) + 1),
179+
int((1.0 / surface.delta) + 1),
180+
vertex_spacing)
181181

182182
# Write vertices
183183
for vert_row in vertices:
@@ -243,10 +243,10 @@ def save_obj_multi(surface_list=(), **kwargs):
243243
surface.delta = surface_list.delta
244244

245245
# Generate triangles
246-
vertices, triangles = _make_triangles(surface.surfpts,
247-
int((1.0 / surface.delta) + 1),
248-
int((1.0 / surface.delta) + 1),
249-
vertex_spacing)
246+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
247+
int((1.0 / surface.delta) + 1),
248+
int((1.0 / surface.delta) + 1),
249+
vertex_spacing)
250250

251251
# Collect vertices
252252
for vert_row in vertices:
@@ -308,10 +308,10 @@ def save_stl_ascii_single(surface=None, **kwargs):
308308
# Create the file and start saving triangulated surface points
309309
try:
310310
with open(file_name, 'w') as fp:
311-
vertices, triangles = _make_triangles(surface.surfpts,
312-
int((1.0 / surface.delta) + 1),
313-
int((1.0 / surface.delta) + 1),
314-
vertex_spacing)
311+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
312+
int((1.0 / surface.delta) + 1),
313+
int((1.0 / surface.delta) + 1),
314+
vertex_spacing)
315315

316316
fp.write("solid Surface\n")
317317
for t in triangles:
@@ -363,10 +363,10 @@ def save_stl_ascii_multi(surface_list=(), **kwargs):
363363
# Set surface delta
364364
surface.delta = surface_list.delta
365365

366-
vertices, triangles = _make_triangles(surface.surfpts,
367-
int((1.0 / surface.delta) + 1),
368-
int((1.0 / surface.delta) + 1),
369-
vertex_spacing)
366+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
367+
int((1.0 / surface.delta) + 1),
368+
int((1.0 / surface.delta) + 1),
369+
vertex_spacing)
370370
for t in triangles:
371371
line = "\tfacet normal " + str(t.normal[0]) + " " + str(t.normal[1]) + " " + str(t.normal[2]) + "\n"
372372
fp.write(line)
@@ -408,10 +408,10 @@ def save_stl_binary_single(surface=None, **kwargs):
408408
# Create the file and start saving triangulated surface points
409409
try:
410410
with open(file_name, 'wb') as fp:
411-
vertices, triangles = _make_triangles(surface.surfpts,
412-
int((1.0 / surface.delta) + 1),
413-
int((1.0 / surface.delta) + 1),
414-
vertex_spacing)
411+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
412+
int((1.0 / surface.delta) + 1),
413+
int((1.0 / surface.delta) + 1),
414+
vertex_spacing)
415415

416416
# Write triangle list to the binary STL file
417417
fp.write(b'\0' * 80) # header
@@ -459,10 +459,10 @@ def save_stl_binary_multi(surface_list=(), **kwargs):
459459
# Set surface delta
460460
surface.delta = surface_list.delta
461461

462-
vertices, triangles = _make_triangles(surface.surfpts,
463-
int((1.0 / surface.delta) + 1),
464-
int((1.0 / surface.delta) + 1),
465-
vertex_spacing)
462+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
463+
int((1.0 / surface.delta) + 1),
464+
int((1.0 / surface.delta) + 1),
465+
vertex_spacing)
466466
triangles_list += triangles
467467

468468
# Write triangle list to the binary STL file
@@ -502,10 +502,10 @@ def save_off_single(surface=None, **kwargs):
502502
try:
503503
with open(file_name, 'w') as fp:
504504
fp.write("OFF\n")
505-
vertices, triangles = _make_triangles(surface.surfpts,
506-
int((1.0 / surface.delta) + 1),
507-
int((1.0 / surface.delta) + 1),
508-
vertex_spacing)
505+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
506+
int((1.0 / surface.delta) + 1),
507+
int((1.0 / surface.delta) + 1),
508+
vertex_spacing)
509509

510510
line = str(len(vertices) * len(vertices[0])) + " " + str(len(triangles)) + " 0\n"
511511
fp.write(line)
@@ -564,10 +564,10 @@ def save_off_multi(surface_list=(), **kwargs):
564564
surface.delta = surface_list.delta
565565

566566
# Generate triangles
567-
vertices, triangles = _make_triangles(surface.surfpts,
568-
int((1.0 / surface.delta) + 1),
569-
int((1.0 / surface.delta) + 1),
570-
vertex_spacing)
567+
vertices, triangles = _gen_triangles_vertices(surface.surfpts,
568+
int((1.0 / surface.delta) + 1),
569+
int((1.0 / surface.delta) + 1),
570+
vertex_spacing)
571571

572572
# Collect vertices
573573
for vert_row in vertices:

0 commit comments

Comments
 (0)