@@ -67,14 +67,13 @@ module CelticKnot far_midpoint = far_edge.virtual_midpoint(far, direction, :enter) if far_edge == edge - difference = 1.0 + arc = 1.0 else - difference = edge.difference(far_edge, direction) - difference = 1.0 if difference == 0.0 + arc = edge.difference(far_edge, direction) + arc = 1.0 if arc == 0.0 end - distance = ((far - midpoint).length + (far - far_midpoint).length) - magnitude = Math::PI * distance * difference + distance = (far - midpoint).length + (far - far_midpoint).length if $DEBUG puts "%d: %s %s" % [step, node, edge] @@ -83,12 +82,13 @@ module CelticKnot puts " vector: %s" % vector puts " midpoint: %s" % midpoint puts " direction: %s" % direction - puts " difference: %f" % difference - puts " distance: %f" % distance - puts " magnitude: %f" % magnitude + puts " arc: %f" % arc end - thread.add_connection(midpoint, vector.normalize, magnitude, edge.normal?) + thread.add_connection(:at => midpoint, :vector => vector.normalize, + :arc => arc, + :weight => Math::PI * arc * distance, :intersection => edge.normal?) + edge.mark(node, direction) edge, midpoint = far_edge, far_midpoint @@ -115,13 +115,25 @@ module CelticKnot loop do far = near[:next] - near[:curve] = Curves::Hermite.new([near[:at], near[:vector] * near[:magnitude], far[:at], far[:vector] * near[:magnitude]]) + near_vector = best_vector_for(near) * near[:weight] + far_vector = best_vector_for(far) * near[:weight] + + near[:curve] = Curves::Hermite.new([near[:at], near_vector, far[:at], far_vector]) near = far break if near == thread.head end end + def best_vector_for(connection) + connection[:best_vector] ||= begin + prev_at = connection[:prev][:arc] >= 0.5 ? connection[:at] : connection[:prev][:at] + next_at = connection[:arc] >= 0.5 ? connection[:at] : connection[:next][:at] + + next_at == prev_at ? connection[:vector] : (next_at - prev_at).normalize + end + end + def compute_overlaps threads.each { |thread| compute_overlaps_for(thread.head) } end lib/celtic_knot/knot.rb @@ -19,14 +19,9 @@ module CelticKnot self end - def add_connection(point, vector, magnitude, intersection) - connection = { :at => point, - :vector => vector, - :magnitude => magnitude, - :thread => self, - :intersection => intersection } - - knot.overlaps[point] << connection + def add_connection(data) + connection = data.merge(:thread => self) + knot.overlaps[connection[:at]] << connection @head ||= connection @tail ||= connection lib/celtic_knot/thread.rb 2c80716a81f6923cd3118bd4a564aa577f1111d4 Jamis Buck jamis@37signals.com http://github.com/jamis/celtic_knot/commit/1935fd8d2dac366b57496cecc50c50a895df5acd 1935fd8d2dac366b57496cecc50c50a895df5acd 2009-06-17T22:14:22-07:00 2009-06-17T22:14:22-07:00 smarter vector interpolation 1761c29fb8df9db6092cb9e43f213216536478a7 Jamis Buck jamis@37signals.com