texplay 0.2.935 → 0.2.940

data/CHANGELOG

@@ -1,3 +1,8 @@
+9/6/10
+version 0.2.940
+* hopefully fixed :trace behaviour. Should now return nil for color when
+pixel out of bounds.
+	
 9/6/10
 version 0.2.930
 * not_a_color now returns true when color channel < 0

data/README.markdown

@@ -5,7 +5,7 @@
 INSTRUCTIONS 
 ============
 
-**TexPlay version 0.2.935**
+**TexPlay version 0.2.940**
 
 [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

@@ -17,24 +17,24 @@ class W < Gosu::Window
         @s = true
 
         @copy = TexPlay.create_image(self, @rad * 2 + 1, @rad * 2 + 1)
-        @copy2 = TexPlay.create_image(self, @rad * 2 + 1, @rad * 2 + 1)
+      @copy2 = TexPlay.create_image(self, @rad * 2 + 1, @rad * 2 + 1)
     end
     
     def draw
+      @pause = true
 
+        @x += 1
+        @y += 1
 
-        @x += 3
-        @y += 3
-
-        @x2 -= 3
-        @y2 += 3
+        @x2 -= 1
+        @y2 += 1
 
 
         @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 => :red
+        @img.rect @x - @rad, @y - @rad, @x + @rad, @y + @rad, :fill => true, :mode => :overlay, :color => :tyrian
 
-      @img.rect @x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad, :fill => true, :mode => :overlay, :color => :blue
+      @img.rect @x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad, :fill => true, :mode => :invert, :color => :blue
 
 #        @img.force_sync [0,0, @img.width, @img.height]
 

data/examples/example_ippa.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+class Window < Gosu::Window
+  def initialize
+    super(500, 500, false, 20)
+
+    @image = TexPlay.create_image(self, 50, 50)
+
+    from_x = 50
+    from_y = 50
+    to_x = 51
+    to_y = 51
+
+    x2, y2, color = @image.line from_x, from_y, to_x, to_y, :trace => { :while_color => :red }
+
+    p x2
+    p y2
+    p color
+  end
+end
+
+Window.new.show

data/examples/example_trace.rb

@@ -8,7 +8,7 @@ class W < Gosu::Window
     super(500, 500, false, 20)
     @img = TexPlay.create_image(self, 500, 500).fill(3,3, :color => :alpha)
     @img.rect 100, 100, 300 , 300, :color => :blue, :fill => true
-    puts (@img.line 400, 200, 100, 200, :trace => { :until_color => :blue }, :color_mode => :gosu)
+    puts (@img.line 498, 200, 600, 200, :trace => { :while_color => :blue })
   end
 
   def draw

data/ext/texplay/actions.c

@@ -162,7 +162,7 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
     }
     draw_epilogue(&cur, tex, primary);
 
-    return (trace_match) { .x = -1, .y = -1 };
+    return (trace_match) { .x = -9999, .y = -9999, .color = not_a_color_v };
 }
 /** end line **/
 

data/ext/texplay/bindings.c

@@ -562,12 +562,12 @@ m_line(int argc, VALUE * argv, VALUE self)
     match = line_do_action(x1, y1, x2, y2, &tex, options, sync_mode, true, NULL);
 
     if (has_optional_hash_arg(options, "trace")) {
-      if (match.x == -1)
+      if (match.x == -9999)
         return Qnil;
       else
         return convert_trace_match_to_ruby_array(match, gosu_color_mode);
     }
-
+    
     return self;
 }
 

data/ext/texplay/utils.c

@@ -407,6 +407,8 @@ convert_gosu_to_rgba_color(VALUE gcolor)
 VALUE
 convert_rgba_to_rb_color(rgba * pix)
 {
+    if (not_a_color(*pix)) return Qnil;
+  
     /* create a new ruby array to store the pixel data */
     VALUE pix_array = rb_ary_new2(4);
 
@@ -423,6 +425,8 @@ convert_rgba_to_rb_color(rgba * pix)
 VALUE
 convert_rgba_to_gosu_color(rgba * pix)
 {
+    if (not_a_color(*pix)) return Qnil;
+
     VALUE gosu_color_class = 0;
 
     if (gosu_color_class == 0) {

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
 module TexPlay
-    VERSION = "0.2.935"
+    VERSION = "0.2.940"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 935
-  version: 0.2.935
+  - 940
+  version: 0.2.940
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -80,6 +80,7 @@ files:
 - examples/example_fluent.rb
 - examples/example_gen_eval.rb
 - examples/example_hash_arguments.rb
+- examples/example_ippa.rb
 - examples/example_light.rb
 - examples/example_light_multiply.rb
 - examples/example_lsystem.rb