texplay 0.2.2-x86-mswin32-60 → 0.2.4-x86-mswin32-60

data/CHANGELOG

@@ -1,78 +1,88 @@
-8/9/09
-version 0.2.2
-* fixed color_control bug, action_struct->color was being overwritten (now using a temp).
-* fixed faulty error msg where max tex size was being displayed as 1024 but is actually 1022
-* added :start_angle parameter to ngon action
-* fixed example screen height from 769 to 768
-* arity of -1 and 0 now supported for color_control procs
-* fixed parameter checks for circle and ngon
-* updated documentation to reflect changes, and added details on caching
-
-2/9/09
-version 0.2.1
-* releasing a gem for TexPlay
-* bumped version number so can add add gosu 0.7.14 dependency to github gem
-* hopefully gem works on both github and rubyforge
-31/8/09
-version 0.2.0
-* added each iterator
-* added alternative to proc for :color_control proc (allowing static linear transforms to pixels)
-* no longer segfaulting on windows (no idea why not)
-* rewrote EmptyImageStub in ruby, using philomory's code. now alot faster.
-* implemented 'shadow' in terms of static :color_control pixel transform
-* added more example code demonstrating each iterator (example_each.rb) and new color_control behaviour
-  i.e example_color_transform.rb
-* should be relatively stable now! 
-
-28/8/09
-version 0.1.9.1 (still BETA)
-* experimental features: Gosu::Image#dup and Gosu::Image#clone
-* also TexPlay::create_blank_image(window, width, height)
-* I noticed these features SEG FAULT on my setup in windows, so be warned
-* This is a BETA release
-
-14/8/09
-version 0.1.9.0 (BETA)
-* major rewrite. TP now supports beziers, polylines, polygons, and more
-* also supports alpha_blending (though still tempermental)
-* This is a BETA release
-
-1/7/09
-version 0.1.6.2
-* fixed another subtle bug in constrain_local_boundaries(). Function was 
-unable to deal with drawing actions that were 100% outside the image 
-boundaries.
-
-28/6/09
-version 0.1.6
-* gen_eval now working as a replacement for instance_eval in the #paint block. Allows for more user-friendly interface.
-* #paint can now be called without a block; if invoked this way it executes any commands in the action queue, e.g
-  @img.circle 20, 20, 40
-  @img.pixel 30, 30
-  @img.paint
-* above will function as if: @img.paint { circle 20, 20, 40; pixel 30, 30 }
-* collected 1.8.6/1.9.1 compatibility into compat.h
-
-16/6/09
-version 0.1.4.6
-* allowed arity of 0 (as well as -1) for ruby 1.9 compatibility
-
-13/6/09
-version 0.1.4.5
-* major bugfix with TexPlay#splice method (segfaut). Also added new color format parameter: color [1, 1, 0, 1] (e.g purple with full alpha).
-Also fixed subtle edge-case bug in constrain_local_boundaries().
-
-9/6/09
-version 0.1.4
-* improved error checking. should work better with later gosu releases
-
-20/2/09 
-version 0.1.1
-* rerelease of this version fixing the oversized image bug for refresh_cache (i.e images over 500 x 500
-
-version 0.1.1
-* oops, bug in leftshift/rightshift functions, fixed!
-
-version 0.1.0
-* release!
-
+15/9/09
+version 0.2.4
+* added lsystem
+* made lsystem both 1.9.1 and 1.8.6 compatible
+
+11/9/09
+version 0.2.3
+* added Ruby 1.8.7 compatibility by modifying extconf.rb to define RUBY_19 macro
+* and modified compat.h to get rid of feature test (fails on 1.8.7)
+
+8/9/09
+version 0.2.2
+* fixed color_control bug, action_struct->color was being overwritten (now using a temp).
+* fixed faulty error msg where max tex size was being displayed as 1024 but is actually 1022
+* added :start_angle parameter to ngon action
+* fixed example screen height from 769 to 768
+* arity of -1 and 0 now supported for color_control procs
+* fixed parameter checks for circle and ngon
+* updated documentation to reflect changes, and added details on caching
+
+2/9/09
+version 0.2.1
+* releasing a gem for TexPlay
+* bumped version number so can add add gosu 0.7.14 dependency to github gem
+* hopefully gem works on both github and rubyforge
+31/8/09
+version 0.2.0
+* added each iterator
+* added alternative to proc for :color_control proc (allowing static linear transforms to pixels)
+* no longer segfaulting on windows (no idea why not)
+* rewrote EmptyImageStub in ruby, using philomory's code. now alot faster.
+* implemented 'shadow' in terms of static :color_control pixel transform
+* added more example code demonstrating each iterator (example_each.rb) and new color_control behaviour
+  i.e example_color_transform.rb
+* should be relatively stable now! 
+
+28/8/09
+version 0.1.9.1 (still BETA)
+* experimental features: Gosu::Image#dup and Gosu::Image#clone
+* also TexPlay::create_blank_image(window, width, height)
+* I noticed these features SEG FAULT on my setup in windows, so be warned
+* This is a BETA release
+
+14/8/09
+version 0.1.9.0 (BETA)
+* major rewrite. TP now supports beziers, polylines, polygons, and more
+* also supports alpha_blending (though still tempermental)
+* This is a BETA release
+
+1/7/09
+version 0.1.6.2
+* fixed another subtle bug in constrain_local_boundaries(). Function was 
+unable to deal with drawing actions that were 100% outside the image 
+boundaries.
+
+28/6/09
+version 0.1.6
+* gen_eval now working as a replacement for instance_eval in the #paint block. Allows for more user-friendly interface.
+* #paint can now be called without a block; if invoked this way it executes any commands in the action queue, e.g
+  @img.circle 20, 20, 40
+  @img.pixel 30, 30
+  @img.paint
+* above will function as if: @img.paint { circle 20, 20, 40; pixel 30, 30 }
+* collected 1.8.6/1.9.1 compatibility into compat.h
+
+16/6/09
+version 0.1.4.6
+* allowed arity of 0 (as well as -1) for ruby 1.9 compatibility
+
+13/6/09
+version 0.1.4.5
+* major bugfix with TexPlay#splice method (segfaut). Also added new color format parameter: color [1, 1, 0, 1] (e.g purple with full alpha).
+Also fixed subtle edge-case bug in constrain_local_boundaries().
+
+9/6/09
+version 0.1.4
+* improved error checking. should work better with later gosu releases
+
+20/2/09 
+version 0.1.1
+* rerelease of this version fixing the oversized image bug for refresh_cache (i.e images over 500 x 500
+
+version 0.1.1
+* oops, bug in leftshift/rightshift functions, fixed!
+
+version 0.1.0
+* release!
+

data/README.markdown

@@ -1,35 +1,35 @@
-![Alt text](https://dl.getdropbox.com/u/239375/texplay.png)
-
-*an image manipulation tool for ruby and gosu*
-
-INSTRUCTIONS 
-============
-
-**TexPlay version 0.2.2**
-
-Gem installation:
-
-+ sudo gem install texplay
-
-To compile TexPlay from source, ensure you are in the directory with the Rakefile and type:
-
-+ rake
-
-OR
-
-+ rake19  (assuming this is the name of your 1.9.1 version of rake)
-
-**NB:** be sure to run the version of rake that corresponds to the ruby version you wish to use! on my system I use rake19 for ruby 1.9.1!
-
-If all goes well, run the example programs:
-
-+ cd examples
-+ ruby example_melt.rb
-+ ruby example_simple.rb
-+ ..etc
-
-+ like any gosu application, gosu.so must be in the current directory (or the gosu gem installed) when running the examples.
-
-
----
-Enjoy!
+![Alt text](https://dl.getdropbox.com/u/239375/texplay.png)
+
+*an image manipulation tool for ruby and gosu*
+
+INSTRUCTIONS 
+============
+
+**TexPlay version 0.2.4**
+
+Gem installation:
+
++ sudo gem install texplay
+
+To compile TexPlay from source, ensure you are in the directory with the Rakefile and type:
+
++ rake
+
+OR
+
++ rake19  (assuming this is the name of your 1.9.1 version of rake)
+
+**NB:** be sure to run the version of rake that corresponds to the ruby version you wish to use! on my system I use rake19 for ruby 1.9.1!
+
+If all goes well, run the example programs:
+
++ cd examples
++ ruby example_melt.rb
++ ruby example_simple.rb
++ ..etc
+
++ like any gosu application, gosu.so must be in the current directory (or the gosu gem installed) when running the examples.
+
+
+---
+Enjoy!

data/Rakefile

@@ -1,87 +1,87 @@
-require 'rake/clean'
-require 'rake/gempackagetask'
-
-TEXPLAY_VERSION = "0.2.2"
-
-$dlext = Config::CONFIG['DLEXT']
-
-CLEAN.include("src/*.#{$dlext}", "src/*.log", "src/*.o", "src/*~", "src/*#*", "src/*.obj", "src/*.def", "src/*.pdb")
-CLOBBER.include("**/*.#{$dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
-
-$make_program = if RUBY_PLATFORM =~ /win/ 
-                    "nmake"
-                else
-                    "make"
-                end
-
-task :default => [:build]
-
-desc "Build TexPlay"
-task :build => :clean do
-    puts "(2) building Makefile..."
-    chdir("./src/") do
-        ruby "extconf.rb"
-        puts "(3) building ctexplay.#{$dlext}..."
-        sh "#{$make_program}"
-        puts "(4) copying ctexplay.#{$dlext} to current directory..."
-        cp "ctexplay.#{$dlext}", "../lib" , :verbose => true
-
-        if RUBY_PLATFORM =~ /mswin/
-            if RUBY_VERSION =~ /1.9/
-                File.rename("../lib/ctexplay.#{$dlext}", "../lib/ctexplay.19.#{$dlext}")
-            else
-                File.rename("../lib/ctexplay.#{$dlext}", "../lib/ctexplay.18.#{$dlext}")
-            end
-        end
-        puts "(5) ...done!"
-    end
-end
-
-specification = Gem::Specification.new do |s|
-    s.name = "texplay"
-    s.summary = "TexPlay is a light-weight image manipulation framework for Ruby and Gosu"
-    s.version = TEXPLAY_VERSION
-    s.date = "2009-09-09"
-    s.author = "John Mair (banisterfiend)"
-    s.email = 'jrmair@gmail.com'
-    s.description = s.summary
-    s.require_path = 'lib'
-    s.add_dependency("gosu",">=0.7.14")
-    s.homepage = "http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/"
-    s.has_rdoc = false
-    s.files =  ["Rakefile", "README.markdown", "CHANGELOG", "README1st",
-                "lib/texplay.rb", "lib/texplay-contrib.rb"] +
-        FileList["src/*", "examples/*.rb", "examples/media/*"].to_a 
-
-    if RUBY_PLATFORM =~ /mswin/
-        s.platform = Gem::Platform::CURRENT
-        s.files += ["lib/ctexplay.18.so", "lib/ctexplay.19.so"]
-        
-    else
-        s.platform = Gem::Platform::RUBY
-        s.extensions = ["src/extconf.rb"]
-    end
-end
-Rake::GemPackageTask.new(specification) do |package|
-    package.need_zip = false
-    package.need_tar = false
-end
-
-SELENE = '/home/john/ruby/projects/selene'
-desc "update selene's version of texplay"
-task :selene => ["#{SELENE}/lib/texplay.rb", "#{SELENE}/lib/texplay-contrib.rb",
-              "#{SELENE}/lib/ctexplay.so"] do
-    puts "...done!"
-end
-
-file "#{SELENE}/lib/texplay.rb" => "texplay.rb" do |t|
-    cp t.prerequisites.first, t.name, :verbose => true
-end
-
-file "#{SELENE}/lib/texplay-contrib.rb" => "texplay-contrib.rb" do |t|
-    cp t.prerequisites.first, t.name, :verbose => true
-end
-
-file "#{SELENE}/lib/ctexplay.#{$dlext}" => "ctexplay.#{$dlext}" do |t|
-    cp t.prerequisites.first, t.name, :verbose => true
-end
+require 'rake/clean'
+require 'rake/gempackagetask'
+
+TEXPLAY_VERSION = "0.2.4"
+
+$dlext = Config::CONFIG['DLEXT']
+
+CLEAN.include("src/*.#{$dlext}", "src/*.log", "src/*.o", "src/*~", "src/*#*", "src/*.obj", "src/*.def", "src/*.pdb")
+CLOBBER.include("**/*.#{$dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
+
+$make_program = if RUBY_PLATFORM =~ /win/ 
+                    "nmake"
+                else
+                    "make"
+                end
+
+task :default => [:build]
+
+desc "Build TexPlay"
+task :build => :clean do
+    puts "(2) building Makefile..."
+    chdir("./src/") do
+        ruby "extconf.rb"
+        puts "(3) building ctexplay.#{$dlext}..."
+        sh "#{$make_program}"
+        puts "(4) copying ctexplay.#{$dlext} to current directory..."
+        cp "ctexplay.#{$dlext}", "../lib" , :verbose => true
+
+        if RUBY_PLATFORM =~ /mswin/
+            if RUBY_VERSION =~ /1.9/
+                File.rename("../lib/ctexplay.#{$dlext}", "../lib/ctexplay.19.#{$dlext}")
+            else
+                File.rename("../lib/ctexplay.#{$dlext}", "../lib/ctexplay.18.#{$dlext}")
+            end
+        end
+        puts "(5) ...done!"
+    end
+end
+
+specification = Gem::Specification.new do |s|
+    s.name = "texplay"
+    s.summary = "TexPlay is a light-weight image manipulation framework for Ruby and Gosu"
+    s.version = TEXPLAY_VERSION
+    s.date = "2009-09-09"
+    s.author = "John Mair (banisterfiend)"
+    s.email = 'jrmair@gmail.com'
+    s.description = s.summary
+    s.require_path = 'lib'
+    s.add_dependency("gosu",">=0.7.14")
+    s.homepage = "http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/"
+    s.has_rdoc = false
+    s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
+                "lib/texplay.rb", "lib/texplay-contrib.rb"] +
+        FileList["src/*", "examples/*.rb", "examples/media/*"].to_a 
+
+    if RUBY_PLATFORM =~ /mswin/
+        s.platform = Gem::Platform::CURRENT
+        s.files += ["lib/ctexplay.18.so", "lib/ctexplay.19.so"]
+        
+    else
+        s.platform = Gem::Platform::RUBY
+        s.extensions = ["src/extconf.rb"]
+    end
+end
+Rake::GemPackageTask.new(specification) do |package|
+    package.need_zip = false
+    package.need_tar = false
+end
+
+SELENE = '/home/john/ruby/projects/selene'
+desc "update selene's version of texplay"
+task :selene => ["#{SELENE}/lib/texplay.rb", "#{SELENE}/lib/texplay-contrib.rb",
+              "#{SELENE}/lib/ctexplay.so"] do
+    puts "...done!"
+end
+
+file "#{SELENE}/lib/texplay.rb" => "texplay.rb" do |t|
+    cp t.prerequisites.first, t.name, :verbose => true
+end
+
+file "#{SELENE}/lib/texplay-contrib.rb" => "texplay-contrib.rb" do |t|
+    cp t.prerequisites.first, t.name, :verbose => true
+end
+
+file "#{SELENE}/lib/ctexplay.#{$dlext}" => "ctexplay.#{$dlext}" do |t|
+    cp t.prerequisites.first, t.name, :verbose => true
+end

data/examples/example_fill.rb

@@ -6,7 +6,7 @@ require 'texplay'
 class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
-        @img = TexPlay::create_blank_image(self, 1022, 1022)
+        @img = TexPlay::create_blank_image(self, 1022, 800)
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/sand1.png")
 
@@ -25,7 +25,7 @@ class W < Gosu::Window
         @img.bezier points
 
         # NOTE: the :texture hash argument works on ALL drawing actions; not just fills
-        @img.fill 300, 600, :texture => @gosu
+        @img.fill 300, 650, :texture => @gosu
 
         # let's demonstrate by drawing a circle using the gosu.png texture
         # NOTE: :texture even works on lines, boxes, polylines, beziers etc. 

data/examples/example_lsystem.rb

@@ -0,0 +1,51 @@
+require 'common'
+require 'texplay'
+
+Dragon = TexPlay::LSystem.new do
+    rule "F" => "F"
+    rule "X" => "X+YF+"
+    rule "Y" => "-FX-Y"
+    angle 90
+
+    atom "FX"
+end
+
+Bush1 = TexPlay::LSystem.new do
+    rule "F" => "F[-F]F[+F][F]"
+    
+    angle 20
+    atom "F"
+end
+
+Bush2 = TexPlay::LSystem.new do
+    rule "F" => "FF"
+    rule "X" => "F[+X]F[-X]+X"
+    
+    angle 20
+    atom "X"
+end
+
+Bush3 = TexPlay::LSystem.new do
+    rule "F" => "FF"
+    rule "X" => "F-[[X]+X]+F[+FX]-X"
+    
+    angle 22.5
+    atom "X"
+end
+
+
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+        @img = TexPlay::create_blank_image(self, 500, 500)
+        @img.lsystem(0, 250, Bush2, :order => 5, :line_length => 5)
+    end
+
+    def draw
+        @img.draw(100,0,1)
+    end
+end
+
+w = W.new
+w.show

data/lib/texplay-contrib.rb

@@ -1,77 +1,149 @@
-begin
-    require 'rubygems'
-rescue LoadError
-end
-
-require 'texplay'
-
-# setup will be executed straight after Gosu::Image instantiation
-TexPlay::on_setup do
-    @turtle_pos = TexPlay::TPPoint.new(width / 2, height / 2 )
-    @turtle_angle = 0
-end
-
-TexPlay::create_macro(:move_to) do |x, y|
-    capture { 
-        @turtle_pos.x = x
-        @turtle_pos.y = y
-    }
-end
-
-TexPlay::create_macro(:move_rel) do |dx, dy|
-    capture { 
-        @turtle_pos.x += dx
-        @turtle_pos.y += dy
-    }
-end
-
-TexPlay::create_macro(:line_to) do |x, y, *other|
-    capture { 
-        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
-
-        @turtle_pos.x, @turtle_pos.y = x, y
-    }
-end
-
-TexPlay::create_macro(:line_rel) do |dx, dy, *other|
-    capture { 
-        x = @turtle_pos.x + dx
-        y = @turtle_pos.y + dy
-
-        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
-
-        @turtle_pos.x, @turtle_pos.y = x, y
-    }
-end
-
-TexPlay::create_macro(:turn_to) do |a|
-    capture {
-        @turtle_angle = a
-    }
-end
-
-TexPlay::create_macro(:turn) do |da|
-    capture { 
-        @turtle_angle += da
-    }
-end
-
-TexPlay::create_macro(:forward) do |dist, *other|
-    capture {
-        visible = other.shift
-
-        radians_per_degree = 0.0174532925199433
-
-        x = @turtle_pos.x + dist * Math::cos(radians_per_degree * @turtle_angle)
-        y = @turtle_pos.y + dist * Math::sin(radians_per_degree * @turtle_angle)
-
-        if(visible) then
-            line_to(x, y, *other)
-        else
-            move_to(x, y)
-        end
-    }
-end
-
-
-
+begin
+    require 'rubygems'
+rescue LoadError
+end
+
+require 'texplay'
+
+if RUBY_VERSION =~ /1.8/
+    require 'jcode'
+end
+
+# setup will be executed straight after Gosu::Image instantiation
+TexPlay::on_setup do
+    @turtle_pos = TexPlay::TPPoint.new(width / 2, height / 2 )
+    @turtle_angle = 0
+end
+
+
+TexPlay::create_macro(:move_to) do |x, y|
+    capture { 
+        @turtle_pos.x = x
+        @turtle_pos.y = y
+    }
+end
+
+TexPlay::create_macro(:move_rel) do |dx, dy|
+    capture { 
+        @turtle_pos.x += dx
+        @turtle_pos.y += dy
+    }
+end
+
+TexPlay::create_macro(:line_to) do |x, y, *other|
+    capture { 
+        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
+
+        @turtle_pos.x, @turtle_pos.y = x, y
+    }
+end
+
+TexPlay::create_macro(:line_rel) do |dx, dy, *other|
+    capture { 
+        x = @turtle_pos.x + dx
+        y = @turtle_pos.y + dy
+
+        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
+
+        @turtle_pos.x, @turtle_pos.y = x, y
+    }
+end
+
+TexPlay::create_macro(:turn_to) do |a|
+    capture {
+        @turtle_angle = a
+    }
+end
+
+TexPlay::create_macro(:turn) do |da|
+    capture { 
+        @turtle_angle += da
+    }
+end
+
+TexPlay::create_macro(:forward) do |dist, *other|
+    capture {
+        visible = other.shift
+
+        radians_per_degree = 0.0174532925199433
+
+        x = @turtle_pos.x + dist * Math::cos(radians_per_degree * @turtle_angle)
+        y = @turtle_pos.y + dist * Math::sin(radians_per_degree * @turtle_angle)
+
+        if(visible) then
+            line_to(x, y, *other)
+        else
+            move_to(x, y)
+        end
+    }
+end
+
+## L-System code
+
+# monkeypatches to TexPlay class
+module TexPlay
+    class LSystem
+        def initialize(&block)
+            @rules = {}
+            
+            instance_eval(&block) if block
+        end
+        
+        def rule(new_rule)
+            @rules.merge!(new_rule)
+        end
+
+        def atom(new_atom)
+            @atom = new_atom
+        end
+
+        def angle(new_angle=nil)
+            return @angle if !new_angle
+            @angle = new_angle
+        end
+
+        def produce_string(order)
+            order = order[:order]
+            string = @atom.dup
+            
+            order.times do
+                i = 0
+                while(i < string.length)
+                    sub = @rules[string[i, 1]]
+                    
+                    string[i] = sub if sub
+                    
+                    i += sub ? sub.length : 1
+                end
+            end
+            
+            string
+        end
+    end
+end
+
+# L-System macro
+TexPlay::create_macro(:lsystem) do |x, y, system, options|
+    capture {
+        theta = system.angle
+        turtle_stack = []
+        move_to(x, y)
+        line_length = options[:line_length] || 1
+        
+        system.produce_string(options).each_char do |v|
+                      
+            case v
+            when "F"
+                forward(line_length, true)
+            when "+"
+                turn(theta)
+            when "-"
+                turn(-theta)
+            when "["
+                turtle_stack.push([@turtle_pos.dup, @turtle_angle])
+            when "]"
+                @turtle_pos, @turtle_angle = turtle_stack.pop
+            end
+        end
+    }
+end

data/lib/texplay.rb

@@ -1,134 +1,134 @@
-# (C) John Mair 2009, under the MIT licence
-
-begin
-    require 'rubygems'
-rescue LoadError
-end
-
-# include gosu first
-require 'rbconfig'
-require 'gosu'
-
-module TexPlay
-    TEXPLAY_VERSION = "0.2.2"
-
-    def self::on_setup(&block)
-        raise "need a block" if !block
-        
-        @__init_procs__ ||= []
-        @__init_procs__.push(block)
-    end
-
-    def self::setup(receiver)
-        if @__init_procs__ then
-            @__init_procs__.each do |init_proc|
-                receiver.instance_eval(&init_proc)
-            end
-        end
-    end
-
-    def self::create_blank_image(window, width, height)
-        Gosu::Image.new(window, EmptyImageStub.new(width, height))
-    end
-
-    module Colors
-        Red = [1, 0, 0, 1]
-        Green = [0, 1, 0, 1]
-        Blue = [0, 0, 1, 1]
-        Black = [0, 0, 0, 1]
-        White = [1, 1, 1, 1]
-        Grey = [0.5, 0.5, 0.5, 1]
-        Alpha = [0, 0, 0, 0]
-        Purple = [1, 0, 1, 1]
-        Yellow = [1, 1, 0, 1]
-        Cyan = [0, 1, 1, 1]
-        Orange = [1, 0.5, 0, 1]
-        Brown = [0.39, 0.26, 0.13, 1]
-        Turquoise = [1, 0.6, 0.8, 1]
-        Tyrian = [0.4, 0.007, 0.235, 1]
-    end
-    include Colors
-end
-
-# credit to philomory for this class
-class EmptyImageStub
-    def initialize(w, h)
-        @w, @h = w, h
-    end
-    
-    def to_blob
-        "\0" * @w * @h * 4
-    end
-    
-    def rows
-        @h
-    end
-    
-    def columns
-        @w
-    end
-end
-
-# bring in user-defined extensions to TexPlay
-direc = File.dirname(__FILE__)
-dlext = Config::CONFIG['DLEXT']
-begin
-    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
-        require "#{direc}/ctexplay.19.#{dlext}"
-    else
-        require "#{direc}/ctexplay.18.#{dlext}"
-    end
-rescue LoadError => e
-    require "#{direc}/ctexplay.#{dlext}"
-end
-    
-require "#{direc}/texplay-contrib"
-
-# monkey patching the Gosu::Image class to add image manipulation functionality
-module Gosu
-    class Image
-
-        # bring in the TexPlay image manipulation methods
-        include TexPlay
-        
-        class << self 
-            alias_method :original_new, :new
-            
-            def new(*args, &block)
-
-                # invoke old behaviour
-                obj = original_new(*args, &block)
-
-                # refresh the TexPlay image cache
-                if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE - 2) &&
-                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE - 2) && obj.quad_cached? then
-                    
-                    obj.refresh_cache
-                end
-
-                # run custom setup
-                TexPlay::setup(obj)
-
-                 obj.instance_variable_set(:@__window__, args.first)
-
-                # return the new image
-                obj
-            end
-        end
-        
-        def __window__
-            @__window__
-        end
-    end
-end
-
-# a bug in ruby 1.8.6 rb_eval_string() means i must define this here (rather than in texplay.c)
-class Proc  
-    def __context__
-        eval('self', self.binding)
-    end
-end
-
-
-
-
+# (C) John Mair 2009, under the MIT licence
+
+begin
+    require 'rubygems'
+rescue LoadError
+end
+
+# include gosu first
+require 'rbconfig'
+require 'gosu'
+
+module TexPlay
+    TEXPLAY_VERSION = "0.2.4"
+
+    def self::on_setup(&block)
+        raise "need a block" if !block
+        
+        @__init_procs__ ||= []
+        @__init_procs__.push(block)
+    end
+
+    def self::setup(receiver)
+        if @__init_procs__ then
+            @__init_procs__.each do |init_proc|
+                receiver.instance_eval(&init_proc)
+            end
+        end
+    end
+
+    def self::create_blank_image(window, width, height)
+        Gosu::Image.new(window, EmptyImageStub.new(width, height))
+    end
+
+    module Colors
+        Red = [1, 0, 0, 1]
+        Green = [0, 1, 0, 1]
+        Blue = [0, 0, 1, 1]
+        Black = [0, 0, 0, 1]
+        White = [1, 1, 1, 1]
+        Grey = [0.5, 0.5, 0.5, 1]
+        Alpha = [0, 0, 0, 0]
+        Purple = [1, 0, 1, 1]
+        Yellow = [1, 1, 0, 1]
+        Cyan = [0, 1, 1, 1]
+        Orange = [1, 0.5, 0, 1]
+        Brown = [0.39, 0.26, 0.13, 1]
+        Turquoise = [1, 0.6, 0.8, 1]
+        Tyrian = [0.4, 0.007, 0.235, 1]
+    end
+    include Colors
+end
+
+# credit to philomory for this class
+class EmptyImageStub
+    def initialize(w, h)
+        @w, @h = w, h
+    end
+    
+    def to_blob
+        "\0" * @w * @h * 4
+    end
+    
+    def rows
+        @h
+    end
+    
+    def columns
+        @w
+    end
+end
+
+# bring in user-defined extensions to TexPlay
+direc = File.dirname(__FILE__)
+dlext = Config::CONFIG['DLEXT']
+begin
+    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
+        require "#{direc}/ctexplay.19.#{dlext}"
+    else
+        require "#{direc}/ctexplay.18.#{dlext}"
+    end
+rescue LoadError => e
+    require "#{direc}/ctexplay.#{dlext}"
+end
+    
+require "#{direc}/texplay-contrib"
+
+# monkey patching the Gosu::Image class to add image manipulation functionality
+module Gosu
+    class Image
+
+        # bring in the TexPlay image manipulation methods
+        include TexPlay
+        
+        class << self 
+            alias_method :original_new, :new
+            
+            def new(*args, &block)
+
+                # invoke old behaviour
+                obj = original_new(*args, &block)
+
+                # refresh the TexPlay image cache
+                if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE - 2) &&
+                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE - 2) && obj.quad_cached? then
+                    
+                    obj.refresh_cache
+                end
+
+                # run custom setup
+                TexPlay::setup(obj)
+
+                 obj.instance_variable_set(:@__window__, args.first)
+
+                # return the new image
+                obj
+            end
+        end
+        
+        def __window__
+            @__window__
+        end
+    end
+end
+
+# a bug in ruby 1.8.6 rb_eval_string() means i must define this here (rather than in texplay.c)
+class Proc  
+    def __context__
+        eval('self', self.binding)
+    end
+end
+
+
+
+

data/src/Makefile

@@ -53,7 +53,7 @@ warnflags =
 CFLAGS   =  -MD -Zi  -O2b2xg- -G6 -Zm600 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS =    
+CPPFLAGS =     -DRUBY_19
 CXXFLAGS = $(CFLAGS) -MD -Zi  -O2b2xg- -G6 -Zm600
 ldflags  = -incremental:no -debug -opt:ref -opt:icf
 dldflags = -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH)

data/src/compat.h

@@ -6,9 +6,13 @@
 #include <ruby.h>
 
 /* this is the test we use to identify ruby 1.9.1 */
+
+/* commenting out this test because it doesn't seem to work in 1.8.7 */
+/*
 #ifdef RCLASS_M_TBL
 # define RUBY_19
 #endif
+*/
 
 /* macros for backwards compatibility with 1.8 */
 #ifndef RUBY_19

data/src/extconf.rb

@@ -15,4 +15,7 @@ else
     exit unless have_library("glut32") 
 end
 
+# 1.9 compatibility
+$CPPFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
+
 create_makefile('ctexplay')

data/src/utils.c

@@ -946,10 +946,26 @@ fact(int n)
 }
 
 unsigned
-comb(int n, int k)
+comb(int n, int r)
 {
-    double temp = fact(n) / (fact(k) * fact(n - k));
+    double temp = fact(n) / (fact(r) * fact(n - r));
     return temp;
+    /*    if(r > (n / 2))
+        r = n - r;
+    
+    return perm(n, r) / fact(r);
+    */
+}
+
+unsigned
+perm(int n, int r)
+{
+    int val = n;
+    int i;
+    for(i = n - 1; i > (n - r); i--)
+        val *= i;
+
+    return val;
 }
 
 double

data/src/utils.h

@@ -138,6 +138,8 @@ VALUE point_y(VALUE point);
 double power(float base, int exp);
 unsigned fact(int n);
 unsigned comb(int n, int k);
+unsigned perm(int n, int r);
+
 double bernstein(int n, int k, float u);
 
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.4
 platform: x86-mswin32-60
 authors: 
 - John Mair (banisterfiend)
@@ -34,7 +34,6 @@ files:
 - Rakefile
 - README.markdown
 - CHANGELOG
-- README1st
 - lib/texplay.rb
 - lib/texplay-contrib.rb
 - src/actions.c
@@ -82,6 +81,7 @@ files:
 - examples/example_fluent.rb
 - examples/example_gen_eval.rb
 - examples/example_hash_arguments.rb
+- examples/example_lsystem.rb
 - examples/example_melt.rb
 - examples/example_polyline.rb
 - examples/example_simple.rb

data/README1st

@@ -1,9 +0,0 @@
-INSTRUCTIONS
-
-TexPlay version 0.2.2
-
-*Ensure that ctexplay.so and gosu.so, and texplay.rb and texplay-contrib.rb are in the working directory for your project
-*require 'texplay' in your ruby program to access the TexPlay module
-*see example programs, for illustration of use
-
-