Anshorei
/
squib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor to remove instance_eval 

When you have a hammer...
dev
Andy Meneely 2015-06-11 17:19:17 -04:00
parent c5e00f1877
commit 243b3836c4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/squib/graphics/shapes.rb
View File

@ -84,15 +84,13 @@ module Squib
x, y, n = poly.x, poly.y, poly.n x, y, n = poly.x, poly.y, poly.n
inner_radius, outer_radius = poly.inner_radius, poly.outer_radius inner_radius, outer_radius = poly.inner_radius, poly.outer_radius
use_cairo do |cc| use_cairo do |cc|
poly.instance_eval do cc.rotate_about(x, y, trans.angle)
cc.rotate_about(x, y, trans.angle) cc.move_to(x + outer_radius, y) #i = 0, so cos(0)=1 and sin(0)=0
cc.move_to(x + outer_radius, y) #i = 0, so cos(0)=1 and sin(0)=0 theta = Math::PI / n.to_f # i.e. (2*pi) / (2*n)
theta = Math::PI / n.to_f # i.e. (2*pi) / (2*n) 0.upto(2 * n) do |i|
0.upto(2 * n) do |i| radius = i.even? ? outer_radius : inner_radius
radius = i.even? ? outer_radius : inner_radius cc.line_to(x + radius * Math::cos(i * theta),
cc.line_to(x + radius * Math::cos(i * theta), y + radius * Math::sin(i * theta))
y + radius * Math::sin(i * theta))
end
end end
cc.close_path cc.close_path
cc.fill_n_stroke(draw) cc.fill_n_stroke(draw)