cf3 0.0.4 → 1.2.0

data/samples/dark_star.rb

@@ -26,8 +26,12 @@ def setup_the_sun
   end
 end
 
-def setup
+def settings
   size 600, 600
+end
+
+def setup
+  sketch_title 'Dark Star'
   setup_the_sun
   no_stroke
   color_mode HSB, 1.0
@@ -43,5 +47,3 @@ def draw_it
   @sun.render :start, size: height/7,  stop_size: 0.8,
   start_x: width/2, start_y: height/2
 end
-
-

data/samples/data/java_args.txt

@@ -1,2 +1 @@
--Xmn128m -Xms512m -Xmx512m -XX:+OptimizeStringConcat -XX:CompileCommand=dontinline,org.jruby.runtime.invokedynamic.InvokeDynamicSupport::invocationFallback 
-
+-XX:InlineSmallCode=500 -Xms256m -Xmx2g -XX:NewSize=64m -XX:MaxNewSize=64m

data/samples/dragon.rb

@@ -6,11 +6,11 @@ INV_SQRT = 1 / Math.sqrt(2)
 
 def setup_the_dragon
   @dragon = ContextFree.define do
-    
+
     shape :start do
       dragon alpha: 1
     end
-    
+
     shape :dragon do
       square hue: 0, brightness: 0, saturation: 1, alpha: 0.02
       split do
@@ -20,12 +20,16 @@ def setup_the_dragon
         rewind
       end
     end
-    
+
   end
 end
 
-def setup
+def settings
   size 800, 500
+end
+
+def setup
+  sketch_title 'Heighway Dragon'
   setup_the_dragon
   smooth
   draw_it

data/samples/escher.rb

@@ -1,124 +1,123 @@
 require 'cf3'
 
-def setup_the_birds 
-    
-    
-    @birds= ContextFree.define do
-        
-        ############ Begin defining custom terminal, an wavy_triangle triangle	  
-        class << self
-            SQRT3 = Math.sqrt(3)
-            define_method(:wavy_diamond) do |some_options| # wavy_triangle triangle
-                size, options = *self.get_shape_values(some_options)
-                rot = options[:rotation]
-                x0 = options[:x]
-                y0 = options[:y]
-                disp = options[:disp]
-                col = options[:color]
-                pts = Array.new(16)
-                pts[0] = PVector.new(x0 - 0.25 * size, y0 - size / SQRT3)     # A
-                pts[2] = PVector.new(x0 + 0.75 * size, y0 - size / SQRT3)     # B
-                pts[4] = PVector.new(x0 + 0.25 * size, y0 + (SQRT3 * size) / 6) # C
-                pts[6] = PVector.new(x0 - 0.75 * size, y0 + (SQRT3 * size) / 6) # D
-                pts[1] = get_mid_point(pts[0], pts[2])#Ab
-                pts[3] = get_mid_point(pts[2], pts[4])#Bc
-                pts[5] = get_mid_point(pts[4], pts[6])#Cd
-                pts[7] = get_mid_point(pts[6], pts[0])#Da
-                pts[8] = get_mid_point(pts[0], pts[1])#Aba
-                adjust_bezier(pts[8], PI/2, -disp * size)#Aba
-                pts[9] = get_mid_point(pts[1], pts[2])
-                adjust_bezier(pts[9], PI/2, disp * size)
-                pts[10] = get_mid_point(pts[2], pts[3])
-                adjust_bezier(pts[10], PI/3, disp * size)
-                pts[11] = get_mid_point(pts[3], pts[4])
-                adjust_bezier(pts[11], PI/3, -disp * size)
-                pts[12] = get_mid_point(pts[4], pts[5])
-                adjust_bezier(pts[12], PI/2, disp * size)
-                pts[13] = get_mid_point(pts[5], pts[6])
-                adjust_bezier(pts[13], PI/2, -disp * size)
-                pts[14] = get_mid_point(pts[6], pts[7])
-                adjust_bezier(pts[14], PI/3, -disp * size)
-                pts[15] = get_mid_point(pts[7], pts[0])
-                adjust_bezier(pts[15], PI/3, disp * size)
-                rotate(rot) if rot
-                fill *col
-                begin_shape
-                    vertex(pts[0].x, pts[0].y)
-                    bezier_vertex(pts[0].x, pts[0].y, pts[8].x, pts[8].y, pts[1].x, pts[1].y)
-                    bezier_vertex(pts[1].x, pts[1].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[3].x, pts[3].y)
-                    bezier_vertex(pts[3].x, pts[3].y, pts[11].x, pts[11].y, pts[4].x, pts[4].y)
-                    bezier_vertex(pts[4].x, pts[4].y, pts[12].x, pts[12].y, pts[5].x, pts[5].y)
-                    bezier_vertex(pts[5].x, pts[5].y, pts[13].x, pts[13].y, pts[6].x, pts[6].y)
-                    bezier_vertex(pts[6].x, pts[6].y, pts[14].x, pts[14].y, pts[7].x, pts[7].y)
-                    bezier_vertex(pts[7].x, pts[7].y, pts[15].x, pts[15].y, pts[0].x, pts[0].y)
-                    vertex(pts[0].x, pts[0].y)
-                    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))
-                end
-                
-                def get_mid_point(a, b)
-                    mid = PVector.add(a, b)
-                    mid.div(2)
-                    return mid
-                end
-            end
-            
-            ########### End definition of custom terminal 'wavy_diamond' shape
-            shape :birds do
-                bird size: 0.1
-                split do	    
-                10.times do |i|
-                    split do
-                    10.times do |j|
-                        bird size: 1, x: (i * 0.5 + 0.25 * (j%2)), y: j * 0.435
-                        rewind
-                    end
-                    rewind
-                    end
-                end
-                end
-            end
-            
-            shape :bird do
-                wavy_diamond color: [38, 1, 1, 1]
-            end
-            
-            shape :bird do
-                wavy_diamond color: [180, 1, 1, 1]
-            end
-            
-            shape :bird do
-                wavy_diamond color: [36, 1, 1, 1]
-            end
-            
-            shape :bird do
-                wavy_diamond color: [0.2, 1, 1, 1]
-            end
-            
-            shape :bird do
-                wavy_diamond color: [0.01, 1, 1, 1]
+def setup_the_birds
+  @birds= ContextFree.define do
+    ############ Begin defining custom terminal, an wavy_triangle triangle
+    class << self
+      SQRT3 = Math.sqrt(3)
+      define_method(:wavy_diamond) do |some_options| # wavy_triangle triangle
+        options = self.get_shape_values(some_options)
+        size = options[:size]
+        rot = options[:rotation]
+        x0 = options[:x]
+        y0 = options[:y]
+        disp = options[:disp]
+        col = options[:color]
+        pts = Array.new(16)
+        pts[0] = Vec2D.new(x0 - 0.25 * size, y0 - size / SQRT3)       # A
+        pts[2] = Vec2D.new(x0 + 0.75 * size, y0 - size / SQRT3)       # B
+        pts[4] = Vec2D.new(x0 + 0.25 * size, y0 + (SQRT3 * size) / 6) # C
+        pts[6] = Vec2D.new(x0 - 0.75 * size, y0 + (SQRT3 * size) / 6) # D
+        pts[1] = get_mid_point(pts[0], pts[2])#Ab
+        pts[3] = get_mid_point(pts[2], pts[4])#Bc
+        pts[5] = get_mid_point(pts[4], pts[6])#Cd
+        pts[7] = get_mid_point(pts[6], pts[0])#Da
+        pts[8] = get_mid_point(pts[0], pts[1])#Aba
+        pts[8] += adjust_bezier(PI/2, -disp * size)#Aba
+        pts[9] = get_mid_point(pts[1], pts[2])
+        pts[9] += adjust_bezier(PI/2, disp * size)
+        pts[10] = get_mid_point(pts[2], pts[3])
+        pts[10] += adjust_bezier(PI/3, disp * size)
+        pts[11] = get_mid_point(pts[3], pts[4])
+        pts[11] += adjust_bezier(PI/3, -disp * size)
+        pts[12] = get_mid_point(pts[4], pts[5])
+        pts[12] += adjust_bezier(PI/2, disp * size)
+        pts[13] = get_mid_point(pts[5], pts[6])
+        pts[13] += adjust_bezier(PI/2, -disp * size)
+        pts[14] = get_mid_point(pts[6], pts[7])
+        pts[14] += adjust_bezier(PI/3, -disp * size)
+        pts[15] = get_mid_point(pts[7], pts[0])
+        pts[15] += adjust_bezier(PI/3, disp * size)
+        rotate(rot) if rot
+        fill *col
+        begin_shape
+        vertex(pts[0].x, pts[0].y)
+        bezier_vertex(pts[0].x, pts[0].y, pts[8].x, pts[8].y, pts[1].x, pts[1].y)
+        bezier_vertex(pts[1].x, pts[1].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[3].x, pts[3].y)
+        bezier_vertex(pts[3].x, pts[3].y, pts[11].x, pts[11].y, pts[4].x, pts[4].y)
+        bezier_vertex(pts[4].x, pts[4].y, pts[12].x, pts[12].y, pts[5].x, pts[5].y)
+        bezier_vertex(pts[5].x, pts[5].y, pts[13].x, pts[13].y, pts[6].x, pts[6].y)
+        bezier_vertex(pts[6].x, pts[6].y, pts[14].x, pts[14].y, pts[7].x, pts[7].y)
+        bezier_vertex(pts[7].x, pts[7].y, pts[15].x, pts[15].y, pts[0].x, pts[0].y)
+        vertex(pts[0].x, pts[0].y)
+        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)
+        (a + b) / 2.0
+      end
+    end
+
+    ########### End definition of custom terminal 'wavy_diamond' shape
+    shape :birds do
+      bird size: 0.1
+      split do
+        10.times do |i|
+          split do
+            10.times do |j|
+              bird size: 1, x: (i * 0.5 + 0.25 * (j%2)), y: j * 0.435
+              rewind
             end
-            
+            rewind
+          end
         end
+      end
     end
-    
-    def setup
-        size 1000, 800
-        setup_the_birds
-        draw_it
+
+    shape :bird do
+      wavy_diamond color: [38, 1, 1, 1]
     end
-    
-    def draw_it
-        background 255
-        @birds.render :birds, :start_x => 0, :start_y => 0, size: 1000, :disp => 0.32, color: [0, 1, 1, 1]
+
+    shape :bird do
+      wavy_diamond color: [180, 1, 1, 1]
+    end
+
+    shape :bird do
+      wavy_diamond color: [36, 1, 1, 1]
+    end
+
+    shape :bird do
+      wavy_diamond color: [0.2, 1, 1, 1]
     end
-    
-    def draw
-        # do nothing
+
+    shape :bird do
+      wavy_diamond color: [0.01, 1, 1, 1]
     end
+  end
+end
+
+def settings
+  size 1000, 800
+end
+
+def setup
+  sketch_title 'In pursuit of M.C. Escher'
+  setup_the_birds
+  draw_it
+end
+
+def draw_it
+  background 255
+  @birds.render :birds, :start_x => 0, :start_y => 0, size: 1000, :disp => 0.32, color: [0, 1, 1, 1]
+end
+
+def draw
+  # do nothing
+end

data/samples/fern.rb

@@ -7,29 +7,33 @@ require 'cf3'
 #######################################################
 
 def setup_the_fern
-  
+
   @fern = ContextFree.define do
-    
+
     shape :start do
-      fern rotation: 50, hue: 306
+      fern rotation: 8, hue: 306
     end
-    
+
     shape :fern do
-      circle size: 0.75, rotation: -10
+      square size: 0.75, rotation: -49
       split do
-        fern size: 0.92, y: -2, rotation: -5, hue: 306
+        fern size: 0.92, y: -2, rotation: 5, hue: 306
         rewind
         fern size: 0.5, y: -2, rotation: 90
-        rewind                                  
+        rewind
         fern size: 0.5, y: -2, rotation: -90
       end
     end
-    
+
   end
 end
 
-def setup
+def settings
   size 600, 600
+end
+
+def setup
+  sketch_title 'Fern'
   setup_the_fern
   no_stroke
 end

data/samples/hex_tube.rb

@@ -1,15 +1,15 @@
 #########################
-# hextube.rb by Martin Prout 
+# hextube.rb by Martin Prout
 #########################
 require 'cf3'
-#load_library :cf3
 
 def setup_the_hextube
   @hexa = ContextFree.define do
     ############ Begin defining custom terminal, as a hexagon (path C++ cfdg)
     class << self
-      define_method(:hexagon) do |some_options| 
-        size, options = *self.get_shape_values(some_options)
+      define_method(:hexagon) do |some_options|
+        options = self.get_shape_values(some_options)
+        size = options[:size]
         rot = (options[:rotation])? options[:rotation]: 0
         no_fill
         stroke(*options[:color])
@@ -19,29 +19,32 @@ def setup_the_hextube
           vertex(size * Math.cos(Math::PI * i/3 + rot), size * Math.sin(Math::PI * i/3 + rot))
         end
         end_shape(CLOSE)
-      end 
+      end
     end
     ########### End definition of custom terminal 'hexagon'
     shape :hextube do
-      hexa brightness: 1.0 
+      hexa brightness: 1.0
     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
 
-def setup
+def settings
   size 800, 800
-  background 0 
-  smooth
+end
+
+def setup
+  sketch_title 'Hex-Tube'
+  background 0
   setup_the_hextube
   draw_it
 end
 
 def draw_it
-  @hexa.render :hextube, start_x: width/2, start_y: height/2, 
+  @hexa.render :hextube, start_x: width/2, start_y: height/2,
                size: height/2.1, color: [60, 1, 1, 0.5]
 end

data/samples/isosceles.rb

@@ -2,26 +2,31 @@ require 'cf3'
 
 def setup_the_spiral
   @spiral= ContextFree.define do
-    ############ Begin defining custom terminal, an isoceles triangle     
-    class << self     
-      define_method(:isoceles) do |some_options| # isoceles triangle
-        size, options = *self.get_shape_values(some_options)
+    ############ Begin defining custom terminal, an isosceles triangle
+    class << self
+      define_method(:isosceles) do |some_options| # isosceles triangle
+        options = get_shape_values(some_options)
+        size = options[:size]
         rot = options[:rotation]
-        rotate(rot) if rot 
-        $app.triangle(-0.5 * size, -0.5 * size, -0.5 * size, 0.5 * size, 0.5 * size, 0.5 * size)
+        rotate(rot) if rot
+        @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
-    ########### End definition of custom terminal 'isoceles'
+    ########### End definition of custom terminal 'isosceles'
     shape :spiral do
-      isoceles brightness: -1, rotation: 90
-      spiral rotation: 135, size: 1/sqrt(2), x: 1/sqrt(2)
+      isosceles brightness: -1, rotation: 90
+      spiral rotation: 135, size: 1 / sqrt(2), x: 1 / sqrt(2)
     end
   end
 end
 
-def setup
+def settings
   size 800, 500
+end
+
+def setup
+  sketch_title 'Isosceles'
   setup_the_spiral
   draw_it
 end
@@ -32,5 +37,5 @@ end
 
 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