texplay 0.2.983pre1 → 0.2.983pre2

data/CHANGELOG

@@ -1,6 +1,12 @@
+*1/10/10
+version 0.2.983pre2
+* added Window#to_texture(...)  seems to be broken! releasing pre2 so
+* others can test it :)
+	
 *27/9/10
 version 0.2.983pre1
 * added Window#to_blob(x,y,width,height), grab a screenshot region
+	
 *24/9/10
 version 0.2.982pre1
 * added :default drawing mode (equivalent to :mode => nil)

data/README.markdown

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

data/examples/common.rb

@@ -1,6 +1,5 @@
 $LOAD_PATH.push(File.dirname(__FILE__) + '/../lib/')
 
-require 'rubygems'
 require 'texplay'
 
 module Common

data/examples/example_window_to_blob.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'common'
 require 'gosu'
 require 'texplay'

data/examples/example_window_to_texture.rb

@@ -0,0 +1,55 @@
+require 'common'
+require 'gosu'
+require 'texplay'
+
+
+class W < Gosu::Window
+
+  def render_to_texture(image, x, y)
+    tex_name = image.gl_tex_info.tex_name
+    xoffset = image.gl_tex_info.left * Gosu::MAX_TEXTURE_SIZE * Gosu::MAX_TEXTURE_SIZE
+    yoffset = image.gl_tex_info.top * Gosu::MAX_TEXTURE_SIZE
+    width = image.width
+    height = image.height
+    
+    self.to_texture(tex_name, xoffset, yoffset, x, y, width, height)
+  end
+
+  def initialize
+    super(500, 500, false, 20)
+    @img = Gosu::Image.new(self, "#{Common::MEDIA}/maria.png")
+    @img2 = TexPlay.create_image(self, 100, 100, :color => Gosu::Color::RED)
+
+  end
+
+  def update
+    
+  end
+  
+  def draw
+    @img.draw 0, 0,1
+    @img2.draw rand(100), rand(100),1
+    @img3.draw rand(300), rand(300), 1 if @img3
+
+    if button_down?(Gosu::KbEscape)
+      #        self.flush
+      @img3 = TexPlay.create_image(self, Gosu::MAX_TEXTURE_SIZE - 2, Gosu::MAX_TEXTURE_SIZE - 2, :color => :purple)
+
+      render_to_texture(@img2, 0, self.height)
+
+
+
+      # if @blob
+      #   @img3 = TexPlay.from_blob(self, @blob,50, 50 ) 
+      # end
+    end
+
+    500000.times {}
+  end
+  
+end
+
+
+w = W.new
+w.show
+

data/ext/texplay/texplay.c

@@ -141,29 +141,56 @@ m_init_TPPoint(int argc, VALUE * argv, VALUE self)
 
 
 static VALUE
-gosu_window_to_blob(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+gosu_window_to_blob(VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_width, VALUE rb_height)
 {
-  int rb_x = FIX2INT(x);
-  int rb_y = FIX2INT(y);
-  int rb_width = FIX2INT(width);
-  int rb_height = FIX2INT(height);
+  int x = FIX2INT(rb_x);
+  int y = FIX2INT(rb_y);
+  int width = FIX2INT(rb_width);
+  int height = FIX2INT(rb_height);
   int window_height = FIX2INT(rb_funcall(self, rb_intern("height"), 0));
 
-  VALUE blob = rb_str_new(NULL, 4 * rb_width * rb_height);
+  VALUE blob = rb_str_new(NULL, 4 * width * height);
     
-  glFinish();
   rb_funcall(self, rb_intern("flush"), 0);
+  glFinish();
     
-  glReadPixels(rb_x, rb_y, rb_width, rb_height, GL_RGBA,
+  glReadPixels(x, y, width, window_height - y, GL_RGBA,
                GL_UNSIGNED_BYTE, RSTRING_PTR(blob));
     
   return blob;
 }
 
+static VALUE
+gosu_window_to_texture(VALUE self, VALUE rb_tex_name, VALUE rb_xoffset, VALUE rb_yoffset,
+                       VALUE rb_x, VALUE rb_y, VALUE rb_width, VALUE rb_height)
+{
+
+  int tex_name = FIX2INT(rb_tex_name);
+  int xoffset = FIX2INT(rb_xoffset);
+  int yoffset = FIX2INT(rb_yoffset);
+  int x = FIX2INT(rb_x);
+  int y = FIX2INT(rb_y);
+  int width = FIX2INT(rb_width);
+  int height = FIX2INT(rb_height);
+    
+  rb_funcall(self, rb_intern("flush"), 0);
+  glFinish();
+
+  glEnable(GL_TEXTURE_2D);
+  glBindTexture(GL_TEXTURE_2D, tex_name);
+  
+  glCopyTexSubImage2D(GL_TEXTURE_2D, 0, xoffset, yoffset, x, y, width, height);
+  glDisable(GL_TEXTURE_2D);  
+  
+  return Qnil;
+}
+
+
 static void
 monkey_patch_gosu(void)
 {
   rb_define_method(gosu_window(), "to_blob", gosu_window_to_blob, 4);
+  rb_define_method(gosu_window(), "to_texture", gosu_window_to_texture, 7);
 }    
 
 static VALUE

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
 module TexPlay
-  VERSION = "0.2.983pre1"
+  VERSION = "0.2.983pre2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  hash: -1037985743
+  hash: 570791623
   prerelease: true
   segments: 
   - 0
   - 2
-  - 983pre1
-  version: 0.2.983pre1
+  - 983pre2
+  version: 0.2.983pre2
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +13:00
+date: 2010-10-01 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - examples/example_turtle.rb
 - examples/example_weird.rb
 - examples/example_window_to_blob.rb
+- examples/example_window_to_texture.rb
 - examples/media/bird.png
 - examples/media/body.png
 - examples/media/empty2.png
@@ -123,7 +124,7 @@ files:
 - examples/media/texplay.png
 - spec/image_spec.rb
 - spec/texplay_spec.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/
 licenses: []