xrvg 0.0.5 → 0.0.6

data/CHANGES

@@ -1,5 +1,13 @@
 = CHANGES
 
+== 0.0.6 (2008.03.24)
+=== Content
+- Add Spiral classes
+- refactor some Float utilitaries into Range class
+- refactor Ondulation bezier builder
+- WARNING: random() filter now always sort its result => Shuffle filter is created. Moreover, .rand method is now only on Random, and not in Samplable interface (due to overloading Array method when using sort_by {rand, which is no good)
+
+
 == 0.0.5 (2008.03.22)
 === Content
 - Add GeoVariety classes

data/README

@@ -1,6 +1,6 @@
 = XRVG -- X Ruby Vector Graphics
 
-Supporting XRVG version: 0.0.5
+Supporting XRVG version: 0.0.6
 
 This package contains XRVG, a Ruby vector graphic programming library.
 

data/Rakefile

@@ -63,7 +63,7 @@ RDOC_FILES = FileList["README", "CHANGES"]
 
 # Ruby library code.
 LIB_DIR = "lib"
-PRE_LIB_FILES = FileList["trace.rb", "samplation.rb", "interpolation.rb", "parametriclength.rb", "utils.rb", "geometry2D.rb",  "color.rb", "frame.rb", "shape.rb", "render.rb", "shape.rb", "style.rb", "bezier.rb", "bezierspline.rb", "fitting.rb", "bezierbuilders.rb", "beziermotifs.rb", "beziertools.rb", "interbezier.rb", "geovariety.rb", "xrvg.rb"]
+PRE_LIB_FILES = FileList["trace.rb", "samplation.rb", "interpolation.rb", "parametriclength.rb", "utils.rb", "geometry2D.rb",  "color.rb", "frame.rb", "shape.rb", "render.rb", "shape.rb", "style.rb", "bezier.rb", "bezierspline.rb", "fitting.rb", "bezierbuilders.rb", "beziermotifs.rb", "beziertools.rb", "interbezier.rb", "geovariety.rb", "spiral.rb", "xrvg.rb"]
 LIB_FILES = FileList["#{LIB_DIR}/*.rb"]
 
 # Example code.
@@ -89,9 +89,9 @@ DIST_FILES.include(BIN_FILES)
 # Don't package files which are autogenerated by RDocTask
 DIST_FILES.exclude(/^(\.\/)?#{RDOC_HTML_DIR}(\/|$)/)
 # Include extension source files.
-DIST_FILES.include(EXT_DIST_FILES)
+# DIST_FILES.include(EXT_DIST_FILES)
 # Don't package temporary files, perhaps created by tests.
-DIST_FILES.exclude("**/temp_*", "**/*.tmp", "**/*.svg" )
+# DIST_FILES.exclude("**/temp_*", "**/*.tmp", "**/*.svg", "*.svg"  )
 # Don't get into recursion...
 DIST_FILES.exclude(/^(\.\/)?pkg(\/|$)/)
 #---
@@ -184,12 +184,28 @@ task "upload-website" do
    sh "winscp.exe /console /script=winscp_script.txt"
 end
 
+#---
+desc "Upload blog to RubyForge with WinSCP"
+task "upload-blog" do
+   sh "winscp.exe /console /script=winscp_script_blog.txt"
+end
+
+
+#---
+desc "Regenerate blog"
+task "gen-blog" do
+  # Rake::Task["clobber"].invoke
+  Rake::Task["muse"].invoke
+  # Rake::Task["examples"].invoke; # must be done with emacs
+  Rake::Task["finish"].invoke
+end
+
 #---
 desc "Regenerate website"
 task "gen-website" do
   Rake::Task["clobber"].invoke
-  Rake::Task["muse"].invoke
-  Rake::Task["examples"].invoke
+  # Rake::Task["muse"].invoke
+  # Rake::Task["examples"].invoke
   Rake::Task["rdoc"].invoke
   Rake::Task["finish"].invoke
 end
@@ -201,9 +217,22 @@ task "publish-website" do
   # sh "scp -r #{WEBSITE_DIR}/* " +
   #  "#{RUBYFORGE_USER}@rubyforge.org:#{rubyforge_path}",
   #  :verbose => true
-  Rake::Task["gen-website"].invoke
+  # Commented because must be triggered explictely as very long: Rake::Task["gen-website"].invoke
   Rake::Task["upload-website"].invoke
 end
+
+#---
+desc "Regenerate blog  and upload it to RubyForge"
+task "publish-blog" do
+  # rubyforge_path = "/var/www/gforge-projects/#{UNIX_NAME}/"
+  # sh "scp -r #{WEBSITE_DIR}/* " +
+  #  "#{RUBYFORGE_USER}@rubyforge.org:#{rubyforge_path}",
+  #  :verbose => true
+  Rake::Task["gen-blog"].invoke
+  Rake::Task["upload-blog"].invoke
+end
+
+
 #---
 task "rubyforge-setup" do
   unless File.exist?(File.join(ENV["HOME"], ".rubyforge"))
@@ -280,6 +309,7 @@ task "examples" => ["muse"] do
   mkdir "#{WEBSITE_DIR}/images"
   require 'www/example_list'
   example_list.each do |fn|
+    puts "generate #{fn} ..."
     source = fn
     svg = String.new(fn)
     svg["\.rb"] = ".svg"

data/examples/arciterate1.rb

@@ -0,0 +1,13 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :stroke, Color.blue, :strokewidth, 0.01 ]
+arc = ArcBezier[ :support, [V2D::O, V2D::X] ]
+samples = [0.1,0.3,0.4,0.6,0.7,0.9]
+subarcs = arc.samples( samples ).foreach(2).map do |points|
+  ArcBezier[ :support, points ]
+end
+render.add( arc, style )
+subarcs.each {|arc| render.add( arc, style ) }
+render.end

data/examples/arcrecurse1.rb

@@ -0,0 +1,30 @@
+require 'xrvg'
+include XRVG
+
+def subarcs( arc, samples )
+  return arc.samples( samples ).foreach(2).map do |points|
+    ArcBezier[:support, points ]
+  end
+end
+
+def arcrecurse( arcs, niter, samples )
+  if niter == 0
+    return arcs
+  else
+    subarcs = []
+    arcs.each do |arc|
+      subarcs += subarcs( arc, samples )
+    end
+    return arcrecurse( subarcs, niter-1, samples )
+  end
+end
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :stroke, Color.blue, :strokewidth, 0.01 ]
+samples = [0.1,0.3,0.4,0.6,0.7,0.9]
+roots   = [ArcBezier[ :support, [V2D::O, V2D::X]]]
+arcrecurse( roots, 4, samples ).each do |arc|
+  render.add( arc, style )
+end
+render.end
+

data/examples/arcrecurse2.rb

@@ -0,0 +1,37 @@
+require 'xrvg'
+include XRVG
+
+def subarcs( arc, samples )
+  return arc.samples( samples ).foreach(2).map do |points|
+    ArcBezier[:support, points ]
+  end
+end
+
+def arcrecurse( arcs, niter, samples )
+  if niter <= 0
+    return arcs
+  else
+    subarcs = []
+    arcs.each do |arc|
+      subarcs += subarcs( arc, samples )
+    end
+    return arcrecurse( subarcs, niter-1, samples )
+  end
+end
+
+render  = SVGRender[:imagesize, "3cm" ]
+style   = Style[ :stroke, Color.blue, :strokewidth, 0.01 ]
+samples = [0.1,0.3,0.4,0.6,0.7,0.9]
+roots   = [ArcBezier[ :support, [V2D::O, V2D::X]]]
+palette = Palette[ :colorlist, [  0.0, Color.black,  
+                                  1.0, Color.blue]]
+niter   = 6
+[(0.0..1.0),(0.01..0.001),palette].samples( niter ) do |time,width,color|
+  time = (niter * time).to_i
+  style.stroke = color
+  style.strokewidth = width
+  arcrecurse( roots, time, samples ).each do |arc|
+    render.add( arc, style )
+  end
+end
+render.end

data/examples/circleiterate1.rb

@@ -0,0 +1,9 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :fill, Color.blue ]
+Circle[].samples( 6 ) do |point|
+  render.add( Circle[:center, point, :radius, 0.333 ], style)
+end
+render.end

data/examples/circleiterate2.rb

@@ -0,0 +1,11 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :fill, Color.blue ]
+Circle[].samples( 6 ) do |point|
+  Circle[:center, point, :radius, 0.3333 ].samples( 6 ) do |point|
+    render.add( Circle[:center, point, :radius, 0.1111 ], style )
+  end
+end
+render.end

data/examples/circleiterate3.rb

@@ -0,0 +1,13 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :fill, Color.blue ]
+Circle[].samples( 6 ) do |point|
+  Circle[:center, point, :radius, 0.3333 ].samples( 6 ) do |point|
+    Circle[:center, point, :radius, 0.1111 ].samples( 6 ) do |point|
+      render.add( Circle[:center, point, :radius, 0.037 ], style )
+    end
+  end
+end
+render.end

data/examples/circlerecurse1.rb

@@ -0,0 +1,27 @@
+require 'xrvg'
+include XRVG
+
+def subcircles( circle, nsamples, radiusfactor )
+  return circle.samples( nsamples )[1..-1].map do |point|
+    Circle[:center, point, :radius, circle.radius * radiusfactor ]
+  end
+end
+
+def circlerecurse( circles, niter, nsamples, radiusfactor )
+  if niter == 0
+    return circles
+  else
+    subcircles = []
+    circles.each do |circle|
+      subcircles += subcircles( circle, nsamples, radiusfactor )
+    end
+    return circlerecurse( subcircles, niter-1, nsamples, radiusfactor )
+  end
+end
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :fill, Color.blue ]
+circlerecurse( [Circle[]], 4, 6, 1.0/3.0 ).each do |circle|
+  render.add( circle, style )
+end
+render.end

data/examples/circlerecurse2.rb

@@ -0,0 +1,27 @@
+require 'xrvg'
+include XRVG
+
+def subcircles( circle, nsamples, radiusfactor )
+  return circle.samples( nsamples )[1..-1].map do |point|
+    Circle[:center, point, :radius, circle.radius * radiusfactor ]
+  end
+end
+
+def circlerecurse( circles, niter, nsamples, radiusfactor )
+  if niter == 0
+    return circles
+  else
+    subcircles = []
+    circles.each do |circle|
+      subcircles += subcircles( circle, nsamples, radiusfactor )
+    end
+    return circlerecurse( subcircles, niter-1, nsamples, radiusfactor )
+  end
+end
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :fill, Color.blue ]
+circlerecurse( [Circle[]], 5, 6, 1.0/3.0 ).each do |circle|
+  render.add( circle, style )
+end
+render.end

data/examples/circlerecurseall.rb

@@ -0,0 +1,29 @@
+require 'xrvg'
+include XRVG
+
+def subcircles( circle, nsamples, radiusfactor )
+  return circle.samples( nsamples )[1..-1].map do |point|
+    Circle[:center, point, :radius, circle.radius * radiusfactor ]
+  end
+end
+
+def circlerecurse( circles, niter, nsamples, radiusfactor )
+  if niter == 0
+    return circles
+  else
+    subcircles = []
+    circles.each do |circle|
+      subcircles += subcircles( circle, nsamples, radiusfactor )
+    end
+    return circlerecurse( subcircles, niter-1, nsamples, radiusfactor )
+  end
+end
+
+render = SVGRender[:imagesize, "3cm" ]
+style = Style[ :fill, Color.blue( 0.2 ) ]
+5.times do |time|
+  circlerecurse( [Circle[]], time, 6, 1.0/3.0 ).each do |circle|
+    render.add( circle, style )
+  end
+end
+render.end

data/examples/euclideangeo.rb

@@ -0,0 +1,11 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+style = Style[ :stroke, Color.blue( 0.3 ), :strokewidth, 0.01 ]
+100.times do
+  xs = (0.0..1.0).ssort().rand( 2 )
+  y  = (0.0..1.0).rand
+  render.add( Line[ :points, xs.map {|x| V2D[x, y]} ], style )
+end
+render.end

data/examples/evolution1.rb

@@ -0,0 +1,8 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+line = LinearBezier.buildwithangle( Range.Angle.sample( 0.95 ) )
+style = Style[ :stroke, Color.blue, :strokewidth, 0.01 ]
+render.add( line, style )
+render.end

data/examples/evolution2.rb

@@ -0,0 +1,9 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+line = LinearBezier.buildwithangle( Range.Angle.sample( 0.45 ) )
+line = ArcBezier[ :support, [line.pointlist[0], line.pointlist[-1]], :height, 0.7 ]
+style = Style[ :stroke, Color.blue, :strokewidth, 0.01 ]
+render.add( line, style )
+render.end

data/examples/evolution3.rb

@@ -0,0 +1,10 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize, "3cm" ]
+line = LinearBezier.buildwithangle( Range.Angle.sample( 0.45 ) )
+line = ArcBezier[ :support, [line.pointlist[0], line.pointlist[-1]], :height, 0.7 ]
+pics = line.reverse.geofull(1.2).samples( 20 ).foreach(2).map {|points| PicBezier[:support, points, :height, -3.0]}
+style = Style[ :stroke, Color.blue, :strokewidth, 0.01 ]
+pics.each {|pic| render.add( pic, style )}
+render.end

data/examples/fuseaugeo.rb

@@ -0,0 +1,16 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+style  = Style[ :stroke, Color.blue( 0.3 ), :strokewidth, 0.01 ]
+support = LinearBezier[ :support, [V2D::O, V2D::X] ]
+support = Ondulation[ :support, support, :freq, 2, :ampl, 0.5 ]
+fuseauvariety = FuseauVariety[ :support, support, :ampl, 0.2 ]
+
+100.times do
+  xs = (0.0..1.0).ssort().rand( 2 )
+  y  = (0.0..1.0).rand
+  render.add( fuseauvariety.line( xs[0], xs[1], y), style )
+end
+render.end
+

data/examples/gradientgeo.rb

@@ -0,0 +1,21 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+
+line        = LinearBezier[ :support, [V2D::O, V2D::X]]
+support     = line.translate( -V2D::Y )
+ondulation  = Ondulation[ :support, support, :freq, 5, :ampl, 0.5 ]
+
+gbezier  = GradientBezier[ :bezierlist, [0.0, line, 1.0, ondulation]]
+
+palette = Palette[ :colorlist, [  0.0, Color.black,  
+                                  0.5, Color.blue,  
+                                  1.0, Color.white]]
+style = Style.new( :strokewidth, 0.01 )
+[gbezier, palette].samples( 10 ) do |bezier, color|
+  style.fill = color
+  style.stroke = color
+  render.add( bezier, style )
+end
+render.end

data/examples/interbeziergeo1.rb

@@ -0,0 +1,14 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+style = Style[ :stroke, Color.blue( 0.3 ), :strokewidth, 0.01 ]
+support1 = LinearBezier[ :support, [V2D::O, V2D::X] ]
+support2 = support1.translate( V2D::Y )
+interbezier  = InterBezier[ :bezierlist, [0.0, support1, 1.0, support2 ] ]
+
+100.times do
+  xs = (0.0..1.0).ssort().rand( 2 )
+  render.add( interbezier.line( xs[0], xs[1], (0.0..1.0).rand ), style )
+end
+render.end

data/examples/interbeziergeo2.rb

@@ -0,0 +1,17 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+style = Style[ :stroke, Color.blue( 0.3 ), :strokewidth, 0.01 ]
+support = LinearBezier[ :support, [V2D::O, V2D::X] ]
+support = support.translate(  V2D::Y * 0.2 )
+support1 = Ondulation[ :support, support, :freq, 2, :ampl, 0.5 ]
+support = support.translate(  -V2D::Y * 0.4 )
+support2 = Ondulation[ :support, support, :freq, 2, :ampl, 0.5 ]
+interbezier = InterBezier[ :bezierlist, [0.0, support1, 1.0, support2 ] ]
+
+100.times do
+  xs = (0.0..1.0).ssort().rand( 2 )
+  render.add( interbezier.line( xs[0], xs[1], (0.0..1.0).rand ), style )
+end
+render.end

data/examples/interbeziergeo3.rb

@@ -0,0 +1,17 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+style = Style[ :stroke, Color.blue( 0.3 ), :strokewidth, 0.01 ]
+support  = LinearBezier[ :support, [V2D::O, V2D::X] ]
+support  = Ondulation[ :support, support, :freq, 2, :ampl, 0.3 ]
+support1 = Offset[ :support, support, :ampl,  0.2 ]
+support2 = Offset[ :support, support, :ampl, -0.2 ]
+
+interbezier  = InterBezier[ :bezierlist, [0.0, support1, 1.0, support2 ] ]
+
+100.times do
+  xs = (0.0..1.0).ssort().rand( 2 )
+  render.add( interbezier.line( xs[0], xs[1], (0.0..1.0).rand ), style )
+end
+render.end

data/examples/offsetgeo.rb

@@ -0,0 +1,16 @@
+require 'xrvg'
+include XRVG
+
+render = SVGRender[:imagesize,"3cm"]
+style  = Style[ :stroke, Color.blue( 0.3 ), :strokewidth, 0.01 ]
+support = LinearBezier[ :support, [V2D::O, V2D::X] ]
+support = Ondulation[ :support, support, :freq, 2, :ampl, 0.5 ]
+offsetvariety = OffsetVariety[ :support, support, :ampl, 0.2 ]
+
+100.times do
+  xs = (0.0..1.0).ssort().rand( 2 )
+  y  = (0.0..1.0).rand
+  render.add( offsetvariety.line( xs[0], xs[1], y), style )
+end
+render.end
+

data/lib/bezier.rb

@@ -288,8 +288,25 @@ class Bezier < Curve
   # compute the sub curve between abscissa t1 and t2
   #
   # may result in a multi-pieces Bezier
+  #
+  # Note: special modulo effect to deal with closed bezier curve
+  #
+  # TODO: improve code (bas design)
   def subbezier( t1, t2)
-    return Bezier.new( :pieces, self.subpieces( t1, t2 ) )
+    # return Bezier.new( :pieces, self.subpieces( t1, t2 ) )
+    ranges = (0.0..1.0).modulos( (t1..t2) )
+    # Trace("Bezier::subbezier t1 #{t1} t2 #{t2} ranges #{ranges.inspect}")
+    pieces = []
+    ranges.each do |range|
+      range = range.sort
+      pieces += self.subpieces( range.begin, range.end )
+    end
+
+    bezier = Bezier.new( :pieces, pieces )
+    if t1 > t2
+      bezier = bezier.reverse
+    end
+    return bezier
   end
 
 # -------------------------------------------------------------
@@ -311,7 +328,22 @@ class Bezier < Curve
   # translate the Bezier curve, by translating its points
   def translate( v )
     return Bezier.new( :pieces, @pieces.map { |piece| piece.translate( v ) } )
-  end    
+  end
+
+  # rotate the Bezier curve, by rotating its points
+  def rotate( angle, center=V2D::O )
+    return Bezier.new( :pieces, @pieces.map { |piece| piece.rotate( angle, center ) } )
+  end
+  
+  # central symetry
+  def sym( center )
+    return Bezier.new( :pieces, @pieces.map { |piece| piece.sym( center ) } )
+  end
+
+  # axis symetry
+  def axesym( point, v )
+    return Bezier.new( :pieces, @pieces.map { |piece| piece.axesym( point, v ) } )
+  end
 
 # -------------------------------------------------------------
 #  similar (transform is used for samplation)
@@ -424,7 +456,7 @@ class Bezier < Curve
     lmin = 0.0
     @lengthranges = []
     lengths.each do |llength|
-      Trace("lmin #{lmin} llength #{llength}")
+      # Trace("lmin #{lmin} llength #{llength}")
       @lengthranges << (lmin..llength)
       lmin = llength
     end
@@ -500,3 +532,5 @@ class Bezier < Curve
   # TODO : add generic bezier builder from points : must be adaptative !! (use Fitting)
 end
 end
+
+

data/lib/bezierbuilders.rb

@@ -186,7 +186,23 @@ end
 class Circle
   # return approximating bezier curve
   def bezier
-    return FitBezierBuilder[ :points, self.samples( 20 ) ]
+    # following computation is too expensive
+    # return FitBezierBuilder[ :points, self.samples( 20 ) ]
+
+    # based on http://www.whizkidtech.redprince.net/bezier/circle/
+    kappa = 0.5522847498
+
+    beziers = []
+    self.frames( (0.0..1.0).samples(5) ).pairs do |f1,f2|
+      beziers << Bezier.vector( f1.center, f1.vector.norm * kappa * self.radius, f2.center, f2.vector.norm * kappa * (-self.radius) )
+    end
+
+    result = beziers[0]
+    beziers[1..-1].each do |b|
+      result = result + b
+    end
+
+    return result
   end
 end
 

data/lib/beziermotifs.rb

@@ -17,6 +17,17 @@ module XRVG
 class BezierMotif < BezierBuilder
   include Attributable
   attribute :support
+
+  def BezierMotif.build( *args )
+    builder = self.new( *args )
+    result = []
+    builder.support.pairs do |p1,p2|
+      builder.support = [p1,p2]
+      result << Bezier.multi( builder.compute )
+    end
+    return result.sum
+  end
+
 end
 
 
@@ -108,7 +119,3 @@ class LinearBezier < BezierMotif
 end
 
 end # end XRVG
-
-
-
-

data/lib/bezierspline.rb

@@ -181,12 +181,34 @@ class BezierSpline #:nodoc:
   end
 
   # simple translation operation : translate every point of the piece
-  # return a new Bezier
+  # return a new BezierSpline
   def translate( v )
     newpoints = self.pointlist.map {|point| point + v}
     return BezierSpline[ :raw, *newpoints ]
   end
 
+  # simple rotation operation : rotate every point of the piece
+  # return a new BezierSpline
+  def rotate( angle, center )
+    newpoints = self.pointlist.map {|point| center + (point-center).rotate( angle )}
+    return BezierSpline[ :raw, *newpoints ]
+  end
+
+  # simple sym operation : sym every point of the piece
+  # return a new BezierSpline
+  def sym( center )
+    newpoints = self.pointlist.map {|point| center.sym( point )}
+    return BezierSpline[ :raw, *newpoints ]
+  end
+
+
+  # simple axe sym operation : sym every point of the piece
+  # return a new BezierSpline
+  def axesym( origin, v )
+    newpoints = self.pointlist.map {|point| point.axesym( origin, v )}
+    return BezierSpline[ :raw, *newpoints ]
+  end
+
   def gdebug(render)
     p1, pc1, pc2, p2 = self.pointlist()
     v1 = pc1 - p1