Skip to content

P
Printrun
Commit 83c49a7b authored by Guillaume Seguin's avatar Guillaume Seguin
Browse files
Options

Improve new 3D viz by correctly handling heavy U-turns

parent 40a15df6
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 28 deletions
printrun/gl/libtatlin/actors.py
View file @ 83c49a7b
...@@ -359,7 +359,7 @@ class GcodeModel(Model): ...@@ -359,7 +359,7 @@ class GcodeModel(Model):
# to store coordinates/colors/normals. # to store coordinates/colors/normals.
# Nicely enough we have 3 per kind of thing for all kinds. # Nicely enough we have 3 per kind of thing for all kinds.
coordspervertex = 3 coordspervertex = 3
verticesperline = 4 verticesperline = 8
coordsperline = coordspervertex * verticesperline coordsperline = coordspervertex * verticesperline
coords_count = lambda nlines: nlines * coordsperline coords_count = lambda nlines: nlines * coordsperline
...@@ -372,7 +372,7 @@ class GcodeModel(Model): ...@@ -372,7 +372,7 @@ class GcodeModel(Model):
trianglesperbox = trianglesperface * facesperbox trianglesperbox = trianglesperface * facesperbox
verticespertriangle = 3 verticespertriangle = 3
indicesperbox = verticespertriangle * trianglesperbox indicesperbox = verticespertriangle * trianglesperbox
boxperline = 1 boxperline = 2
indicesperline = indicesperbox * boxperline indicesperline = indicesperbox * boxperline
indices_count = lambda nlines: nlines * indicesperline indices_count = lambda nlines: nlines * indicesperline
...@@ -412,6 +412,8 @@ class GcodeModel(Model): ...@@ -412,6 +412,8 @@ class GcodeModel(Model):
ntravelcoords = travel_coords_count(nlines) ntravelcoords = travel_coords_count(nlines)
ncoords = coords_count(nlines) ncoords = coords_count(nlines)
nindices = indices_count(nlines) nindices = indices_count(nlines)
# TODO: only reallocate memory if needed
# compute ncoords(nlines-lines_processed)+vertex_k
if ncoords != vertices.size: if ncoords != vertices.size:
self.travels.resize(ntravelcoords, refcheck = False) self.travels.resize(ntravelcoords, refcheck = False)
self.vertices.resize(ncoords, refcheck = False) self.vertices.resize(ncoords, refcheck = False)
...@@ -475,33 +477,70 @@ class GcodeModel(Model): ...@@ -475,33 +477,70 @@ class GcodeModel(Model):
avg_move_normal_y /= norm avg_move_normal_y /= norm
delta_angle = move_angle - prev_move_angle delta_angle = move_angle - prev_move_angle
delta_angle = (delta_angle + twopi) % twopi delta_angle = (delta_angle + twopi) % twopi
fact = math.cos(delta_angle / 2) fact = abs(math.cos(delta_angle / 2))
fact = max(0.3, abs(fact)) # If move is turning too much, avoid creating a big peak
# TODO: Handle cases where the above would create a "peak" # by adding an intermediate box
# at the intersection by adding an extra set of vertices
# and facets
if fact < 0.5: if fact < 0.5:
pass # FIXME: It looks like there's some heavy code duplication here...
hw = path_halfwidth / fact hw = path_halfwidth
# Compute vertices p1x = prev_pos[0] - hw * prev_move_normal_x
p1x = prev_pos[0] - hw * avg_move_normal_x p2x = prev_pos[0] + hw * prev_move_normal_x
p2x = prev_pos[0] + hw * avg_move_normal_x p1y = prev_pos[1] - hw * prev_move_normal_y
p1y = prev_pos[1] - hw * avg_move_normal_y p2y = prev_pos[1] + hw * prev_move_normal_y
p2y = prev_pos[1] + hw * avg_move_normal_y new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] + path_halfheight))
new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] + path_halfheight)) new_vertices.extend((p1x, p1y, prev_pos[2]))
new_vertices.extend((p1x, p1y, prev_pos[2])) new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] - path_halfheight))
new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] - path_halfheight)) new_vertices.extend((p2x, p2y, prev_pos[2]))
new_vertices.extend((p2x, p2y, prev_pos[2])) new_normals.extend((0, 0, 1))
new_normals.extend((0, 0, 1)) new_normals.extend((-prev_move_normal_x, -prev_move_normal_y, 0))
new_normals.extend((-avg_move_normal_x, -avg_move_normal_y, 0)) new_normals.extend((0, 0, -1))
new_normals.extend((0, 0, -1)) new_normals.extend((prev_move_normal_x, prev_move_normal_y, 0))
new_normals.extend((avg_move_normal_x, avg_move_normal_y, 0)) first = vertex_k / 3
first = vertex_k / 3 # Link to previous
# Link to previous new_indices += triangulate_box(prev_id, prev_id + 1,
new_indices += triangulate_box(prev_id, prev_id + 1, prev_id + 2, prev_id + 3,
prev_id + 2, prev_id + 3, first, first + 1,
first, first + 1, first + 2, first + 3)
first + 2, first + 3) p1x = prev_pos[0] - hw * move_normal_x
p2x = prev_pos[0] + hw * move_normal_x
p1y = prev_pos[1] - hw * move_normal_y
p2y = prev_pos[1] + hw * move_normal_y
new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] + path_halfheight))
new_vertices.extend((p1x, p1y, prev_pos[2]))
new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] - path_halfheight))
new_vertices.extend((p2x, p2y, prev_pos[2]))
new_normals.extend((0, 0, 1))
new_normals.extend((-move_normal_x, -move_normal_y, 0))
new_normals.extend((0, 0, -1))
new_normals.extend((move_normal_x, move_normal_y, 0))
prev_id += 4
first += 4
# Link to previous
new_indices += triangulate_box(prev_id, prev_id + 1,
prev_id + 2, prev_id + 3,
first, first + 1,
first + 2, first + 3)
else:
hw = path_halfwidth / fact
# Compute vertices
p1x = prev_pos[0] - hw * avg_move_normal_x
p2x = prev_pos[0] + hw * avg_move_normal_x
p1y = prev_pos[1] - hw * avg_move_normal_y
p2y = prev_pos[1] + hw * avg_move_normal_y
new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] + path_halfheight))
new_vertices.extend((p1x, p1y, prev_pos[2]))
new_vertices.extend((prev_pos[0], prev_pos[1], prev_pos[2] - path_halfheight))
new_vertices.extend((p2x, p2y, prev_pos[2]))
new_normals.extend((0, 0, 1))
new_normals.extend((-avg_move_normal_x, -avg_move_normal_y, 0))
new_normals.extend((0, 0, -1))
new_normals.extend((avg_move_normal_x, avg_move_normal_y, 0))
first = vertex_k / 3
# Link to previous
new_indices += triangulate_box(prev_id, prev_id + 1,
prev_id + 2, prev_id + 3,
first, first + 1,
first + 2, first + 3)
else: else:
# Compute vertices normal to the current move and cap it # Compute vertices normal to the current move and cap it
p1x = prev_pos[0] - path_halfwidth * move_normal_x p1x = prev_pos[0] - path_halfwidth * move_normal_x
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment