texplay 0.2.920 → 0.2.930

data/CHANGELOG

@@ -1,3 +1,7 @@
+9/6/10
+version 0.2.930
+* not_a_color now returns true when color channel < 0
+
 8/6/10
 version 0.2.920
 * :trace now supports :color_mode => :gosu

data/README.markdown

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

data/examples/example_alpha_blend.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
 

data/examples/example_bezier.rb

@@ -5,8 +5,8 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
-        @img = TexPlay::create_blank_image(self, 500, 500)
+        super(500, 500, false, 20)
+        @img = TexPlay.create_image(self, 500, 500)
 
         # put a border on the image
         @img.rect 0,0, @img.width - 1, @img.height - 1

data/examples/example_color_control.rb

@@ -4,7 +4,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
@@ -58,7 +58,7 @@ class W < Gosu::Window
 
     def draw
 
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_color_transform.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
         @x = 100
         @y = 100

data/examples/example_color_transform_circle.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
   def initialize
-    super(1024, 768, false, 20)
+    super(500, 500, false, 20)
     @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
     @x = 100
     @y = 100
@@ -29,7 +29,6 @@ class W < Gosu::Window
     @x2 -= 3
     @y2 += 3
 
-
     @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
     
@@ -42,9 +41,6 @@ class W < Gosu::Window
     @img.draw 10, 10,1
 
     if button_down?(Gosu::KbEscape)
-      IL.Enable(IL::ORIGIN_SET)
-      IL.OriginFunc(IL::ORIGIN_UPPER_LEFT)
-      #            screenshot.crop(0,0, 500, 500).save("screenshot.jpg").free
       exit
     end  
     

data/examples/example_darken.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+
+class W < Gosu::Window
+    def initialize
+        super(500, 500, false, 20)
+        @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
+        @img.rect 0,0, @img.width - 1, @img.height - 1, :color_control => { :mult => [0.25, 0.25, 0.25, 1] }, :fill => true
+
+        @img.rect 230, 240, 330, 340, :fill => true,
+      :color_control => { :mult => [4, 4, 4, 1] }
+
+    end
+    
+    def draw
+        @img.draw 0, 0,1
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/examples/example_dup.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
         @img.rect 0,0, @img.width - 1, @img.height - 1
 
@@ -63,8 +63,8 @@ class W < Gosu::Window
         x = @img.width * rand
         y = @img.height * rand
 
-        @img.draw 100, 50,1
-        @bunk.draw 500, 300,1
+        @img.draw 0, 0,1
+        @bunk.draw 0, 0,1
     end
     
 end

data/examples/example_each.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
 
         # each can accept a block of two types of arity:
@@ -31,7 +31,7 @@ class W < Gosu::Window
     
     def draw
     
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_effect.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # put a border on the image
@@ -24,7 +24,7 @@ class W < Gosu::Window
             fill (@img.width * rand), (@img.height * rand), :color => :random, :glow => true
         }
 
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_fill.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = TexPlay::create_blank_image(self, 1022, 800)
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/sand1.png")
@@ -33,7 +33,7 @@ class W < Gosu::Window
     end
     
     def draw
-        @img.draw 10, 10,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_fill_old.rb

@@ -4,7 +4,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
@@ -38,7 +38,7 @@ class W < Gosu::Window
     
     def draw
 
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_fluent.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
         @img.rect 0,0, @img.width - 1, @img.height - 1
 

data/examples/example_gen_eval.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         @width = @img.width
@@ -14,7 +14,6 @@ class W < Gosu::Window
         # turn alpha blending and filling on
         @img.set_options :alpha_blend => true, :fill => true
     end
-    
     def draw
         
         # Gen_eval lets us use local instance vars within the block
@@ -25,7 +24,7 @@ class W < Gosu::Window
             :color => [rand, rand ,rand, rand]
         }  
         
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
 end
 

data/examples/example_hash_arguments.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
 

data/examples/example_light_multiply.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+class W < Gosu::Window
+    def initialize
+      super(500, 500, false, 20)
+      @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
+      @cover = TexPlay.create_image(self, @img.width, @img.height, :color => Gosu::Color.new(127, 127, 127, 127))
+    end
+    
+    def draw
+      @img.draw 0, 0, 1
+      @cover.draw 0, 0, 1, 1, 1, Gosu::Color.new(0xffffffff), :multiply
+    end
+end
+
+W.new.show
+        

data/examples/example_lsystem.rb

@@ -45,15 +45,15 @@ end
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = TexPlay::create_blank_image(self, 500, 500)
         @img.set_options :color => :rand
-        @img.lsystem(400, 150, Koch, :order => 8, :line_length => 6)
+        @img.lsystem(0, 250, Bush3, :order => 6, :line_length => 4)
         #@img.save("dragon.jpg")
     end
 
     def draw
-        @img.draw(100,0,1)
+        @img.draw(0,0,1)
     end
 end
 

data/examples/example_melt.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
     end
     
@@ -16,7 +16,7 @@ class W < Gosu::Window
 
         @img.splice @img, x, y + 1, :crop => [x, y, x + 100, y + 100]
 
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_polyline.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # put a border on the image
@@ -32,7 +32,7 @@ class W < Gosu::Window
 
         # NOTE: (when viewing) the blue line is the extra line added to close the polygon,
         # red lines are original polyline
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_scale.rb

@@ -6,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/logo.png")
         @img2 = TexPlay::create_blank_image(self, 500, 500)
 

data/examples/example_select.rb

@@ -0,0 +1,30 @@
+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)
+      @img.rect 100, 100, 200, 300, :color => :red, :fill => true
+      @img.rect 200, 100, 300, 300, :color => :blue, :fill => true
+
+
+      @img.line 0, 0, 500, 500, :dest_ignore => :red
+
+      @img.circle 200, 100, 50, :fill => true, :dest_select => [:red, :blue], :color => :orange
+      
+    end
+    
+    def draw
+        @img.draw 100, 50,1
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/examples/example_simple.rb

@@ -32,8 +32,8 @@ class W < Gosu::Window
       @img.line 200, 300, 300, 400, :thickness => 5,
       :dest_select => :blue, :dest_ignore => :red
 
-      puts @img.get_pixel 200, 310
-      puts @img.get_pixel 200, 310, :color_mode => :gosu
+      puts (@img.get_pixel 2000, 310).inspect
+      puts @img.get_pixel 2000, 310, :color_mode => :gosu
     end
     
     def draw

data/examples/example_splice.rb

@@ -1,3 +1,4 @@
+
 require 'rubygems'
 require 'common'
 require 'texplay'
@@ -5,7 +6,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/gosu.png")
 

data/examples/example_sync.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # sets the 'global' color for all actions in this image
@@ -51,7 +51,7 @@ class W < Gosu::Window
     
     def draw
         
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
 end
 

data/examples/example_turtle.rb

@@ -5,7 +5,7 @@ require 'texplay'
 
 class W < Gosu::Window
     def initialize
-        super(1024, 768, false, 20)
+        super(500, 500, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
 
         # put a border on the image
@@ -29,7 +29,7 @@ class W < Gosu::Window
             @length += 2
         }
 
-        @img.draw 100, 50,1
+        @img.draw 0, 0,1
     end
     
 end

data/examples/example_weird.rb

@@ -5,11 +5,10 @@ require 'texplay'
 
 class W < Gosu::Window
   def initialize
-    super(1024, 768, false, 20)
+    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, 10, 300, 300, :color => :blue, :fill => true, :mode => :softlight
   end
 
   def draw

data/ext/texplay/utils.c

@@ -281,13 +281,14 @@ save_rgba_to_image_local_color(VALUE image, rgba color)
 bool
 not_a_color(rgba color1) 
 {
-    return color1.red == -1;
+    return color1.red < 0 || color1.green < 0 ||
+      color1.blue < 0 || color1.alpha < 0;
 }
 
 bool
 is_a_color(rgba color1)
 {
-    return !not_a_color(color1);
+    return color1.red > 0 && color1.green > 0 && color1.blue > 0 && color1.alpha > 0;
 }
 
 bool

data/lib/texplay/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 920
-  version: 0.2.920
+  - 930
+  version: 0.2.930
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - examples/example_color_control.rb
 - examples/example_color_transform.rb
 - examples/example_color_transform_circle.rb
+- examples/example_darken.rb
 - examples/example_dup.rb
 - examples/example_each.rb
 - examples/example_effect.rb
@@ -80,11 +81,13 @@ files:
 - examples/example_gen_eval.rb
 - examples/example_hash_arguments.rb
 - examples/example_light.rb
+- examples/example_light_multiply.rb
 - examples/example_lsystem.rb
 - examples/example_melt.rb
 - examples/example_meyet.rb
 - examples/example_polyline.rb
 - examples/example_scale.rb
+- examples/example_select.rb
 - examples/example_simple.rb
 - examples/example_splice.rb
 - examples/example_sync.rb