texplay 0.2.4-x86-mswin32-60 → 0.2.5-x86-mswin32-60

data/CHANGELOG

@@ -1,88 +1,94 @@
-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!
-
+6/10/09
+version 0.2.5
+* fixed quad_draw flicker bug
+* added splice_and_scale (to texplay-contrib.rb)
+* now using rake-compiler to run build process
+
+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.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!
+![Alt text](https://dl.getdropbox.com/u/239375/texplay.png)
+
+*an image manipulation tool for ruby and gosu*
+
+INSTRUCTIONS 
+============
+
+**TexPlay version 0.2.5**
+
+Gem installation:
+
++ sudo gem install texplay
+
+To compile TexPlay from source, ensure you are in the directory with the Rakefile and type:
+
++ rake compile
+
+OR
+
++ rake19 compile (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,66 @@
-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
+require 'rake/clean'
+require 'rake/gempackagetask'
+#require 'rake/extensiontask'
+
+TEXPLAY_VERSION = "0.2.5"
+
+$dlext = Config::CONFIG['DLEXT']
+
+CLEAN.include("ext/**/*.#{$dlext}", "ext/**/*.log", "ext/**/*.o", "ext/**/*~", "ext/**/*#*", "ext/**/*.obj", "ext/**/*.def", "ext/**/*.pdb")
+CLOBBER.include("**/*.#{$dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
+
+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 = Time.now.strftime '%Y-%m-%d'
+    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.platform = Gem::Platform::RUBY
+  
+    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["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb",
+                 "examples/media/*"].to_a 
+                 
+    if RUBY_PLATFORM =~ /mswin/
+        s.platform = Gem::Platform::CURRENT
+        s.files += ["lib/1.8/texplay.so", "lib/1.9/texplay.so"]
+        
+    else
+        s.platform = Gem::Platform::RUBY        
+        s.extensions = ["ext/texplay/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_bezier.rb

@@ -15,7 +15,7 @@ class W < Gosu::Window
 
         # NOTE: TexPlay also accepts points. a 'point' is any object that responds to 'x' or 'y'
         # NOTE: current maximum points for a bezier is 13
-        (0..@img.width + 100).step(50) { |x|
+        (0..@img.width + 100).step(40) { |x|
             p = TexPlay::TPPoint.new
             p.x = x
             p.y = @img.height * rand

data/examples/example_dup.rb

@@ -32,7 +32,30 @@ class W < Gosu::Window
         puts @bunk.little
 
         # add a red line to the copy to identify it
-        @bunk.line 0, 0, 1024, 1024, :color => :red
+        #@bunk.line 0, 0, 1024, 1024, :color => :red
+
+        @bunk.each(:region =>[200,200,350,350]) { |c,x,y|
+
+            num_pixels = 0
+            total = [0, 0, 0, 0]
+            @bunk.circle x, y, 2,
+            :color_control => proc { |v|
+                if v
+                    total[0] += v[0]
+                    total[1] += v[1]
+                    total[2] += v[2]
+                    total[3] += v[3]
+
+                    num_pixels += 1
+                end
+                :none
+            }
+
+            c[0] = total[0] / num_pixels.to_f
+            c[1] = total[1] / num_pixels.to_f
+            c[2] = total[2] / num_pixels.to_f
+            c[3] = total[3] / num_pixels.to_f
+        }
 
     end