cf3 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8af1424885f56dc32e59cbde844fceb924a4f9
-  data.tar.gz: 69c5707acfd748da7428921c2da6a2e085dbbffc
+  metadata.gz: 7e17853f9381b6ed49bc8167e843761fa8a14f21
+  data.tar.gz: 5dc00b417e9f3bfe81809b418507f30d015fd72c
 SHA512:
-  metadata.gz: d4ffc79ae3dbe15ec0df3b529d8e2fb5df121d1074b681a86d2f950754d09d5d1860fb464feb1d684c5308be499396efd3ffd069700d19f53b8db742431d214d
-  data.tar.gz: 5eca072d46f2571e3524c038c13a1c440d832082c681ccb129baf8d74f093f2160a8222184b6f9a1948d6e3d2e8c11aaef02dc6526bf9faf5ea95ef8875b0419
+  metadata.gz: 042745bf5d971d9f3f3d63d55f6ca0a99c1604e888b223ee29e2b6cf062f41cab21b7a6d5170d470a8dcff0dceab6b33e461e38a2d6a2271e7985741a3231c5a
+  data.tar.gz: f7bc02c7d7492ebef52e4c29c3ccffbefeb80ee1f42f8e7c8685b7fcd0d289b5c1a89bfccb3be6d28bce80a6a43128c7bd4ecb6c4d7d65e542abbc9fbe116f38

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.0.4 Introduce :w and :h as options to supplement size
+  * start support for width and height options (:w, :h)
+
+
 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

data/lib/cf3.rb

@@ -10,7 +10,7 @@ module Processing
 
     attr_accessor :rule, :app, :width, :height
 
-    AVAILABLE_OPTIONS = [:x, :y, :rotation, :size, :flip, :color, :hue, :saturation, :brightness, :alpha]
+    AVAILABLE_OPTIONS = [:x, :y, :w, :h, :rotation, :size, :flip, :color, :hue, :saturation, :brightness, :alpha]
     HSB_ORDER         = {hue: 0, saturation: 1, brightness: 2, alpha: 3}
     TRIANGLE_TOP      = -1 / Math.sqrt(3)
     TRIANGLE_BOTTOM   = Math.sqrt(3) / 6
@@ -103,8 +103,8 @@ module Processing
           old_ops[:color] = adjusted
         when :flip
           old_ops[key] = !old_ops[key]
-        when :width, :height
-          old_ops[key] *= value
+        when :w, :h
+          old_ops[key] = value * old_ops[:size]
         when :color
           old_ops[key] = value
         else # Used a key that we don't know about or trying to set
@@ -168,7 +168,7 @@ module Processing
     def render(rule_name, starting_values={})
       @values = {x: 0, y: 0,
                  rotation: 0, flip: false,
-                 size: 20, width: 20, height: 20,
+                 size: 20, w: nil, h: nil,
                  start_x: width/2, start_y: height/2,
                  color: [180, 0.5, 0.5, 1],
                  stop_size: 1.5}
@@ -206,9 +206,11 @@ module Processing
     # methods, but hopefully triangles will be added soon.
     def square(some_options={})
       size, options = *get_shape_values(some_options)
+      width = options[:w] || options[:size]
+      height = options[:h] || options[:size]
       rot = options[:rotation] 
       @app.rotate(rot) if rot
-      @app.rect(0, 0, size, size)
+      @app.rect(0, 0, width, height)
       @app.rotate(-rot) if rot  
     end
 
@@ -229,8 +231,8 @@ module Processing
 
     def ellipse(some_options={})
       size, options = *get_shape_values(some_options)
-      width = options[:width] || options[:size]
-      height = options[:height] || options[:size]
+      width = options[:w] || options[:size]
+      height = options[:h] || options[:size]
       rot = some_options[:rotation] 
       @app.rotate(rot) if rot
       @app.oval(options[:x] || 0, options[:y] || 0, width, height)

data/lib/cf3/version.rb

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

data/samples/dragon.rb

@@ -2,23 +2,25 @@
 
 require 'cf3'
 
+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
-        dragon size: 1/Math.sqrt(2), rotation: -45, x: 0.25, y: 0.25
+        dragon size: INV_SQRT, rotation: -45, x: 0.25, y: 0.25
         rewind
-        dragon size: 1/Math.sqrt(2), rotation: 135, x: 0.25, y: 0.25
+        dragon size: INV_SQRT, rotation: 135, x: 0.25, y: 0.25
         rewind
       end
     end
-
+    
   end
 end
 
@@ -35,6 +37,6 @@ end
 
 def draw_it
   background 255
-  @dragon.render :start, size: width*0.8,  stop_size: 2,
-                         start_x: width/3, start_y: height/3.5
+  @dragon.render :start, size: width * 0.8,  stop_size: 2,
+  start_x: width/3, start_y: height / 3.5
 end

data/samples/fern.rb

@@ -3,7 +3,7 @@ require 'cf3'
 #######################################################
 # This sketch takes some time to develop,             #
 # clicking the mouse, allows you view current state   #
-# final state background green                        #
+# in the final state background will be green         #
 #######################################################
 
 def setup_the_fern

data/samples/sierpinski.rb

@@ -2,25 +2,23 @@ require 'cf3'
 
 load_library 'control_panel'
 
-attr_accessor :resolution, :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: PI
+      triangle size: 0.5, rotation: 180
       split do
         tri size: 0.5, y: -0.578, x: 0, 
-            hue: 0.8, saturation: 0.2, brightness: 0.8
+        hue: 288, saturation: 0.2, brightness: 0.8
         rewind
-        tri size: 0.5, y: 0.289, x: -0.5, hue: 0.2, 
-            saturation: 0.2, brightness: 0.8
+        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: 0.2, 
-            saturation: 0.2, brightness: 0.8
+        tri size: 0.5, y: 0.289, x: 0.5, hue: 72, 
+        saturation: 0.2, brightness: 0.8
       end
-    end
-    
+    end    
   end
 end
 
@@ -28,17 +26,24 @@ def setup
   size 600, 600
   setup_the_triangle
   no_stroke
-  color_mode HSB, 1.0
-  smooth
+  @hide = false
   @resolution = 5
   control_panel do |p|
+    p.look_feel "Metal"	# optionall set look and feel  
     p.slider :resolution, (2..50), 5
     @panel = p
   end
 end
 
 def draw
-  panel.set_visible(self.visible) # display panel after sketch frame
+  unless hide	
+    panel.set_visible(true) # display panel after sketch frame
+    @hide = true
+  end
   background 0.1
-  @triangle.render :tri, size: height/1.1, color: [0, 0.5, 1], stop_size: @resolution, start_y: height/1.65
+  @triangle.render :tri, size: height/1.1, color: [0, 0.5, 1.0, 1.0], stop_size: @resolution, start_y: height/1.65
+end
+
+def mouse_clicked
+  @hide = false	
 end

data/samples/tree.rb

@@ -46,11 +46,10 @@ def setup_the_trees
     end
     
     shape :flower do
-      split saturation: 0, brightness: rand(1.3)+4.7, set_width: rand(15)+10, set_height: rand(2)+2 do
-        oval rotation: 0
-        oval rotation: 45
-        oval rotation: 90
-        oval rotation: 135
+      split saturation: 0, brightness: rand(1.3)+4.7, w: rand(15)+10, h: rand(2)+2 do
+	(0 .. 135).step(45) do |rot|      
+          oval rotation: rot
+	end
       end
     end    
   end  

data/samples/tree4.rb

@@ -42,24 +42,23 @@ end
 
 def setup
   size 600, 600
-  # srand 5  uncomment this to get nice looking tree
-  smooth
+  srand 5  # comment this to get variable tree shape
   setup_the_tree
-  background 255         # NB color mode here is "RGB 255", within context free definition 
-  draw_it                # the color mode is "HSB 1.0", supports :hue, :saturation, :brightness
-  # save_frame "/home/tux/tree4.png"
 end
 
 def draw
   # create a draw loop
 end
 
+#####
+# color: [0, 0, 0, 1] even in HSB this should be black, seems to work...
+#####
 def draw_it
-  @tree.render :trunk, start_x: width/2, start_y: height * 0.9, stop_size: height/150, size: height/15
+  @tree.render :trunk, start_x: width/2, start_y: height * 0.9, stop_size: height/150, size: height/15, color: [0, 0, 0, 1] 
 end
 
 def mouse_clicked
   java.lang.System.gc  # might help to reduce runtime stack blow ups, it happens!
-  background 1
+  background 200
   draw_it
 end

data/samples/xcross.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
+        cross size: 0.5, x: -2
+        rewind
+        plus size: 0.5, x: 2
+      end
+    end
+    
+    shape :cross do
+      square w: 1, h: 3, rotation: -45
+      square w: 1, h: 3, rotation: 45
+    end
+    
+    shape :plus do
+      square w: 1, h: 3
+      square w: 1, h: 3, rotation: 90
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf3
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-processing
@@ -79,7 +79,6 @@ files:
 - lib/cf3/version.rb
 - samples/accident.rb
 - samples/alhambra.rb
-- samples/alhambra2.rb
 - samples/bar_code.rb
 - samples/city.rb
 - samples/creature.rb
@@ -88,7 +87,6 @@ files:
 - samples/dragon.rb
 - samples/escher.rb
 - samples/fern.rb
-- samples/grapher.rb
 - samples/hex_tube.rb
 - samples/isosceles.rb
 - samples/levy.rb
@@ -100,6 +98,7 @@ files:
 - samples/tree.rb
 - samples/tree4.rb
 - samples/vine.rb
+- samples/xcross.rb
 - samples/y.rb
 - test/test_cf3.rb
 homepage: http://learning-ruby-processing.blogspot.co.uk/

data/samples/alhambra2.rb

@@ -1,98 +0,0 @@
-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/grapher.rb

@@ -1,47 +0,0 @@
-#########################
-# grapher.rb by Martin Prout after grapher.cfdg 
-#########################
-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)
-        rot = (options[:rotation])? options[:rotation]: 0
-        no_fill
-        stroke(*options[:color])
-        stroke_weight(size/30)
-        begin_shape
-        6.times do |i|
-          vertex(size * Math.cos(Math::PI * i/3 + rot), size * Math.sin(Math::PI * i/3 + rot))
-        end
-        end_shape(CLOSE)
-      end 
-    end
-    ########### End definition of custom terminal 'hexagon'
-    shape :hextube do
-      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
-    end
-  end
-end
-
-def setup
-  size 800, 800
-  background 0 
-  smooth
-  setup_the_hextube
-  draw_it
-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]
-end