cf3 0.0.5 → 1.0.0

data/lib/cf3/version.rb

@@ -1,3 +1,3 @@
 module Cf3
-  VERSION = "0.0.5"
+  VERSION = '1.0.0'
 end

data/samples/Rakefile

@@ -0,0 +1,30 @@
+# Simple demo Rakefile to autorun samples in current directory
+# adjust path to k9 executable, and or opts as required
+
+SAMPLES_DIR = './'
+
+desc 'run demo'
+task default: [:demo]
+
+desc 'demo'
+task :demo do
+  samples_list.shuffle.each { |sample| run_sample sample }
+end
+
+def samples_list
+  files = []
+  Dir.chdir(SAMPLES_DIR)
+  Dir.glob('*.rb').each do |file|
+    files << File.join(SAMPLES_DIR, file)
+  end
+  return files
+end
+
+def run_sample(sample_name)
+  puts "Running #{sample_name}...quit to run next sample"
+  open("|k9 -r #{sample_name}", 'r') do |io|
+    while l = io.gets
+      puts(l.chop)
+    end
+  end
+end

data/samples/accident.rb

@@ -1,26 +1,28 @@
 #########################
-# rubystar.rb 
+# rubystar.rb
 #########################
-require 'cf3' 
+require 'cf3'
 
 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)
-        rot = options[:rotation]        
+      define_method(:sharp) do |some_options|
+        options = get_shape_values(some_options)
+        size = options[:size]
+        rot = options[:rotation]
         #f = (options[:flip])? -1 : 1
-        @app.rotate(rot) if rot 
+        @app.rotate(rot) if rot
         #@app.triangle(0, 0, size * cos(0), size * sin(0), size * cos(PI * f/5), size * sin(PI*f/5))
         @app.triangle(0, 0, size * cos(0), size * sin(0), size * cos(PI/5), size * sin(PI/5))
         @app.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]
         f = (options[:flip])? -1 : 1                           # NB custom flip adjustment
         @app.triangle(0, 0, size * cos(0), size * sin(0), size/PHI * cos(PI * f/5 ), size/PHI * sin(PI * f/5))
@@ -28,51 +30,49 @@ def setup_the_sunstar
       end
     end
     ########### End definition of custom terminals 'sharp and flat'
-    
+
     shape :tiling do
       outer brightness: 1.0
     end
-  
-    
+
     shape :outer do
       split do
-      10.times do       
+      10.times do
         sunstar y: sqrt((PHI)** - 0.125), rotation: 36
       end
       rewind
       end
       outer size: 1/PHI
-    end  
-    
-    
+    end
+
     shape :sunstar do
       split do
-      sun brightness: 0.9, alpha: 1.0 
+      sun brightness: 0.9, alpha: 1.0
       rewind
       star brightness: 0.9, alpha: 0.8
       rewind
       end
     end
-    
+
     shape :dart do
-      flat size: 1, hue: 65, sat: 0.9, brightness: 0.9 
+      flat size: 1, hue: 65, sat: 0.9, brightness: 0.9
       flat size: 1, hue: 65, sat: 1.0, brightness: 1.0, flip: true
     end
-    
-    shape :kite do 
-      sharp size: 1, hue: 0, sat: 0.9, brightness: 0.9 
+
+    shape :kite do
+      sharp size: 1, hue: 0, sat: 0.9, brightness: 0.9
       sharp size: 1, hue: 0, sat: 1.0, brightness: 1.0, 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|
@@ -84,14 +84,18 @@ def setup_the_sunstar
   end
 end
 
-def setup
+def settings
   size 800, 800
-  background 255  
+end
+
+def setup
+  sketch_title 'Accident'
+  background 255
   setup_the_sunstar
   draw_it
 end
 
 def draw_it
-  @hexa.render :tiling, start_x: width * 0.75, start_y: height/2.64, 
-               size: height/6 
+  @hexa.render :tiling, start_x: width * 0.75, start_y: height/2.64,
+               size: height/6
 end

data/samples/alhambra.rb

@@ -8,34 +8,36 @@ RED = [17, 0.983, 0.231, 1]
 COLORS = [GOLD, BLACK, GREEN, BLUE, RED]
 
 def setup_the_tiles
-  @tiles= ContextFree.define do
-    ############ Begin defining custom terminal, an wavy_triangle triangle        
-    class << self    
+  @tiles = ContextFree.define do
+    ############ Begin defining custom terminal, an wavy_triangle triangle
+    class << self
+      SQRT3 = Math.sqrt(3)
       define_method(:wavy_triangle) do |some_options| # wavy_triangle triangle
-        size, options = *self.get_shape_values(some_options)
+        options = get_shape_values(some_options)
+        size = options[:size]
         rot = options[:rotation]
         disp = 0.32          # could introduce a rule option?
         x0 = options[:x]
         y0 = options[:y]
         pts = Array.new(12)
-        pts[0] = PVector.new(x0, y0 - size/Math.sqrt(3))                  # A
-        pts[1] = PVector.new(x0 - 0.5 * size, y0 + (Math.sqrt(3)*size)/6) # B
-        pts[2] = PVector.new(x0 + 0.5 * size, y0 + (Math.sqrt(3)*size)/6) # C
-        pts[3] = get_mid_point(pts[0], pts[1])                            # Ab
-        pts[4] = get_mid_point(pts[1], pts[2])                            # Bc
-        pts[5] = get_mid_point(pts[0], pts[2])                            # Ca
-        pts[6] = get_mid_point(pts[0], pts[3])                            # Aba
-        adjust_bezier(pts[6], PI/3, disp*size)                            # Aba
-        pts[7] = get_mid_point(pts[3], pts[1])                            # Abb
-        adjust_bezier(pts[7], PI/3, -disp*size)                           # Abb
+        pts[0] = Vec2D.new(x0, y0 - size / SQRT3)                    # A
+        pts[1] = Vec2D.new(x0 - 0.5 * size, y0 + SQRT3 * size / 6)   # B
+        pts[2] = Vec2D.new(x0 + 0.5 * size, y0 + SQRT3 * size / 6)   # C
+        pts[3] = get_mid_point(pts[0], pts[1])                       # Ab
+        pts[4] = get_mid_point(pts[1], pts[2])                       # Bc
+        pts[5] = get_mid_point(pts[0], pts[2])                       # Ca
+        pts[6] = get_mid_point(pts[0], pts[3])                       # Aba
+        pts[6] += adjust_bezier(PI/3, disp * size)                   # Aba
+        pts[7] = get_mid_point(pts[3], pts[1])                       # Abb
+        pts[7] += adjust_bezier(PI/3, -disp * size)                  # Abb
         pts[8] = get_mid_point(pts[1], pts[4])
-        adjust_bezier(pts[8], PI/2, -disp*size)
+        pts[8] += adjust_bezier(PI/2, -disp * size)
         pts[9] = get_mid_point(pts[4], pts[2])
-        adjust_bezier(pts[9], PI/2, disp*size)
+        pts[9] += adjust_bezier(PI/2, disp * size)
         pts[10] = get_mid_point(pts[2], pts[5])
-        adjust_bezier(pts[10], -PI/3, -disp*size)
+        pts[10] += adjust_bezier(-PI/3, -disp * size)
         pts[11] = get_mid_point(pts[5], pts[0])
-        adjust_bezier(pts[11], -PI/3, disp*size)
+        pts[11] += adjust_bezier(-PI/3, disp * size)
         rotate(rot) if rot
         begin_shape
           vertex(pts[0].x, pts[0].y)
@@ -45,22 +47,20 @@ def setup_the_tiles
           bezier_vertex(pts[4].x, pts[4].y, pts[9].x, pts[9].y, pts[2].x, pts[2].y)
           bezier_vertex(pts[2].x, pts[2].y, pts[10].x, pts[10].y, pts[5].x, pts[5].y)
           bezier_vertex(pts[5].x, pts[5].y, pts[11].x, pts[11].y, pts[0].x, pts[0].y)
-        end_shape(CLOSE)        
+        end_shape(CLOSE)
         rotate(-rot) if rot
       end
-    
+
       private
-      def adjust_bezier(base, theta, disp)
-        base.add(PVector.new(Math.cos(theta)*disp, Math.sin(theta)*disp))
+      def adjust_bezier(theta, disp)
+        Vec2D.new(Math.cos(theta) * disp, Math.sin(theta) * disp)
       end
-    
+
       def get_mid_point(a, b)
-        mid = PVector.add(a, b)
-        mid.div(2)
-        return mid
+        (a + b) / 2.0
       end
     end
-  
+
     ########### End definition of custom terminal 'wavy_triangle' shape
     shape :tiles do
       20.times do |i|
@@ -72,10 +72,13 @@ def setup_the_tiles
   end
 end
 
-def setup
+def settings
   size 1024, 720
+end
+
+def setup
+  sketch_title 'Alhambra Tiling'
   background 255
-  smooth
   setup_the_tiles
   draw_it
 end

data/samples/bar_code.rb

@@ -9,77 +9,81 @@ require 'cf3'
 def setup_the_barcode
   @barcode = ContextFree.define do
     ############ Begin defining custom terminal, a proportional vertical bar
-    class << self      
-      define_method(:vbar) do |some_options| 
-        size, options = *self.get_shape_values(some_options)
+    class << self
+      define_method(:vbar) do |some_options|
+        options = self.get_shape_values(some_options)
+        size = options[:size]
         w = some_options[:w]|| 0.1    # default vbar width is 0.1
-        ratio = w * size 
+        ratio = w * size
         rot = options[:rotation]
         rect_mode(CENTER)
-        rotate(rot) if rot 
+        rotate(rot) if rot
         rect(-0.5 * ratio, -0.4 * size, 0.5 * ratio, 0.6 * size)
         rotate(-rot) if rot
-      end 
+      end
     end
     ########### End definition of custom terminal 'vbar'
-    
+
     shape :strip do
       2.times do
-        end_bar x: 0.09 
-      end 
+        end_bar x: 0.09
+      end
       4.times do
         five x: 0.04
       end
       2.times do
         end_bar x: 0.09
-      end  
+      end
     end
-      
+
     shape :bar, 1 do             # wide
       vbar size: 0.8, w: 0.08, brightness: -1
     end
-    
+
     shape :bar, 1 do             # wide
       vbar size: 0.8, w: 0.06, brightness: -1
     end
-    
+
     shape :bar, 1.6 do             # narrow
       vbar size: 0.8, w: 0.02, brightness: -1
     end
-    
+
     shape :bar, 1.6 do             # narrow
       vbar size: 0.8, w: 0.03, brightness: -1
     end
-    
+
     shape :end_bar, 1.6 do         # narrow extra long
       vbar size: 1, w: 0.03, brightness: -1
     end
 
     shape :five do
       5.times do
-      bar x: 0.06
-    end
-    end      
+        bar x: 0.06
+      end
     end
   end
+end
 
-def setup
+def settings
   size 350, 200
+end
+
+def setup
+  sketch_title 'Bar Code'
   text_font(create_font("Dialog.plain", 24), 24)
   background 255, 255, 0
   draw_text
-  smooth
   setup_the_barcode
   draw_it
 end
 
 def draw_it
-  @barcode.render :strip, start_x: 0, start_y: height, 
+  @barcode.render :strip, start_x: 0, start_y: height,
                size: height
 end
 
 def draw_text
-  code = "23467"  
+  code = "23467"
   fill 0
   text code, 40, 80
 end

data/samples/city.rb

@@ -1,10 +1,10 @@
 # city.rb after city.cfdg
 
-require 'cf3'  # NB: requires ruby 1.9 for rand range
+require 'cf3'
 
 def setup_the_city
   @city = ContextFree.define do
-    
+
     shape :neighborhood do
       split do
         block x: -0.25, y: -0.25
@@ -16,29 +16,32 @@ def setup_the_city
         block x: -0.25, y: 0.25
       end
     end
-    
+
     shape :block do
       buildings size: 0.85
     end
-    
+
     shape :block, 5 do
       neighborhood size: 0.5, rotation: rand(-PI..PI), hue: rand(2), brightness: rand(0.75..1.75)
     end
-    
+
     shape :block, 0.1 do
       # Do nothing
     end
-    
+
     shape :buildings do
       square
     end
-    
+
   end
 end
 
-def setup
+def settings
   size 600, 600
-  smooth
+end
+
+def setup
+  sketch_title 'City'
   setup_the_city
   @background = color 255, 255, 255
   draw_it
@@ -50,8 +53,8 @@ end
 
 def draw_it
   background @background
-  @city.render :neighborhood, 
-               start_x: width/2, start_y: height/2, 
+  @city.render :neighborhood,
+               start_x: width/2, start_y: height/2,
                size: height/2.5, color: [0.1, 0.1, 0.1]
 end
 

data/samples/creature.rb

@@ -4,7 +4,7 @@ require 'cf3'
 
 def setup_the_creature
   @creature = ContextFree.define do
-    
+
     shape :start do
       rot = 0
       split do
@@ -16,26 +16,30 @@ def setup_the_creature
         legs rotation: 360
       end
     end
-    
+
     shape :legs do
       circle hue:  54, saturation: 0.5, brightness: 1.0
       legs y: 0.1, size: 0.96
     end
-    
+
     shape :legs, 0.01 do
       circle
       split do
-        legs rotation: 3 
+        legs rotation: 3
         rewind
         legs rotation: -3
       end
     end
-    
+
   end
 end
 
-def setup
+def settings
   size 600, 600
+end
+
+def setup
+  sketch_title 'Creature'
   setup_the_creature
   no_stroke
 end