@@ -67,7 +67,7 @@ puts "thread ------>" # from the given starting node, and travelling in the given direction # around the far node. - @midpoint = @edge.virtual_midpoint(@node, @direction, :exit) + @midpoint = @edge.virtual_midpoint(@node, @direction, :start) return continue_thread end @@ -95,7 +95,6 @@ puts " vector: %s" % vector puts " midpoint: %s" % @midpoint puts " direction: %s" % @direction puts " difference: %f" % difference - @thread.add_connection(@midpoint, vector, 4.5 * difference) @edge.mark(@node, @direction) lib/celtic_knot/builder.rb @@ -174,12 +174,17 @@ module CelticKnot # This will be a point offset some distance from the natural midpoint, # colinear with the edge. In this case, the direction parameter is # ignored, and the midpoint returned will always be the one nearest the - # reference node if phase is :enter, and the furthest if phase is :exit. + # reference node if phase is :enter, and the furthest if phase is :start. def virtual_midpoint(reference, direction, phase) - direction = midpoint - reference - distance = length/3 - offset = phase == :enter ? -1 : 1 # FIXME: don't hardcode the cable width - return reference + direction.normalize * (distance + offset) + direction = (midpoint - reference).normalize + + if phase == :start + return reference + direction * 0.75 * length + elsif phase == :enter + return reference + direction * 0.25 * length + else + raise ArgumentError, "unknown phase: #{phase.inspect}" + end end def vector(parallel, direction) lib/celtic_knot/edge.rb 825d93ff04f5064f7222704271f3abc1250f3ef7 Jamis Buck jamis@37signals.com http://github.com/jamis/celtic_knot/commit/95db7ecc70ce48b0688610361d4598e2ae1311ba 95db7ecc70ce48b0688610361d4598e2ae1311ba 2009-06-07T12:18:06-07:00 2009-06-07T12:18:06-07:00 compute midpoint of ignored edges better da89f8b745dfeb9613fd426ba6c490d3921be492 Jamis Buck jamis@37signals.com