texplay 0.2.950 → 0.2.960

data/CHANGELOG

@@ -1,3 +1,10 @@
+4/7/10
+version 0.2.960
+* added :transparent pseudo-color
+* added :tolerance option (applies to :trace and :source_select etc
+	family)
+* fixed memleak in to_blob
+
 10/6/10
 version 0.2.950
 * fixed bug in apply_drawing_mode, wasn't using blended_pixel as source_pixel

data/README.markdown

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

data/examples/example_color_transform.rb

@@ -32,9 +32,9 @@ class W < Gosu::Window
 
         @copy2.splice @img, 0, 0, :crop => [@x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad], :sync_mode => :no_sync
         @copy.splice @img, 0, 0, :crop => [@x - @rad, @y - @rad, @x + @rad, @y + @rad], :sync_mode => :no_sync
-        @img.rect @x - @rad, @y - @rad, @x + @rad, @y + @rad, :fill => true, :mode => :overlay, :color => :tyrian
+        @img.rect @x - @rad, @y - @rad, @x + @rad, @y + @rad, :fill => true, :mode => :color_dodge, :color => 0xff888888, :alpha_blend => true
 
-      @img.rect @x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad, :fill => true, :mode => :invert, :color => :blue
+      @img.rect @x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad, :fill => true, :mode => :color_dodge, :color => 0xff888888
 
 #        @img.force_sync [0,0, @img.width, @img.height]
 

data/examples/example_select.rb

@@ -5,26 +5,26 @@ 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 => :blue, :fill => true
+  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
+    @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 => :orange
-      
-    end
-    
-    def draw
-        @img.draw 100, 50,1
-    end
+    @img.circle 200, 100, 50, :fill => true, :dest_select => [:red, :blue], :color => :transparent
     
+  end
+  
+  def draw
+    @img.draw 100, 50,1
+  end
+  
 end
 
 
 w = W.new
 w.show
-        
+

data/examples/example_weird.rb

@@ -7,12 +7,14 @@ class W < Gosu::Window
   def initialize
     super(500, 500, false, 20)
     @img = Gosu::Image.new(self, "#{Common::MEDIA}/gob.png")
-    @sun = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
-    @img.splice @sun, 0, 0, :mode => :exclusion
+    @img.rect 0, 0, @img.width - 1, @img.height - 1
+    puts @img.line 1,1, 1, @img.height - 1, :trace => { :while_color => :alpha }
+    
+    
   end
 
   def draw
-    @img.draw 100, 50,1
+    @img.draw 50, 50,1
   end
 end
 

data/ext/texplay/actions.c

@@ -14,16 +14,23 @@
 /** line_do_action, bresenham's algorithm **/
 typedef enum { no_mode, until_color, while_color} trace_mode_type;
 
+/* utility func to manage both kinds of color comparions */
+static bool
+cmp_color_with_or_without_tolerance(rgba c1, rgba c2, action_struct * payload)
+{
+  return payload->pen.has_tolerance ? cmp_color_with_tolerance(c1, c2, payload->pen.tolerance) : cmp_color(c1, c2);
+}
+
 static inline bool
-is_trace_match(rgba c, rgba trace_color, trace_mode_type trace_mode)
+is_trace_match(action_struct * cur, rgba c, rgba trace_color, trace_mode_type trace_mode)
 {
   if(trace_mode == while_color) {
-    if(!cmp_color(c, trace_color))
-      return true;
+      if(!cmp_color_with_or_without_tolerance(c, trace_color, cur))
+        return true;
   }
   else if(trace_mode == until_color) {
-    if(cmp_color(c, trace_color))
-      return true;
+      if(cmp_color_with_or_without_tolerance(c, trace_color, cur))
+        return true;
   }
 
   return false;
@@ -98,7 +105,7 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
              else {
                rgba c = get_pixel_color(tex, x, y);
 
-               if (is_trace_match(c, trace_color, trace_mode)) 
+               if (is_trace_match(payload, c, trace_color, trace_mode)) 
                  return (trace_match) { x, y, c };
              }
             }
@@ -126,7 +133,7 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
              else {
                rgba c = get_pixel_color(tex, x, y);
 
-               if (is_trace_match(c, trace_color, trace_mode)) 
+               if (is_trace_match(payload, c, trace_color, trace_mode)) 
                  return (trace_match) { x, y, c };
              }                
             }
@@ -151,7 +158,7 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
         else {
           rgba c = get_pixel_color(tex, x, y);
           
-          if (is_trace_match(c, trace_color, trace_mode)) 
+          if (is_trace_match(payload, c, trace_color, trace_mode)) 
             return (trace_match) { x, y, c };
         }        
     }

data/ext/texplay/bindings.c

@@ -337,10 +337,8 @@ m_get_options(VALUE self)
 static void
 get_image_chunk_with_size(char * data, texture_info * tex, char * blob)
 {
-    int x, y;
-
-    for(y = 0; y < tex->height; y++)
-        for(x = 0; x < tex->width; x++) {
+    for(int y = 0; y < tex->height; y++)
+        for(int x = 0; x < tex->width; x++) {
             int buf_index = 4 * (x + y * tex->width);
                 
             int offset = calc_pixel_offset(tex, x, y);
@@ -354,8 +352,6 @@ m_to_blob(VALUE self)
 {
     texture_info tex;
     int sidelength;
-    VALUE blob;
-    void * new_array = NULL;
     
     ADJUST_SELF(self);
 
@@ -368,12 +364,12 @@ m_to_blob(VALUE self)
     glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &sidelength);
 
     /* initialize texture data array, mult. by 4 because {rgba} */
-    new_array = malloc(sidelength * sidelength * 4);
+    char new_array[sidelength * sidelength * 4];
 
     /* get texture data from video memory */
     glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_UNSIGNED_BYTE,(void*)(new_array));
 
-    blob = rb_str_new(NULL, 4 * tex.width * tex.height);
+    VALUE blob = rb_str_new(NULL, 4 * tex.width * tex.height);
     
     get_image_chunk_with_size(new_array, &tex, RSTRING_PTR(blob));
 

data/ext/texplay/graphics_utils.c

@@ -147,6 +147,13 @@ set_pixel_color(rgba * pixel_color, texture_info * tex, int x, int y)
     tex_data[alpha] = pixel_color->alpha;    
 }
 
+/* utility func to manage both kinds of color comparions */
+static bool
+cmp_color_with_or_without_tolerance(rgba c1, rgba c2, action_struct * payload)
+{
+  return payload->pen.has_tolerance ? cmp_color_with_tolerance(c1, c2, payload->pen.tolerance) : cmp_color(c1, c2);
+}
+
 static bool
 skip_pixel(rgba source_color, action_struct * payload, texture_info * tex, int x, int y)
 {
@@ -158,18 +165,17 @@ skip_pixel(rgba source_color, action_struct * payload, texture_info * tex, int x
   
   if (payload->pen.source_select.size > 0) {
     for (int i = 0; i < payload->pen.source_select.size; i++) {
-      if (cmp_color(source_color, payload->pen.source_select.colors[i])) {
-              color_match = true;
-              break;
-      }
-    }
+        if (cmp_color_with_or_without_tolerance(source_color, payload->pen.source_select.colors[i], payload)) {
+            color_match = true;
+            break;
+        }
     if (!color_match) return true;
+    }
   }
-  
 
   if (payload->pen.source_ignore.size > 0) {
     for (int i = 0; i < payload->pen.source_ignore.size; i++) {
-          if (cmp_color(source_color, payload->pen.source_ignore.colors[i]))
+      if (cmp_color_with_or_without_tolerance(source_color, payload->pen.source_ignore.colors[i], payload))
               return true;
     }
   }
@@ -177,7 +183,7 @@ skip_pixel(rgba source_color, action_struct * payload, texture_info * tex, int x
   color_match = false;
   if (payload->pen.dest_select.size > 0) {
     for (int i = 0; i < payload->pen.dest_select.size; i++) {
-        if (cmp_color(dest_color, payload->pen.dest_select.colors[i])) {
+      if (cmp_color_with_or_without_tolerance(dest_color, payload->pen.dest_select.colors[i], payload)) {
             color_match = true;
             break;
         }
@@ -187,7 +193,7 @@ skip_pixel(rgba source_color, action_struct * payload, texture_info * tex, int x
 
   if (payload->pen.dest_ignore.size > 0) {
     for (int i = 0; i < payload->pen.dest_ignore.size; i++) {
-          if (cmp_color(dest_color, payload->pen.dest_ignore.colors[i]))
+      if (cmp_color_with_or_without_tolerance(dest_color, payload->pen.dest_ignore.colors[i], payload))
               return true;
     }
   }
@@ -359,6 +365,10 @@ initialize_action_struct(action_struct * cur, VALUE hash_arg, sync sync_mode)
     cur->pen.source_ignore.size = 0;
     cur->pen.dest_select.size = 0;
     cur->pen.dest_ignore.size = 0;
+
+    /* tolerance */
+    cur->pen.has_tolerance = false;
+    cur->pen.tolerance = 0.0;
 }
     
 /* TODO: fix this function below, it's too ugly and bulky and weird **/
@@ -400,6 +410,20 @@ process_common_hash_args(action_struct * cur, VALUE * hash_arg, sync sync_mode,
         cur->pen.has_color_control_transform = true;
     }
 
+    /* tolerance */
+    if(RTEST(get_from_hash(*hash_arg, "tolerance"))) {
+      cur->pen.tolerance = NUM2DBL(get_from_hash(*hash_arg, "tolerance"));
+
+      /* maximum length of hypotonese extended in 4-space (color space) is sqrt(4) */
+      if (cur->pen.tolerance >= 2)
+        cur->pen.tolerance = 2;
+
+      if (cur->pen.tolerance < 0)
+        cur->pen.tolerance = 0;
+      
+      cur->pen.has_tolerance = true;
+    }
+       
     /* lerp */
     if(RTEST(get_from_hash(*hash_arg, "lerp"))) {
       cur->pen.lerp = NUM2DBL(get_from_hash(*hash_arg, "lerp"));

data/ext/texplay/texplay.h

@@ -56,7 +56,8 @@ typedef enum {
 
 /* structs */
 typedef struct s_rgba {
-    float red, green, blue, alpha;
+  float red, green, blue, alpha;
+  float tolerance;
 } rgba;
 
 typedef struct {
@@ -129,10 +130,11 @@ typedef struct action_struct {
         bool has_drawing_mode;
         draw_mode drawing_mode;
 
-        
+        /* tolerance */
+        bool has_tolerance;
+        float tolerance;
 
         /* color selection */
-      
         bool has_color_select;
         rgba_list source_select;
         rgba_list source_ignore;

data/ext/texplay/utils.c

@@ -306,15 +306,64 @@ not_rb_raw_color(VALUE cval)
     !is_a_num(get_from_array(cval, 0));
 }
 
+/** cmp_color related functions **/
+static bool
+is_transparent_color(rgba color1)
+{
+    return color1.red == -666 && color1.green == -666 && color1.blue == -666 &&
+      color1.alpha == -666;
+}
+
+static bool
+special_cmp_color(rgba color1, rgba color2)
+{
+    if (is_transparent_color(color1))
+        return color2.alpha == 0;
+    else if (is_transparent_color(color2))
+        return color1.alpha == 0;
+}
+
+static bool
+special_cmp_color_with_tolerance(rgba color1, rgba color2, float tolerance)
+{
+    if (is_transparent_color(color1))
+      return (color1.alpha) <= tolerance;
+    else if (is_transparent_color(color2))
+        return color2.alpha <= tolerance;
+}
+
+
+static float
+color_distance_squared(rgba c1, rgba c2)
+{
+  return (c1.red - c2.red) * (c1.red - c2.red) +
+    (c1.green - c2.green) * (c1.green - c2.green) +
+    (c1.blue - c2.blue) * (c1.blue - c2.blue) +
+    (c1.alpha - c2.alpha) * (c1.alpha - c2.alpha);
+}
+      
 
 bool
-cmp_color(rgba color1, rgba color2) 
+cmp_color_with_tolerance(rgba color1, rgba color2, float tolerance)
 {
+  if (color1.red < 0 || color2.red < 0)
+    return special_cmp_color_with_tolerance(color1, color2, tolerance);
+  
+  return color_distance_squared(color1, color2) <= (tolerance * tolerance);
+}
 
+bool
+cmp_color(rgba color1, rgba color2) 
+{
+    if (color1.red < 0 || color2.red < 0)
+      return special_cmp_color(color1, color2);
+    
     return (color1.red == color2.red) && (color1.green == color2.green) && (color1.blue == color2.blue)
         && (color1.alpha == color2.alpha);
 }
+        
 
+/*** these functions are UNSAFE ***/
 void
 color_copy(float * source, float * dest) 
 {
@@ -327,6 +376,7 @@ zero_color(float * tex)
 {
     memset(tex, 0, 4 * sizeof(float));
 }
+/***                           ***/
 
 rgba
 find_color_from_string(char * try_color) 
@@ -372,6 +422,9 @@ find_color_from_string(char * try_color)
     else if(!strcmp("alpha", try_color)) {
         cur_color.red = 0.0; cur_color.green = 0.0; cur_color.blue = 0.0; cur_color.alpha = 0.0;
     }
+    else if(!strcmp("transparent", try_color)) {
+        cur_color.red = -666; cur_color.green = -666; cur_color.blue = -666; cur_color.alpha = -666;
+    }
     else if(!strcmp("none", try_color)) {
         cur_color = not_a_color_v;
     }
@@ -438,7 +491,7 @@ convert_rgba_to_gosu_color(rgba * pix)
 VALUE
 gosu_color_class()
 {
-   VALUE gcolor_class = 0;
+   static VALUE gcolor_class = 0;
 
    if (gcolor_class == 0) {
        VALUE gosu_class = rb_const_get(rb_cObject, rb_intern("Gosu"));
@@ -476,6 +529,8 @@ convert_rb_color_to_rgba(VALUE cval)
             my_color.alpha = 1;
 
         break;
+
+    /* hex literals */
     case T_FIXNUM:
     case T_BIGNUM:
       return convert_gosu_to_rgba_color(rb_funcall(gosu_color_class(),

data/ext/texplay/utils.h

@@ -14,6 +14,7 @@ extern const rgba not_a_color_v;
 /* color and pixel related functions */
 rgba find_color_from_string(char * try_color);
 bool cmp_color(rgba color1, rgba color2);
+bool cmp_color_with_tolerance(rgba color1, rgba color2, float tolerance);
 void color_copy(float * source, float * dest);
 rgba get_pixel_color(texture_info * tex, int x, int y) ;
 float* get_pixel_data(texture_info * tex, int x, int y);

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
 module TexPlay
-    VERSION = "0.2.950"
+    VERSION = "0.2.960"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 950
-  version: 0.2.950
+  - 960
+  version: 0.2.960
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2010-07-04 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency