texplay 0.2.981 → 0.2.983pre1

data/CHANGELOG

@@ -1,3 +1,11 @@
+*27/9/10
+version 0.2.983pre1
+* added Window#to_blob(x,y,width,height), grab a screenshot region
+*24/9/10
+version 0.2.982pre1
+* added :default drawing mode (equivalent to :mode => nil)
+* changed Linux texture size to 512
+	
 16/8/10
 version 0.2.981
 * oops, added :caching => false to TexPlay#dup

data/README.markdown

@@ -5,7 +5,7 @@
 INSTRUCTIONS 
 ============
 
-**TexPlay version 0.2.981**
+**TexPlay version 0.2.983pre1**
 
 [Read The Documentation](http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/)
 

data/Rakefile

@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), '..')
 
 require 'rake/clean'
 require 'rake/gempackagetask'
@@ -27,8 +28,8 @@ specification = Gem::Specification.new do |s|
 
     s.extensions = ["ext/texplay/extconf.rb"]
     s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
-                "lib/texplay.rb", "lib/texplay-contrib.rb", "lib/texplay/version.rb"] +
-        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb", "examples/media/*"].to_a 
+                "lib/texplay.rb", "lib/texplay-contrib.rb", "lib/texplay/version.rb", "lib/texplay/patches.rb"] +
+        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb", "examples/media/*", "spec/*.rb"].to_a 
 end
 
 # Rake::ExtensionTask.new('texplay', specification)  do |ext|
@@ -57,12 +58,20 @@ end
 #   s.has_rdoc = false
 
 #   s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
-#               "lib/texplay.rb", "lib/texplay-contrib.rb", "lib/texplay/version.rb", "lib/1.8/texplay.so",
+#               "lib/texplay.rb", "lib/texplay-contrib.rb",
+#               "lib/texplay/version.rb",
+#               "lib/texplay/patches.rb",
+#               "lib/1.8/texplay.so",
 #               "lib/1.9/texplay.so"] +
-#     FileList["examples/*.rb", "examples/media/*"].to_a
+#     FileList["examples/*.rb", "examples/media/*", "spec/*.rb"].to_a
 # end
 
 Rake::GemPackageTask.new(specification) do |package|
   package.need_zip = false
   package.need_tar = false
 end
+
+desc "Run rspec 2.0"
+task :rspec do
+  system "rspec spec/**/*_spec.rb"
+end

data/examples/example_blank.rb

@@ -7,11 +7,28 @@ require 'texplay'
 class W < Gosu::Window
     def initialize
       super(500, 500, false, 20)
-      @img = TexPlay.create_image(self, 500, 500, :color => Gosu::Color::BLUE)
+      @img = TexPlay.create_image(self, 50, 50, :color => Gosu::Color::BLUE)
+      @img2 = TexPlay.create_image(self, 50, 50, :color => Gosu::Color::RED)
+
+    end
+
+    def update
+  
     end
     
     def draw
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
+      @img2.draw 100, 100,1
+      if button_down?(Gosu::KbEscape)
+#        self.flush
+        @blob = self.to_blob(0,self.height - 70, 50, 50)
+        if @blob
+          @img3 = TexPlay.from_blob(self, @blob,50, 50 ) 
+        end
+      end
+
+      @img3.draw rand(300), rand(300), 1 if @img3
+      500000.times {}
     end
     
 end

data/examples/example_select.rb

@@ -5,26 +5,34 @@ require 'texplay'
 
 
 class W < Gosu::Window
-  def initialize
-    super(500, 500, false, 20)
-    @img = TexPlay.create_image(self, 500, 500)
-    @img.rect 100, 100, 200, 300, :color => :red, :fill => true
-    @img.rect 200, 100, 300, 300, :color_control => proc { [0, 0, 1 - (0.5 * rand), 1.0] }, :fill => true
-
-
-    @img.line 0, 0, 500, 500, :dest_ignore => :red, :dest_select => :blue, :tolerance => 1
-
-    @img.circle 200, 100, 50, :fill => true, :dest_select => [:red, :blue], :color => :transparent
+    def initialize
+      super(500, 500, false, 20)
+
+      # draw a filled rect with left region blue, and right region red
+      # at top and yellow at bottom
+      @img = TexPlay.create_image(self, 500, 500, :color => Gosu::Color::BLUE)
+      @img.rect 250,0, 500, 500, :color => :red, :fill => true
+      @img.rect 250, 250, 500, 500, :color => :yellow, :fill => true
+
+      # base rect is green on left and purple on right
+      @base = TexPlay.create_image(self, 500, 500, :color => :green)
+      @base.rect 250,0, 500, 500, :color => :purple, :fill => true
+
+      # splice @img into @base, and select the yellow part of @img to
+      # go into the purple part of @base
+      # a combination of source_select
+      # and dest_select - filtering both source and destination pixels
+      @base.splice @img, 0, 0, :dest_select => :purple, :source_select => :yellow
+
+    end
+    
+    def draw
+      @base.draw 0, 0,1
+    end
     
-  end
-  
-  def draw
-    @img.draw 100, 50,1
-  end
-  
 end
 
 
 w = W.new
 w.show
-
+        

data/examples/example_select2.rb

@@ -0,0 +1,28 @@
+
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+require 'benchmark'
+
+
+class W < Gosu::Window
+  def initialize
+    super(500, 500, false, 20)
+    @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
+    @maria = Gosu::Image.new(self, "#{Common::MEDIA}/maria.png")
+    @img.rect 0,0, @img.width - 1, @img.height - 1
+    @img.splice @maria, 0, 0,  :tolerance => 0.70, :source_select => [:brown,:yellow], :crop => [200, 50, 500, 800]
+    
+  end
+  
+  def draw
+    @img.draw 0, 0,1
+  end
+  
+end
+
+
+w = W.new
+w.show
+

data/examples/example_splice.rb

@@ -1,6 +1,6 @@
 
 require 'rubygems'
-require 'common'
+require './common'
 require 'texplay'
 
 
@@ -10,7 +10,7 @@ class W < Gosu::Window
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
 
-        @img.splice @gosu, 140,20, :alpha_blend => true
+        @img.splice @gosu, 140,20, :alpha_blend => true, :mode => :default
         @img.rect 140,20, 160, 180, :color => [1,1,1,0.5], :alpha_blend => true, :fill => true
 
         @img.splice @gosu, 50,20, :chroma_key => :alpha

data/examples/example_tiles.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class Gosu::Image
   # so we can use the old TexPlay to_blob -- appears to segfault?!
-  remove_method :to_blob
+  undef_method :to_blob
 end
 
 class W < Gosu::Window

data/examples/example_window_to_blob.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+
+class W < Gosu::Window
+    def initialize
+      super(500, 500, false, 20)
+      @img = TexPlay.create_image(self, 50, 50, :color => Gosu::Color::BLUE)
+      @img2 = TexPlay.create_image(self, 50, 50, :color => Gosu::Color::RED)
+
+    end
+
+    def update
+  
+    end
+    
+    def draw
+        @img.draw 0, 0,1
+      @img2.draw 100, 100,1
+      if button_down?(Gosu::KbEscape)
+#        self.flush
+        @blob = self.to_blob(0,self.height - 70, 50, 50)
+        if @blob
+          @img3 = TexPlay.from_blob(self, @blob,50, 50 ) 
+        end
+      end
+
+      @img3.draw rand(300), rand(300), 1 if @img3
+      500000.times {}
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/ext/texplay/bindings.c

@@ -112,6 +112,24 @@ M_refresh_cache_all(VALUE self)
     return Qnil;
 }
 
+/* VALUE */
+/* M_screenshot(VALUE self, VALUE x, VALUE y, VALUE width, VALUE width) */
+/* { */
+/*     texture_info tex; */
+/*     int sidelength; */
+/*     int rb_x = FIX2INT(x); */
+/*     int rb_y = FIX2INT(y); */
+/*     int rb_width = FIX2INT(width); */
+/*     int rb_height = FIX2INT(height); */
+    
+/*     VALUE blob = rb_str_new(NULL, 4 * rb_width * rb_height); */
+
+/*     glReadPixels(rb_x, rb_y, rb_width, rb_height, GL_RGBA, GL_UNSIGNED_BYTE, RSTRING_PTR(blob)); */
+
+/*     return blob; */
+/* } */
+
+
 /* creates a blank image */
 /* VALUE */
 /* M_create_blank(VALUE self, VALUE window, VALUE width, VALUE height) */
@@ -347,6 +365,8 @@ get_image_chunk_with_size(char * data, texture_info * tex, char * blob)
         }
 }
 
+
+
 VALUE
 m_to_blob(VALUE self)
 {

data/ext/texplay/graphics_utils.c

@@ -169,7 +169,7 @@ skip_pixel(rgba source_color, action_struct * payload, texture_info * tex, int x
             color_match = true;
             break;
         }
-    if (!color_match) return true;
+        if (!color_match) return true;
     }
   }
 
@@ -230,7 +230,7 @@ set_pixel_color_with_style(action_struct * payload, texture_info * tex, int x, i
     if(payload->pen.has_color_control_proc)
         blended_pixel = exec_color_control_proc(payload, tex, x,  y, blended_pixel);
 
-    /* should skip this pixel? */
+    /* should skip this pixel? color selection */
     if (skip_pixel(blended_pixel, payload, tex, x, y))
       return;
 
@@ -489,7 +489,12 @@ prepare_drawing_mode(action_struct * cur)
 
       Check_Type(draw_mode, T_SYMBOL);
         
-      if(draw_mode == string2sym("clear"))
+      if(draw_mode == string2sym("default")) {
+        cur->pen.has_drawing_mode = false;
+
+        return;
+      }
+      else if(draw_mode == string2sym("clear"))
         cur->pen.drawing_mode = clear;
 
       else if(draw_mode == string2sym("copy"))

data/ext/texplay/texplay.c

@@ -24,145 +24,165 @@
 /** constructor for TPPoint class **/
 static VALUE m_init_TPPoint(int argc, VALUE * argv, VALUE self);
 static void monkey_patch_gosu(void);
+static VALUE gosu_window(void);
 
 void
 Init_texplay() {
 
-    VALUE jm_Module = rb_define_module("TexPlay");
-    VALUE TPPoint = rb_define_class_under(jm_Module, "TPPoint", rb_cObject);
-
-    /** define basic point class TPPoint **/
-    rb_attr(TPPoint, rb_intern("x"), 1, 1, Qtrue);
-    rb_attr(TPPoint, rb_intern("y"), 1, 1, Qtrue);
-    rb_define_method(TPPoint, "initialize", m_init_TPPoint, -1);
-    /** end of TPPoint definition **/
-
-    /* TexPlay methods */
-    rb_define_method(jm_Module, "paint", m_paint, -1);
-    rb_define_method(jm_Module, "get_pixel", m_getpixel, -1);
-    rb_define_method(jm_Module, "circle", m_circle, -1);
-    rb_define_method(jm_Module, "line", m_line, -1);
-    rb_define_method(jm_Module, "rect", m_rect, -1);
-    rb_define_method(jm_Module, "pixel", m_pixel, -1);
-    rb_define_method(jm_Module, "fill", m_flood_fill, -1);
-    rb_define_method(jm_Module, "bezier", m_bezier, -1);
-    rb_define_method(jm_Module, "polyline", m_polyline, -1);
-    rb_define_method(jm_Module, "ngon", m_ngon, -1);
+  VALUE jm_Module = rb_define_module("TexPlay");
+  VALUE TPPoint = rb_define_class_under(jm_Module, "TPPoint", rb_cObject);
+
+  /** define basic point class TPPoint **/
+  rb_attr(TPPoint, rb_intern("x"), 1, 1, Qtrue);
+  rb_attr(TPPoint, rb_intern("y"), 1, 1, Qtrue);
+  rb_define_method(TPPoint, "initialize", m_init_TPPoint, -1);
+  /** end of TPPoint definition **/
+
+  /* TexPlay methods */
+  rb_define_method(jm_Module, "paint", m_paint, -1);
+  rb_define_method(jm_Module, "get_pixel", m_getpixel, -1);
+  rb_define_method(jm_Module, "circle", m_circle, -1);
+  rb_define_method(jm_Module, "line", m_line, -1);
+  rb_define_method(jm_Module, "rect", m_rect, -1);
+  rb_define_method(jm_Module, "pixel", m_pixel, -1);
+  rb_define_method(jm_Module, "fill", m_flood_fill, -1);
+  rb_define_method(jm_Module, "bezier", m_bezier, -1);
+  rb_define_method(jm_Module, "polyline", m_polyline, -1);
+  rb_define_method(jm_Module, "ngon", m_ngon, -1);
     
-    rb_define_method(jm_Module, "splice", m_splice, -1);
+  rb_define_method(jm_Module, "splice", m_splice, -1);
     
-    rb_define_method(jm_Module, "color", m_color, -1);
-    rb_define_method(jm_Module, "offset", m_offset, -1);
-    rb_define_method(jm_Module, "method_missing", m_missing, -1);
-    rb_define_method(jm_Module, "quad_cached?", m_quad_cached, 0);
+  rb_define_method(jm_Module, "color", m_color, -1);
+  rb_define_method(jm_Module, "offset", m_offset, -1);
+  rb_define_method(jm_Module, "method_missing", m_missing, -1);
+  rb_define_method(jm_Module, "quad_cached?", m_quad_cached, 0);
 
-    rb_define_method(jm_Module, "each", m_each, -1);
+  rb_define_method(jm_Module, "each", m_each, -1);
     
-    /* needs to be updated, not yet done **/
-    /* rb_define_method(jm_Module, "bitmask", m_bitmask, -1); */
-    /* rb_define_method(jm_Module, "leftshift", m_lshift, -1); */
-    /* rb_define_method(jm_Module, "rightshift", m_rshift, -1); */
-    /* rb_define_method(jm_Module, "[]=", m_special_pixel, -1); */
-
-    rb_define_method(jm_Module, "dup", m_dup_image, 0);
-    rb_define_method(jm_Module, "clone", m_clone_image, 0);
-    rb_define_method(jm_Module, "to_blob", m_to_blob, 0);
-    rb_define_method(jm_Module, "force_sync", m_force_sync, 1);
-    rb_define_method(jm_Module, "set_options", m_user_set_options, 1);
-    rb_define_method(jm_Module, "get_options", m_get_options, 0);
-    rb_define_method(jm_Module, "delete_options", m_user_delete_options, 0);
-
-    rb_define_method(jm_Module, "refresh_cache", m_cache_refresh, 0);
+  /* needs to be updated, not yet done **/
+  /* rb_define_method(jm_Module, "bitmask", m_bitmask, -1); */
+  /* rb_define_method(jm_Module, "leftshift", m_lshift, -1); */
+  /* rb_define_method(jm_Module, "rightshift", m_rshift, -1); */
+  /* rb_define_method(jm_Module, "[]=", m_special_pixel, -1); */
+
+  rb_define_method(jm_Module, "dup", m_dup_image, 0);
+  rb_define_method(jm_Module, "clone", m_clone_image, 0);
+  rb_define_method(jm_Module, "to_blob", m_to_blob, 0);
+  rb_define_method(jm_Module, "force_sync", m_force_sync, 1);
+  rb_define_method(jm_Module, "set_options", m_user_set_options, 1);
+  rb_define_method(jm_Module, "get_options", m_get_options, 0);
+  rb_define_method(jm_Module, "delete_options", m_user_delete_options, 0);
+
+  rb_define_method(jm_Module, "refresh_cache", m_cache_refresh, 0);
     
-    /* a constant containing the sidelength of largest allowable quad */
-    rb_define_const(jm_Module, "TP_MAX_QUAD_SIZE", INT2FIX(max_quad_size() - 2));
-
-    /* singleton method for creating & removing macros */
-    rb_define_singleton_method(jm_Module, "create_macro", M_create_macro, 1);
-    rb_define_singleton_method(jm_Module, "remove_macro", M_remove_macro, 1);
-    rb_define_singleton_method(jm_Module, "refresh_cache_all", M_refresh_cache_all, 0);
-    /* rb_define_singleton_method(jm_Module, "create_blank_image", M_create_blank, 3); */
-
-    /** aliases; must be made on singleton class because we're using class methods **/
-    rb_define_method(jm_Module, "box", m_rect, -1);
-    rb_define_method(jm_Module, "colour", m_color, -1);
-    rb_define_method(jm_Module, "composite", m_splice, -1);
-    rb_define_method(jm_Module, "set_pixel", m_pixel, -1);
-    rb_define_method(jm_Module, "[]", m_getpixel, -1);
-    rb_define_method(jm_Module, "cache", m_cache_refresh, 0);
-    /** end of aliases **/
-
-    /** associated with gen_eval **/
-    rb_define_method(rb_cObject, "gen_eval", rb_gen_eval, -1);
-    rb_define_method(rb_cObject, "capture", rb_capture, 0);
+  /* a constant containing the sidelength of largest allowable quad */
+  rb_define_const(jm_Module, "TP_MAX_QUAD_SIZE", INT2FIX(max_quad_size() - 2));
+
+  /* singleton method for creating & removing macros */
+  rb_define_singleton_method(jm_Module, "create_macro", M_create_macro, 1);
+  rb_define_singleton_method(jm_Module, "remove_macro", M_remove_macro, 1);
+  rb_define_singleton_method(jm_Module, "refresh_cache_all", M_refresh_cache_all, 0);
+  /* rb_define_singleton_method(jm_Module, "create_blank_image", M_create_blank, 3); */
+
+  /** aliases; must be made on singleton class because we're using class methods **/
+  rb_define_method(jm_Module, "box", m_rect, -1);
+  rb_define_method(jm_Module, "colour", m_color, -1);
+  rb_define_method(jm_Module, "composite", m_splice, -1);
+  rb_define_method(jm_Module, "set_pixel", m_pixel, -1);
+  rb_define_method(jm_Module, "[]", m_getpixel, -1);
+  rb_define_method(jm_Module, "cache", m_cache_refresh, 0);
+  /** end of aliases **/
+
+  /** associated with gen_eval **/
+  rb_define_method(rb_cObject, "gen_eval", rb_gen_eval, -1);
+  rb_define_method(rb_cObject, "capture", rb_capture, 0);
     
-    rb_define_method(rb_cObject, "to_module", rb_to_module , 0);
-    rb_define_method(rb_cObject, "reset_tbls", rb_reset_tbls , 0);
-    rb_define_method(rb_cObject, "gen_extend", rb_gen_extend, -1);
-    rb_define_method(rb_cModule, "gen_include", rb_gen_include, -1);
+  rb_define_method(rb_cObject, "to_module", rb_to_module , 0);
+  rb_define_method(rb_cObject, "reset_tbls", rb_reset_tbls , 0);
+  rb_define_method(rb_cObject, "gen_extend", rb_gen_extend, -1);
+  rb_define_method(rb_cModule, "gen_include", rb_gen_include, -1);
 
-    rb_define_alias(rb_cObject, "gen_eval_with", "gen_eval");
-    /** end of gen_eval defs **/
+  rb_define_alias(rb_cObject, "gen_eval_with", "gen_eval");
+  /** end of gen_eval defs **/
 
 
-    /** basic setup **/
+  /** basic setup **/
 
-    /* seed the random number generator */
-    srand(time(NULL));
+  /* seed the random number generator */
+  srand(time(NULL));
 
-    monkey_patch_gosu();
-    /** end basic setup **/
+  monkey_patch_gosu();
+  /** end basic setup **/
 }
 
 /** constructor for TPPoint class **/
 static VALUE
 m_init_TPPoint(int argc, VALUE * argv, VALUE self)
 {
-    if(argc == 0) {
-        rb_iv_set(self, "@x", INT2FIX(0));
-        rb_iv_set(self, "@y", INT2FIX(0));
-    }
-    else if(argc == 2){
-        if(is_a_num(argv[0]) && is_a_num(argv[1])) {
-            rb_iv_set(self, "@x", argv[0]);
-            rb_iv_set(self, "@y", argv[1]);
-        }
-        else
-            rb_raise(rb_eArgError, "must provide two numbers");
+  if(argc == 0) {
+    rb_iv_set(self, "@x", INT2FIX(0));
+    rb_iv_set(self, "@y", INT2FIX(0));
+  }
+  else if(argc == 2){
+    if(is_a_num(argv[0]) && is_a_num(argv[1])) {
+      rb_iv_set(self, "@x", argv[0]);
+      rb_iv_set(self, "@y", argv[1]);
     }
     else
-        rb_raise(rb_eArgError, "please provide x and y args only");
+      rb_raise(rb_eArgError, "must provide two numbers");
+  }
+  else
+    rb_raise(rb_eArgError, "please provide x and y args only");
 
-    return Qnil;
+  return Qnil;
     
 }
 /** end constructor for TPPoint **/
 
 
 static VALUE
-gosu_window_to_blob(VALUE self)
+gosu_window_to_blob(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
-    int width, height;
-    VALUE blob;
-
-    width = rb_funcall(self, rb_intern("width"), 0);
-    height = rb_funcall(self, rb_intern("height"), 0);
-
-    blob = rb_str_new(NULL, 4 * width * height);
-
-    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, RSTRING_PTR(blob));
+  int rb_x = FIX2INT(x);
+  int rb_y = FIX2INT(y);
+  int rb_width = FIX2INT(width);
+  int rb_height = FIX2INT(height);
+  int window_height = FIX2INT(rb_funcall(self, rb_intern("height"), 0));
 
-    return blob;
+  VALUE blob = rb_str_new(NULL, 4 * rb_width * rb_height);
+    
+  glFinish();
+  rb_funcall(self, rb_intern("flush"), 0);
+    
+  glReadPixels(rb_x, rb_y, rb_width, rb_height, GL_RGBA,
+               GL_UNSIGNED_BYTE, RSTRING_PTR(blob));
+    
+  return blob;
 }
 
 static void
 monkey_patch_gosu(void)
 {
+  rb_define_method(gosu_window(), "to_blob", gosu_window_to_blob, 4);
+}    
+
+static VALUE
+gosu_window(void)
+{
+  static VALUE GosuWindow = 0;
+
+  if (!GosuWindow) {
     VALUE Gosu = rb_const_get(rb_cObject, rb_intern("Gosu"));
-    VALUE GosuWindow = rb_const_get(Gosu, rb_intern("Window"));
+    GosuWindow = rb_const_get(Gosu, rb_intern("Window"));
+  }
+
+  return GosuWindow;
+}
     
-    rb_define_method(GosuWindow, "to_blob", gosu_window_to_blob, 0);
-}    
+
+  
+                                  
+                                  
 
 
 

data/ext/texplay/utils.c

@@ -772,7 +772,7 @@ max_quad_size(void)
 {
   
 #if defined(__APPLE__) || defined(__linux__)
-  return 1024;
+  return 512;
 #endif
   
     static unsigned size = 0;

data/lib/texplay.rb

@@ -12,6 +12,7 @@ direc = File.dirname(__FILE__)
 require 'rbconfig'
 require 'gosu'
 require "#{direc}/texplay/version"
+require "#{direc}/texplay/patches"
 
 module TexPlay
     class << self
@@ -35,6 +36,8 @@ module TexPlay
             :color => :alpha,
             :caching => false,
           }.merge!(options)
+
+          raise ArgumentError, "Height and width must be positive" if height <= 0 or width <= 0
           
           img = Gosu::Image.new(window, EmptyImageStub.new(width, height), :caching => options[:caching])
           img.rect 0, 0, img.width - 1, img.height - 1, :color => options[:color], :fill => true 
@@ -44,6 +47,23 @@ module TexPlay
 
         alias_method :create_blank_image, :create_image
 
+        # Image can be :tileable, but it will break if it is tileable AND gets modified after creation.
+        def from_blob(window, blob_data, width, height, options={})
+          options = {
+            :caching => @options[:caching],
+            :tileable => false,
+          }.merge!(options)
+
+          raise ArgumentError, "Height and width must be positive (received #{width}x#{height})" if height <= 0 or width <= 0
+
+          expected_size = height * width * 4
+          if blob_data.size != expected_size
+            raise ArgumentError, "Blob data is not of the correct size (expected #{expected_size} but received #{blob_data.size} bytes)"
+          end
+
+          Gosu::Image.new(window, ImageStub.new(blob_data, width, height), options[:tileable], :caching => options[:caching])
+        end
+
         def set_options(options = {})
             @options.merge!(options)
         end
@@ -100,22 +120,24 @@ module TexPlay
       
 end
 
-# credit to philomory for this class
-class EmptyImageStub
-    def initialize(w, h)
-        @w, @h = w, h
-    end
+# Used to create images from blob data.
+class ImageStub
+    attr_reader :rows, :columns
     
-    def to_blob
-        "\0" * @w * @h * 4
+    def initialize(blob_data, width, height)
+        @data, @columns, @rows = blob_data, width, height
     end
     
-    def rows
-        @h
+    def to_blob
+        @data
     end
-    
-    def columns
-        @w
+end
+
+# Used to create blank images.
+# credit to philomory for this class
+class EmptyImageStub < ImageStub
+    def initialize(width, height)
+        super("\0" * (width * height * 4), width, height)
     end
 end
 

data/lib/texplay/patches.rb

@@ -0,0 +1,4 @@
+# 1.9.2 path fix
+
+$LOAD_PATH.push File.dirname(File.expand_path(__FILE__))
+

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
 module TexPlay
-    VERSION = "0.2.981"
+  VERSION = "0.2.983pre1"
 end

data/spec/image_spec.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), '..', 'lib','texplay')
+
+require 'texplay'
+
+describe Gosu::Image do
+  it "should do all sorts of things"
+end

data/spec/texplay_spec.rb

@@ -0,0 +1,80 @@
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), '..', 'lib','texplay')
+
+require 'texplay'
+
+describe TexPlay do
+  before :each do
+    @window = Gosu::Window.new(640, 480, false)
+  end
+
+  describe "#create_image" do
+    it "should create a blank image of the correct size" do
+      width, height = 30, 10
+      image = described_class.create_image(@window, width, height)
+
+      image.width.should == width
+      image.height.should == height
+
+      width.times do |x|
+        height.times do |y|
+          image.get_pixel(x, y).should == [0.0, 0.0, 0.0, 0.0]
+        end
+      end
+    end
+
+    it "should create a coloured image of the correct size" do
+      width, height = 10, 30
+      color = [1.0, 1.0, 0.0, 1.0]
+      image = described_class.create_image(@window, width, height, :color => color)
+
+      image.width.should == width
+      image.height.should == height
+
+      width.times do |x|
+        height.times do |y|
+          image.get_pixel(x, y).should == color
+        end
+      end
+    end
+
+    it "should raise an error if an image dimension is 0 or less" do
+      lambda { described_class.create_image(@window, 0, 0)}.should raise_error ArgumentError
+    end
+
+    # TODO: Should probably be an ArgumentError.
+    it "should raise an error if the image would be too large" do
+      too_big = TexPlay::TP_MAX_QUAD_SIZE + 1
+      [[too_big, 5], [10, too_big], [too_big, too_big]].each do |width, height|
+        lambda { described_class.create_image(@window, width, height)}.should raise_error Exception
+      end
+    end
+  end
+
+  describe "#from_blob" do
+    it "should create an image with the requested pixel data and size" do
+      # 4 x 3, with columns of red, blue, green, transparent.
+      gosu_colors = [[255, 0, 0, 255], [0, 255, 0, 255], [0, 0, 255, 255], [0, 0, 0, 0]]
+      texplay_colors = gosu_colors.map {|a| a.map {|c| c / 255.0 } }
+      width, height = gosu_colors.size, 3
+      
+      image = described_class.from_blob(@window, (gosu_colors * height).flatten.pack('C*'), width, height)
+
+      image.width.should == width
+      image.height.should == height
+
+      texplay_colors.each_with_index do |color, x|
+        3.times do |y|
+          image.get_pixel(x, y).should == color
+        end
+      end
+    end
+
+    it "should raise an error if the image size is not correct for the blob data" do
+      lambda { described_class.from_blob(@window, [1, 1, 1, 1].pack("C*"), 2, 1) }.should raise_error ArgumentError
+    end
+
+    it "should raise an error if an image dimension is 0 or less" do
+      lambda { described_class.from_blob(@window, '', 0, 0) }.should raise_error ArgumentError
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  hash: 1981
-  prerelease: false
+  hash: -1037985743
+  prerelease: true
   segments: 
   - 0
   - 2
-  - 981
-  version: 0.2.981
+  - 983pre1
+  version: 0.2.983pre1
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +12:00
+date: 2010-09-27 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - lib/texplay.rb
 - lib/texplay-contrib.rb
 - lib/texplay/version.rb
+- lib/texplay/patches.rb
 - ext/texplay/extconf.rb
 - ext/texplay/actions.h
 - ext/texplay/bindings.h
@@ -94,6 +95,7 @@ files:
 - examples/example_polyline.rb
 - examples/example_scale.rb
 - examples/example_select.rb
+- examples/example_select2.rb
 - examples/example_simple.rb
 - examples/example_splice.rb
 - examples/example_sync.rb
@@ -104,6 +106,7 @@ files:
 - examples/example_transparent3.rb
 - examples/example_turtle.rb
 - examples/example_weird.rb
+- examples/example_window_to_blob.rb
 - examples/media/bird.png
 - examples/media/body.png
 - examples/media/empty2.png
@@ -118,6 +121,8 @@ files:
 - examples/media/sand1.png
 - examples/media/sunset.png
 - examples/media/texplay.png
+- spec/image_spec.rb
+- spec/texplay_spec.rb
 has_rdoc: true
 homepage: http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/
 licenses: []
@@ -139,12 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: