cf3 0.0.5 → 1.0.0

data/samples/tree4.rb

@@ -2,7 +2,7 @@
 # tree4.rb by Martin Prout after tree4.cfdg
 # A non deterministic sketch run it until you get a result you like
 # uncomment "srand 5" to get a more deterministic result. It looked
-# pretty good on my linux box (however I'm not sure how universal the 
+# pretty good on my linux box (however I'm not sure how universal the
 # random seeding is in jruby)
 #################################################################
 
@@ -12,14 +12,14 @@ def setup_the_tree
   @tree = ContextFree.define do
     shape :trunk, 20 do                     # rule has a probability weighting of 20
       circle size: 0.25, brightness: 0.5    # giving an actual probability = 0.952381
-      scraggle y: -0.1                      # the minus is require by the upside down coordinate system             
+      scraggle y: -0.1                      # the minus is require by the upside down coordinate system
     end
 
     shape :trunk, 1 do                      # rule has a probability weighting of 1
-      branch size: 0.7                      # giving an actual probability = 0.047619  
+      branch size: 0.7                      # giving an actual probability = 0.047619
     end
 
-    shape :trunk, 0.02 do                    # empty rule top stop early    
+    shape :trunk, 0.02 do                    # empty rule top stop early
     end
 
     shape :branch do
@@ -30,8 +30,8 @@ def setup_the_tree
       end
     end
 
-    shape :scraggle do                       # without an explicit weighting    
-      trunk rotation: 5                      # probability of each scraggle rule 
+    shape :scraggle do                       # without an explicit weighting
+      trunk rotation: 5                      # probability of each scraggle rule
     end                                      # is 0.5
 
     shape :scraggle do
@@ -40,8 +40,12 @@ def setup_the_tree
   end
 end
 
-def setup
+def settings
   size 600, 600
+end
+
+def setup
+  sketch_title 'Tree 4'
   srand 5  # comment this to get variable tree shape
   setup_the_tree
 end
@@ -54,7 +58,7 @@ 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, color: [0, 0, 0, 1] 
+  @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

data/samples/vine.rb

@@ -3,11 +3,11 @@
 require 'cf3'
 
 def setup_the_vine
-  
+
   @vine = ContextFree.define do
-    
+
     shrink = 0.961
-    
+
     shape :root do
       split do
         shoot y: 1
@@ -15,12 +15,12 @@ def setup_the_vine
         shoot rotation: 180
       end
     end
-    
+
     shape :shoot do
       square
       shoot y: 0.98, rotation: 5, size: shrink + rand * 0.05, brightness: 0.990
     end
-    
+
     shape :shoot, 0.02 do
       square
       split do
@@ -29,12 +29,16 @@ def setup_the_vine
         shoot rotation: -90
       end
     end
-    
+
   end
 end
 
-def setup
+def settings
   size 700, 700
+end
+
+def setup
+  sketch_title 'Vine'
   setup_the_vine
   no_stroke
 end

data/samples/xcross.rb

@@ -5,10 +5,13 @@ require 'cf3'
 # from primitive terminals (renders on mouse clicked)
 ###
 
+def settings
+  size 400, 200
+end
+
 def setup
-  size 400, 200 
-  @stars = ContextFree.define do
-    
+  sketch_title 'X-Cross'
+  @stars = ContextFree.define do    
     shape :stars do
       split do
         cross size: 0.5, x: -2
@@ -16,21 +19,21 @@ def setup
         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
 end
 
 def draw_it
-  background 0.2 
+  background 0.2
   @stars.render :stars, size: height/2, color: [220, 1, 1, 1]
 end
 

data/samples/y.rb

@@ -1,21 +1,21 @@
 # y.rb ruby-processing by Martin Prout
 require 'cf3'
-Y_TOP = -1 / Math.sqrt(3) 
+Y_TOP = -1 / Math.sqrt(3)
 Y_BOT = Math.sqrt(3) / 6
 
 def setup_the_triangle
   @triangle = ContextFree.define do
-    ########  
+    ########
     shape :start do
     unit brightness: 1.0
     end
-    
+
     shape :unit do
       triangle size: 1.0
       split do
         unit size: 0.5, x: 0, y: Y_TOP/2, brightness: 0.8
-        rewind 
-        unit size: 0.5, x: -0.25, y: -Y_TOP/4, brightness: 0.8        
+        rewind
+        unit size: 0.5, x: -0.25, y: -Y_TOP/4, brightness: 0.8
         rewind
         unit size: 0.5, x: 0.25, y: -Y_TOP/4, brightness: 0.8
       end
@@ -23,13 +23,17 @@ def setup_the_triangle
     ########
   end
 end
-                
-def setup
+
+def settings
   size 1024, 1024
+  smooth 8
+end
+
+def setup
+  sketch_title 'Y'
   setup_the_triangle
   no_stroke
   color_mode RGB, 1
-  smooth 8
   draw_it
   save_frame("y.png")
 end

data/test/test_cf3.rb

@@ -1,19 +1,23 @@
 require_relative '../lib/cf3.rb'
 
+def settings
+  size 200, 200
+end
+
 def setup
-  size 200, 200 
+  sketch_title 'Test'
   @triangle = ContextFree.define do
     shape :tri do
-      circle      
-      triangle brightness: 0.8
-      circle brightness: 1.0, size: 0.02
+      circle brightness: 1.0, sat: 1.0, hue: 200
+      triangle brightness: 0.8, hue: 60
+      square brightness: 0.02, size: 0.05
     end
-  end 
+  end
 end
 
 def draw_it
-  background 0.2 
-  @triangle.render :tri, size: height/2
+  background 255, 255, 0 # NB: default color_mode here
+  @triangle.render :tri, size: height / 2.0
 end
 
 def draw

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: cf3
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
-- Martin Prout
+- Martin Prout, Funatsufumiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-processing
+  name: jruby_art
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -43,23 +43,24 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: "    A library for ruby-processing, that allows the writing of context
-  free \n    sketches (like context free art) in a ruby DSL. It is a bit of a toy\n
-  \   compared to the c++ version.  However you can get quite a bit of \n    satisfaction
-  creating an interesting graphic, and you can't always\n    predict what you are
-  going to get.\n"
+        version: '12.0'
+description: |2
+      A library for JRubyArt, that allows the writing of context free
+      sketches (like context free art) in a ruby DSL. It is a bit of a toy
+      compared to the c++ version.  However you can get quite a bit of
+      satisfaction creating an interesting graphic, and you can't always
+      predict what you are going to get.
 email:
-- martin_p@lineone.net
+- mamba2928@yahoo.co.uk
 executables:
 - cf3samples
 extensions: []
@@ -77,6 +78,7 @@ files:
 - cf3ruby.gemspec
 - lib/cf3.rb
 - lib/cf3/version.rb
+- samples/Rakefile
 - samples/accident.rb
 - samples/alhambra.rb
 - samples/bar_code.rb
@@ -103,7 +105,8 @@ files:
 - test/test_cf3.rb
 homepage: http://learning-ruby-processing.blogspot.co.uk/
 licenses:
-- GPL3
+- GPL-3.0
+- LGPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -121,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A ruby-DSL library for CF3 sketches