texplay 0.2.1 → 0.2.2

data/src/actions.c

@@ -23,7 +23,6 @@ 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 rgba exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y);
 static void set_pixel_color_with_style(action_struct * payload, texture_info * tex,
                                        int x, int y);
 /* end helpers */
@@ -225,12 +224,13 @@ ngon_do_action(int x, int y, int r, int num_sides, texture_info * tex, VALUE has
     int x1, y1, x2, y2, x0, y0;
     int n;
     int thickness;
+    float angle = 0;
 
     draw_prologue(&cur, tex, x - r, y - r,
                   x + r, y + r, &hash_arg, sync_mode, primary, &payload);
 
 
-    if(is_a_hash(hash_arg))
+    if(is_a_hash(hash_arg)) {
         if(RTEST(get_from_hash(hash_arg, "thickness"))) {
             thickness = NUM2INT(get_from_hash(hash_arg, "thickness"));
 
@@ -241,13 +241,18 @@ ngon_do_action(int x, int y, int r, int num_sides, texture_info * tex, VALUE has
             cur.ymax = y + r + thickness / 2;
         }
 
+        if(RTEST(get_from_hash(hash_arg, "start_angle"))) {
+            angle = NUM2INT(get_from_hash(hash_arg, "start_angle")) / 360.0 * 2 * PI;
+        }
+    }
+    
     /* calculate first point */
-    x0 = x1 = x + r;
-    y0 = y1 = y;
+    x0 = x1 = x + r * cos(angle);
+    y0 = y1 = y + r * sin(angle);
 
     for(n = 0; n < num_sides; n++) {
-        x2 = x + r * cos((2 * PI / num_sides) * n);
-        y2 = y + r * sin((2 * PI / num_sides) * n);
+        x2 = x + r * cos((2 * PI / num_sides) * n + angle);
+        y2 = y + r * sin((2 * PI / num_sides) * n + angle);
 
         line_do_action(x1, y1, x2, y2, tex, hash_arg, no_sync, false, payload);
 
@@ -919,10 +924,11 @@ splice_do_action(int x0, int y0, int cx1, int cy1, int cx2, int cy2, texture_inf
                 payload->color = get_pixel_color_from_chunk(image_buf, xbound, ybound, x, y);
                 
             if(has_chroma) {
-                bool cmp = cmp_color(payload->color, chromakey);
-                if(!cmp && !inverse_chroma)
-                    set_pixel_color_with_style(payload, tex, x0 + x, y0 + y);
-                else if(cmp && inverse_chroma)
+                bool chroma_match = cmp_color(payload->color, chromakey);
+                
+                /* look at released 0.2.0 code to see how USED to do this.
+                   this is now a simplified boolean expression */
+                if(chroma_match == inverse_chroma)
                     set_pixel_color_with_style(payload, tex, x0 + x, y0 + y);
             }
             else
@@ -1175,18 +1181,23 @@ prepare_color_control(action_struct * cur)
 }
 
 static rgba 
-exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y)
+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 = cur->color;
+    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)));
@@ -1231,20 +1242,57 @@ prepare_fill_texture(action_struct * payload)
     }
 }
 
-static void
+
+/* TODO: reimplement using SSE2 */
+static rgba
 apply_color_control_transform(action_struct * payload, texture_info * tex, int x, int y)
+                              
 {
-    payload->color = get_pixel_color(tex, x, y);
+    rgba transformed_color;
+    
+    transformed_color = get_pixel_color(tex, x, y);
         
-    payload->color.red += payload->pen.color_add.red; 
-    payload->color.green += payload->pen.color_add.green; 
-    payload->color.blue += payload->pen.color_add.blue; 
-    payload->color.alpha += payload->pen.color_add.alpha;
-
-    payload->color.red *= payload->pen.color_mult.red; 
-    payload->color.green *= payload->pen.color_mult.green; 
-    payload->color.blue *= payload->pen.color_mult.blue; 
-    payload->color.alpha *= payload->pen.color_mult.alpha;
+    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
@@ -1253,53 +1301,30 @@ set_pixel_color_with_style(action_struct * payload, texture_info * tex, int x, i
 
     rgba blended_pixel;
 
+    blended_pixel = payload->color;
+
     /* for color_control transform */
     if(payload->pen.has_color_control_transform)
-        apply_color_control_transform(payload, tex, x, y);
+        blended_pixel = apply_color_control_transform(payload, tex, x, y);
     
     /*    for texture fill  */
     if(payload->pen.has_source_texture)
-        payload->color = get_pixel_color(&payload->pen.source_tex,
+        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)
-        payload->color = exec_color_control_proc(payload, tex, x,  y);
+        blended_pixel = exec_color_control_proc(payload, tex, x,  y, blended_pixel);
     
 
     /*  TO DO: do bitwise pixel combinations here */
     
-    /* if i do not use blended_pixel and instead use payload->color in the
-       code below i get an interesting blurring effect in images (with alpha_blend => true)
-    */
-    blended_pixel = payload->color;
-    
-    
-    /*  alpha blending
-        TO DO: refactor into its own helper function
+    /*  TO DO: refactor into its own helper function
         & rewrite using sse2 */
-    if(payload->pen.alpha_blend) {
-        rgba dest_pixel = get_pixel_color(tex, x, y);
-            
-        /* 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 */
-        if(is_a_color(payload->color) && is_a_color(dest_pixel)) {
-
-            /** TO DO: rewrite this using sse2 instructions **/
-            blended_pixel.red = payload->color.alpha * payload->color.red + (1 - payload->color.alpha)
-                * dest_pixel.red;
-
-            blended_pixel.green = payload->color.alpha * payload->color.green + (1 - payload->color.alpha)
-                * dest_pixel.green;
-
-            blended_pixel.blue = payload->color.alpha * payload->color.blue + (1 - payload->color.alpha)
-                * dest_pixel.blue;
-
-            blended_pixel.alpha = payload->color.alpha;
-        }
-    }
+    if(payload->pen.alpha_blend)
+        blended_pixel = apply_alpha_blend(payload, tex, x,  y, blended_pixel);
+    
 
     set_pixel_color(&blended_pixel, tex, x, y);
 }

data/src/bindings.c

@@ -369,7 +369,7 @@ m_circle(int argc, VALUE * argv, VALUE self)
     
     ADJUST_SELF(self);
     
-    if(argc < 1) rb_raise(rb_eArgError, "circle action needs at least 1 parameter");
+    if(argc < 2) rb_raise(rb_eArgError, "circle action needs at least 2 parameter");
 
     process_x_y_pairs(self, 1, argv, &x1, &y1);
 
@@ -398,7 +398,7 @@ m_ngon(int argc, VALUE * argv, VALUE self)
 
     ADJUST_SELF(self);
     
-    if(argc < 4) rb_raise(rb_eArgError, "ngon requires at least 4 parameters (x, y, radius, num_sides)");
+    if(argc < 3) rb_raise(rb_eArgError, "ngon requires at least 3 parameters (x, y, radius, num_sides)");
 
     process_x_y_pairs(self, 1, argv, &x1, &y1);
 

data/src/texplay.c

@@ -68,7 +68,7 @@ Init_ctexplay() {
     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()));
+    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);

data/src/utils.c

@@ -585,9 +585,9 @@ ComputeOutCode (int x, int y, int xmin, int ymin, int xmax, int ymax)
 	return code;
 }
  
-//Cohen-Sutherland clipping algorithm clips a line from
-//P0 = (x0, y0) to P1 = (x1, y1) against a rectangle with 
-//diagonal from (xmin, ymin) to (xmax, ymax).
+/** Cohen-Sutherland clipping algorithm clips a line from
+P0 = (x0, y0) to P1 = (x1, y1) against a rectangle with 
+diagonal from (xmin, ymin) to (xmax, ymax). **/
 void
 cohen_sutherland_clip (int * x0, int * y0,int * x1, int * y1, int xmin, int ymin,
                                 int xmax, int ymax)
@@ -762,7 +762,7 @@ check_for_texture_info(VALUE image)
         rb_raise(rb_eException, "Error: gl_tex_info returns nil for %s (%i x %i). Could be caused by "
                  "very large image or Gosu bug. Try updating Gosu or use a smaller image. Note: TexPlay should"
                  " be able to work with %i x %i images.",
-                 StringValuePtr(image_name), width, height, max_quad_size(), max_quad_size());
+                 StringValuePtr(image_name), width, height, max_quad_size() - 2, max_quad_size() - 2);
     }
 
     return info;
@@ -897,7 +897,8 @@ bool
 is_a_point(VALUE try_point)
 {
     /* if it responds to 'x' it's near enough (technically must respond to x AND y) */
-    if(rb_respond_to(try_point, rb_intern("x")))
+    /* added the is_a_num() check due to WEIRD bug where FIXNUMS were responding to the 'x' method (wtf?) but returning nil when invoked */
+    if(rb_respond_to(try_point, rb_intern("x")) && !is_a_num(try_point))
         return true;
 
     return false;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 +12:00
+date: 2009-09-09 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- README
+- README.markdown
 - CHANGELOG
 - README1st
 - lib/texplay.rb
@@ -64,22 +64,16 @@ files:
 - examples/example_hash_arguments.rb
 - examples/example_gen_eval.rb
 - examples/example_polyline.rb
-- examples/basic.rb
-- examples/test.rb
 - examples/example_fill.rb
 - examples/example_bezier.rb
 - examples/example_simple.rb
 - examples/example_fill_old.rb
 - examples/example_each.rb
-- examples/benchmark.rb
 - examples/example_fluent.rb
 - examples/example_sync.rb
 - examples/example_splice.rb
 - examples/example_alpha_blend.rb
-- examples/basic2.rb
 - examples/example_melt.rb
-- examples/test2.rb
-- examples/specs.rb
 - examples/media/sand1.png
 - examples/media/rose.bmp
 - examples/media/maria.png

data/README

@@ -1,21 +0,0 @@
-INSTRUCTIONS 
-
-TexPlay version 0.2.1
-
-To compile TexPlay, 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!
-(note that TexPlay has only been tested on 32 bit linux systems and WindowsXP using VS 6.0)

data/examples/basic.rb

@@ -1,48 +0,0 @@
-
-require 'rubygems'
-require 'common'
-
-require 'gosu'
-require 'texplay'
-
-class W < Gosu::Window
-    def initialize
-        super(1024, 769, false, 20)
-        @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
-        @img.rect 0,0, @img.width - 1, @img.height - 1
-
-        @img.instance_variable_set(:@horse, :love)
-        class << @img
-            def little
-                :little
-            end
-        end
-        @bunk = @img.clone
-        puts @bunk.instance_variable_get(:@horse)
-        puts @bunk.little
-    end
-    
-    def draw
-        x = @img.width * rand
-        y = @img.height * rand
-
-        @img.
-            line(0, 0, 1024, 1024).
-            circle(20, 20, 50).
-            rect 30, 30, 100, 100
-        
-        @img.draw 100, 50,1
-        @bunk.draw 500, 300,1
-        @bunk.line 0, 0, 1024, 1024, :color => :red
-
-        
-
-        @bunk.pixel x, y, :color => :none
-    end
-    
-end
-
-
-w = W.new
-w.show
-        

data/examples/basic2.rb

@@ -1,37 +0,0 @@
-require 'rubygems'
-require 'common'
-require 'gosu'
-require 'texplay'
-
-class Proc
-    def __context__
-        eval('self', self.binding)
-    end
-end
-
-class W < Gosu::Window
-    def initialize
-        super(1024, 769, false, 20)
-        @img = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
-    end
-
-    def trick
-        @img.dup_eval { self }
-    end
-
-    def draw
-        @img.paint {
-            circle -5100, -9700, 20
-            circle(@img.width * rand * 2 - @img.width, @img.height * rand * 2 - @img.height, 40)
-        }
-        @img.draw(100,100,1)
-    end
-
-    def img
-        @img
-    end
-end
-
-w = W.new
-w.show
-