panda_canvas 0.5.0 → 0.6.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Dimitry Solovyov
+Copyright (c) 2010-2011 Dimitry Solovyov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.rdoc

@@ -12,4 +12,4 @@ Panda Canvas is available as a gem:
 
 == More
 
-Take a look at the {wiki}[http://github.com/8bitpanda/panda_canvas/wiki].
+Take a look at the {wiki}[http://github.com/dimituri/panda_canvas/wiki].

data/lib/panda_canvas/animation_canvas.rb

@@ -15,26 +15,25 @@ module PandaCanvas
       self.caption = 'Panda Canvas'
       @block = block
       @image = TexPlay.create_image(self, width, height)
-      @clean_room = AnimationCleanRoom.new(@image)
-      @clean_room.canvas_calls = []
-      @clean_room.frame = 0
+      @agent = DrawingAgent.new(self, @image)
+      @agent.frame = 0
     end
 
     # Draws the image in memory.
     def draw
       @image.draw(0, 0, 0)
-      @clean_room.canvas_calls.each {|call| send call[0], *call[1..-1] }
+      @agent.canvas_calls.each {|call| send call[0], *call[1..-1] }
     end
 
     # Runs an animation block.
     def update
       @image.rect 0, 0, width, height, :color => :black, :fill => true
       DrawingMethods::CANVAS_UPDATE.each {|call| send call[0], *call[1..-1] }
-      @clean_room.canvas_calls = []
-      @clean_room.frame += 1
-      @clean_room.instance_eval &@block
+      @agent.canvas_calls = []
+      @agent.frame += 1
+      @agent.instance_eval &@block
     end
 
-  end
+  end # AnimationCanvas
 
-end # PandaCanvas
+end # PandaCanvas

data/lib/panda_canvas/{animation_clean_room.rb → drawing_agent.rb}

@@ -1,7 +1,9 @@
 module PandaCanvas
 
-  # AnimationCleanRoom is used to capture and store method calls for delayed execution.
-  class AnimationCleanRoom
+  # DrawingAgent is used to capture drawing method calls
+  # and pass them to the active window and a TextPlay image
+  # in the correct order.
+  class DrawingAgent
 
     # Array of methods that need to be passed to canvas.
     attr_accessor :canvas_calls
@@ -9,9 +11,12 @@ module PandaCanvas
     # Current frame number.
     attr_accessor :frame
 
-    # Initializes the clean object for method call capturing.
+    # Initializes the clean object in a given +window+
+    # for method call capturing.
     # TexPlay +image+ is used for TexPlay drawing methods.
-    def initialize(image)
+    def initialize(window, image)
+      @canvas_calls = []
+      @window = window
       @image = image
     end
 
@@ -21,11 +26,13 @@ module PandaCanvas
         @canvas_calls << [sym, *args]
       elsif Gosu::Image.public_instance_methods.include? sym
         @image.send sym, *args
+      elsif @window.respond_to? sym
+        @window.send sym, *args
       else
         super
       end
     end
 
-  end # CleanRoom
+  end # DrawingAgent
 
-end # PandaCanvas
+end # PandaCanvas

data/lib/panda_canvas/drawing_canvas.rb

@@ -5,6 +5,16 @@ module PandaCanvas
 
     include DrawingMethods
 
+    # Include platform-specific update behavior.
+    if RUBY_PLATFORM =~ /mswin|mingw/
+      require 'panda_canvas/drawing_with_clean_room'
+      include DrawingWithCleanRoom
+    else
+      require 'fiber'
+      require 'panda_canvas/drawing_with_fibers'
+      include DrawingWithFibers
+    end
+
     # TexPlay image, which is drawn in the window.
     attr_reader :image
 
@@ -14,10 +24,8 @@ module PandaCanvas
       super(width, height, false)
       self.caption = 'Panda Canvas'
       @image = TexPlay.create_image(self, width, height)
-      clean_room = DrawingCleanRoom.new
-      clean_room.instance_eval(&block)
-      @calls = clean_room.calls
       @canvas_calls = []
+      prepare &block
     end
 
     # Draws the image in memory.
@@ -26,22 +34,6 @@ module PandaCanvas
       @canvas_calls.each {|call| send call[0], *call[1..-1] }
     end
 
-    # Runs a range of commands until the next flush.
-    def update
-      DrawingMethods::CANVAS_UPDATE.each {|call| send call[0], *call[1..-1] }
-      unless @calls.empty?
-        flush_index = @calls.index(DrawingCleanRoom::FLUSH)
-        @calls.slice!(0...flush_index).each do |call|
-          if DrawingMethods::CANVAS_CALLS.include? call[0]
-            @canvas_calls << call
-          else
-            @image.send call[0], *call[1..-1]
-          end
-        end
-        @calls.shift
-      end
-    end
-
-  end # Canvas
+  end # DrawingCanvas
 
-end # PandaCanvas
+end # PandaCanvas

data/lib/panda_canvas/drawing_clean_room.rb

@@ -1,6 +1,7 @@
 module PandaCanvas
 
-  # DrawingCleanRoom is used to capture and store method calls for delayed execution.
+  # DrawingCleanRoom is used to capture and store method calls
+  # for delayed execution.
   class DrawingCleanRoom
 
     # Signature for the +flush+ method.
@@ -30,6 +31,6 @@ module PandaCanvas
       end
     end
 
-  end # CleanRoom
+  end # DrawingCleanRoom
 
-end # PandaCanvas
+end # PandaCanvas

data/lib/panda_canvas/drawing_methods.rb

@@ -1,14 +1,17 @@
 module PandaCanvas
 
+  # DrawingMethods is a set of drawing methods used by PandaCanvas canvases.
   module DrawingMethods
 
     # Signature set for defaults that are executed in each update event.
     CANVAS_UPDATE = [[:font, 12]]
 
-    # Names of calls that need to be sent directly to Canvas instead of the TexPlay image on draw.
+    # Names of calls that need to be sent directly to Canvas
+    # instead of the TexPlay image on draw.
     CANVAS_CALLS = [:font, :text, :text_rel].freeze
 
-    # Sets the font with name +font_name+ and +height+ in pixels to be used when drawing text.
+    # Sets the font with name +font_name+ and +height+ in pixels
+    # to be used when drawing text.
     # All subsequent text drawing calls will use the given font.
     def font(height, font_name=Gosu::default_font_name)
       @used_fonts ||= {}
@@ -47,4 +50,4 @@ module PandaCanvas
 
   end # DrawingMethods
 
-end # PandaCanvas
+end # PandaCanvas

data/lib/panda_canvas/drawing_with_clean_room.rb

@@ -0,0 +1,35 @@
+module PandaCanvas
+
+  # DrawingWithCleanRoom adds behavior to perform canvas updates
+  # using method capturing and delayed execution.
+  # This is faster, but somewhat ugly and should only be used in environments
+  # where resuming fibers in the Gosu draw loop results in a segfault.
+  module DrawingWithCleanRoom
+
+    # Evaluates the drawing block in a DrawingCleanRoom instance
+    # and captures drawing method sequence.
+    def prepare(&block)
+      clean_room = DrawingCleanRoom.new
+      clean_room.instance_eval(&block)
+      @calls = clean_room.calls
+    end
+
+    # Performs drawing until the next flush using the captured sequence.
+    def update
+      unless @calls.empty?
+        DrawingMethods::CANVAS_UPDATE.each {|call| send call[0], *call[1..-1] }
+        flush_index = @calls.index(DrawingCleanRoom::FLUSH)
+        @calls.slice!(0...flush_index).each do |call|
+          if DrawingMethods::CANVAS_CALLS.include? call[0]
+            @canvas_calls << call
+          else
+            @image.send call[0], *call[1..-1]
+          end
+        end
+        @calls.shift
+      end
+    end
+
+  end # DrawingWithCleanRoom
+
+end # PandaCanvas

data/lib/panda_canvas/drawing_with_fibers.rb

@@ -0,0 +1,30 @@
+module PandaCanvas
+
+  # DrawingWithFibers adds behavior to perform canvas updates
+  # using fibers. Test show that this behavior is only suitable for unixes.
+  module DrawingWithFibers
+
+    # Yields control back to calling context.
+    def flush
+      Fiber.yield
+    end
+
+    # Creates a new fiber that evaluates the given +block+ in this instance.
+    def prepare(&block)
+      @agent = agent = DrawingAgent.new(self, @image)
+      @fiber = Fiber.new { agent.instance_eval &block }
+    end
+
+    # Performs drawing until the next flush by resuming the fiber.
+    def update
+      if @fiber.alive?
+        @agent.canvas_calls = []
+        DrawingMethods::CANVAS_UPDATE.each {|call| send call[0], *call[1..-1] }
+        @fiber.resume
+        @canvas_calls = @agent.canvas_calls
+      end
+    end
+
+  end # DrawingWithCleanRoom
+
+end # PandaCanvas

data/lib/panda_canvas/version.rb

@@ -1,6 +1,15 @@
 module PandaCanvas
 
-  # PandaCanvas version.
-  VERSION = '0.5.0'
+  module Version #:nodoc:
 
-end # end PandaCanvas
+    MAJOR = 0
+    MINOR = 6
+    TINY = 0
+
+    def self.to_s
+      [MAJOR, MINOR, TINY].join '.'
+    end
+
+  end
+
+end # PandaCanvas

data/lib/panda_canvas.rb

@@ -3,8 +3,8 @@ $:.unshift(libdir) unless $:.include?(libdir)
 
 require 'texplay'
 require 'panda_canvas/drawing_methods'
+require 'panda_canvas/drawing_agent'
 require 'panda_canvas/animation_canvas'
-require 'panda_canvas/animation_clean_room'
 require 'panda_canvas/drawing_canvas'
 require 'panda_canvas/drawing_clean_room'
 
@@ -33,4 +33,4 @@ module PandaCanvas
 
   end # class << self
 
-end # PandaCanvas
+end # PandaCanvas

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: panda_canvas
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Dimitry Solovyov
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +03:00
+date: 2011-05-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 24
         version: 0.7.24
   type: :runtime
   version_requirements: *id001
@@ -40,15 +32,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 981
         version: 0.2.981
   type: :runtime
   version_requirements: *id002
 description: Educational 2D drawing canvas on top of Gosu and TexPlay.
-email: 
+email: dimituri@gmail.com
 executables: []
 
 extensions: []
@@ -57,16 +45,18 @@ extra_rdoc_files: []
 
 files: 
 - lib/panda_canvas/animation_canvas.rb
-- lib/panda_canvas/animation_clean_room.rb
+- lib/panda_canvas/drawing_agent.rb
 - lib/panda_canvas/drawing_canvas.rb
 - lib/panda_canvas/drawing_clean_room.rb
 - lib/panda_canvas/drawing_methods.rb
+- lib/panda_canvas/drawing_with_clean_room.rb
+- lib/panda_canvas/drawing_with_fibers.rb
 - lib/panda_canvas/version.rb
 - lib/panda_canvas.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true
-homepage: 
+homepage: http://github.com/dimituri/panda_canvas
 licenses: []
 
 post_install_message: 
@@ -79,25 +69,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Educational 2D drawing canvas on top of Gosu and TexPlay.