cf3 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf03ff4ab58c68a6bd23d96f7d63b8470e0dc0d
-  data.tar.gz: 91aefce6f4a52cc9a045876bb90a2762b66b7fb2
+  metadata.gz: 8f8af1424885f56dc32e59cbde844fceb924a4f9
+  data.tar.gz: 69c5707acfd748da7428921c2da6a2e085dbbffc
 SHA512:
-  metadata.gz: dd7e9fff158ddf4928772873aa5fa703693dfdee81873330c7dc1c05bfe4ca70a219d85866be5c0fdddbd6f1cd2ba2a1009ffdb75c842ed326a27441485cfee7
-  data.tar.gz: e80cab9e1fca1a36863f3722651ebb913f0b1c5fabd511a4f33a63791e46b672bbd29bf18e1c8e077ccb3b492336942c08a9810ded36991e909f8cab5b7a7ecd
+  metadata.gz: d4ffc79ae3dbe15ec0df3b529d8e2fb5df121d1074b681a86d2f950754d09d5d1860fb464feb1d684c5308be499396efd3ffd069700d19f53b8db742431d214d
+  data.tar.gz: 5eca072d46f2571e3524c038c13a1c440d832082c681ccb129baf8d74f093f2160a8222184b6f9a1948d6e3d2e8c11aaef02dc6526bf9faf5ea95ef8875b0419

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.0.3 Change to use HSB 360 1 1 1 (ie just like cfdg)
+  * rotation of primitives like shapes now in degrees (vs radians)
+  * examples updated, includes a colorful alhambra design
+
+
 v0.0.2 Second Gem Release
   * extract samples to cf3work/samples, was cf3samples/samples
   * gives me an opportunity to create a lock for bundler?

data/README.md

@@ -2,12 +2,12 @@
 
 **context-free DSL for ruby-1.9 and CF3 syntax** 
 
-Very much derived from [context-free.rb][] by Jeremy Ashkenas this version is updated to be more in line with CF3 and ruby 1.9 syntax. Tested as working with last rubygems release of ruby-processing (v 1.0.11) as well as the current [version][] (v 2.1.0).
+Very much derived from [context-free.rb][] by Jeremy Ashkenas this version is updated to be more in line with CF3 and ruby 1.9 syntax. Tested as working with last rubygems release of ruby-processing (v 1.0.11) as well as the current [version][] (v 2.1.4).
 [context-free.rb]:https://github.com/jashkenas/context_free/
 [version]:https://github.com/monkstone/ruby-processing/releases/
 ## Installation
 
-To use this library you need install jruby (preferably jruby-1.7.4+), you will also need [ruby-processing][] to be installed (minimum version 1.0.11, preferred version 2.1.0). There are three ways you can install this library:-
+To use this library you need install jruby (preferably jruby-1.7.4+), you will also need [ruby-processing][] to be installed (minimum version 1.0.11, preferred version 2.1.4). There are three ways you can install this library:-
 
 ***rake test and gem install***
 
@@ -16,7 +16,7 @@ Either clone this repository, or download a [snapshot][].
 ```bash
 cd cf3ruby 
 jruby -S rake test # builds and tests gem (mouse click on frame for test image to show)
-jruby -S gem install cf3-0.0.1.gem # may need sudo access
+jruby -S gem install cf3-0.0.3.gem # may need sudo access
 ```
 
 ***local bundle install***
@@ -25,25 +25,28 @@ Either clone this repository, or download a [snapshot].
 
 ```bash
 cd cf3
-bundle install
+bundle install          # using regular installed bundler may need to set GEM_PATH
+jruby -S bundle install # if you installed bundler with jruby
 ```
 
 ***gem install from rubygems***
 ```bash
-gem install cf3
+gem install cf3            # regular install may need to set GEM_PATH env variable
+jruby -S gem install cf3   # jruby install 
 ```
 it couldn't be easier could it?
 
 ## Usage
 
-Extract the included samples to your home directory
+Extract the included samples to your home directory (HOME/cf3work/samples)
 ```bash
-jruby -S cf3samples
+cf3samples           # should work
+jruby -S cf3samples  # else if installed with jruby this should also work
 ```
 
-As for running ruby-processing, it requires the external jruby flag
+As for running ruby-processing, ( _it requires the external jruby flag prior to ruby-processing-2.1.2_ )
 ```bash
-rp5 run --jruby city.rb # this is why you should install both ruby-processing and cf3ruby using jruby
+rp5 run city.rb # providing you installed both ruby-processing and cf3ruby using jruby
 
 ```
 You should read the [ruby-processing_documentation][] on using rubygems.

data/lib/cf3.rb

@@ -14,7 +14,7 @@ module Processing
     HSB_ORDER         = {hue: 0, saturation: 1, brightness: 2, alpha: 3}
     TRIANGLE_TOP      = -1 / Math.sqrt(3)
     TRIANGLE_BOTTOM   = Math.sqrt(3) / 6
-
+    RADIANS = (Math::PI / 180.0)
     # Define a context-free system. Use this method to create a ContextFree
     # object. Call render() on it to make it draw.
     def self.define(&block)
@@ -96,7 +96,7 @@ module Processing
         when :x, :y
           old_ops[key] = value * old_ops[:size]
         when :rotation
-          old_ops[key] = value * (Math::PI / 180.0)
+          old_ops[key] = value * RADIANS
         when :hue, :saturation, :brightness, :alpha
           adjusted = old_ops[:color].dup
           adjusted[HSB_ORDER[key]] *= value
@@ -170,7 +170,7 @@ module Processing
                  rotation: 0, flip: false,
                  size: 20, width: 20, height: 20,
                  start_x: width/2, start_y: height/2,
-                 color: [0.5, 0.5, 0.5, 1],
+                 color: [180, 0.5, 0.5, 1],
                  stop_size: 1.5}
       @values.merge!(starting_values)
       @finished = false
@@ -178,7 +178,7 @@ module Processing
       @app.rect_mode CENTER
       @app.ellipse_mode CENTER
       @app.no_stroke
-      @app.color_mode HSB, 1.0
+      @app.color_mode HSB, 360, 1.0, 1.0, 1.0    # match cfdg
       @app.translate @values[:start_x], @values[:start_y]
       self.send(rule_name, {})
     end
@@ -204,32 +204,35 @@ module Processing
 
     # Square, circle, and ellipse are the primitive drawing
     # methods, but hopefully triangles will be added soon.
-    def square(some_options=nil)
+    def square(some_options={})
       size, options = *get_shape_values(some_options)
+      rot = options[:rotation] 
+      @app.rotate(rot) if rot
       @app.rect(0, 0, size, size)
+      @app.rotate(-rot) if rot  
     end
 
 
-    def circle(some_options=nil)
+    def circle(some_options={})
       size, options = *get_shape_values(some_options)
       @app.ellipse(0, 0, size, size)
     end
 
-    def triangle(some_options=nil)
-      rot = some_options[:rotation]
-      @app.rotate(rot) if rot
+    def triangle(some_options={})
       size, options = *get_shape_values(some_options)
+      rot = options[:rotation] 
+      @app.rotate(rot) if rot
       @app.triangle(0, TRIANGLE_TOP * size, 0.5 * size, TRIANGLE_BOTTOM * size, -0.5 * size, TRIANGLE_BOTTOM * size)
       @app.rotate(-rot) if rot
     end
 
 
     def ellipse(some_options={})
-      rot = some_options[:rotation]
-      @app.rotate(rot) if rot
       size, options = *get_shape_values(some_options)
       width = options[:width] || options[:size]
       height = options[:height] || options[:size]
+      rot = some_options[:rotation] 
+      @app.rotate(rot) if rot
       @app.oval(options[:x] || 0, options[:y] || 0, width, height)
       @app.rotate(-rot) if rot
     end

data/lib/cf3/version.rb

@@ -1,3 +1,3 @@
 module Cf3
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/samples/accident.rb

@@ -47,21 +47,21 @@ def setup_the_sunstar
     
     shape :sunstar do
       split do
-      sun brightness: 0.8 
+      sun brightness: 0.9, alpha: 1.0 
       rewind
-      star brightness: 0.8, alpha: 0.8
+      star brightness: 0.9, alpha: 0.8
       rewind
       end
     end
     
     shape :dart do
-      flat size: 1, color: [0.18, 0.6, 0.6] 
-      flat size: 1, color: [0.18, 1.0, 1.0], flip: true
+      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, color: [0, 0.6, 0.6] 
-      sharp size: 1, color: [0, 1.0, 1.0], rotation: 180, flip: true
+      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      
@@ -85,9 +85,8 @@ def setup_the_sunstar
 end
 
 def setup
-  size 800, 820
-  background 150, 20, 0 
-  smooth
+  size 800, 800
+  background 255  
   setup_the_sunstar
   draw_it
 end

data/samples/alhambra.rb

@@ -1,5 +1,12 @@
 require 'cf3'
 
+GOLD = [33, 0.967, 0.592, 1]
+BLACK = [0, 0.909, 0.129, 1]
+GREEN = [148, 0.696, 0.271, 1]
+BLUE = [225, 0.777, 0.475, 1]
+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        
@@ -56,9 +63,9 @@ def setup_the_tiles
   
     ########### End definition of custom terminal 'wavy_triangle' shape
     shape :tiles do
-      10.times do |i|
-        10.times do |j|
-          wavy_triangle size: 1, x: (i + 0.5 * j%2), y: j * 0.9
+      20.times do |i|
+        20.times do |j|
+          wavy_triangle size: 1, x: (i + 0.5 * j%2), y: j * 0.9, color: COLORS[i % 5]
         end
       end
     end
@@ -66,7 +73,7 @@ def setup_the_tiles
 end
 
 def setup
-  size 400, 400
+  size 1024, 720
   background 255
   smooth
   setup_the_tiles
@@ -74,6 +81,6 @@ def setup
 end
 
 def draw_it
-  @tiles.render :tiles, start_x: -50, start_y: 20,
-               size: height/6, color: [0, 0.8, 0.8, 1]
+  @tiles.render :tiles, start_x: -200, start_y: 0,
+               size: height/6
 end

data/samples/alhambra2.rb

@@ -0,0 +1,98 @@
+require 'cf3'
+#############
+# to be fixed
+#############
+
+GOLD = [33, 0.967, 0.592, 1]
+BLACK = [0, 0.909, 0.129, 1]
+GREEN = [148, 0.696, 0.271, 1]
+BLUE = [225, 0.777, 0.475, 1]
+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    
+      define_method(:wavy_triangle) do |some_options| # wavy_triangle triangle
+        size, options = *self.get_shape_values(some_options)
+        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[8] = get_mid_point(pts[1], pts[4])
+        adjust_bezier(pts[8], PI/2, -disp*size)
+        pts[9] = get_mid_point(pts[4], pts[2])
+        adjust_bezier(pts[9], PI/2, disp*size)
+        pts[10] = get_mid_point(pts[2], pts[5])
+        adjust_bezier(pts[10], -PI/3, -disp*size)
+        pts[11] = get_mid_point(pts[5], pts[0])
+        adjust_bezier(pts[11], -PI/3, disp*size)
+        rotate(rot) if rot
+        begin_shape
+          vertex(pts[0].x, pts[0].y)
+          bezier_vertex(pts[0].x, pts[0].y, pts[6].x, pts[6].y, pts[3].x, pts[3].y)
+          bezier_vertex(pts[3].x, pts[3].y, pts[7].x, pts[7].y, pts[1].x, pts[1].y)
+          bezier_vertex(pts[1].x, pts[1].y, pts[8].x, pts[8].y, pts[4].x, pts[4].y)
+          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)        
+        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_triangle' shape
+    shape :tiles do
+      20.times do |i|
+        20.times do |j|
+	  split do	
+            wavy_triangle size: 1, x: (i + 0.5 * j%2), y: j * 0.9, color: COLORS[i % 5]
+	    rewind
+	    star size: 0.4, x: (2.5 * i - 1.25 * j%2) +0.4, y: (j * 2.5 * 0.9) + 1.25, color: COLORS[j % 5]
+	  end
+        end
+      end
+    end
+
+    shape :star do
+      triangle 
+      triangle rotation: 180
+    end
+  end
+end
+
+def setup
+  size 1024, 720
+  background 255
+  smooth
+  setup_the_tiles
+  draw_it
+end
+
+def draw_it
+  @tiles.render :tiles, start_x: -200, start_y: 0,
+               size: height/6
+end

data/samples/creature.rb

@@ -18,8 +18,8 @@ def setup_the_creature
     end
     
     shape :legs do
-      circle hue:  0.15, saturation: 0.5, brightness: 1.0, color: [0.95, 0.15]
-      legs y: 0.1, size: 0.965
+      circle hue:  54, saturation: 0.5, brightness: 1.0
+      legs y: 0.1, size: 0.96
     end
     
     shape :legs, 0.01 do
@@ -38,10 +38,6 @@ def setup
   size 600, 600
   setup_the_creature
   no_stroke
-  color_mode HSB, 1.0
-  smooth
-  draw_it
-  # save_frame("creature.png")
 end
 
 def draw
@@ -49,9 +45,9 @@ def draw
 end
 
 def draw_it
-  background -1.0
+  background 0
   @creature.render :start, size:  height/5, stop_size: 0.8,
-  start_x: width/2, start_y: height/3,  color: [0.75, 0.1, 0.9]
+  start_x: width/2, start_y: height/3
 end
 
 def mouse_clicked

data/samples/data/java_args.txt

@@ -1,2 +1,2 @@
--Xmn128m -Xms1024m -Xmx1024m -XX:+OptimizeStringConcat -XX:CompileCommand=dontinline,org.jruby.runtime.invokedynamic.InvokeDynamicSupport::invocationFallback 
+-Xmn128m -Xms512m -Xmx512m -XX:+OptimizeStringConcat -XX:CompileCommand=dontinline,org.jruby.runtime.invokedynamic.InvokeDynamicSupport::invocationFallback 
 

data/samples/escher.rb

@@ -86,15 +86,15 @@ def setup_the_birds
             end
             
             shape :bird do
-                wavy_diamond color: [0.7, 1, 1, 1]
+                wavy_diamond color: [38, 1, 1, 1]
             end
             
             shape :bird do
-                wavy_diamond color: [0.5, 1, 1, 1]
+                wavy_diamond color: [180, 1, 1, 1]
             end
             
             shape :bird do
-                wavy_diamond color: [0.1, 1, 1, 1]
+                wavy_diamond color: [36, 1, 1, 1]
             end
             
             shape :bird do

data/samples/fern.rb

@@ -1,17 +1,23 @@
 require 'cf3'
 
+#######################################################
+# This sketch takes some time to develop,             #
+# clicking the mouse, allows you view current state   #
+# final state background green                        #
+#######################################################
+
 def setup_the_fern
   
   @fern = ContextFree.define do
     
     shape :start do
-      fern rotation: 50, hue: 0.8
+      fern rotation: 50, hue: 306
     end
     
     shape :fern do
       circle size: 0.75, rotation: -10
       split do
-        fern size: 0.92, y: -2, rotation: -5, hue: 0.85
+        fern size: 0.92, y: -2, rotation: -5, hue: 306
         rewind
         fern size: 0.5, y: -2, rotation: 90
         rewind                                  
@@ -26,9 +32,6 @@ def setup
   size 600, 600
   setup_the_fern
   no_stroke
-  color_mode HSB, 1.0
-  smooth
-  draw_it
 end
 
 def draw
@@ -36,8 +39,8 @@ def draw
 end
 
 def draw_it
-  background 0.33, 0.25, 0.2
-  @fern.render :start, size: height/23, color: [0.35, 0.4, 0.9, 0.55], stop_size: 1,
+  background 119, 0.25, 0.2, 1.0
+  @fern.render :start, size: height/23, color: [126, 0.4, 0.9, 0.55], stop_size: 1,
                        start_x: width/2.5, start_y: height/1.285
 end
 

data/samples/hex_tube.rb

@@ -43,5 +43,5 @@ end
 
 def draw_it
   @hexa.render :hextube, start_x: width/2, start_y: height/2, 
-               size: height/2.1, color: [0, 1, 1, 0.5]
+               size: height/2.1, color: [60, 1, 1, 0.5]
 end

data/samples/pcr.rb

@@ -36,12 +36,12 @@ def setup_the_gel
     end
  
     shape :band do       # narrow band with 0.66' probability        
-      hbar size: 0.8, ht: 0.1, brightness: 0.3, alpha: 0.3, hue: 0.7, saturation: 1.0
+      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      
-      hbar size: 0.8, ht: 0.15, brightness: 0.8, alpha: 0.6, hue: -0.1, saturation: 1.0
+      hbar size: 0.8, ht: 0.15, brightness: 0.8, alpha: 0.6, hue: -36, saturation: 1.0
       band brightness: 0.5
     end
  
@@ -81,7 +81,7 @@ end
 
 def draw_it
   @pcr.render :gel, start_x: -50, start_y: height/2, 
-               size: height/5, color: [0.7, 0.8, 0.8, 1.0]
+               size: height/5, color: [252, 0.8, 0.8, 1.0]
 end
 
 def mouse_clicked

data/samples/rubystar.rb

@@ -0,0 +1,79 @@
+#########################
+# rubystar.rb 
+# Adding two custom "triangle" shapes.
+# These flat and sharp primitives are
+# used to make dart and kite shapes (for penrose?)
+#########################
+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 
+    class << self
+    include Math
+      define_method(:sharp) do |some_options|      
+        size, options = *self.get_shape_values(some_options)
+        rot = options[:rotation]
+        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)
+        rot = options[:rotation]
+        rotate(rot) if rot
+        f = (options[:flip])? -1 : 1  # flip adjustment NB: sin(0) = 0, cos(0) = 1
+        @app.triangle(0, 0, size/PHI, 0, size * cos(PI * f/5), size * sin(PI * f/5))
+        rotate(-rot) if rot
+      end
+    end
+    ########### End definition of custom terminals 'sharp and flat'
+    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    
+      split do
+        5.times do |i|
+          dart rotation: 72 * i 
+          rewind
+        end
+      end
+    end
+  
+    shape :sun do
+      split do
+        5.times do |i|
+          kite rotation: 72 * i
+          rewind
+        end
+      end
+    end
+  end
+end
+
+def setup
+  size 800, 800
+  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 
+end

data/samples/spiral.rb

@@ -1,6 +1,6 @@
 # Contributed by Monkstone.
 
-load_library :cf3
+require 'cf3'
 
 def setup_the_spiral
   @spiral = ContextFree.define do
@@ -16,7 +16,7 @@ def setup_the_spiral
     end
     
     shape :base do
-       triangle hue: 0.5
+       triangle hue: 180
        base rotation:  3, size: 0.98, x: 0.09, brightness: 1.01
     end
     
@@ -50,4 +50,4 @@ def draw_it
   @spiral.render :start, size: height/5, stop_size: 1,
                          color: [0.35, 0.4, 0.9, 0.25], 
                          start_x: width/2, start_y: height/2
-end
+end

data/samples/star.rb

@@ -0,0 +1,43 @@
+require 'cf3'
+#######
+# Simple example demonstrating rewind
+# also how to make simple composite shapes
+# from primitive terminals (renders on mouse clicked)
+###
+
+def setup
+  size 400, 200 
+  @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
+
+def draw_it
+  background 0.2 
+  @stars.render :stars, size: height/2, color: [220, 1, 1, 1]
+end
+
+def draw
+  # Do nothing.
+end
+
+def mouse_clicked
+  draw_it
+end

data/samples/tree.rb

@@ -5,13 +5,13 @@
 require  'cf3'
 load_library :control_panel
 
-attr_reader :panel
+attr_reader :panel, :hide
 
 def setup_the_trees
-
   control_panel do |panel|
-    @panel = panel
+    panel.look_feel "Metal"
     panel.slider :srand, 0..100
+    @panel = panel
   end
   
   @tree = ContextFree.define do
@@ -42,7 +42,7 @@ def setup_the_trees
     shape :leaf do
       the_size = rand(25)
       the_x = [1, 0, 0, 0][rand(4)]
-      circle size: the_size, hue: 0.15, saturation: 1.25, brightness: 1.9, x: the_x, color: [0.95, 0.15]
+      circle size: the_size, hue: 54, saturation: 1.25, brightness: 0.9, x: the_x
     end
     
     shape :flower do
@@ -59,40 +59,29 @@ end
 
 def setup
   size 800, 800
+  @hide = true
   setup_the_trees
   no_stroke
-  smooth
   frame_rate 5
   draw_it
 end
 
 def draw
-  panel.set_visible(true) if self.visible	
-  # Do nothing.
-end
-
-def draw_the_background
-  color_mode RGB, 1
-  color = [0.0, 0.0, 0.00]
-  background *color
-  count = height/2
-  push_matrix
-  size = height / count
-  (2*count).times do |i|
-    color[2] = color[2] + (0.07/count)
-    fill *color
-    rect 0, i, width, 1
+  unless hide
+    panel.set_visible(true)
   end
 end
 
 def draw_it
   Kernel::srand(@srand) if @srand
-  draw_the_background
+  background(color(rand(0 .. 255), rand(0 .. 255), rand(0 .. 255), 255))
   @tree.render :seed, start_x: width/2, start_y: height+20, 
-                      size: height/60, color: [0.7, 0.15, 0.8]
+                      size: height/60, color: [252, 0.15, 0.8, 1]
 end
 
 def mouse_clicked
+  @hide = false
   panel.set_visible(true)  
   draw_it
+  @hide = true
 end

data/samples/vine.rb

@@ -37,9 +37,6 @@ def setup
   size 700, 700
   setup_the_vine
   no_stroke
-  color_mode HSB, 1.0
-  smooth
-  draw_it
 end
 
 def draw
@@ -47,8 +44,8 @@ def draw
 end
 
 def draw_it
-  background 0.75, 1.0, 0.15
-  @vine.render :root, size: height/75, color: [0.75, 0.1, 0.9],
+  background 270, 1.0, 0.15, 1.0
+  @vine.render :root, size: height/75, color: [270, 0.1, 0.9, 1.0],
                      start_x: width/2, start_y: height/2
 end
 

data/test/test_cf3.rb

@@ -5,15 +5,14 @@ def setup
   @triangle = ContextFree.define do
     shape :tri do
       circle      
-      triangle brightness: 0
-      circle brightness: 10, size: 0.02
+      triangle brightness: 0.8
+      circle brightness: 1.0, size: 0.02
     end
   end 
-  color_mode HSB, 1.0
 end
 
 def draw_it
-  background 1.0  
+  background 0.2 
   @triangle.render :tri, size: height/2
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-processing
@@ -79,6 +79,7 @@ files:
 - lib/cf3/version.rb
 - samples/accident.rb
 - samples/alhambra.rb
+- samples/alhambra2.rb
 - samples/bar_code.rb
 - samples/city.rb
 - samples/creature.rb
@@ -92,8 +93,10 @@ files:
 - samples/isosceles.rb
 - samples/levy.rb
 - samples/pcr.rb
+- samples/rubystar.rb
 - samples/sierpinski.rb
 - samples/spiral.rb
+- samples/star.rb
 - samples/tree.rb
 - samples/tree4.rb
 - samples/vine.rb