cf3 0.0.5 → 1.0.0

data/samples/pcr.rb

@@ -9,23 +9,24 @@ require 'cf3'
 def setup_the_gel
   @pcr = ContextFree.define do
     ############ Begin defining custom terminal, a proportional horizontal bar
-    class << self   
+    class << self
       define_method(:hbar) do |some_options|
-        size, options = *self.get_shape_values(some_options)
-        ht = some_options[:ht]|| 0.1    # default hbar width is 0.1
-        ratio = ht * size 
+        options = get_shape_values(some_options)
+        size = options[:size]
+        ht = some_options[:ht] || 0.1   # default hbar width is 0.1
+        ratio = ht * size
         rot = options[:rotation]
         rect_mode(CENTER)
-        rotate(rot) if rot 
+        rotate(rot) if rot
         rect(-0.5 * size, -0.5 * ratio, 0.5 * size, 0.5 * ratio)
       end
     end
     ########### End definition of custom terminal 'hbar'
- 
+
     shape :gel do
       dna brightness: 1.0
     end
- 
+
     shape :dna do
       split do
         26.times do
@@ -34,43 +35,46 @@ def setup_the_gel
         end
       end
     end
- 
-    shape :band do       # narrow band with 0.66' probability        
+
+    shape :band do       # narrow band with 0.66' probability
       hbar size: 0.8, ht: 0.1, brightness: 0.3, alpha: 0.3, hue: 251, saturation: 1.0
       band brightness: 0.5
     end
- 
-    shape :band, 0.5 do   # double width band with 0.33' probability      
+
+    shape :band, 0.5 do   # double width band with 0.33' probability
       hbar size: 0.8, ht: 0.15, brightness: 0.8, alpha: 0.6, hue: -36, saturation: 1.0
       band brightness: 0.5
     end
- 
-    shape :band, 0.08 do  # a low probability empty rule used to end recursion     
-    end 
-   
-    shape :band do             
+
+    shape :band, 0.08 do  # a low probability empty rule used to end recursion
+    end
+
+    shape :band do
       band y: -0.23
     end
- 
-    shape :band do         
+
+    shape :band do
       band y: 0.17
     end
- 
+
     shape :band do
-       band y: 0.29 
+       band y: 0.29
     end
 
     shape :band do
-      band y: -0.33 
+      band y: -0.33
     end
 
   end
 end
 
-def setup
+def settings
   size 500, 300
+end
+
+def setup
+  sketch_title 'PCR gel'
   background 0, 0, 180
-  smooth
   setup_the_gel
   draw_it
 end
@@ -80,7 +84,7 @@ def draw
 end
 
 def draw_it
-  @pcr.render :gel, start_x: -50, start_y: height/2, 
+  @pcr.render :gel, start_x: -50, start_y: height/2,
                size: height/5, color: [252, 0.8, 0.8, 1.0]
 end
 

data/samples/rubystar.rb

@@ -1,5 +1,5 @@
 #########################
-# rubystar.rb 
+# rubystar.rb
 # Adding two custom "triangle" shapes.
 # These flat and sharp primitives are
 # used to make dart and kite shapes (for penrose?)
@@ -10,18 +10,20 @@ PHI = (1 + Math.sqrt(5)) / 2
 
 def setup_the_sunstar
   @hexa = ContextFree.define do
-  ############ Begin defining custom terminals, as a sharp and flat triangles 
+  ############ Begin defining custom terminals, as a sharp and flat triangles
     class << self
     include Math
-      define_method(:sharp) do |some_options|      
-        size, options = *self.get_shape_values(some_options)
+      define_method(:sharp) do |some_options|
+        options = get_shape_values(some_options)
+        size = options[:size]
         rot = options[:rotation]
-        rotate(rot) if rot           # NB: sin(0) = 0, cos(0) = 1                                         
+        rotate(rot) if rot           # NB: sin(0) = 0, cos(0) = 1
         @app.triangle(0, 0, size, 0, size * cos(PI/5), size * sin(PI/5))
         rotate(-rot) if rot
       end
-      define_method(:flat) do |some_options|      
-        size, options = *self.get_shape_values(some_options)
+      define_method(:flat) do |some_options|
+        options = get_shape_values(some_options)
+        size = options[:size]
         rot = options[:rotation]
         rotate(rot) if rot
         f = (options[:flip])? -1 : 1  # flip adjustment NB: sin(0) = 0, cos(0) = 1
@@ -30,31 +32,31 @@ def setup_the_sunstar
       end
     end
     ########### End definition of custom terminals 'sharp and flat'
-    shape :tiling do    
+    shape :tiling do
       sun brightness: 0.8
       star brightness: 0.8, alpha: 0.8
       tiling size: 1/PHI, brightness: 1.0
     end
-  
+
     shape :dart do
       flat size: 1, color: [65, 0.6, 0.6, 1]
       flat size: 1, color: [65, 1.0, 1.0, 1], flip: true
     end
-  
+
     shape :kite do
       sharp size: 1, color: [0, 0.6, 0.6, 1]
       sharp size: 1, color: [0, 1.0, 1.0, 1], rotation: 180, flip: true
     end
-  
-    shape :star do    
+
+    shape :star do
       split do
         5.times do |i|
-          dart rotation: 72 * i 
+          dart rotation: 72 * i
           rewind
         end
       end
     end
-  
+
     shape :sun do
       split do
         5.times do |i|
@@ -66,14 +68,18 @@ def setup_the_sunstar
   end
 end
 
-def setup
+def settings
   size 800, 800
+end
+
+def setup
+  sketch_title 'Ruby Star'
   background 150, 20, 0, 1
   setup_the_sunstar
   draw_it
 end
 
 def draw_it
-  @hexa.render :tiling, start_x: width/2, start_y: height/2, 
-               size: height 
+  @hexa.render :tiling, start_x: width/2, start_y: height/2,
+               size: height
 end

data/samples/sierpinski.rb

@@ -1,42 +1,46 @@
-require 'cf3' 
+require 'cf3'
 
 load_library 'control_panel'
 
 attr_accessor :resolution, :panel, :hide
 
-def setup_the_triangle  
+def setup_the_triangle
   @triangle = ContextFree.define do
     shape :tri do
-      triangle size: 0.5, rotation: 180
+      triangle size: 0.5
       split do
-        tri size: 0.5, y: -0.578, x: 0, 
+        tri size: 0.5, y: -0.578, x: 0,
         hue: 288, saturation: 0.2, brightness: 0.8
         rewind
-        tri size: 0.5, y: 0.289, x: -0.5, hue: 72, 
+        tri size: 0.5, y: 0.289, x: -0.5, hue: 72,
         saturation: 0.2, brightness: 0.8
         rewind
-        tri size: 0.5, y: 0.289, x: 0.5, hue: 72, 
+        tri size: 0.5, y: 0.289, x: 0.5, hue: 72,
         saturation: 0.2, brightness: 0.8
       end
-    end    
+    end
   end
 end
 
-def setup
+def settings
   size 600, 600
+end
+
+def setup
+  sketch_title 'Sierpinski'
   setup_the_triangle
   no_stroke
   @hide = false
   @resolution = 5
   control_panel do |p|
-    p.look_feel "Metal"	# optionall set look and feel  
+    p.look_feel 'Nimbus'	# optional set look and feel  
     p.slider :resolution, (2..50), 5
     @panel = p
   end
 end
 
 def draw
-  unless hide	
+  unless hide
     panel.set_visible(true) # display panel after sketch frame
     @hide = true
   end
@@ -45,5 +49,5 @@ def draw
 end
 
 def mouse_clicked
-  @hide = false	
+  @hide = false
 end

data/samples/spiral.rb

@@ -4,7 +4,7 @@ require 'cf3'
 
 def setup_the_spiral
   @spiral = ContextFree.define do
-    
+
     shape :start do
        split do
        star rotation: 240
@@ -14,14 +14,14 @@ def setup_the_spiral
        star rotation: 0
        end
     end
-    
+
     shape :base do
        triangle hue: 180
        base rotation:  3, size: 0.98, x: 0.09, brightness: 1.01
     end
-    
+
     shape :star do
-       split do             
+       split do
        base brightness: 0.8, rotation: 80
        rewind
        base brightness: 0.8, rotation: 40
@@ -29,25 +29,29 @@ def setup_the_spiral
        base brightness: 0.8, rotation: 0
        end
     end
-    
+
   end
 end
- 
-def setup
+
+def settings
   size 600, 600
+end
+
+def setup
+  sketch_title 'Spiral'
   setup_the_spiral
   no_stroke
   color_mode HSB, 1.0
   draw_it
 end
- 
+
 def draw
   # Do nothing.
 end
- 
+
 def draw_it
   background 0.33, 0.25, 0.2
   @spiral.render :start, size: height/5, stop_size: 1,
-                         color: [0.35, 0.4, 0.9, 0.25], 
+                         color: [0.35, 0.4, 0.9, 0.25],
                          start_x: width/2, start_y: height/2
 end

data/samples/star.rb

@@ -5,10 +5,14 @@ require 'cf3'
 # from primitive terminals (renders on mouse clicked)
 ###
 
+def settings
+  size 400, 200
+end
+
 def setup
-  size 400, 200 
+  sketch_title 'Star Shapes'
   @stars = ContextFree.define do
-    
+
     shape :stars do
       split do
         sqstar size: 0.8, x: -1
@@ -16,21 +20,21 @@ def setup
         trstar x: 1
       end
     end
-    
+
     shape :sqstar do
       square
       square rotation: 45
     end
-    
+
     shape :trstar do
       triangle
       triangle rotation: 180
     end
-  end 
+  end
 end
 
 def draw_it
-  background 0.2 
+  background 0.2
   @stars.render :stars, size: height/2, color: [220, 1, 1, 1]
 end
 

data/samples/tree.rb

@@ -9,25 +9,25 @@ attr_reader :panel, :hide
 
 def setup_the_trees
   control_panel do |panel|
-    panel.look_feel "Metal"
-    panel.slider :srand, (0..100), 50
+    panel.look_feel 'Nimbus'
+    panel.slider :srand, (0..100), 48.85
     @panel = panel
   end
-  
+
   @tree = ContextFree.define do
-    
+
     shape :seed do
       square
       leaf y: 0 if size < 4.5 && rand < 0.018
       flower y: 0 if size < 2.0 && rand < 0.02
       seed y: -1, size: 0.986, rotation: 3, brightness: 0.989
     end
-    
+
     shape :seed, 0.1 do
       square
       seed flip: true
     end
-    
+
     shape :seed, 0.04 do
       square
       split do
@@ -38,26 +38,29 @@ def setup_the_trees
         seed size: 0.8, rotation: rand(50)
       end
     end
-    
+
     shape :leaf do
       the_size = rand(25)
       the_x = [1, 0, 0, 0][rand(4)]
       circle size: the_size, hue: 54, saturation: 1.25, brightness: 0.9, x: the_x
     end
-    
+
     shape :flower do
-      split saturation: 0, brightness: rand(1.3)+4.7, w: rand(15)+10, h: rand(2)+2 do
-	(0 .. 135).step(45) do |rot|      
+      split saturation: 0, brightness: rand(1.3..6.0), w: rand(15..25), h: rand(2..4) do
+        (0..135).step(45) do |rot|
           oval rotation: rot
-	end
+        end
       end
-    end    
-  end  
+    end
+  end
 end
 
+def settings
+  size 800, 800
+end
 
 def setup
-  size 800, 800
+  sketch_title 'Tree'
   @hide = false
   setup_the_trees
   no_stroke
@@ -74,13 +77,13 @@ end
 def draw_it
   Kernel::srand(@srand) if @srand
   background(color(rand(0 .. 255), rand(0 .. 255), rand(0 .. 255), 255))
-  @tree.render :seed, start_x: width/2, start_y: height+20, 
+  @tree.render :seed, start_x: width/2, start_y: height+20,
                       size: height/60, color: [252, 0.15, 0.8, 1]
 end
 
 def mouse_clicked
   @hide = false
-  panel.set_visible(true)  
+  panel.set_visible(true)
   draw_it
   @hide = true
 end