texplay 0.2.975 → 0.2.980

data/CHANGELOG

@@ -1,3 +1,11 @@
+16/8/10
+version 0.2.980
+* added :caching option to TexPlay.set_options, and Gosu::Image.new. For
+	control over whether images are cached or not. (accepts true and
+	false values)
+* TexPlay.create_image() no longer calls refresh_cache
+* added new TexPlay#clear() method, just draws a filled rect over image.
+	
 14/8/10
 version 0.2.975
 * fixed :tolerance bug (was in special_cmp_color_with_tolerance, was checking color1.alpha <= tolerance instead of color2.alpha <= tolerance)

data/README.markdown

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

data/Rakefile

@@ -31,12 +31,12 @@ specification = Gem::Specification.new do |s|
         FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "examples/*.rb", "examples/media/*"].to_a 
 end
 
-#Rake::ExtensionTask.new('texplay', specification)  do |ext|
-  # ext.config_script = 'extconf.rb' 
-  # ext.cross_compile = true                
-  #ext.cross_platform = 'i386-mswin32'
+# Rake::ExtensionTask.new('texplay', specification)  do |ext|
+#   ext.config_script = 'extconf.rb' 
+#   ext.cross_compile = true                
+#   ext.cross_platform = 'i386-mswin32'
 #  ext.platform = 'i386-mswin32'
-#end
+# end
 
 
 #comment this when want to build normal gems.

data/examples/example_cache.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+class W < Gosu::Window
+  def initialize
+    super(400, 300, false, 20)
+    TexPlay.set_options :caching => true
+    @img = Gosu::Image.new(self, "#{Common::MEDIA}/object.png", :caching => false)
+
+    @img.clear :color => :red, :dest_select => :transparent, :tolerance => 0.9 
+  end
+  
+  def draw
+    @img.draw 100, 100, 1
+  end
+  
+end
+
+
+w = W.new
+w.show

data/examples/example_color_transform_circle.rb

@@ -2,55 +2,17 @@ require 'rubygems'
 require 'common'
 require 'gosu'
 require 'texplay'
-#require 'devil/gosu'
 
 class W < Gosu::Window
   def initialize
-    super(500, 500, false, 20)
-    @img = Gosu::Image.new(self, "#{Common::MEDIA}/sunset.png")
-    @x = 100
-    @y = 100
-    
-    @x2 = 400
-    @y2 = 100
-    @rad = 70
-    @s = true
-
-    @copy = TexPlay.create_image(self, @rad * 2 + 1, @rad * 2 + 1)
-    @copy2 = TexPlay.create_image(self, @rad * 2 + 1, @rad * 2 + 1)
+    super(500, 300, false, 20)
+    @spritesheet = Gosu::Image.new(self, "body.png", false)
+    @spritesheet.splice(Gosu::Image.new(self, "face.png", false), 0,0, :alpha_blend => true)
+    @sprite_array = Gosu::Image::load_tiles(self, @spritesheet, 40, 80, false)
   end
   
   def draw
-
-
-    @x += 3
-    @y += 3
-
-    @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
-    
-    @img.circle @x, @y, @rad, :fill => true, :mode => :overlay, :color => :red
-
-    @img.rect @x2 - @rad, @y2 - @rad, @x2 + @rad, @y2 + @rad, :fill => true, :mode => :overlay, :color => :blue
-
-    #        @img.force_sync [0,0, @img.width, @img.height]
-
-    @img.draw 10, 10,1
-
-    if button_down?(Gosu::KbEscape)
-      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
-
+    @sprite_array[0].draw(200,200,0)
   end
   
 end
@@ -59,3 +21,16 @@ end
 w = W.new
 w.show
 
+
+# require 'rubygems'
+# require 'gosu'
+# require 'texplay'
+# class Game_Window < Gosu::Window
+# 	def initialize
+# 		super(500, 400, false)
+# 		self.caption = "Image Test"
+# 	end
+
+# 	def draw
+# 	end
+# end

data/examples/example_tiles.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'common'
+require 'gosu'
+require 'texplay'
+
+class Gosu::Image
+  # so we can use the old TexPlay to_blob -- appears to segfault?!
+  remove_method :to_blob
+end
+
+class W < Gosu::Window
+  def initialize
+    super(500, 300, false, 20)
+    @spritesheet = Gosu::Image.new(self, "#{Common::MEDIA}/body.png", false)
+    @spritesheet.splice(Gosu::Image.new(self, "#{Common::MEDIA}/face.png", false), 0,0, :alpha_blend => true)
+    @sprite_array = Gosu::Image::load_tiles(self, @spritesheet, 40, 80, false)
+  end
+  
+  def draw
+    @spritesheet.draw(200,200,0)
+    # @sprite_array[0].draw(200,200,0)
+  end
+  
+end
+
+
+w = W.new
+w.show
+
+
+# require 'rubygems'
+# require 'gosu'
+# require 'texplay'
+# class Game_Window < Gosu::Window
+# 	def initialize
+# 		super(500, 400, false)
+# 		self.caption = "Image Test"
+# 	end
+
+# 	def draw
+# 	end
+
+# end

data/ext/texplay/bindings.c

@@ -729,7 +729,7 @@ m_clear(int argc, VALUE * argv, VALUE self)
     parms[2] = INT2NUM(XMAX_OOB);
     parms[3] = INT2NUM(YMAX_OOB);
 
-    //  m_box(ARY_SIZE(parms), parms, self);
+    //    m_box(ARY_SIZE(parms), parms, self);
 
     return self;
 }

data/ext/texplay/texplay.c

@@ -43,7 +43,6 @@ Init_texplay() {
     rb_define_method(jm_Module, "circle", m_circle, -1);
     rb_define_method(jm_Module, "line", m_line, -1);
     rb_define_method(jm_Module, "rect", m_rect, -1);
-    rb_define_method(jm_Module, "clear", m_clear, -1);
     rb_define_method(jm_Module, "pixel", m_pixel, -1);
     rb_define_method(jm_Module, "fill", m_flood_fill, -1);
     rb_define_method(jm_Module, "bezier", m_bezier, -1);
@@ -89,7 +88,8 @@ Init_texplay() {
     rb_define_method(jm_Module, "colour", m_color, -1);
     rb_define_method(jm_Module, "composite", m_splice, -1);
     rb_define_method(jm_Module, "set_pixel", m_pixel, -1);
-    rb_define_method(jm_Module, "[]", m_getpixel, 2);
+    rb_define_method(jm_Module, "[]", m_getpixel, -1);
+    rb_define_method(jm_Module, "cache", m_cache_refresh, 0);
     /** end of aliases **/
 
     /** associated with gen_eval **/

data/lib/texplay.rb

@@ -30,15 +30,38 @@ module TexPlay
             end
         end
 
-        def create_blank_image(window, width, height, options={})
+        def create_image(window, width, height, options={})
+          options = {
+            :color => :alpha,
+            :caching => false,
+          }.merge!(options)
           
-          img = Gosu::Image.new(window, EmptyImageStub.new(width, height))
-          img.rect 0, 0, img.width - 1, img.height - 1, :color => options[:color], :fill => true if options[:color]
+          img = Gosu::Image.new(window, EmptyImageStub.new(width, height), :caching => options[:caching])
+          img.rect 0, 0, img.width - 1, img.height - 1, :color => options[:color], :fill => true 
 
           img
         end
 
-        alias_method :create_image, :create_blank_image
+        alias_method :create_blank_image, :create_image
+
+        def set_options(options = {})
+            @options.merge!(options)
+        end
+
+        def get_options
+            @options
+        end
+
+        # default values defined here
+        def set_defaults
+          @options = {
+              :caching => true
+          }
+        end
+
+        def init
+            set_defaults
+        end
     end
 
     module Colors
@@ -58,6 +81,23 @@ module TexPlay
         Tyrian = [0.4, 0.007, 0.235, 1]
     end
     include Colors
+
+    # extra instance methods defined in Ruby
+
+    # clear an image (with an optional clear color)
+    def clear(options = {})
+      options = {
+        :color => :alpha,
+        :fill => true
+      }.merge!(options)
+
+      capture {
+        rect 0, 0, width - 1, height - 1, options
+      }
+      
+      self
+    end
+      
 end
 
 # credit to philomory for this class
@@ -108,35 +148,39 @@ module Gosu
             
             def new(*args, &block)
 
+                options = args.last.is_a?(Hash) ? args.pop : {}
                 # invoke old behaviour
                 obj = original_new(*args, &block)
 
-                prepare_image(obj, *args)
+                prepare_image(obj, args.first, options)
             end
             
             alias_method :original_from_text, :from_text
 
             def from_text(*args, &block)
 
+                options = args.last.is_a?(Hash) ? args.pop : {}
                 # invoke old behaviour
                 obj = original_from_text(*args, &block)
 
-                prepare_image(obj, *args)
+                prepare_image(obj, args.first, options)
             end
 
-            def prepare_image(obj, *args)
-
+            def prepare_image(obj, window, options={})
+                options = {
+                  :caching => TexPlay.get_options[:caching]
+                }.merge!(options)
+                
                 # refresh the TexPlay image cache
                 if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE) &&
-                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE) && obj.quad_cached? then
-                    
-                    obj.refresh_cache
+                    obj.height <= (TexPlay::TP_MAX_QUAD_SIZE) && obj.quad_cached? then
+                    obj.refresh_cache if options[:caching]
                 end
-
+                
                 # run custom setup
                 TexPlay.setup(obj)
-
-                obj.instance_variable_set(:@__window__, args.first)
+              
+                obj.instance_variable_set(:@__window__, window)
 
                 obj
             end
@@ -157,5 +201,6 @@ class Proc
 end
 
 
-
+# initialize TP (at the moment just setting some default settings)
+TexPlay.init
 

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
 module TexPlay
-    VERSION = "0.2.975"
+    VERSION = "0.2.980"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  hash: 1929
+  hash: 1983
   prerelease: false
   segments: 
   - 0
   - 2
-  - 975
-  version: 0.2.975
+  - 980
+  version: 0.2.980
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 +12:00
+date: 2010-08-16 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - examples/example_alpha_blend.rb
 - examples/example_bezier.rb
 - examples/example_blank.rb
+- examples/example_cache.rb
 - examples/example_color_control.rb
 - examples/example_color_transform.rb
 - examples/example_color_transform_circle.rb
@@ -96,6 +97,7 @@ files:
 - examples/example_simple.rb
 - examples/example_splice.rb
 - examples/example_sync.rb
+- examples/example_tiles.rb
 - examples/example_trace.rb
 - examples/example_transparent.rb
 - examples/example_transparent2.rb
@@ -103,7 +105,9 @@ files:
 - examples/example_turtle.rb
 - examples/example_weird.rb
 - examples/media/bird.png
+- examples/media/body.png
 - examples/media/empty2.png
+- examples/media/face.png
 - examples/media/gob.png
 - examples/media/gosu.png
 - examples/media/green.png