texplay 0.2.5 → 0.2.7

data/CHANGELOG

@@ -1,3 +1,12 @@
+16/10/09
+version 0.2.7
+* removed memory leak from Gosu::Image#to_blob, now writing directly to RSTRING_PTR
+
+12/10/09
+version 0.2.666
+* added Gosu::Image#to_blob
+* to_blob functionality enables Gosu::Images to work with DevIL library
+
 6/10/09
 version 0.2.5
 * fixed quad_draw flicker bug

data/README.markdown

@@ -5,14 +5,20 @@
 INSTRUCTIONS 
 ============
 
-**TexPlay version 0.2.5**
+**TexPlay version 0.2.7**
 
 Gem installation:
 
 + sudo gem install texplay
 
-To compile TexPlay from source, ensure you are in the directory with the Rakefile and type:
+How to build the gems? (maintainers only)
 
++ Install rake-compiler (http://github.com/luislavena/rake-compiler)
++ Install 1.9.1 and 1.8.6 mingw ruby versions (instructions above)
++ Type: rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1
++ Upload new gems to rubyforge and gemcutter.
+
+How to build from source?    
 + rake compile
 
 OR

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/extensiontask'
 
-TEXPLAY_VERSION = "0.2.5"
+TEXPLAY_VERSION = "0.2.7"
 
 $dlext = Config::CONFIG['DLEXT']
 
@@ -20,15 +20,14 @@ specification = Gem::Specification.new do |s|
     s.require_path = 'lib'
     s.add_dependency("gosu",">=0.7.14")
     s.platform = Gem::Platform::RUBY
-    s.extensions = ["ext/texplay/extconf.rb"]
     s.homepage = "http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/"
     s.has_rdoc = false
+
+    s.extensions = ["ext/texplay/extconf.rb"]
     s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
                 "lib/texplay.rb", "lib/texplay-contrib.rb"] +
         FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb",
                  "examples/media/*"].to_a 
-
-
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/examples/example_lsystem.rb

@@ -1,5 +1,5 @@
 require 'common'
-require 'texplay'
+require 'devil/gosu'
 
 Dragon = TexPlay::LSystem.new do
     rule "F" => "F"
@@ -47,7 +47,9 @@ class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
         @img = TexPlay::create_blank_image(self, 500, 500)
-        @img.lsystem(250, 250, Koch, :order => 8, :line_length => 10)
+        @img.set_options :color => :rand
+        @img.lsystem(400, 350, Dragon, :order => 13, :line_length => 4)
+        @img.save("dragon.jpg")
     end
 
     def draw

data/examples/example_scale.rb

@@ -8,34 +8,9 @@ class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
         @img = Gosu::Image.new(self, "#{Common::MEDIA}/logo.png")
-        #@img.rect 0,0, @img.width - 1, @img.height - 1
         @img2 = TexPlay::create_blank_image(self, 500, 500)
-        #@img2.rect 0,0, 1000, 1000, :fill => true
 
-        TexPlay::create_macro(:splice_and_scale) do |img, cx, cy, *options|
-            options = options.first ? options.first : {}
-
-            options = {
-                :color_control => proc do |c1, c2, x, y|
-                    factor = options[:factor] || 1
-                    factor_x = options[:factor_x] || factor
-                    factor_y = options[:factor_y] || factor
-
-                    x = factor_x * (x - cx) + cx
-                    y = factor_y * (y - cy) + cy
-                    
-                    rect x, y, x + factor_x, y + factor_y, :color => c2, :fill => true
-                    :none
-                end
-            }.merge!(options)
-                
-            splice img, cx, cy, options
-
-            self
-        end
-
-
-        @img2.splice_and_scale @img, 0, 50, :factor => 0.3, :factor_y => 4
+        @img2.splice_and_scale @img, 0, 50, :factor => 2
         @img2.splice @img, 0, 200 
     end
     

data/ext/texplay/bindings.c

@@ -333,6 +333,54 @@ m_get_options(VALUE self)
     return get_image_local(self, USER_DEFAULTS);
 }
 
+static void
+get_image_chunk_with_size(char * data, texture_info * tex, char * blob)
+{
+    int x, y;
+
+    for(y = 0; y < tex->height; y++)
+        for(x = 0; x < tex->width; x++) {
+            int buf_index = 4 * (x + y * tex->width);
+                
+            int offset = calc_pixel_offset(tex, x, y);
+
+            memcpy(blob + buf_index, data + offset, 4);
+        }
+}
+
+VALUE
+m_to_blob(VALUE self)
+{
+    texture_info tex;
+    int sidelength;
+    VALUE blob;
+    void * new_array = NULL;
+    
+    ADJUST_SELF(self);
+
+    get_texture_info(self, &tex);
+
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, tex.tname);
+
+    /* get length of a side, since square texture */
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &sidelength);
+
+    /* initialize texture data array, mult. by 4 because {rgba} */
+    new_array = malloc(sidelength * sidelength * 4);
+
+    /* get texture data from video memory */
+    glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_UNSIGNED_BYTE,(void*)(new_array));
+
+    blob = rb_str_new(NULL, 4 * tex.width * tex.height);
+    
+    get_image_chunk_with_size(new_array, &tex, RSTRING_PTR(blob));
+
+    glDisable(GL_TEXTURE_2D);
+
+    return blob;
+}
+
 /* return the pixel colour for the given x, y */
 VALUE
 m_getpixel(int argc, VALUE * argv, VALUE self) 

data/ext/texplay/bindings.h

@@ -30,7 +30,6 @@ VALUE m_rshift(int argc, VALUE * argv, VALUE self);
 
 VALUE m_each(int argc, VALUE * argv, VALUE self);
 
-
 VALUE m_quad_cached(VALUE self);
 VALUE m_cache_refresh(VALUE self);
 
@@ -42,4 +41,6 @@ VALUE m_force_sync(VALUE self, VALUE ary);
 VALUE m_dup_image(VALUE self);
 VALUE m_clone_image(VALUE self);
 
+VALUE m_to_blob(VALUE self);
+
 #endif

data/ext/texplay/extconf.rb

@@ -4,18 +4,27 @@ require 'mkmf'
 # linux
 if RUBY_PLATFORM =~ /linux/ then
     exit unless have_library("glut")
+    exit unless have_library("GL")
     
 # macosx
 elsif RUBY_PLATFORM =~ /darwin/
     $LDFLAGS +=  " -framework GLUT"
-    $CPPFLAGS += " -I/System/Library/Frameworks/GLUT.framework/Headers"
+    $CFLAGS += " -I/System/Library/Frameworks/GLUT.framework/Headers"
 
 # windows    
-else 
-    exit unless have_library("glut32") 
+else
+    
+    exit unless have_library("freeglut_static") 
+    exit unless have_library("opengl32")
+    
+    if RUBY_PLATFORM =~ /mingw/
+        $CFLAGS += " -I/home/john/.rake-compiler/ruby/ruby-1.9.1-p243/include"
+        $CFLAGS += " -I/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/include"
+        $CFLAGS += " -D FREEGLUT_STATIC"
+    end
 end
 
 # 1.9 compatibility
-$CPPFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
+$CFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
 
 create_makefile('texplay')

data/ext/texplay/gen_eval.c

@@ -37,6 +37,7 @@ set_hidden_self(VALUE duped_context, VALUE hidden_self)
 VALUE
 rb_capture(VALUE self) {
     VALUE hidden_self;
+    VALUE result;
     
     rb_need_block();
     
@@ -46,11 +47,12 @@ rb_capture(VALUE self) {
                 (2) otherwise simply yield to the block
     */
     if(!NIL_P(hidden_self))
-        rb_obj_instance_eval(0, 0, hidden_self);
+        result = rb_obj_instance_eval(0, 0, hidden_self);
     else
-        rb_yield(Qnil);
+        result = rb_yield(Qnil);
 
-    return hidden_self;
+    /* we want the return value of capture to be the return value of the block */
+    return result;
 }
 
 /** ruby 1.9 funcs **/

data/ext/texplay/texplay.c

@@ -60,6 +60,7 @@ Init_texplay() {
 
     rb_define_method(jm_Module, "dup", m_dup_image, 0);
     rb_define_method(jm_Module, "clone", m_clone_image, 0);
+    rb_define_method(jm_Module, "to_blob", m_to_blob, 0);
     rb_define_method(jm_Module, "force_sync", m_force_sync, 1);
     rb_define_method(jm_Module, "set_options", m_user_set_options, 1);
     rb_define_method(jm_Module, "get_options", m_get_options, 0);

data/ext/texplay/utils.c

@@ -847,7 +847,6 @@ get_image_chunk(texture_info * tex, int xmin, int ymin, int xmax, int ymax)
 
     return image_buf;
 }
-    
 
 /* get information from texture */
 void

data/lib/texplay.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'gosu'
 
 module TexPlay
-    TEXPLAY_VERSION = "0.2.5"
+    TEXPLAY_VERSION = "0.2.7"
 
     def self::on_setup(&block)
         raise "need a block" if !block

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -04:00
+date: 2009-10-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,10 +82,8 @@ files:
 - examples/media/gosu.png
 - examples/media/logo.png
 - examples/media/empty2.png
-has_rdoc: true
+has_rdoc: false
 homepage: http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -106,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: TexPlay is a light-weight image manipulation framework for Ruby and Gosu
 test_files: []