texplay 0.2.910 → 0.2.920

data/CHANGELOG

@@ -1,3 +1,7 @@
+8/6/10
+version 0.2.920
+* :trace now supports :color_mode => :gosu
+
 7/6/10
 version 0.2.910
 * 1.8.7 incompatibility fixed

data/README.markdown

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

data/examples/example_blank.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+
+class W < Gosu::Window
+    def initialize
+      super(500, 500, false, 20)
+      @img = TexPlay.create_image(self, 500, 500, :color => Gosu::Color::BLUE)
+    end
+    
+    def draw
+        @img.draw 100, 50,1
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/examples/example_trace.rb

@@ -5,10 +5,10 @@ require 'texplay'
 
 class W < Gosu::Window
   def initialize
-    super(1024, 768, false, 20)
+    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 }).inspect
+    puts (@img.line 400, 200, 100, 200, :trace => { :until_color => :blue }, :color_mode => :gosu)
   end
 
   def draw

data/ext/texplay/bindings.c

@@ -520,13 +520,17 @@ m_flood_fill(int argc, VALUE * argv, VALUE self)
 }
 
 static inline VALUE
-convert_trace_match_to_ruby_array(trace_match match)
+convert_trace_match_to_ruby_array(trace_match match, bool gosu_color_mode)
 {
   VALUE ary = rb_ary_new();
 
   rb_ary_store(ary, 0, INT2FIX(match.x));
   rb_ary_store(ary, 1, INT2FIX(match.y));
-  rb_ary_store(ary, 2, convert_rgba_to_rb_color(&match.color));
+
+  if (gosu_color_mode)
+    rb_ary_store(ary, 2, convert_rgba_to_gosu_color(&match.color));
+  else
+    rb_ary_store(ary, 2, convert_rgba_to_rb_color(&match.color));
 
   return ary;
 }
@@ -537,6 +541,7 @@ m_line(int argc, VALUE * argv, VALUE self)
 {
     int x1, y1, x2, y2;
     int last = argc - 1;
+    bool gosu_color_mode = false;
     VALUE options;
     texture_info tex;
     trace_match match;
@@ -549,6 +554,9 @@ m_line(int argc, VALUE * argv, VALUE self)
 
     options = argv[last];
 
+    if (hash_value_is(options, "color_mode", string2sym("gosu")))
+      gosu_color_mode = true;
+
     get_texture_info(self, &tex);
 
     match = line_do_action(x1, y1, x2, y2, &tex, options, sync_mode, true, NULL);
@@ -557,7 +565,7 @@ m_line(int argc, VALUE * argv, VALUE self)
       if (match.x == -1)
         return Qnil;
       else
-        return convert_trace_match_to_ruby_array(match);
+        return convert_trace_match_to_ruby_array(match, gosu_color_mode);
     }
 
     return self;

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
 module TexPlay
-    VERSION = "0.2.910"
+    VERSION = "0.2.920"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 910
-  version: 0.2.910
+  - 920
+  version: 0.2.920
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +02:00
+date: 2010-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - examples/common.rb
 - examples/example_alpha_blend.rb
 - examples/example_bezier.rb
+- examples/example_blank.rb
 - examples/example_color_control.rb
 - examples/example_color_transform.rb
 - examples/example_color_transform_circle.rb