panda_canvas 0.4.3 → 0.5.0

data/lib/panda_canvas/animation_canvas.rb

@@ -0,0 +1,40 @@
+module PandaCanvas
+
+  # AnimationCanvas is a subclassed Gosu::Window that is used for animation.
+  class AnimationCanvas < Gosu::Window
+
+    include DrawingMethods
+
+    # TexPlay image, which is drawn in the window.
+    attr_reader :image
+
+    # Creates a new canvas window with dimensions +width+ and +height+.
+    # A +block+ is passed to be executed.
+    def initialize(width, height, &block)
+      super(width, height, false)
+      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
+    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] }
+    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
+    end
+
+  end
+
+end # PandaCanvas

data/lib/panda_canvas/animation_clean_room.rb

@@ -0,0 +1,31 @@
+module PandaCanvas
+
+  # AnimationCleanRoom is used to capture and store method calls for delayed execution.
+  class AnimationCleanRoom
+
+    # Array of methods that need to be passed to canvas.
+    attr_accessor :canvas_calls
+
+    # Current frame number.
+    attr_accessor :frame
+
+    # Initializes the clean object for method call capturing.
+    # TexPlay +image+ is used for TexPlay drawing methods.
+    def initialize(image)
+      @image = image
+    end
+
+    # Capures and stores all missing method calls in the instance.
+    def method_missing(sym, *args)
+      if DrawingMethods::CANVAS_CALLS.include? sym
+        @canvas_calls << [sym, *args]
+      elsif Gosu::Image.public_instance_methods.include? sym
+        @image.send sym, *args
+      else
+        super
+      end
+    end
+
+  end # CleanRoom
+
+end # PandaCanvas

data/lib/panda_canvas/drawing_canvas.rb

@@ -0,0 +1,47 @@
+module PandaCanvas
+
+  # DrawingCanvas is a subclassed Gosu::Window that is used for drawing.
+  class DrawingCanvas < Gosu::Window
+
+    include DrawingMethods
+
+    # TexPlay image, which is drawn in the window.
+    attr_reader :image
+
+    # Creates a new canvas window with dimensions +width+ and +height+.
+    # A +block+ is passed to be executed.
+    def initialize(width, height, &block)
+      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 = []
+    end
+
+    # Draws the image in memory.
+    def draw
+      @image.draw(0, 0, 0)
+      @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 # PandaCanvas

data/lib/panda_canvas/{clean_room.rb → drawing_clean_room.rb}

@@ -1,18 +1,12 @@
 module PandaCanvas
 
-  # CleanRoom is used to capture and store method calls for delayed execution.
-  class CleanRoom
+  # DrawingCleanRoom is used to capture and store method calls for delayed execution.
+  class DrawingCleanRoom
 
     # Signature for the +flush+ method.
     # This method is used to stop calculation and draw the frame.
     FLUSH = [:flush].freeze
 
-    # 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.
-    CANVAS_CALLS = [:font, :text, :text_rel].freeze
-
     # Returns an array of captured method calls.
     # A +flush+ is appended at the end.
     def calls
@@ -28,7 +22,8 @@ module PandaCanvas
     def method_missing(sym, *args)
       if sym == :flush
         @_calls << FLUSH
-      elsif Gosu::Image.public_instance_methods.include? sym
+      elsif (DrawingMethods::CANVAS_CALLS.include? sym) ||
+        (Gosu::Image.public_instance_methods.include? sym)
         @_calls << [sym, *args]
       else
         super

data/lib/panda_canvas/{canvas.rb → drawing_methods.rb}

@@ -1,31 +1,17 @@
 module PandaCanvas
 
-  # Canvas is a subclassed Gosu::Window that is used for drawing.
-  class Canvas < Gosu::Window
+  module DrawingMethods
 
-    # TexPlay image, which is drawn in the window.
-    attr_reader :image
+    # Signature set for defaults that are executed in each update event.
+    CANVAS_UPDATE = [[:font, 12]]
 
-    # Creates a new canvas window with dimensions +width+ and +height+.
-    # A list of +calls+ in the form +[:method, *args]+ is passed to be executed.
-    def initialize(width, height, calls)
-      super(width, height, false)
-      self.caption = 'Panda Canvas'
-      @image = TexPlay.create_image(self, width, height)
-      @calls = calls
-      @canvas_calls = []
-      @used_fonts = {}
-    end
-
-    # Draws the image in memory.
-    def draw
-      @image.draw(0, 0, 0)
-      @canvas_calls.each {|call| send call[0], *call[1..-1] }
-    end
+    # 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.
     # All subsequent text drawing calls will use the given font.
     def font(height, font_name=Gosu::default_font_name)
+      @used_fonts ||= {}
       key = [font_name, height]
       if @used_fonts.include? key
         @font = @used_fonts[key]
@@ -59,21 +45,6 @@ module PandaCanvas
       @font.draw_rel(s, x, y, 0, rel_x, rel_y, 1, 1, color)
     end
 
-    # Runs a range of commands until the next flush.
-    def update
-      CleanRoom::CANVAS_UPDATE.each {|call| send call[0], *call[1..-1] }
-      unless @calls.empty?
-        @calls.slice!(0...@calls.index(CleanRoom::FLUSH)).each do |call|
-          if CleanRoom::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 # DrawingMethods
 
 end # PandaCanvas

data/lib/panda_canvas/version.rb

@@ -1,6 +1,6 @@
 module PandaCanvas
 
   # PandaCanvas version.
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 
 end # end PandaCanvas

data/lib/panda_canvas.rb

@@ -2,8 +2,11 @@ libdir = File.dirname(__FILE__)
 $:.unshift(libdir) unless $:.include?(libdir)
 
 require 'texplay'
-require 'panda_canvas/canvas'
-require 'panda_canvas/clean_room'
+require 'panda_canvas/drawing_methods'
+require 'panda_canvas/animation_canvas'
+require 'panda_canvas/animation_clean_room'
+require 'panda_canvas/drawing_canvas'
+require 'panda_canvas/drawing_clean_room'
 
 # Panda Canvas is an educational 2D drawing canvas.
 module PandaCanvas
@@ -17,9 +20,14 @@ module PandaCanvas
     # Takes a +block+ with drawing code.
     # The code is then drawn in a window with dimensions +width+ and +height+.
     def draw(width=640, height=480, &block)
-      clean_room = CleanRoom.new
-      clean_room.instance_eval(&block)
-      @canvas = Canvas.new(width, height, clean_room.calls)
+      @canvas = DrawingCanvas.new(width, height, &block)
+      @canvas.show
+    end
+
+    # Takes a +block+ with animation code.
+    # The code is then drawn in a window with dimensions +width+ and +height+.
+    def animate(width=640, height=480, &block)
+      @canvas = AnimationCanvas.new(width, height, &block)
       @canvas.show
     end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Dimitry Solovyov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +03:00
+date: 2010-10-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,8 +56,11 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/panda_canvas/canvas.rb
-- lib/panda_canvas/clean_room.rb
+- lib/panda_canvas/animation_canvas.rb
+- lib/panda_canvas/animation_clean_room.rb
+- lib/panda_canvas/drawing_canvas.rb
+- lib/panda_canvas/drawing_clean_room.rb
+- lib/panda_canvas/drawing_methods.rb
 - lib/panda_canvas/version.rb
 - lib/panda_canvas.rb
 - LICENSE