texplay 0.2.710 → 0.2.722

data/CHANGELOG

@@ -1,3 +1,7 @@
+12/03/10
+version 0.2.721	
+* fixed bug in alpha_blend (now blends alpha channels too)
+
 6/12/09
 version 0.2.710
 * fixed bug in line drawing code (wasn't drawing final pixel)

data/Rakefile

@@ -1,3 +1,4 @@
+
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/extensiontask'
@@ -27,36 +28,41 @@ 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 
-end
-
-Rake::GemPackageTask.new(specification) do |package|
-    package.need_zip = false
-    package.need_tar = false
+        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb", "examples/media/*"].to_a 
 end
 
 Rake::ExtensionTask.new('texplay', specification)  do |ext|
-    ext.config_script = 'extconf.rb' 
-    ext.cross_compile = true                
-    ext.cross_platform = 'i386-mswin32'
+  # ext.config_script = 'extconf.rb' 
+  # ext.cross_compile = true                
+  #ext.cross_platform = 'i386-mswin32'
+#  ext.platform = 'i386-mswin32'
 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
+# comment this when want to build normal gems.
+# only have this code uncommented when building mswin32 and mingw32
+# binary gems
+#   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 = 'i386-mingw32'
+#     s.homepage = "http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/"
+#     s.has_rdoc = false
 
-# file "#{SELENE}/lib/ctexplay.#{$dlext}" => "ctexplay.#{$dlext}" do |t|
-#     cp t.prerequisites.first, t.name, :verbose => true
+#     s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
+#                 "lib/texplay.rb", "lib/texplay-contrib.rb", "lib/texplay/version.rb", "lib/1.8/texplay.so",
+#                 "lib/1.9/texplay.so"] +
+#     FileList["examples/*.rb", "examples/media/*"].to_a
 # end
+  
+Rake::GemPackageTask.new(specification) do |package|
+  package.need_zip = false
+  package.need_tar = false
+end

data/examples/example_color_transform.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'common'
 require 'gosu'
 require 'texplay'
-require 'devil/gosu'
+#require 'devil/gosu'
 
 class W < Gosu::Window
     def initialize
@@ -34,7 +34,7 @@ class W < Gosu::Window
         @copy.splice @img, 0, 0, :crop => [@x - @rad, @y - @rad, @x + @rad, @y + @rad]
         @img.
             circle @x, @y, @rad, :fill => true,
-        :color_control => { :mult => [1, 1, 1, 1] }
+        :color_control => { :mult => [1.0, 0.5, 0.5, 1] }
 
          #    circle @x2, @y2, @rad, :fill => true,
 #             :color_control => { :mult => [0.3, 0.9, 0.3, 1] }
@@ -47,7 +47,7 @@ class W < Gosu::Window
         if button_down?(Gosu::KbEscape)
             IL.Enable(IL::ORIGIN_SET)
             IL.OriginFunc(IL::ORIGIN_UPPER_LEFT)
-            screenshot.crop(0,0, 500, 500).save("screenshot.jpg").free
+#            screenshot.crop(0,0, 500, 500).save("screenshot.jpg").free
             exit
         end  
         

data/examples/example_lsystem.rb

@@ -1,5 +1,5 @@
 require 'common'
-require 'devil/gosu'
+require 'gosu'
 
 Dragon = TexPlay::LSystem.new do
     rule "F" => "F"
@@ -48,8 +48,8 @@ class W < Gosu::Window
         super(1024, 768, false, 20)
         @img = TexPlay::create_blank_image(self, 500, 500)
         @img.set_options :color => :rand
-        @img.lsystem(400, 350, Dragon, :order => 13, :line_length => 4)
-        @img.save("dragon.jpg")
+        @img.lsystem(400, 150, Koch, :order => 8, :line_length => 6)
+        #@img.save("dragon.jpg")
     end
 
     def draw

data/examples/example_splice.rb

@@ -1,33 +1,27 @@
-require 'rubygems'
-require 'common'
-require 'texplay'
-
-
-class W < Gosu::Window
-    def initialize
-        super(1024, 768, false, 20)
-        @img = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
-        @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
-
-        @img.splice @gosu, 140,20, 
-        :color_control => proc { |c1, c2, x, y|
-            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
-
-    def draw
-        @img.draw 100, 50,1
-    end
-    
-end
-
-
-w = W.new
-w.show
-        
+require 'rubygems'
+require 'common'
+require 'texplay'
+
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+        @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.rect 140,20, 160, 180, :color => [1,1,1,0.5], :alpha_blend => true, :fill => true
+
+        @img.splice @gosu, 50,20, :chroma_key => :alpha
+    end
+
+    def draw
+        @img.draw 100, 50,1
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/examples/example_weird.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'common'
+require 'texplay'
+
+
+class W < Gosu::Window
+  def initialize
+    super(1024, 768, false, 20)
+    @img = Gosu::Image.new(self, "#{Common::MEDIA}/bird.png")
+    @green = Gosu::Image.new(self, "#{Common::MEDIA}/gob.png")
+    ###    @img = Gosu::Image.new(self, "gob.png")
+    #@img = TexPlay.create_image(self, 500, 500).fill(0,0, :color => :red)
+
+    @img.splice @green, 0, 0, :alpha_blend => true
+    puts @img.get_pixel 15, 15
+    #        @img.rect 0, 0, @img.width, @img.height, :texture => @gob, :fill => true, :alpha_blend => true
+
+  end
+
+  def draw
+    @img.draw 100, 50,1
+  end
+  
+end
+
+
+w = W.new
+w.show
+

data/ext/texplay/actions.c

@@ -1,5 +1,6 @@
 #include "texplay.h"
 #include "utils.h"
+#include "graphics_utils.h"
 #include "actions.h"
 #include <assert.h>
 #include <math.h>
@@ -10,24 +11,6 @@
 #endif
 
 
-/* small helper functions */
-static void process_common_hash_args(action_struct * cur, VALUE * hash_arg, sync sync_mode, bool primary);
-static void update_bounds(action_struct * cur, int xmin, int ymin, int xmax, int ymax);
-static void update_lazy_bounds(action_struct * cur, texture_info * tex);
-static void set_local_bounds(action_struct * cur, int xmin, int ymin, int xmax, int ymax, texture_info * tex);
-
-static void draw_prologue(action_struct * cur, texture_info * tex,
-                          int xmin, int ymin, int xmax, int ymax, VALUE * hash_arg, sync sync_mode,
-                          bool primary, action_struct ** payload_ptr);
-static void draw_epilogue(action_struct * cur, texture_info * tex, bool primary);
-
-static void prepare_fill_texture(action_struct * cur);
-static void prepare_color_control(action_struct * cur);
-static void set_pixel_color_with_style(action_struct * payload, texture_info * tex,
-                                       int x, int y);
-/* end helpers */
-
-
 /** line_do_action, bresenham's algorithm **/
 void
 line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_arg,
@@ -151,14 +134,14 @@ void
 polyline_do_action(VALUE points, texture_info * tex, VALUE hash_arg,
                    sync sync_mode, bool primary, action_struct * payload)
 {
-    action_struct cur;
+
     int x1, y1, x2, y2;
     int format;
     int num_point_pairs;
     int k;
+    int draw_offset_y, draw_offset_x;
+    action_struct cur;
     VALUE offset_val;
-    int draw_offset_x;
-    int draw_offset_y;
     bool closed = false;
     
     draw_prologue(&cur, tex, XMAX_OOB, YMAX_OOB, XMIN_OOB, YMIN_OOB, &hash_arg, sync_mode, primary, &payload);
@@ -230,7 +213,6 @@ ngon_do_action(int x, int y, int r, int num_sides, texture_info * tex, VALUE has
 {
     action_struct cur;
     int x1, y1, x2, y2, x0, y0;
-    int n;
     int thickness;
     float angle = 0;
 
@@ -258,7 +240,7 @@ ngon_do_action(int x, int y, int r, int num_sides, texture_info * tex, VALUE has
     x0 = x1 = x + r * cos(angle);
     y0 = y1 = y + r * sin(angle);
 
-    for(n = 0; n < num_sides; n++) {
+    for(int n = 0; n < num_sides; n++) {
         x2 = x + r * cos((2 * PI / num_sides) * n + angle);
         y2 = y + r * sin((2 * PI / num_sides) * n + angle);
 
@@ -316,10 +298,9 @@ rect_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
         line_do_action(x2, y1, x2, y2, tex, hash_arg, no_sync, false, payload);
     }
     else {
-        int y;
         if(y1 > y2) SWAP(y1, y2);
 
-        for(y = y1; y <= y2; y++)
+        for(int y = y1; y <= y2; y++)
             line_do_action(x1, y, x2, y, tex, hash_arg, no_sync, false, payload);
     }
 
@@ -702,12 +683,11 @@ static void
 bezier_point(VALUE points, float u, float * x, float * y, int n, int format,
              int draw_offset_x, int draw_offset_y)
 {
-    int k;
     int xy_index;
     double sumx = 0, sumy = 0;
  
 
-    for(k = 0; k < n; k++) {
+    for(int k = 0; k < n; k++) {
         switch(format) {
         case POINT_FORMAT:
             
@@ -843,15 +823,15 @@ each_pixel_do_action(int x1, int y1, int x2, int y2, VALUE proc, texture_info *
                      sync sync_mode, bool primary, action_struct * payload)
 {
     action_struct cur;
-    int x, y, arity;
+    int arity;
     VALUE rb_pix = rb_ary_new2(4);
     
     draw_prologue(&cur, tex, x1, y1, x2, y2, &hash_arg, sync_mode, primary, &payload);
 
     arity = FIX2INT(rb_funcall(proc, rb_intern("arity"), 0));
 
-    for(y = y1; y < y2 + 1; y++)
-        for(x = x1; x < x2 + 1; x++) {
+    for(int y = y1; y < y2 + 1; y++)
+        for(int x = x1; x < x2 + 1; x++) {
             rgba pix = get_pixel_color(tex, x, y);
 
             set_color_array(rb_pix, &pix);
@@ -889,11 +869,10 @@ splice_do_action(int x0, int y0, int cx1, int cy1, int cx2, int cy2, texture_inf
     int xbound;
     int ybound;
     rgba chromakey;
-    int x, y;
     float * image_buf = NULL;
     bool inverse_chroma = false;
-    bool has_chroma = false;
     bool same_image = false;
+    bool has_chroma = false;
 
     constrain_boundaries(&cx1, &cy1, &cx2, &cy2, splice_tex->width, splice_tex->height);
     xbound = cx2 - cx1 + 1;
@@ -923,8 +902,8 @@ splice_do_action(int x0, int y0, int cx1, int cy1, int cx2, int cy2, texture_inf
     if(same_image) 
         image_buf = get_image_chunk(splice_tex, cx1, cy1, cx2, cy2);
     
-    for(y = 0; y < ybound; y++)
-        for(x = 0; x < xbound; x++) {
+    for(int y = 0; y < ybound; y++)
+        for(int x = 0; x < xbound; x++) {
             
             if(!same_image)
                 payload->color = get_pixel_color(splice_tex, cx1 + x, cy1 + y);
@@ -950,390 +929,5 @@ splice_do_action(int x0, int y0, int cx1, int cy1, int cx2, int cy2, texture_inf
 }
 /** end splice **/
 
-static void
-initialize_action_struct(action_struct * cur, VALUE hash_arg, sync sync_mode)
-{
-    /* initialize action-struct to default values */
-    cur->sync_mode = sync_mode;
-    cur->hash_arg = hash_arg;
-
-    cur->color = convert_image_local_color_to_rgba(cur->tex->image);
-    cur->pen.has_color_control_proc = false;
-    cur->pen.has_color_control_transform = false;
-    cur->pen.has_source_texture = false;
-    cur->pen.alpha_blend = false;
-
-    /* set static color control transformations to defaults */
-    cur->pen.color_mult.red = 1.0;
-    cur->pen.color_mult.green = 1.0;
-    cur->pen.color_mult.blue = 1.0;
-    cur->pen.color_mult.alpha = 1.0;
-
-    cur->pen.color_add.red = 0.0;
-    cur->pen.color_add.green = 0.0;
-    cur->pen.color_add.blue = 0.0;
-    cur->pen.color_add.alpha = 0.0;
-}
-    
-/* TODO: fix this function below, it's too ugly and bulky and weird **/
-static void
-process_common_hash_args(action_struct * cur, VALUE * hash_arg, sync sync_mode, bool primary)
-{
-    
-    VALUE user_defaults;  
-    VALUE hash_blend;
-
-
-    /* if a hash doesn't exist then create one */
-    if(!is_a_hash(*hash_arg)) 
-        *hash_arg = rb_hash_new();
-
-    /* init the action to default values */
-    initialize_action_struct(cur, *hash_arg, sync_mode);
-
-    /* get the user default options & merge with given options */
-    user_defaults = get_image_local(cur->tex->image, USER_DEFAULTS);
-    hash_blend = rb_funcall(user_defaults, rb_intern("merge"), 1, *hash_arg);
-    rb_funcall(*hash_arg, rb_intern("merge!"), 1, hash_blend);
-
-    if(has_optional_hash_arg(*hash_arg, "color")) {
-        VALUE c = get_from_hash(*hash_arg, "color");
-        cur->color = convert_rb_color_to_rgba(c);
-        if(c == string2sym("random")) {
-            set_hash_value(*hash_arg, "color", convert_rgba_to_rb_color(&cur->color));
-        }
-    }
-
-    /* shadows */
-    if(RTEST(get_from_hash(*hash_arg, "shadow"))) {
-        cur->pen.color_mult.red = 0.66;
-        cur->pen.color_mult.green = 0.66;
-        cur->pen.color_mult.blue = 0.66;
-        cur->pen.color_mult.alpha = 1;
-
-        cur->pen.has_color_control_transform = true;
-    }
-    
-    /* sync mode */
-    if(has_optional_hash_arg(*hash_arg, "sync_mode")) {
-        VALUE user_sync_mode = get_from_hash(*hash_arg, "sync_mode");
-
-        Check_Type(user_sync_mode, T_SYMBOL);
-        
-        if(user_sync_mode == string2sym("lazy_sync"))
-            cur->sync_mode = lazy_sync;
-        else if(user_sync_mode == string2sym("eager_sync"))
-            cur->sync_mode = eager_sync;
-        else if(user_sync_mode == string2sym("no_sync"))
-            cur->sync_mode = no_sync;
-        else
-            rb_raise(rb_eArgError, "unrecognized sync mode: %s\n. Allowable modes are "
-                     ":lazy_sync, :eager_sync, :no_sync.",
-                     sym2string(user_sync_mode));
-
-        delete_from_hash(*hash_arg, "sync_mode");
-        
-    }
-
-    /* process the color_control block or transform (if there is one) */
-    prepare_color_control(cur);
-
-    /* process the filling texture (if there is one) */
-    prepare_fill_texture(cur);
-
-    /* does the user want to blend alpha values ? */
-    if(get_from_hash(*hash_arg, "alpha_blend") == Qtrue)
-        cur->pen.alpha_blend = true;
-
-}
-
-static void
-update_lazy_bounds(action_struct * cur, texture_info * tex)
-{
-    
-    /* only update global bounds if we're doing a lazy_sync */
-    if(cur->sync_mode == lazy_sync) {
-        int xmin, ymin, xmax, ymax;
-        VALUE lazy_bounds;
-
-        lazy_bounds = get_image_local(tex->image, LAZY_BOUNDS);
-
-        xmin = INT2FIX(MIN(cur->xmin, FIX2INT(get_from_array(lazy_bounds, 0))));
-        ymin = INT2FIX(MIN(cur->ymin, FIX2INT(get_from_array(lazy_bounds, 1))));
-        xmax = INT2FIX(MAX(cur->xmax, FIX2INT(get_from_array(lazy_bounds, 2))));
-        ymax = INT2FIX(MAX(cur->ymax, FIX2INT(get_from_array(lazy_bounds, 3))));
-
-        set_array_value(lazy_bounds, 0, xmin);
-        set_array_value(lazy_bounds, 1, ymin);
-        set_array_value(lazy_bounds, 2, xmax);
-        set_array_value(lazy_bounds, 3, ymax);
-    }
-}
-
-static void
-update_bounds(action_struct * cur, int xmin, int ymin, int xmax, int ymax)
-{
-    if(xmin > xmax) SWAP(xmin, xmax);
-    if(ymin > ymax) SWAP(ymin, ymax);
-    
-    cur->xmin = MIN(cur->xmin, xmin);
-    cur->ymin = MIN(cur->ymin, ymin);
-    cur->xmax = MAX(cur->xmax, xmax);
-    cur->ymax = MAX(cur->ymax, ymax);
-}
-
-static void
-set_local_bounds(action_struct * cur, int xmin, int ymin, int xmax, int ymax, texture_info * tex)
-{
-    if(cur->sync_mode == no_sync)
-        return;
-
-    /* local bounds used by both eager_sync and lazy_sync: */
-    
-    /* eager sync: to demarcate precise area to sync to opengl */
-    /* lazy sync: to update global bounds */
-    cur->xmin = xmin;
-    cur->ymin = ymin;
-    cur->xmax = xmax;
-    cur->ymax = ymax;
-}
-
-static void
-draw_prologue(action_struct * cur, texture_info * tex, int xmin, int ymin, int xmax, int ymax,
-              VALUE * hash_arg, sync sync_mode, bool primary, action_struct ** payload_ptr)
-{
-    if(!primary) return;
-
-    /* set the payload pointer */
-    *payload_ptr = cur;
-    
-    /* not too happy about having this here, look at texplay.h for why */
-    cur->tex = tex;
-    
-    process_common_hash_args(cur, hash_arg, sync_mode, primary);
-    
-    set_local_bounds(cur, xmin, ymin, xmax, ymax, tex);
-}
-
-void
-draw_epilogue(action_struct * cur, texture_info * tex, bool primary)
-{
-    /* only primary actions get sync'd */
-    if(!primary) return;
-    
-    switch(cur->sync_mode) {
-
-        /* do not sync */
-    case no_sync:
-        return;
-        break;
-
-        /* sync immediately */
-    case eager_sync:
-        create_subtexture_and_sync_to_gl(IMAGE_BOUNDS(cur), tex);
-        break;
-
-        /* sync later (at end of paint block?) */
-    case lazy_sync:
-        update_lazy_bounds(cur, tex);
-        break;
-        
-    default:
-        rb_raise(rb_eRuntimeError,
-                 "sync_mode may only be: lazy_sync, eager_sync, no_sync. got %d\n", cur->sync_mode);
-    }
-}
-
-/* set action color to return value of color_control proc */
-static void
-prepare_color_control(action_struct * cur)
-{
-
-    if(is_a_hash(cur->hash_arg)) {
-        VALUE try_val = get_from_hash(cur->hash_arg, "color_control");
-        
-        if(rb_respond_to(try_val, rb_intern("call"))) {
-            cur->pen.color_control_proc = try_val;
-            cur->pen.color_control_arity = FIX2INT(rb_funcall(try_val, rb_intern("arity"), 0));
-            cur->pen.has_color_control_proc = true;
-        }
-        else if(is_a_hash(try_val)) {
-            VALUE try_add = get_from_hash(try_val, "add");
-            VALUE try_mult = get_from_hash(try_val, "mult");
-
-            if(is_an_array(try_add)) {
-                if(RARRAY_LEN(try_add) < 4)
-                    rb_raise(rb_eArgError, ":color_control transform :add needs 4 parameters");
-                
-                cur->pen.color_add.red = NUM2DBL(get_from_array(try_add, 0));
-                cur->pen.color_add.green = NUM2DBL(get_from_array(try_add, 1));
-                cur->pen.color_add.blue = NUM2DBL(get_from_array(try_add, 2));
-                cur->pen.color_add.alpha = NUM2DBL(get_from_array(try_add, 3));
-
-                cur->pen.has_color_control_transform = true;
-            }
-            if(is_an_array(try_mult)) {
-                if(RARRAY_LEN(try_mult) < 4)
-                    rb_raise(rb_eArgError, ":color_control transform :mult needs 4 parameters");
-
-                cur->pen.color_mult.red = NUM2DBL(get_from_array(try_mult, 0));
-                cur->pen.color_mult.green = NUM2DBL(get_from_array(try_mult, 1));
-                cur->pen.color_mult.blue = NUM2DBL(get_from_array(try_mult, 2));
-                cur->pen.color_mult.alpha = NUM2DBL(get_from_array(try_mult, 3));
-
-                cur->pen.has_color_control_transform = true;
-            }
-                
-        }
-    }
-}
-
-static rgba 
-exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y, rgba blended_pixel)
-{
-    int arity = cur->pen.color_control_arity;
-    VALUE proc = cur->pen.color_control_proc;
-    rgba old_color = get_pixel_color(tex, x, y);
-    rgba current_color = blended_pixel;
-    rgba new_color;
-
-    if(!cur->pen.has_color_control_proc)
-        rb_raise(rb_eRuntimeError, "needs a proc");
-
-    switch(arity) {
-    case -1:
-    case 0:
-        new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), 0));
-        break;
-        
-    case 1:
-        new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), arity,
-                                                        convert_rgba_to_rb_color(&old_color)));
-        break;
-            
-    case 2:
-        new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), arity,
-                                                        convert_rgba_to_rb_color(&old_color),
-                                                        convert_rgba_to_rb_color(&current_color)));
-        break;
-            
-    case 3:
-        new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), arity,
-                                                        convert_rgba_to_rb_color(&old_color),
-                                                        INT2FIX(x), INT2FIX(y)));
-        break;
-    case 4:
-        new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), arity,
-                                                        convert_rgba_to_rb_color(&old_color),
-                                                        convert_rgba_to_rb_color(&current_color),
-                                                        INT2FIX(x), INT2FIX(y)));
-        break;
-    default:
-        rb_raise(rb_eArgError, "permissible arities for color_control proc are 1, 2, 3  and 4. Got %d\n",
-                 arity);
-    }
-        
-    /* update the action color */
-    return new_color;
-}
 
-static void
-prepare_fill_texture(action_struct * payload)
-{
-    if(is_a_hash(payload->hash_arg)) {
-        VALUE try_image = get_from_hash(payload->hash_arg, "texture");
-        if(is_gosu_image(try_image)) {
-
-            get_texture_info(try_image, &payload->pen.source_tex);
-            payload->pen.has_source_texture = true;
-        }
-    }
-}
-
-
-/* TODO: reimplement using SSE2 */
-static rgba
-apply_color_control_transform(action_struct * payload, texture_info * tex, int x, int y)
-                              
-{
-    rgba transformed_color;
-    
-    transformed_color = get_pixel_color(tex, x, y);
-        
-    transformed_color.red += payload->pen.color_add.red; 
-    transformed_color.green += payload->pen.color_add.green; 
-    transformed_color.blue += payload->pen.color_add.blue; 
-    transformed_color.alpha += payload->pen.color_add.alpha;
-
-    transformed_color.red *= payload->pen.color_mult.red; 
-    transformed_color.green *= payload->pen.color_mult.green; 
-    transformed_color.blue *= payload->pen.color_mult.blue; 
-    transformed_color.alpha *= payload->pen.color_mult.alpha;
-
-    return transformed_color;
-}
-
-static rgba
-apply_alpha_blend(action_struct * payload, texture_info * tex, int x, int y, rgba blended_pixel)
-{
-    rgba dest_pixel = get_pixel_color(tex, x, y);
-    rgba finished_pixel;
-
-
-    if(not_a_color(blended_pixel))
-        return blended_pixel;
-    
-    /* alpha blending is nothing more than a weighted average of src and dest pixels
-       based on source alpha value */
-    /* NB: destination alpha value is ignored */
-
-    /** TO DO: rewrite this using sse2 instructions **/
-    finished_pixel.red = blended_pixel.alpha * blended_pixel.red + (1 - blended_pixel.alpha)
-        * dest_pixel.red;
-
-    finished_pixel.green = blended_pixel.alpha * blended_pixel.green + (1 - blended_pixel.alpha)
-        * dest_pixel.green;
-
-    finished_pixel.blue = blended_pixel.alpha * blended_pixel.blue + (1 - blended_pixel.alpha)
-        * dest_pixel.blue;
-
-    finished_pixel.alpha = blended_pixel.alpha;
-    
-
-    return finished_pixel;
-}
-
-static void
-set_pixel_color_with_style(action_struct * payload, texture_info * tex, int x, int y)
-{
-
-    rgba blended_pixel;
-
-    blended_pixel = payload->color;
-
-    /* for color_control transform */
-    if(payload->pen.has_color_control_transform)
-        blended_pixel = apply_color_control_transform(payload, tex, x, y);
-    
-    /*    for texture fill  */
-    if(payload->pen.has_source_texture)
-        blended_pixel = get_pixel_color(&payload->pen.source_tex,
-                                         x % payload->pen.source_tex.width,
-                                         y % payload->pen.source_tex.height);
-
-    /* for color_control block */
-    if(payload->pen.has_color_control_proc)
-        blended_pixel = exec_color_control_proc(payload, tex, x,  y, blended_pixel);
-    
-
-    /*  TO DO: do bitwise pixel combinations here */
-    
-    /*  TO DO: refactor into its own helper function
-        & rewrite using sse2 */
-    if(payload->pen.alpha_blend)
-        blended_pixel = apply_alpha_blend(payload, tex, x,  y, blended_pixel);
-    
-
-    set_pixel_color(&blended_pixel, tex, x, y);
-}