texplay 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+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

data/README.markdown

@@ -0,0 +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!

data/README1st

@@ -1,6 +1,6 @@
 INSTRUCTIONS
 
-TexPlay version 0.2.1
+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

data/Rakefile

@@ -26,9 +26,9 @@ task :build => :clean do
 
         if RUBY_PLATFORM =~ /mswin/
             if RUBY_VERSION =~ /1.9/
-                File.rename("../lib/ctexplay.#{dlext}", "../lib/ctexplay19.#{$dlext}")
+                File.rename("../lib/ctexplay.#{$dlext}", "../lib/ctexplay.19.#{$dlext}")
             else
-                File.rename("../lib/ctexplay.#{dlext}", "../lib/ctexplay18.#{$dlext}")
+                File.rename("../lib/ctexplay.#{$dlext}", "../lib/ctexplay.18.#{$dlext}")
             end
         end
         puts "(5) ...done!"
@@ -38,8 +38,8 @@ 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 = "0.2.1"
-    s.date = "2009-09-02"
+    s.version = "0.2.2"
+    s.date = "2009-09-09"
     s.author = "John Mair (banisterfiend)"
     s.email = 'jrmair@gmail.com'
     s.description = s.summary
@@ -47,13 +47,13 @@ specification = Gem::Specification.new do |s|
     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", "CHANGELOG", "README1st",
+    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/ctexplay18.so", "lib/ctexplay19.so"]
+        s.files += ["lib/ctexplay.18.so", "lib/ctexplay.19.so"]
         
     else
         s.platform = Gem::Platform::RUBY

data/examples/example_alpha_blend.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
 

data/examples/example_bezier.rb

@@ -5,8 +5,8 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
-        @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
+        super(1024, 768, false, 20)
+        @img = TexPlay::create_blank_image(self, 500, 500)
 
         # put a border on the image
         @img.rect 0,0, @img.width - 1, @img.height - 1
@@ -23,18 +23,9 @@ class W < Gosu::Window
             points << p
         }
 
-        @img.move_to(points.first.x, points.first.y)
+        # making the bezier 
+        @img.bezier points, :color => :red
 
-        # making the bezier more interesting by using turtle graphics :) (a rough bezier)
-        @img.bezier points, :color => :red, :color_control => proc { |c, x, y|
-            if((x % 10) == 0) then
-                @img.line_to(x, y + rand * 20 - 10)
-            end
-            :none
-        }
-
-        #@img.fill 100, 400, :color => :yellow
-        
         # NOTE: can 'close' a bezier curve too (as with polylines)
     end
     

data/examples/example_color_control.rb

@@ -4,7 +4,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
@@ -18,6 +18,7 @@ class W < Gosu::Window
         # a valid color symbol)
         
         # color_control accepts procs of 4 types:
+        # arity of 0: nothing is yielded and color is set by return value of block
         # arity of 1: just the destination pixel color is yielded
         # arity of 2: both the destination and the source pixel colors are yielded (in that order)
         # arity of 3: the destination pixel color is yielded along with the x and y coords of the current pixel
@@ -52,7 +53,7 @@ class W < Gosu::Window
         }
 
         # this just fills a rect with random colours
-        @img.rect 400, 400, 470, 470, :fill => true, :color_control => proc { |c| :rand }
+        @img.rect 400, 400, 470, 470, :fill => true, :color_control => proc { :rand }
     end
 
     def draw

data/examples/example_color_transform.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
     end
     
@@ -14,9 +14,9 @@ class W < Gosu::Window
         x = (@img.width - 100/2) * rand 
         y = (@img.height - 100/2) * rand 
 
-        @img.rect x, y, x + 50, y + 50, :fill => true, :color_control => { :mult => [0.9 , 0.3, 0.3, 1] }
+        @img.rect x, y, x + 50, y + 50, :fill => true,
+        :color_control => { :mult => [0.9 , 0.3, 0.3, 1] }
 
-        
 
         @img.draw 100, 50,1
     end

data/examples/example_dup.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
         @img.rect 0,0, @img.width - 1, @img.height - 1
 

data/examples/example_each.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
 
         # each can accept a block of two types of arity:

data/examples/example_effect.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # put a border on the image

data/examples/example_fill.rb

@@ -6,16 +6,15 @@ require 'texplay'
 class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
-        @img = TexPlay::create_blank_image(self, 1000, 1000)
-        #        @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
-        @tp = Gosu::Image.new(self, "#{Common::MEDIA}/maria.png")
+        @img = TexPlay::create_blank_image(self, 1022, 1022)
+        @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/sand1.png")
 
         points = []
 
         # 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 + 90).step(85) { |x|
+        (0..@img.width + 90).step(185) { |x|
             p = TexPlay::TPPoint.new
             p.x = x
             p.y = @img.height * rand
@@ -25,19 +24,15 @@ class W < Gosu::Window
 
         @img.bezier points
 
-
         # NOTE: the :texture hash argument works on ALL drawing actions; not just fills
-        @img.fill 300, 400, :color => :red, :texture => @gosu
-#        @img.circle 300, 400, 40
+        @img.fill 300, 600, :texture => @gosu
 
         # let's demonstrate by drawing a circle using the gosu.png texture
         # NOTE: :texture even works on lines, boxes, polylines, beziers etc. 
         @img.circle 400, 50, 40, :fill => true, :texture => @tp
-        
     end
     
     def draw
-
         @img.draw 10, 10,1
     end
     

data/examples/example_fill_old.rb

@@ -4,7 +4,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")

data/examples/example_fluent.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
         @img.rect 0,0, @img.width - 1, @img.height - 1
 

data/examples/example_gen_eval.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         @width = @img.width

data/examples/example_hash_arguments.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
 

data/examples/example_melt.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
     end
     

data/examples/example_polyline.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # put a border on the image

data/examples/example_simple.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
 
@@ -18,6 +18,9 @@ class W < Gosu::Window
         @img.circle 400, 100, 40, :fill => true, :color => [rand, rand, rand, 1]
         @img.rect 200, 300, 300, 400, :fill => true, :color => :red
 
+        @img.ngon 400,300,50, 5, :start_angle => 90
+        @img.ngon 300,300,50, 5, :start_angle => 45
+
         # NOTE: chroma_key means NOT to splice in that color (pixels with that color are skipped)
         # (chroma_key_not does the opposite, it skips pixels that do NOT have that color)
         @img.splice @gosu, 210, 330, :chroma_key => :alpha

data/examples/example_splice.rb

@@ -5,27 +5,23 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
 
-#        @img.rect 20,20,100, 100, :fill => true, :texture => @gosu, :alpha_blend => true
-#        @img.rect 20,20, 100, 100, :color => [1, 0, 0, 0.1], :alpha_blend => true, :fill => true 
-        @img.splice @gosu, 20,20, :color_control => { :add => [0.5, 0.5, 0.5, 0.5]}
-        @img.splice @gosu, 100,20, :alpha_blend => true,
+        @img.splice @gosu, 140,20, 
         :color_control => proc { |c1, c2, x, y|
-            @img.set_pixel x + rand, y + 2 *rand, :color => c2
-            :none
+            factor = 1 - (y - 25) / @gosu.height.to_f
+            c2[0] *= factor
+            c2[1] *= factor
+            c2[2] *= factor
+            c2
         }
-            
-        
-            
+
+        @img.splice @gosu, 50,20, :chroma_key => :alpha
     end
 
-    
-    # NOTE: turtle is currently written in Ruby so is very slow, look at texplay-contrib.rb for source code.
     def draw
-
         @img.draw 100, 50,1
     end
     

data/examples/example_sync.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # sets the 'global' color for all actions in this image

data/examples/example_turtle.rb

@@ -5,11 +5,11 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 769, false, 20)
+        super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # put a border on the image
-        @img.rect 0,0, @img.width - 1, @img.height - 1
+        @img.rect 0, 0, @img.width - 1, @img.height - 1
 
         @length = 0
     end

data/lib/texplay-contrib.rb

@@ -6,26 +6,26 @@ end
 require 'texplay'
 
 # setup will be executed straight after Gosu::Image instantiation
-TexPlay.on_setup do
+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|
+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|
+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|
+TexPlay::create_macro(:line_to) do |x, y, *other|
     capture { 
         line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
 
@@ -33,7 +33,7 @@ TexPlay.create_macro(:line_to) do |x, y, *other|
     }
 end
 
-TexPlay.create_macro(:line_rel) do |dx, dy, *other|
+TexPlay::create_macro(:line_rel) do |dx, dy, *other|
     capture { 
         x = @turtle_pos.x + dx
         y = @turtle_pos.y + dy
@@ -44,19 +44,19 @@ TexPlay.create_macro(:line_rel) do |dx, dy, *other|
     }
 end
 
-TexPlay.create_macro(:turn_to) do |a|
+TexPlay::create_macro(:turn_to) do |a|
     capture {
         @turtle_angle = a
     }
 end
 
-TexPlay.create_macro(:turn) do |da|
+TexPlay::create_macro(:turn) do |da|
     capture { 
         @turtle_angle += da
     }
 end
 
-TexPlay.create_macro(:forward) do |dist, *other|
+TexPlay::create_macro(:forward) do |dist, *other|
     capture {
         visible = other.shift
 

data/lib/texplay.rb

@@ -10,16 +10,16 @@ require 'rbconfig'
 require 'gosu'
 
 module TexPlay
-    TEXPLAY_VERSION = "0.2.1"
+    TEXPLAY_VERSION = "0.2.2"
 
-    def self.on_setup(&block)
+    def self::on_setup(&block)
         raise "need a block" if !block
         
         @__init_procs__ ||= []
         @__init_procs__.push(block)
     end
 
-    def self.setup(receiver)
+    def self::setup(receiver)
         if @__init_procs__ then
             @__init_procs__.each do |init_proc|
                 receiver.instance_eval(&init_proc)
@@ -27,7 +27,7 @@ module TexPlay
         end
     end
 
-    def self.create_blank_image(window, width, height)
+    def self::create_blank_image(window, width, height)
         Gosu::Image.new(window, EmptyImageStub.new(width, height))
     end
 
@@ -37,7 +37,7 @@ module TexPlay
         Blue = [0, 0, 1, 1]
         Black = [0, 0, 0, 1]
         White = [1, 1, 1, 1]
-        Grey = [0.5, 0.5, 0.5, 0.5]
+        Grey = [0.5, 0.5, 0.5, 1]
         Alpha = [0, 0, 0, 0]
         Purple = [1, 0, 1, 1]
         Yellow = [1, 1, 0, 1]
@@ -52,8 +52,8 @@ end
 
 # credit to philomory for this class
 class EmptyImageStub
-    def initialize(w,h)
-        @w, @h = w, h;
+    def initialize(w, h)
+        @w, @h = w, h
     end
     
     def to_blob
@@ -74,9 +74,9 @@ direc = File.dirname(__FILE__)
 dlext = Config::CONFIG['DLEXT']
 begin
     if RUBY_VERSION && RUBY_VERSION =~ /1.9/
-        require "#{direc}/ctexplay19.#{dlext}"
+        require "#{direc}/ctexplay.19.#{dlext}"
     else
-        require "#{direc}/ctexplay18.#{dlext}"
+        require "#{direc}/ctexplay.18.#{dlext}"
     end
 rescue LoadError => e
     require "#{direc}/ctexplay.#{dlext}"