tidy up

Author: monkstone

contributed/Rakefile

@@ -15,5 +15,5 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  system "k9 -r #{sample_name}"
+  system "jruby --dev -S k9 -r #{sample_name}"
 end

contributed/data/java_args.txt

@@ -1 +1,3 @@
---add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d.opengl=ALL-UNNAMED 
+--add-opens java.base/java.nio=ALL-UNNAMED
+--add-opens java.desktop/java.awt=ALL-UNNAMED
+

contributed/data/sutcliffe.png

@@ -1,14 +1,13 @@
-load_libraries :my_dot, :color_group
+load_libraries :my_dot
 
 NUM_ELEM = 100
 PALETTE = %w[#F58F12 #0B9EE7 #4EA731 #F4D910 #F334E3 #202020]
-attr_reader :my_dots, :frm, :save_anim, :group
+attr_reader :my_dots, :frm, :save_anim, :colors
 
 def setup
   sketch_title 'Fading Arcs'
-  @group = ColorGroup.from_web_array(PALETTE)
-  colors = group.colors
-  background(group.last)
+  @colors = web_to_color_array(PALETTE)
+  background(colors.last)
   no_stroke
   @save_anim = false
   @my_dots = (0..NUM_ELEM).map do
@@ -22,7 +21,7 @@ def setup
 end
 
 def draw
-  fill(group.last, 10)
+  fill(colors.last, 10)
   rect(0, 0, width, height)
   my_dots.each(&:display)
   return unless save_anim

contributed/fading.rb

@@ -7,7 +7,7 @@ def setup
   sketch_title 'Recursive Pentagons'
   @strut_factor = 0.2
   @renderer = GfxRender.new self.g # so we can send Vec2D :to_vertex
-  group = ColorGroup.from_web_array(PALETTE.to_java(:string))
+  group = ColorGroup.from_web_array(PALETTE)
   @cols = group.colors
   background(cols.last)
   no_loop

contributed/recursive_pentagon.rb

@@ -45,9 +45,9 @@ def draw_progress_bar(progress)
   rect(100, (height / 2) - 30, (width - 200), 60)
   # Fill in the portion that's done:
   fill(gray)
-  rect(100, (height/2)-30, (width-200) * progress, 60)
+  rect(100, (height / 2) - 30, (width - 200) * progress, 60)
 end
 
-def draw_progress_text(progress)
-  text(format('%d%', (progress * 100).round), width / 2, (height / 2) + 50)
+def draw_progress_text(progress = 0)
+  text "#{(progress * 100).round}%", width / 2, (height / 2) + 50
 end