Working thick lines for FieldPlanner

This commit is contained in:
2021-09-19 20:32:00 -05:00
parent 93c6430028
commit 0facd003f0

View File

@@ -66,11 +66,13 @@ module TAC
@unit = :inches @unit = :inches
@total_distance = 0 @total_distance = 0
@node_color = Gosu::Color.rgb(200, 100, 50) @node_color = 0xff_00f000
@segment_color = Gosu::Color.rgb(255, 127, 0) @node_hover_color = Gosu::Color::YELLOW
@segment_color = 0xaa_00f000
@node_radius = 6 @node_radius = 6
@segment_thickness = 2 @segment_thickness = 2
measure_path
refresh_panel refresh_panel
end end
@@ -107,12 +109,7 @@ module TAC
when Gosu::MS_RIGHT # Delete Node when Gosu::MS_RIGHT # Delete Node
result = @nodes.find do |node| result = @nodes.find do |node|
Gosu.distance( Gosu.distance(node.x, node.y, x, y) <= @node_radius * 0.25
node.x,
node.y,
x,
y
) <= 1.5
end end
@nodes.delete(result) if result @nodes.delete(result) if result
@@ -125,13 +122,18 @@ module TAC
end end
def display_path def display_path
x = (window.mouse_x - @field_container.x) / @field.scale
y = (window.mouse_y - @field_container.y) / @field.scale
last_node = @nodes.first last_node = @nodes.first
@nodes.each_with_index do |current_node, i| @nodes.each_with_index do |current_node, i|
mouse_near = Gosu.distance(current_node.x, current_node.y, x, y) <= @node_radius * 0.25
Gosu.draw_circle( Gosu.draw_circle(
current_node.x * @field.scale + @field_container.x, current_node.x * @field.scale + @field_container.x,
current_node.y * @field.scale + @field_container.y, current_node.y * @field.scale + @field_container.y,
@node_radius, 7, @node_color, 10 @node_radius, 7, mouse_near ? @node_hover_color : @node_color, 10
) )
next if i.zero? next if i.zero?
@@ -145,7 +147,7 @@ module TAC
distance = Gosu.distance(last_node.x, last_node.y, current_node.x, current_node.y) * @field.scale distance = Gosu.distance(last_node.x, last_node.y, current_node.x, current_node.y) * @field.scale
Gosu.rotate(angle, last_node.x * @field.scale, last_node.y * @field.scale) do Gosu.rotate(angle, last_node.x * @field.scale + @field_container.x, last_node.y * @field.scale + @field_container.y) do
Gosu.draw_rect( Gosu.draw_rect(
(@field_container.x + last_node.x * @field.scale) - (@segment_thickness / 2.0), (@field_container.x + last_node.x * @field.scale) - (@segment_thickness / 2.0),
(@field_container.y + last_node.y * @field.scale) - distance, (@field_container.y + last_node.y * @field.scale) - distance,
@@ -155,16 +157,6 @@ module TAC
) )
end end
# Gosu.draw_line(
# last_node.x * @field.scale + @field_container.x,
# last_node.y * @field.scale + @field_container.y,
# @segment_color,
# current_node.x * @field.scale + @field_container.x,
# current_node.y * @field.scale + @field_container.y,
# @segment_color,
# 3
# )
last_node = current_node last_node = current_node
end end
end end
@@ -192,27 +184,27 @@ module TAC
@total_distance_label.value = "#{inches_to_unit(@total_distance).round(2)}" @total_distance_label.value = "#{inches_to_unit(@total_distance).round(2)}"
@units_label.value = @unit.to_s.capitalize @units_label.value = @unit.to_s.capitalize
@points_container.clear do # @points_container.clear do
v1 = @nodes.first # v1 = @nodes.first
break unless v1 # break unless v1
para "Vector #{inches_to_unit(v1.x).round}:#{inches_to_unit(v1.y).round} - 0 #{@unit.to_s.capitalize}" # para "Vector #{inches_to_unit(v1.x).round}:#{inches_to_unit(v1.y).round} - 0 #{@unit.to_s.capitalize}"
@nodes.each_with_index do |v2, i| # @nodes.each_with_index do |v2, i|
next if i.zero? # next if i.zero?
distance = Gosu.distance( # distance = Gosu.distance(
v1.x + @field_container.x, # v1.x + @field_container.x,
v1.y + @field_container.y, # v1.y + @field_container.y,
v2.x + @field_container.x, # v2.x + @field_container.x,
v2.y + @field_container.y # v2.y + @field_container.y
) # )
para "Vector #{inches_to_unit(v1.x).round}:#{inches_to_unit(v1.y).round} - #{inches_to_unit(distance).round(2)} #{@unit.to_s.capitalize}" # para "Vector #{inches_to_unit(v1.x).round}:#{inches_to_unit(v1.y).round} - #{inches_to_unit(distance).round(2)} #{@unit.to_s.capitalize}"
v1 = v2 # v1 = v2
end # end
end # end
end end
def inches_to_unit(inches) def inches_to_unit(inches)