Some fixes, some not resolved

Author: monkstone

external_library/gem/cf3/alhambra.rb

@@ -9,11 +9,11 @@
 
 def setup_the_tiles
   @tiles = ContextFree.define do
-    ############ Begin defining custom terminal, an wavy_triangle triangle        
+    ############ Begin defining custom terminal, an wavy_triangle triangle
     class << self
       SQRT3 = Math.sqrt(3)
       define_method(:wavy_triangle) do |some_options| # wavy_triangle triangle
-        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?
@@ -47,20 +47,20 @@ class << self
           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(theta, disp)
         Vec2D.new(Math.cos(theta) * disp, Math.sin(theta) * disp)
       end
-    
-      def get_mid_point(a, b) 
+
+      def get_mid_point(a, b)
         (a + b) / 2.0
       end
     end
-  
+
     ########### End definition of custom terminal 'wavy_triangle' shape
     shape :tiles do
       20.times do |i|

external_library/gem/cf3/hex_tube.rb

@@ -27,8 +27,8 @@ class << self
     end
 
     shape :hexa do |i = nil, j = 0.5|
-      hexagon size: 1, brightness: 1.0
-      hexa size: 0.9, rotation: 5 *j
+      hexagon(size: 1, brightness: 1.0)
+      hexa(size: 0.9, rotation: 5 * j)
     end
   end
 end

external_library/gem/cf3/isosceles.rb

@@ -5,11 +5,11 @@ def setup_the_spiral
     ############ Begin defining custom terminal, an isoceles triangle
     class << self
       define_method(:isoceles) do |some_options| # isoceles triangle
-        options = self.get_shape_values(some_options)
+        options = get_shape_values(some_options)
         size = options[:size]
         rot = options[:rotation]
         rotate(rot) if rot
-        self.app.triangle(-0.5 * size, -0.5 * size, -0.5 * size, 0.5 * size, 0.5 * size, 0.5 * size)
+        Processing.app.triangle(-0.5 * size, -0.5 * size, -0.5 * size, 0.5 * size, 0.5 * size, 0.5 * size)
         rotate(-rot) if rot
       end
     end
@@ -37,5 +37,5 @@ def draw
 
 def draw_it
   background 255
-  @spiral.render :spiral, size: height, start_x: width/3, start_y: height/2
+  @spiral.render :spiral, size: height, start_x: width / 3, start_y: height / 2
 end

external_library/gem/cf3/levy.rb

@@ -8,11 +8,11 @@ def setup_the_levy
     end
     shape :levy do
       square alpha: 0.1
-     split do
+      split do
         levy  size: 1/Math.sqrt(2), rotation: -45, x: 0.5, brightness: 0.9
         rewind
         levy  size: 1/Math.sqrt(2), rotation: 45, x: 0.5, brightness: 0.9
-     end
+      end
     end
   end
 end
@@ -28,12 +28,10 @@ def setup
   save_frame("levy.png")
 end
 
-
 def draw
   # Do nothing.
 end
 
-
 def draw_it
   background 255
   @levy.render :start, size: 250,  stop_size: 2,

external_library/gem/cf3/pcr.rb

@@ -11,7 +11,7 @@ def setup_the_gel
     ############ Begin defining custom terminal, a proportional horizontal bar
     class << self
       define_method(:hbar) do |some_options|
-        options = self.get_shape_values(some_options)
+        options = get_shape_values(some_options)
         size = options[:size]
         ht = some_options[:ht] || 0.1   # default hbar width is 0.1
         ratio = ht * size

external_library/gem/cf3/spiral.rb

@@ -35,6 +35,7 @@ def settings
 end
 
 def setup
+  sketch_title 'Spiral'
   setup_the_spiral
   no_stroke
   color_mode HSB, 1.0

external_library/gem/cf3/star.rb

@@ -5,32 +5,36 @@
 # from primitive terminals (renders on mouse clicked)
 ###
 
+def settings
+  size 400, 200
+end
+
 def setup
-  size 400, 200 
+  sketch_title 'Stars' 
   @stars = ContextFree.define do
-    
+
     shape :stars do
       split do
         sqstar size: 0.8, x: -1
         rewind
         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
 

external_library/gem/cf3/tree.rb

@@ -1,7 +1,6 @@
 # tree.rb by jashkenas
 # This sketch demonstrates a lil' Ruby DSL for defining
 # context-free drawings. Each shape rule calls itself by chance.
-
 require  'cf3'
 load_library :control_panel