texplay 0.2.700 → 0.2.710

data/CHANGELOG

@@ -1,3 +1,15 @@
+6/12/09
+version 0.2.710
+* fixed bug in line drawing code (wasn't drawing final pixel)
+* fixed bug in filled rect code (wasn't drawing final row)
+* fixed bug in flood fill (wasn't drawing on first column)
+* added glDisable(GL_TEXTURE_2D) calls to cache.c, and removed 'restore previous texture binding' (i doubt there is any previous binding to restore)
+* using version.rb to help manage versions
+
+23/11/09
+* fixed bug in texplay.rb. Replaced TexPlay::TP_MAX_QUAD_SIZE - 2 with
+just TexPlay::TP_MAX_QUAD_SIZE (the -2 is now built into the constant)
+
 16/10/09
 version 0.2.700
 * removed memory leak from Gosu::Image#to_blob, now writing directly to RSTRING_PTR

data/README.markdown

@@ -5,7 +5,7 @@
 INSTRUCTIONS 
 ============
 
-**TexPlay version 0.2.700**
+**TexPlay version 0.2.710**
 
 Gem installation:
 

data/Rakefile

@@ -2,7 +2,8 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/extensiontask'
 
-TEXPLAY_VERSION = "0.2.700"
+# get the texplay version
+require 'lib/texplay/version'
 
 $dlext = Config::CONFIG['DLEXT']
 
@@ -12,7 +13,7 @@ CLOBBER.include("**/*.#{$dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
 specification = Gem::Specification.new do |s|
     s.name = "texplay"
     s.summary = "TexPlay is a light-weight image manipulation framework for Ruby and Gosu"
-    s.version = TEXPLAY_VERSION
+    s.version = TexPlay::VERSION
     s.date = Time.now.strftime '%Y-%m-%d'
     s.author = "John Mair (banisterfiend)"
     s.email = 'jrmair@gmail.com'
@@ -25,7 +26,7 @@ specification = Gem::Specification.new do |s|
 
     s.extensions = ["ext/texplay/extconf.rb"]
     s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
-                "lib/texplay.rb", "lib/texplay-contrib.rb"] +
+                "lib/texplay.rb", "lib/texplay-contrib.rb", "lib/texplay/version.rb"] +
         FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb",
                  "examples/media/*"].to_a 
 end

data/examples/example_color_transform.rb

@@ -2,23 +2,62 @@ require 'rubygems'
 require 'common'
 require 'gosu'
 require 'texplay'
-
+require 'devil/gosu'
 
 class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
+        @x = 100
+        @y = 100
+        
+        @x2 = 400
+        @y2 = 100
+        @rad = 50
+        @s = true
+
+        @copy = TexPlay.create_blank_image(self, @rad * 2 + 1, @rad * 2 + 1)
+        @copy2 = TexPlay.create_blank_image(self, @rad * 2 + 1, @rad * 2 + 1)
     end
     
     def draw
-        x = (@img.width - 100/2) * rand 
-        y = (@img.height - 100/2) * rand 
 
-        @img.rect x, y, x + 50, y + 50, :fill => true,
-        :color_control => { :mult => [0.9 , 0.3, 0.3, 1] }
 
+        @x += 1
+        @y += 1
+
+        @x2 -= 1
+        @y2 += 1
+
+
+        @copy2.splice @img, 0, 0, :crop => [@x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad]
+        @copy.splice @img, 0, 0, :crop => [@x - @rad, @y - @rad, @x + @rad, @y + @rad]
+        @img.
+            circle @x, @y, @rad, :fill => true,
+        :color_control => { :mult => [1, 1, 1, 1] }
+
+         #    circle @x2, @y2, @rad, :fill => true,
+#             :color_control => { :mult => [0.3, 0.9, 0.3, 1] }
+        
+
+#        @img.force_sync [0,0, @img.width, @img.height]
+
+        @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  
+        
+    end
+
+    def update
+        @img.splice @copy, @x - @rad, @y - @rad if !@s
+        @img.splice @copy2, @x2 - @rad, @y2 - @rad if !@s
+        @s = nil if @s
 
-        @img.draw 100, 50,1
     end
     
 end

data/examples/example_fill_test.rb

@@ -0,0 +1,106 @@
+require 'rubygems'
+require 'common'
+require 'texplay'
+require 'devil/gosu'
+
+
+class W < Gosu::Window
+    WIDTH = 1000
+    HEIGHT = 800
+    def initialize
+        super(1024, 768, false, 20)
+        @img = TexPlay::create_blank_image(self, WIDTH, HEIGHT)
+        @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
+        @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/sand1.png")
+
+
+        image = TexPlay::create_blank_image(self, WIDTH, HEIGHT)
+        image2 = TexPlay::create_blank_image(self, WIDTH, HEIGHT)
+
+        puts "..created blank!"
+        puts "..starting drawing!"
+
+        # now let's create the landscape
+        points = []
+        (0..WIDTH + 120).step(90) {  |x|
+            p = TexPlay::TPPoint.new
+            p.x = x
+            p.y = HEIGHT - rand * 600
+            if p.y >= HEIGHT - 1 
+                p.y = HEIGHT - 1
+            end
+            points << p
+        }
+
+        points.first.y = 600
+        points.last.x = WIDTH + 200
+
+        points.last.y = 600
+
+        mag = rand(50) + 10
+        rough = 2 + rand(20)
+        spike = 2 + rand(14)
+        period = 2 * rand + 0.2
+        image.move_to(points.first.x, points.first.y)
+
+        image.rect 200, 200, 300, 300, :color => :green, :fill => true
+        image.rect 300, 200, 400, 300, :color => :green, :fill => false
+        #image.line 200, 200, 300, 300, :color => :green, :fill => true#, :thickness => 3
+        #        image.pixel 300,300, :color => :white
+        #        image.line 200, 300, 300, 300, :color => :white, :sync_mode => :eager_sync
+
+        #       
+        image.rect 0, 0, image.width - 1, image.height - 1, :color => :white
+        image.circle image.width, 0, 10, :color => :red, :fill => true
+        #        image.rect 0, 400, image.width - 1, 600, :color => :green
+
+        # plain beziers are boring, so let's augment it with a randomized sine wave
+        image.bezier points, :color => :white,  :color_control => proc {  |c, t, y|
+            y +=  mag * Math::sin(t * period * Math::PI / 180)
+            if (t % rough == 0 ) then
+                image.line_to(t, y + rand * spike - (spike / 2), :texture => @gosu)
+            end
+            :none
+        }
+        
+        #image.bezier [rand(500), 700, rand(100), 800, rand(800), 900, rand(300), 850 ], :closed => true
+        image.fill 300, 760, :color => :red #:texture => @gosu
+        image.rect 0,0, image.width - 1, image.height - 1, :fill => true, :color => :blue
+        image2.fill 300, 300, :color => :red
+        
+        @img = image
+        @img2 = image2
+        #       @img.circle  10, image.height / 2, 50, :color => :red, :fill => true
+        #@img.rect 0,100, 100, 200, :color => :red, :fill => true
+        #@img.line -1, 100, 100, 100, :color => :blue, :fill => true
+
+        #        @img.line 0,100, 0, 200, :color => :red, :fill => true
+
+        
+        #        @img.force_sync [0,0, image.width, image.height]
+        #        @img.rect  -10, image.height / 2, 50, image.height / 2 + 50, :color => :red, :fill => true
+        #        @img.line 0,0, 0, image.height - 1, :color => :red
+
+        @bunk = TexPlay.create_blank_image(self, 100, 100)
+        @bunk.circle 50, 50, 50, :color => :rand, :fill => true
+        
+    end
+    
+    def draw
+        @img.draw  0, 600,1
+        @img2.draw 50, 600, 1
+        @bunk.draw 500, 500, 1
+
+        if button_down?(Gosu::KbEscape)
+            Devil.from_blob(self.to_blob, self.width, self.height).save("hello.jpg")
+            #screenshot.crop(100, 100, 500, 500).save("hello.jpg")
+            exit
+        end
+    end
+    
+end
+
+
+w = W.new
+w.show
+

data/examples/example_modify.rb

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+require 'devil/gosu'
+
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+        @img = Gosu::Image.new(self, "#{Common::MEDIA}/platform.png")
+
+        # each can accept a block of two types of arity:
+        # arity 1 - yields just the pixel color
+        # arity 3 - yield the pixel color, and the x and y
+
+        # max out the blue component of every pixel
+        @img.each { |v|
+            if v[0] > 0.7 && v[1] > 0.6 && v[2] < 0.6 then
+                v[1] = 0.0
+                v[2] = 0.0
+            end
+        }
+
+        #@img.save("/home/john/Desktop/red.png")
+
+ 
+    end
+    
+    def draw
+    
+        @img.draw 100, 50,1
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/examples/example_sine.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'common'
+require 'texplay'
+
+
+class W < Gosu::Window
+    NUM_WAVES = 10
+
+    def initialize
+        super(1024, 768, 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")
+
+        points = []
+
+        # NOTE: TexPlay also accepts points. a 'point' is any object that responds to 'x' or y
+        # NOTE: current maximum points for a bezier is 13
+        (0..@img.width + 90).step(185) { |x|
+            p = TexPlay::TPPoint.new
+            p.x = x
+            p.y = @img.height * rand
+
+            points << p
+        }
+
+        waves = []
+        NUM_WAVES.times {
+            waves.push({ :amp => rand(100), :freq => rand(1000).to_f })
+        }
+            
+        @img.move_to 0, 300
+        (0..1100).step(10) { |x|
+            y = 300
+            waves.each { |w|
+                y += w[:amp] * Math::sin((x / w[:freq]) * Math::PI * 2) 
+            }
+            @img.line_to(x, y)
+        }
+
+        # NOTE: the :texture hash argument works on ALL drawing actions; not just fills
+        @img.fill 300, 650, :texture => @gosu
+
+    end
+    
+    def draw
+        @img.draw 10, 10,1
+    end
+    
+end
+
+
+w = W.new
+w.show
+        

data/ext/texplay/actions.c

@@ -66,6 +66,14 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
     if(W >= H) {
         F = 2 * H - W;
         while(x != x2) {
+           if(thickness <= 1) {
+                set_pixel_color_with_style(payload, tex, x, y);
+            }
+            else {
+                set_hash_value(hash_arg, "fill", Qtrue);
+                circle_do_action(x, y, thickness / 2, tex, hash_arg, no_sync, false, payload);
+            }
+           
             if(F < 0)
                 F += 2 * H;
             else {
@@ -73,6 +81,11 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
                 y += yinc;
             }
             x += xinc;
+        }
+    }
+    else {
+        F = 2 * W - H;
+        while(y != y2 ) {
 
             if(thickness <= 1) {
                 set_pixel_color_with_style(payload, tex, x, y);
@@ -81,11 +94,7 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
                 set_hash_value(hash_arg, "fill", Qtrue);
                 circle_do_action(x, y, thickness / 2, tex, hash_arg, no_sync, false, payload);
             }
-        }
-    }
-    else {
-        F = 2 * W - H;
-        while(y != y2 ) {
+            
             if(F < 0)
                 F += 2 * W;
             else {
@@ -93,18 +102,17 @@ line_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
                 x += xinc;
             }
             y += yinc;
-
-            if(thickness <= 1) {
-                set_pixel_color_with_style(payload, tex, x, y);
-            }
-            else {
-                set_hash_value(hash_arg, "fill", Qtrue);
-                circle_do_action(x, y, thickness / 2, tex, hash_arg, no_sync, false, payload);
-            }
-            
         }
     }
-			
+
+    if(thickness <= 1) {
+        set_pixel_color_with_style(payload, tex, x2, y2);
+    }
+    else {
+        set_hash_value(hash_arg, "fill", Qtrue);
+        circle_do_action(x2, y2, thickness / 2, tex, hash_arg, no_sync, false, payload);
+                
+    }
     draw_epilogue(&cur, tex, primary);
 }
 /** end line **/
@@ -311,7 +319,7 @@ rect_do_action(int x1, int y1, int x2, int y2, texture_info * tex, VALUE hash_ar
         int y;
         if(y1 > y2) SWAP(y1, y2);
 
-        for(y = y1; y < y2; y++)
+        for(y = y1; y <= y2; y++)
             line_do_action(x1, y, x2, y, tex, hash_arg, no_sync, false, payload);
     }
 
@@ -660,7 +668,7 @@ scan_fill_do_action(int x, int y, texture_info * tex, VALUE hash_arg,
                     /* update the drawing rectangle */
                     update_bounds(payload, x, y1, x, y1);
 
-                    if(!spanLeft && x > 1 && cmp_color(old_color, get_pixel_color(tex, x - 1, y1))) 
+                    if(!spanLeft && x > 0 && cmp_color(old_color, get_pixel_color(tex, x - 1, y1))) 
                         {
                             if(!push(x - 1, y1, tex->width - 1)) return;
                             spanLeft = true;

data/ext/texplay/cache.c

@@ -25,13 +25,9 @@ cache_entry*
 cache_create_entry(int tname) {
     float * new_array;
     int sidelength, new_element = cache.len;
-    GLint saved_tname;
 
     if(cache.len >= CACHE_SIZE) {  rb_raise(rb_eRuntimeError, "cache is full! increase CACHE_SIZE");  }
 
-    /* save current texture binding */
-    /*  glGetIntegerv(GL_TEXTURE_BINDING_2D, &saved_tname); */
-
     /* opengl initialization code */
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, tname);
@@ -53,12 +49,8 @@ cache_create_entry(int tname) {
     /* update size of cache */
     cache.len++;
 
-    /* restore saved texture binding */
-    /* glBindTexture(GL_TEXTURE_2D, saved_tname); */
-
     glDisable(GL_TEXTURE_2D);
 
-
     return &cache.entry[new_element];
 }
 
@@ -92,35 +84,27 @@ void
 cache_refresh_all(void) {
     float * tdata;
     int tname, index;
-    GLint saved_tname;
 
-    /* save current texture binding */
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &saved_tname);
+    /* opengl initialization code */
+    glEnable(GL_TEXTURE_2D);
 
     for(index = 0; index < cache.len; index++) {
         tdata = cache.entry[index].tdata;
         tname = cache.entry[index].tname;
 
-        /* opengl initialization code */
-        glEnable(GL_TEXTURE_2D);
         glBindTexture(GL_TEXTURE_2D, tname);
 
         glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT, (void*)(tdata));
     }
 
-    /* restore saved texture binding */
-    glBindTexture(GL_TEXTURE_2D, saved_tname);
+    glDisable(GL_TEXTURE_2D);
 }
 
 /* refresh the cache for a specific quad */
 void
 cache_refresh_entry(int tname) {
-    GLint saved_tname;
     cache_entry * entry;
 
-    /* save current texture binding */
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &saved_tname);
-
     entry = find_in_cache(tname);
     
     /* opengl initialization code */
@@ -129,7 +113,6 @@ cache_refresh_entry(int tname) {
 
     glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT, (void*)(entry->tdata));
 
-    /* restore saved texture binding */
-    glBindTexture(GL_TEXTURE_2D, saved_tname);
+    glDisable(GL_TEXTURE_2D);
 }
 

data/ext/texplay/texplay.c

@@ -12,11 +12,18 @@
 #include "bindings.h"
 #include "object2module.h"
 #include "gen_eval.h"
+#ifdef __APPLE__
+# include <glut.h>
+#else
+# include <GL/glut.h>
+#endif
+
 
 /* setup ruby bindings */
 
 /** constructor for TPPoint class **/
 static VALUE m_init_TPPoint(int argc, VALUE * argv, VALUE self);
+static void monkey_patch_gosu(void);
 
 void
 Init_texplay() {
@@ -103,6 +110,7 @@ Init_texplay() {
     /* seed the random number generator */
     srand(time(NULL));
 
+    monkey_patch_gosu();
     /** end basic setup **/
 }
 
@@ -130,7 +138,31 @@ m_init_TPPoint(int argc, VALUE * argv, VALUE self)
 }
 /** end constructor for TPPoint **/
 
+
+static VALUE
+gosu_window_to_blob(VALUE self)
+{
+    int width, height;
+    VALUE blob;
+
+    width = rb_funcall(self, rb_intern("width"), 0);
+    height = rb_funcall(self, rb_intern("height"), 0);
+
+    blob = rb_str_new(NULL, 4 * width * height);
+
+    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, RSTRING_PTR(blob));
+
+    return blob;
+}
+
+static void
+monkey_patch_gosu(void)
+{
+    VALUE Gosu = rb_const_get(rb_cObject, rb_intern("Gosu"));
+    VALUE GosuWindow = rb_const_get(Gosu, rb_intern("Window"));
     
+    rb_define_method(GosuWindow, "to_blob", gosu_window_to_blob, 0);
+}    
 
 
 

data/lib/texplay.rb

@@ -5,30 +5,35 @@ begin
 rescue LoadError
 end
 
+direc = File.dirname(__FILE__)
+
 # include gosu first
 require 'rbconfig'
 require 'gosu'
+require "#{direc}/texplay/version"
 
 module TexPlay
-    TEXPLAY_VERSION = "0.2.700"
-
-    def self::on_setup(&block)
-        raise "need a block" if !block
-        
-        @__init_procs__ ||= []
-        @__init_procs__.push(block)
-    end
+    class << self
+        def on_setup(&block)
+            raise "need a block" if !block
+            
+            @__init_procs__ ||= []
+            @__init_procs__.push(block)
+        end
 
-    def self::setup(receiver)
-        if @__init_procs__ then
-            @__init_procs__.each do |init_proc|
-                receiver.instance_eval(&init_proc)
+        def setup(receiver)
+            if @__init_procs__ then
+                @__init_procs__.each do |init_proc|
+                    receiver.instance_eval(&init_proc)
+                end
             end
         end
-    end
 
-    def self::create_blank_image(window, width, height)
-        Gosu::Image.new(window, EmptyImageStub.new(width, height))
+        def create_blank_image(window, width, height)
+            Gosu::Image.new(window, EmptyImageStub.new(width, height))
+        end
+
+        alias_method :create_image, :create_blank_image
     end
 
     module Colors
@@ -90,6 +95,8 @@ module Gosu
 
         # bring in the TexPlay image manipulation methods
         include TexPlay
+
+        attr_reader :__window__
         
         class << self 
             alias_method :original_new, :new
@@ -100,8 +107,8 @@ module Gosu
                 obj = original_new(*args, &block)
 
                 # refresh the TexPlay image cache
-                if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE - 2) &&
-                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE - 2) && obj.quad_cached? then
+                if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE) &&
+                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE) && obj.quad_cached? then
                     
                     obj.refresh_cache
                 end
@@ -115,10 +122,6 @@ module Gosu
                 obj
             end
         end
-        
-        def __window__
-            @__window__
-        end
     end
 end
 

data/lib/texplay/version.rb

@@ -0,0 +1,3 @@
+module TexPlay
+    VERSION = "0.2.710"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  version: 0.2.700
+  version: 0.2.710
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -04:00
+date: 2009-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,6 +36,7 @@ files:
 - CHANGELOG
 - lib/texplay.rb
 - lib/texplay-contrib.rb
+- lib/texplay/version.rb
 - ext/texplay/extconf.rb
 - ext/texplay/object2module.h
 - ext/texplay/bindings.h
@@ -55,9 +56,11 @@ files:
 - examples/example_dup.rb
 - examples/example_turtle.rb
 - examples/example_color_control.rb
+- examples/example_sine.rb
 - examples/example_effect.rb
 - examples/common.rb
 - examples/example_color_transform.rb
+- examples/example_fill_test.rb
 - examples/example_hash_arguments.rb
 - examples/example_gen_eval.rb
 - examples/example_polyline.rb
@@ -67,6 +70,7 @@ files:
 - examples/example_fill_old.rb
 - examples/example_blur.rb
 - examples/example_each.rb
+- examples/example_modify.rb
 - examples/example_fluent.rb
 - examples/example_sync.rb
 - examples/example_splice.rb
@@ -81,6 +85,7 @@ files:
 - examples/media/texplay.png
 - examples/media/gosu.png
 - examples/media/logo.png
+- examples/media/platform.png
 - examples/media/empty2.png
 has_rdoc: false
 homepage: http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/