xrvg 0.0.4 → 0.0.5

data/CHANGES

@@ -1,5 +1,11 @@
 = CHANGES
 
+== 0.0.5 (2008.03.22)
+=== Content
+- Add GeoVariety classes
+=== Debug
+- color interpolation right again, but color trim is no longer done
+
 == 0.0.4 (2008.03.16)
 Really big functional release. Several additional releases are needed to add appropriate tests and docs.
 === Content

data/README

@@ -1,6 +1,6 @@
 = XRVG -- X Ruby Vector Graphics
 
-Supporting XRVG version: 0.0.4
+Supporting XRVG version: 0.0.5
 
 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", "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", "xrvg.rb"]
 LIB_FILES = FileList["#{LIB_DIR}/*.rb"]
 
 # Example code.

data/lib/color.rb

@@ -35,10 +35,11 @@ class Color
   #
   # r, g, b, a must be between 0.0 and 1.0
   def initialize( r, g, b, a)
-    r = Range.O.trim( r )
-    g = Range.O.trim( g )
-    b = Range.O.trim( b )
-    a = Range.O.trim( a )
+    # cannot trim because otherwise color interpolation cannot be right !!
+    # r = Range.O.trim( r )
+    # g = Range.O.trim( g )
+    # b = Range.O.trim( b )
+    # a = Range.O.trim( a )
     @items = [r,g,b,a]
   end
 
@@ -129,8 +130,8 @@ class Color
 
   # return a random color vector, with 1.0 opacity !!
   #  Color.rand => Color[0.2345, 0.987623, 0.4123, 1.0]
-  def Color.rand
-    return Color[Kernel::rand,Kernel::rand,Kernel::rand,1.0] 
+  def Color.rand( opacity )
+    return Color[Kernel::rand,Kernel::rand,Kernel::rand,opacity] 
   end
 
   # return a black color vector

data/lib/interpolation.rb

@@ -42,7 +42,8 @@ module Interpolation
 	if dindex == index
 	  return value
 	end
-	result = pvalue + ((value + pvalue * (-1.0) ) * ((dindex - pindex) / (index - pindex )))
+	result = pvalue + ((value + (pvalue * (-1.0)) ) * ((dindex - pindex) / (index - pindex )))
+	Trace("pindex #{pindex} pvalue #{pvalue.inspect} index #{index} value #{value.inspect} dindex #{dindex} result #{result.inspect}")
 	break
       end
       pvalue, pindex = value, index

data/lib/xrvg.rb

@@ -3,7 +3,7 @@
 # Please refer to README for XRVG introduction
 
 # XRVG version (used in rakefile)
-XRVG_VERSION = "0.0.4"
+XRVG_VERSION = "0.0.5"
 
 # XRVG namespace
 module XRVG
@@ -38,7 +38,7 @@ require 'bezierbuilders'
 require 'beziermotifs'
 require 'beziertools'
 require 'interbezier'
-# require 'geovariety'
+require 'geovariety'
 # require 'spiral'
 # require 'graph'
 

data/test/test_color.rb

@@ -29,6 +29,10 @@ class ColorTest < Test::Unit::TestCase
     assert_equal( orange, Color.orange )
   end
 
+  def test_rand
+    assert_equal( 0.3, Color.rand( 0.3 ).a )
+  end
+
   def test_svg
     assert_equal( "rgb(0,0,0)", Color.black.svg )
   end
@@ -77,6 +81,7 @@ class ColorTest < Test::Unit::TestCase
 
   def test_format255
     assert_equal( [255,255,255,255], Color.white.format255 )
+    assert_equal( [25,25,25,25], Color[0.1,0.1,0.1,0.1].format255 )
   end
 
 end
@@ -88,6 +93,8 @@ class PaletteTest < Test::Unit::TestCase
     palette = Palette.new( :colorlist, [ 0.0, Color.black, 1.0, Color.white ] )
     assert_equal( Color[0.5, 0.5, 0.5, 1.0], palette.color( 0.5 ) )
     assert_equal( Color[0.5, 0.5, 0.5, 1.0], palette.sample( 0.5 ) )
+    palette  = Palette[ :colorlist, [ 0.0, Color.blue,   0.3,  Color.orange,  0.5, Color.yellow, 0.7,  Color.green, 1.0, Color.blue] ]
+    assert_equal( Color[1.0, 0.75, 0.0, 1.0], palette.sample( 0.4 ) )
   end
 
   def test_reverse

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: xrvg
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2008-03-16 00:00:00 +01:00
+  version: 0.0.5
+date: 2008-03-22 00:00:00 +01:00
 summary: Ruby vector graphics library
 require_paths: 
 - lib