texplay 0.2.940 → 0.2.950

data/CHANGELOG

@@ -1,3 +1,8 @@
+10/6/10
+version 0.2.950
+* fixed bug in apply_drawing_mode, wasn't using blended_pixel as source_pixel
+* hex literal colors now accepted, e.g 0xffff0000 (red)	
+	
 9/6/10
 version 0.2.940
 * hopefully fixed :trace behaviour. Should now return nil for color when

data/README.markdown

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

data/examples/example_font.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+
+
+# TEST_CASE 1 shows 2 pieces of text, but the background is black, even with :chroma_key. TEST_CASE 2 shows nothing.
+# However, if you remove the :chroma_key's, you see a black background (and no text) in TEST_CASE 2, so there, :chroma_key appears to work.
+
+class Wnd < Gosu::Window
+  def initialize  
+    super(500, 200, false)
+    self.caption = "Splice Issues"
+    
+    @chrome = TexPlay::create_blank_image(self, 200, 200)
+    @sunset = Gosu::Image.new(self, "#{Common::MEDIA}/sand1.png")
+
+    
+    @long_text = Gosu::Image.from_text(self, "This is a long piece of text..", Gosu::default_font_name, 60)
+    @chrome.splice @long_text, 0, 0
+
+    @chrome.rect 0,0, @chrome.width, @chrome.height, :texture => @sunset, :fill => true, :mode => :multiply
+    
+  end
+  
+  def draw
+    @chrome.draw(0,0,1)
+  end
+end
+
+Wnd.new.show
+

data/examples/example_simple.rb

@@ -11,9 +11,9 @@ class W < Gosu::Window
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
 
         # put a border on the image
-        @img.rect 0,0, @img.width - 1, @img.height - 1, :color => Gosu::Color::CYAN
+        @img.rect 0,0, @img.width - 1, @img.height - 1, :color => 0xffff00ff, :fill => true
 
-        # perform some simple drawing actions 
+        # perform some e drawing actions 
         @img.line 0,0, @img.width - 1, @img.height - 1, :color => Gosu::Color::AQUA
         @img.circle 400, 100, 40, :fill => true, :color => [rand, rand, rand, 1]
       @img.rect 200, 300, 300, 400, :fill => true, :color => :red, :source_ignore => [:green],

data/ext/texplay/graphics_utils.c

@@ -19,7 +19,7 @@ static void prepare_color_control(action_struct * cur);
 static void prepare_color_select(action_struct * cur);
 static rgba apply_lerp(action_struct * payload, texture_info * tex, int x, int y);
 static rgba apply_alpha_blend(action_struct * payload, texture_info * tex, int x, int y, rgba blended_pixel);
-static rgba apply_drawing_mode(action_struct * payload, texture_info * tex, int x, int y);
+static rgba apply_drawing_mode(action_struct * payload, texture_info * tex, int x, int y, rgba blended_pixel);
 
 static rgba apply_color_control_transform(action_struct * payload, texture_info * tex, int x, int y);
 static rgba exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y, rgba blended_pixel);
@@ -230,7 +230,7 @@ set_pixel_color_with_style(action_struct * payload, texture_info * tex, int x, i
 
     /* drawing modes */
     if(payload->pen.has_drawing_mode) {
-      blended_pixel = apply_drawing_mode(payload, tex, x, y);
+      blended_pixel = apply_drawing_mode(payload, tex, x, y, blended_pixel);
     }
 
     /*  TO DO: refactor into its own helper function
@@ -817,11 +817,10 @@ mode_colorburn_channel(float b, float s)
 }
   
 static rgba
-apply_drawing_mode(action_struct * payload, texture_info * tex, int x, int y)
+apply_drawing_mode(action_struct * payload, texture_info * tex, int x, int y, rgba source_pixel)
 {
   rgba finished_pixel;
   
-  rgba source_pixel = payload->color;  
   rgba dest_pixel = get_pixel_color(tex, x, y);
 
   rgba_char dest_pixel_char = color_float_to_int_format(dest_pixel);

data/ext/texplay/utils.c

@@ -276,8 +276,6 @@ save_rgba_to_image_local_color(VALUE image, rgba color)
     return ilc;
 }
 
-
-
 bool
 not_a_color(rgba color1) 
 {
@@ -427,14 +425,7 @@ convert_rgba_to_gosu_color(rgba * pix)
 {
     if (not_a_color(*pix)) return Qnil;
 
-    VALUE gosu_color_class = 0;
-
-    if (gosu_color_class == 0) {
-        VALUE gosu_class = rb_const_get(rb_cObject, rb_intern("Gosu"));
-        gosu_color_class = rb_const_get(gosu_class, rb_intern("Color"));
-    }
-    
-    VALUE gosu_color = rb_funcall(gosu_color_class, rb_intern("new"), 0);
+    VALUE gosu_color = rb_funcall(gosu_color_class(), rb_intern("new"), 0);
 
     rb_funcall(gosu_color, rb_intern("red="), 1, INT2FIX(pix->red * 255));
     rb_funcall(gosu_color, rb_intern("green="), 1, INT2FIX(pix->green * 255));
@@ -444,7 +435,18 @@ convert_rgba_to_gosu_color(rgba * pix)
     return gosu_color;
 }
 
+VALUE
+gosu_color_class()
+{
+   VALUE gcolor_class = 0;
 
+   if (gcolor_class == 0) {
+       VALUE gosu_class = rb_const_get(rb_cObject, rb_intern("Gosu"));
+        gcolor_class = rb_const_get(gosu_class, rb_intern("Color"));
+    }
+
+   return gcolor_class;
+}
 
 /* convert Ruby color to C color */
 rgba
@@ -474,6 +476,12 @@ convert_rb_color_to_rgba(VALUE cval)
             my_color.alpha = 1;
 
         break;
+    case T_FIXNUM:
+    case T_BIGNUM:
+      return convert_gosu_to_rgba_color(rb_funcall(gosu_color_class(),
+                                                   rb_intern("new"), 1, cval));
+    break;
+        
     default:
         rb_raise(rb_eArgError, "unsupported argument type for color. Got type 0x%x\n", TYPE(cval) );
     }

data/ext/texplay/utils.h

@@ -23,6 +23,7 @@ bool not_a_color(rgba color1);
 bool is_a_color(rgba color1);
 VALUE convert_rgba_to_rb_color(rgba * pix);
 rgba convert_rb_color_to_rgba(VALUE cval);
+VALUE gosu_color_class();
 bool is_gosu_color(VALUE try_color);
 bool is_rb_raw_color(VALUE cval);
 bool not_rb_raw_color(VALUE cval);

data/lib/texplay/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 940
-  version: 0.2.940
+  - 950
+  version: 0.2.950
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - examples/example_fill.rb
 - examples/example_fill_old.rb
 - examples/example_fluent.rb
+- examples/example_font.rb
 - examples/example_gen_eval.rb
 - examples/example_hash_arguments.rb
 - examples/example_ippa.rb