xrvg 0.0.1 → 0.0.2

data/lib/samplation.rb

@@ -51,18 +51,18 @@ module FloatFunctor
   end
 
   # hook for Array
-  def compute( indata, type )
-    return self.apply( self.modify( indata ), type )
+  def compute( indata, type, &block )
+    return self.apply( self.modify( indata ), type, &block )
   end
 
   # hook for rand()
   def process( indata, type, &block )
-    outdata    = self.compute( indata, type )
     if not block
+      outdata    = self.compute( indata, type )
       # Trace("Samplable#trigger object #{self.inspect} indata #{indata.inspect} outdata #{outdata.inspect}")
       return outdata
     else
-      outdata.foreach(nil,&block)
+      self.compute( indata, type, &block )
     end
   end
 
@@ -101,6 +101,7 @@ module FloatFunctor
   # it is a registration interface
   #
   # must not be overloaded
+
   # must be refactored with some meta hooks
   def applyhash
     result = {}
@@ -110,12 +111,12 @@ module FloatFunctor
   end
 
   # must not be overloaded (apart from Samplable containers)
-  def apply( data, type )
+  def apply( data, type, &block )
     @applyhash = self.applyhash
     if not @applyhash.key? type
       Kernel::Raise("FloatFunctor::apply no regsitration for type #{type} and  object #{object.inspect}")
     else
-      return self.send(@applyhash[type], data )
+      return self.send(@applyhash[type], data, &block )
     end
   end
 
@@ -250,12 +251,17 @@ module Samplable
   # to be overloaded if needed
   #
   # called by FloatFunctor apply method
-  def apply_samples( inputs )
-    return inputs.map {|abs| self.apply_sample( abs ) }
+  def apply_samples( inputs, &block )
+    if not block
+      return inputs.map {|abs| self.apply_sample( abs ) }
+    else
+      container = self.apply_sample( inputs[0] ); yield container;
+      inputs[1..-1].each {|abs| yield self.apply_sample( abs, container ) }
+    end
   end
 
   # to be overloaded if needed
-  def apply_sample( abs )
+  def apply_sample( abs, container=nil )
     return abs
   end
 
@@ -296,7 +302,7 @@ module Splittable
 
   # must not be overriden
   def split( abs1, abs2 )
-    return self.apply( self.filter( [abs1,abs2] ), :split ).pop
+    return self.apply( self.modify( [abs1,abs2] ), :split ).pop
   end
 
   # to be overloaded if needed

data/lib/shape.rb

@@ -74,7 +74,7 @@ class Curve < Shape
   # abstract
   #
   # must be defined
-  def point( abscissa )
+  def point( abscissa, container=nil )
     Kernel::raise("Curve::point must be redefined in subclasses")
   end
 
@@ -83,7 +83,7 @@ class Curve < Shape
   # abstract
   #
   # must be defined
-  def tangent( abscissa )
+  def tangent( abscissa, container=nil )
     Kernel::raise("Curve::tangent must be redefined in subclasses")
   end
 
@@ -92,28 +92,10 @@ class Curve < Shape
   # abstract
   #
   # must be defined
-  def acc( abscissa )
+  def acc( abscissa, container=nil )
     Kernel::raise("Curve::acc must be redefined in subclasses")
   end
 
-  # must compute the rotation at curve abscissa
-  #
-  # abstract
-  #
-  # must be defined
-  def rotation( abscissa )
-    Kernel::raise("Curve::rotation must be redefined in subclasses")
-  end
-
-  # must compute the scale at curve abscissa
-  #
-  # abstract
-  #
-  # must be defined
-  def scale( abscissa )
-    Kernel::raise("Curve::scale must be redefined in subclasses")
-  end
-
   # must return the length at abscissa, or total length if abscissa nil
   #
   # abstract
@@ -127,10 +109,61 @@ class Curve < Shape
   def default_style
     return Style[ :stroke, Color.black, :strokewidth, self.length / 100.0 ]
   end
+
+  # compute the rotation at curve abscissa, or directly from tangent (for frame computation speed up),
+  # as angle between tangent0 angle and tangent( abscissa ) (or tangent) angle
+  def rotation( abscissa, tangent=nil )
+    if not tangent
+      tangent = self.tangent( abscissa )
+    end
+    return (tangent.angle - self.tangent0_angle)
+  end
+
+  # must compute the scale at curve abscissa, or directly from tangent (for frame computation speed up)
+  # as ratio between tangent0 size and tangent( abscissa ) (or tangent) size
+  def scale( abscissa, tangent=nil )
+    if not tangent
+      tangent = self.tangent( abscissa )
+    end
+    result = 0.0
+    if not self.tangent0_length == 0.0
+      result = (tangent.r - self.tangent0_length)
+    end
+    return result
+  end
+
+  def tangent0
+    if not @tangent0
+      @tangent0 = self.tangent( 0.0 )
+    end
+    return @tangent0
+  end
+
+  # TODO : must be cached in vector
+  def tangent0_angle
+    if not @tangent0_angle
+      @tangent0_angle = self.tangent0.angle
+    end
+    return @tangent0_angle
+  end
+
+  # TODO : must be cached in vector
+  def tangent0_length
+    if not @tangent0_length
+      @tangent0_length = self.tangent0.r
+    end
+    return @tangent0_length
+  end
   
+  # compute frame vector at abscissa t, that is [curve.point( t ), curve.tangent( t ) ]
+  def framev( t )
+    return [curve.point( t ), curve.tangent( t ) ]
+  end
+
   # compute frame at abscissa t
   def frame( t )
-    return Frame[ :center, self.point( t ), :vector, self.tangent( t ), :rotation, self.rotation( t ), :scale, self.scale( t ) ]
+    point, tangent = self.framev( t )
+    return Frame[ :center, point, :vector, tangent, :rotation, self.rotation( nil, tangent ), :scale, self.scale( nil, tangent ) ]
   end
 
   # compute normal at abscissa t
@@ -149,10 +182,11 @@ class Curve < Shape
 
   # compute curvature at abscissa t
   def curvature( t )
-    if self.acc_normal( t ) == 0.0
+    acc_normal = self.acc_normal( t )
+    if acc_normal == 0.0
       return 0.0
     end
-    return 1.0 / (self.tangent( t ).r / self.acc_normal( t ))
+    return 1.0 / (self.tangent( t ).r / acc_normal )
   end
 
   # shortcut method to map frames from abscissas
@@ -171,17 +205,23 @@ class Curve < Shape
     return abscissas.map { |abscissa| self.tangent( abscissa ) }
   end
 
+  # shortcut method, map of normal
+  def normals( indexes )
+    return indexes.map {|i| self.normal( i )}
+  end
+
 end
 
 # Line class
 # = Intro
 # Used to draw polylines and polygons
 # = Attributes
-#  attribute :exts, [Point[0.0, 0.0], Point[1.0, 1.0]]
+#  attribute :points, [V2D[0.0, 0.0], V2D[1.0, 1.0]]
+# WARNING : getter "points" is not defined, because is defined as Curve.points( abscissa ) !!!
 # = Example
-#  line = Line[ :exts, [Point::O, Point::X] ]
+#  line = Line[ :points, [V2D::O, V2D::X] ]
 class Line < Curve
-  attribute :exts, [Point[0.0, 0.0], Point[1.0, 1.0]]
+  attribute :points, [V2D[0.0, 0.0], V2D[1.0, 1.0]]
 
   def initialize (*args) #:nodoc:
     super( *args )
@@ -191,7 +231,7 @@ class Line < Curve
   def init_tangents #:nodoc:
     index = 0
     @tangents = Array.new
-    self.exts.pairs { |p1, p2| 
+    @points.pairs { |p1, p2| 
       @tangents[ index ] = (p2-p1).norm 
       index += 1
     }
@@ -201,7 +241,7 @@ class Line < Curve
   def length
     if not @length
       @length = 0.0
-      self.exts.pairs do |p1, p2|
+      @points.pairs do |p1, p2|
 	@length += (p1 - p2).r
       end
     end
@@ -209,54 +249,60 @@ class Line < Curve
   end
 
   # compute line point at abscissa
-  #   Line[ :exts, [Point::O, Point::X] ].point( 0.3 ) => Vector[0.0,0.3]
-  def point (abscissa)
+  #   Line[ :points, [V2D::O, V2D::X] ].point( 0.3 ) => V2D[0.0,0.3]
+  def point (abscissa, container=nil)
+    container ||= V2D[]
     piece1   = abscissa.to_int
-    if piece1 == @exts.size - 1
-      return @exts[-1]
+    if piece1 == @points.size - 1
+      container.xy = @points[-1]
+    else
+      abscissa -= piece1
+      cpoints = @points.slice( piece1, 2 )
+      container.xy = [(cpoints[0].x..cpoints[1].x).sample( abscissa ), 
+	              (cpoints[0].y..cpoints[1].y).sample( abscissa )]
     end
-    abscissa -= piece1
-    cexts = self.exts.slice( piece1, 2 )
-    return (cexts[0]..cexts[1]).sample( abscissa )
+    return container
   end
 
   # compute line frame at abscissa
   #  
   # for the moment, frame rotation is always 0.0, and scale always 1.0
   def frame (abscissa)
-    return Frame[ :center, self.point( abscissa ), :vector, Vector[ 0.0, 0.0 ], :rotation, 0.0, :scale, 1.0 ]
+    return Frame[ :center, self.point( abscissa ), :vector, V2D[ 0.0, 0.0 ], :rotation, 0.0, :scale, 1.0 ]
   end
 
   # compute line tangent at abscissa
-  def tangent (abscissa)
-    return @tangents[abscissa.to_int].dup
+  def tangent (abscissa, container=nil)
+    container ||= V2D[]
+    container.xy = @tangents[abscissa.to_int]
+    return container
   end
 
   # compute viewbox of the line
   #
-  # simply call Point.viewbox on :exts
+  # simply call V2D.viewbox on :points
   def viewbox
-    return Point.viewbox( self.exts )
+    return V2D.viewbox( @points )
   end
 
   # translate a line of v offset, v being a vector
   #
-  # return a new line with every point of :exts translated
+  # return a new line with every point of :points translated
   def translate( v )
-    return Line[ :exts, @exts.map {|ext| ext.translate( v )} ]
+    return Line[ :points, @points.map {|ext| ext.translate( v )} ]
   end
 
   # reverse a line
   #
-  # return a new line with :exts reversed
+  # return a new line with :points reversed
   def reverse
-    return Line[ :exts, @exts.reverse ]
+    return Line[ :points, @points.reverse ]
   end
 
   # return line svg description
   def svg
-    path = "M #{exts[0].x} #{exts[0].y} "
-    exts[1..-1].each { |p|
+    path = "M #{points[0].x} #{points[0].y} "
+    @points[1..-1].each { |p|
       path += "L #{p.x} #{p.y}"
     }
     return "<path d=\"" + path + "\"/>"
@@ -270,12 +316,12 @@ end
 # = Intro
 # define a circle curve
 # = Attributes
-#   attribute :center, Vector[0.0,0.0]
+#   attribute :center, V2D[0.0,0.0]
 #   attribute :radius, 1.0
 # = Example
-#  c = Circle[ :center, Point::O, :radius, 1.0 ] # equiv Circle[] 
+#  c = Circle[ :center, V2D::O, :radius, 1.0 ] # equiv Circle[] 
 class Circle < Curve
-  attribute :center, Vector[0.0,0.0]
+  attribute :center, V2D[0.0,0.0]
   attribute :radius, 1.0
 
   # compute length of the circle
@@ -318,10 +364,12 @@ class Circle < Curve
   end
 
   # compute point at abscissa
-  def point (abscissa)
+  def point (abscissa, container=nil)
     angle = Range::Angle.sample( abscissa )
-    return Point[ self.cx + self.radius * Math.cos( angle ),
-                  self.cy + self.radius * Math.sin( angle )]
+    container ||=V2D[]
+    container.x = self.cx + self.radius * Math.cos( angle )
+    container.y = self.cy + self.radius * Math.sin( angle )
+    return container
   end
 
   # compute tangent at abscissa

data/lib/style.rb

@@ -19,27 +19,28 @@ require 'color'
 #   render.add( Circle[], Style[ :stroke, Color.red ] )
 class Style
   include Attributable
-  attribute :opacity,       1.0
+  # attribute :opacity,       1.0
   attribute :fill,          "none", [String, Color, Gradient]
-  attribute :fillopacity,   1.0
+  # attribute :fillopacity,   1.0
   attribute :stroke,        "none", [String, Color, Gradient]
   attribute :strokewidth,   1.0
-  attribute :strokeopacity, 1.0
+  # attribute :strokeopacity, 1.0
 
-  def fill=( color )
-    if color.is_a? Color
-      self.fillopacity = color.a
+  def fillopacity()
+    if @fill.is_a? Color
+      return @fill.a
     end
-    @fill = color
+    return 1.0
   end
 
-  def stroke=( color )
-    if color.is_a? Color
-      self.strokeopacity = color.a
+  def strokeopacity()
+    if @stroke.is_a? Color
+      return @stroke.a
     end
-    @stroke = color
+    return 1.0
   end
 
+ 
   def svgfill
     if fill.is_a? Color
       return fill.svg
@@ -63,7 +64,7 @@ class Style
   def svgline
     template = 'style="opacity:%opacity%;fill:%fill%;fill-opacity:%fillopacity%;stroke:%stroke%;stroke-width:%strokewidth%;stroke-opacity:%strokeopacity%"'
     
-    return template.subreplace( {"%opacity%" => opacity,
+    return template.subreplace( {"%opacity%" => 1.0,
 				 "%fill%"    => svgfill,
 				 "%fillopacity%" => fillopacity,
 				 "%stroke%"  => svgstroke,

data/lib/utils.rb

@@ -51,9 +51,10 @@ class Range
 
   # compute the symetric of value in context of range
   #  (0.0..1.0).complement( 0.3 ) => 0.7
+  #  (1.0..2.0).complement( 1.3 ) => 1.7
   def complement( value )
     diff = value - self.begin
-    return (self.end - value)
+    return (self.end - diff)
   end
 
 
@@ -317,8 +318,8 @@ class Array
   include Splittable
 
   # FloatFunctor overloading to synchronize content sampling and splitting
-  def compute( inputs, type )
-    return self.map {|v| v.compute( inputs, type )}.forzip
+  def compute( inputs, type, &block )
+    return self.map {|v| v.compute( inputs, type )}.forzip(nil,&block)
   end
 
 end

data/lib/xrvg.rb

@@ -3,7 +3,7 @@
 # Please refer to README for XRVG introduction
 
 # XRVG version (used in rakefile)
-XRVG_VERSION = "0.0.1"
+XRVG_VERSION = "0.0.2"
 
 # Standard Ruby extensions
 require 'enumerator'
@@ -26,8 +26,7 @@ require 'color'
 require 'frame'
 require 'shape'
 require 'render'
-# require 'bezier'
-# require 'bezierspline'
+require 'bezier'
 
 # XRVG extensions
 # require 'bezierbuilders'

data/test/test_bezier.rb

@@ -0,0 +1,151 @@
+require 'test/unit'
+require 'bezier'
+
+class BezierTest < Test::Unit::TestCase
+
+  @@piece = [ :raw, V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0] ]
+  @@bezier = Bezier.single( *@@piece )
+  @@beziersym = Bezier.raw( V2D[0.0, 0.0], V2D[1.0, 0.0], V2D[0.0, 1.0], V2D[1.0, 1.0] )
+  @@pieces = [[:raw, V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0,   0.0],   V2D[1.0, 0.0] ],
+              [:raw, V2D[1.0, 0.0], V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0] ]]
+  @@multibezier = Bezier.multi( @@pieces )
+
+  def test_builder
+    b = Bezier.new( :pieces, [BezierSpline[:raw, V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0]]] )
+    assert_equal( V2D[0.0, 1.0], b.firstpoint )
+
+    b = Bezier.single( :raw, V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0] )
+    assert_equal( V2D[0.0, 1.0], b.firstpoint )
+
+    b = Bezier.raw( V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0] )
+    assert_equal( V2D[0.0, 1.0], b.firstpoint )
+    
+    b = Bezier.vector( V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0] )
+    assert_equal( V2D[0.0, 1.0], b.firstpoint )
+    
+    b = Bezier.multi( [@@piece] )
+    assert_equal( V2D[0.0, 1.0], b.firstpoint )
+
+    b = Bezier.multi( [@@piece,@@piece] )
+    assert_equal( V2D[0.0, 1.0], b.firstpoint )
+  end
+
+  def test_O
+    assert_equal( [V2D::O, V2D::O, V2D::O, V2D::O], Bezier::O.pointlist )
+  end
+  
+  def test_piece
+    assert_equal( V2D[0.0, 1.0], @@multibezier.piece( 0 ).firstpoint )
+    assert_equal( V2D[1.0, 0.0], @@multibezier.piece( 1 ).firstpoint )
+    
+    assert_equal( V2D[0.0, 1.0], @@multibezier.piece( 0.2 ).firstpoint )
+    assert_equal( V2D[1.0, 0.0], @@multibezier.piece( 0.7 ).firstpoint )
+
+    assert_equal( V2D[0.0, 1.0], @@multibezier.piece( 0.2, :parameter ).firstpoint )
+    assert_equal( V2D[0.0, 1.0], @@multibezier.piece( 0.7, :parameter ).firstpoint )
+    assert_equal( V2D[1.0, 0.0], @@multibezier.piece( 1.2, :parameter ).firstpoint )
+  end
+  
+  def test_piecenumber
+    assert_equal( 1, @@bezier.piecenumber )
+    assert_equal( 2, @@multibezier.piecenumber )
+  end
+  
+  def test_viewbox
+    assert_equal( [0.0, 0.0, 1.0, 1.0], @@bezier.viewbox )
+  end
+
+  def test_pointlist
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0],
+		   V2D[1.0, 0.0],  V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0] ], @@multibezier.pointlist() )
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0],
+		   V2D[1.0, 0.0],  V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0] ], @@multibezier.pointlist(:raw) )
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 0.0], V2D[1.0, 0.0], V2D[-1.0, 0.0],
+		   V2D[1.0, 0.0],  V2D[1.0, 2.0], V2D[2.0, 0.0], V2D[-1.0, 1.0] ], @@multibezier.pointlist(:vector) )
+
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0]], @@multibezier.piece(0).pointlist() )
+    assert_equal( [ V2D[1.0, 0.0], V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0]], @@multibezier.piece(1).pointlist() )
+
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0]], @@multibezier.piece(0).pointlist(:raw) )
+    assert_equal( [ V2D[1.0, 0.0], V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0]], @@multibezier.piece(1).pointlist(:raw) )
+
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 0.0], V2D[1.0, 0.0], V2D[-1.0, 0.0]], @@multibezier.piece(0).pointlist(:vector) )
+    assert_equal( [ V2D[1.0, 0.0], V2D[1.0, 2.0], V2D[2.0, 0.0], V2D[-1.0, 1.0]], @@multibezier.piece(1).pointlist(:vector) )
+    
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0]], @@multibezier.piece(0.2).pointlist(:raw) )
+    assert_equal( [ V2D[1.0, 0.0], V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0]], @@multibezier.piece(0.8).pointlist(:raw) )
+
+    assert_equal( [ V2D[0.0, 1.0], V2D[1.0, 1.0], V2D[0.0, 0.0], V2D[1.0, 0.0]], @@multibezier.piece(0.2, :parameter).pointlist )
+    assert_equal( [ V2D[1.0, 0.0], V2D[2.0, 2.0], V2D[1.0, 1.0], V2D[2.0, 0.0]], @@multibezier.piece(1.2, :parameter).pointlist )
+  end
+
+  def test_firstpoint
+    assert_equal( V2D[0.0, 1.0], @@multibezier.firstpoint )
+  end
+
+  def test_lastpoint
+    assert_equal( V2D[2.0, 0.0], @@multibezier.lastpoint )
+  end
+
+  def test_beziers
+    beziers = @@multibezier.beziers
+    assert_equal( 2, beziers.length )
+    assert_equal( V2D[0.0, 1.0], beziers[0].firstpoint )
+    assert_equal( V2D[1.0, 0.0], beziers[1].firstpoint )
+  end
+
+
+  def test_computelength
+    assert( (1.0 -  Bezier.raw( V2D[0.0, 0.0], V2D[1.0, 0.0], V2D[0.0, 0.0], V2D[1.0, 0.0] ).length()).abs < 0.00001 ) 
+  end
+
+
+  def test_point
+    assert( V2D.vequal?( V2D[0.5, 0.5], @@beziersym.point( 0.5 ) ) )
+  end
+
+
+  def test_point_boundary
+    assert( V2D.vequal?( @@beziersym.point( 0.0 ), @@beziersym.point( -1.0 ) ) )
+    assert( V2D.vequal?( @@beziersym.point( 1.0 ), @@beziersym.point( 2.0 ) ) )
+  end
+
+  def test_parameter
+    assert( V2D.vequal?( @@beziersym.piece(0).point( 0.1 ), @@beziersym.point( 0.1, nil, :parameter ) ) )
+  end
+
+  def test_tangent
+    assert( V2D.vequal?( V2D[0.0, 0.5], @@beziersym.tangent( 0.5 ) ) )
+  end
+
+  def test_acc
+    assert( V2D.vequal?( V2D[0.0, 0.0], @@beziersym.acc( 0.5 ) ) )
+  end
+
+  def test_point2
+    container = V2D[0.0,0.0]
+    assert( V2D.vequal?( V2D[0.5, 0.5], @@beziersym.point( 0.5, container ) ) )
+    assert( V2D.vequal?( V2D[0.5, 0.5], container ) )
+  end
+
+  def test_tangent2
+    container = V2D[0.0,0.0]
+    assert( V2D.vequal?( V2D[0.0, 0.5], @@beziersym.tangent( 0.5, container ) ) )
+    assert( V2D.vequal?( V2D[0.0, 0.5], container ) )
+  end
+
+  def test_tangent3
+    container = V2D[0.0,0.0]
+    assert( V2D.vequal?( V2D[0.0, 0.0], @@beziersym.acc( 0.5, container ) ) )
+    assert( V2D.vequal?( V2D[0.0, 0.0], container ) )
+  end
+  
+  def test_ranges
+    assert_equal( [(0.0..1.0), (1.0..2.0)],  @@multibezier.ranges )
+  end
+
+end
+
+  
+      
+