panda_canvas 0.3.0 → 0.4.0

data/README.rdoc

@@ -8,4 +8,8 @@ It is created as a teaching tool for the {Computer Club n.a. 8-bit Panda}[http:/
 
 Panda Canvas is available as a gem:
 
-  $ gem install panda_canvas
+  $ gem install panda_canvas
+
+== More
+
+Take a look at the {wiki}[http://github.com/8bitpanda/panda_canvas/wiki].

data/lib/panda_canvas/canvas.rb

@@ -7,26 +7,53 @@ module PandaCanvas
     attr_reader :image
 
     # Creates a new canvas window with dimensions +width+ and +height+.
-    # A list of +calls+ in the form
-    #  [:method, *args]
-    # is passed to be executed.
+    # 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
+
+    # Sets the font with name +font_name+ and +height+ in pixels to be used when drawing text.
+    def font(font_name, height)
+      key = [font_name, height]
+      if @used_fonts.include? key
+        @font = @used_fonts[key]
+      else
+        @font = @used_fonts[key] = Gosu::Font.new(self, font_name, height)
+      end
+    end
+
+    # Draws text +s+ in coordinates +x+ and +y+ with a given +color+.
+    def text(s, x, y, color)
+      if color.is_a? Symbol
+        rgb = TexPlay::Colors.const_get(color.capitalize)[0..2].map! do |c|
+          c * 255
+        end
+        color = Gosu::Color.new(255, *rgb)
+      end
+      @font.draw(s, x, y, 0, 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_SIGNATURE)).each do |call|
-          @image.send call[0], *call[1..-1]
+        @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

data/lib/panda_canvas/clean_room.rb

@@ -1,32 +1,51 @@
-module PandaCanvas
-
-  # CleanRoom is used to capture and store method calls for delayed execution.
-  class CleanRoom
-
-    # Signature for the +flush+ method.
-    # This method is used to stop calculation and draw the frame.
-    FLUSH_SIGNATURE = [:flush].freeze
-
-    # Returns an array of captured method calls.
-    # A +flush+ is appended at the end.
-    def calls
-      @calls + [FLUSH_SIGNATURE]
-    end
-
-    # Initializes the clean object for method call capturing.
-    def initialize
-      @calls = []
-    end
-
-    # Capures and stores all missing method calls in the instance.
-    def method_missing(sym, *args)
-      if sym == :flush
-        @calls << FLUSH_SIGNATURE
-      else
-        @calls << [sym, *args]
-      end
-    end
-
-  end # CleanRoom
-
+module PandaCanvas
+
+  # CleanRoom is used to capture and store method calls for delayed execution.
+  class CleanRoom
+
+    # 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, Gosu::default_font_name, 12]]
+
+    # Names of calls that need to be sent directly to Canvas instead of the TexPlay image on draw.
+    CANVAS_CALLS = [:font, :text].freeze
+
+    # Returns an array of captured method calls.
+    # A +flush+ is appended at the end.
+    def calls
+      @_calls + [FLUSH]
+    end
+
+    # Initializes the clean object for method call capturing.
+    def initialize
+      @_calls = []
+    end
+
+    # Capures and stores all missing method calls in the instance.
+    def method_missing(sym, *args)
+      if sym == :flush
+        @_calls << FLUSH
+      else
+        @_calls << [sym, *args]
+      end
+    end
+
+    # Adds a font change call to +font_name+ with +height+ in pixels.
+    # Uses default typeface, if +font_name+ is +nil+.
+    # All subsequent text drawing calls will use the given font.
+    def font(height, font_name=nil)
+      @_calls << [:font, font_name || Gosu::default_font_name, height]
+    end
+
+    # Adds text +s+ to be drawn on screen with current font and +color+.
+    # Text is placed in +x+ and +y+ coordinates.
+    def text(s, x, y, color=0xffffffff)
+      @_calls << [:text, s, x, y, color]
+    end
+
+  end # CleanRoom
+
 end # PandaCanvas

data/lib/panda_canvas/version.rb

@@ -1,6 +1,6 @@
 class PandaCanvas
 
   # PandaCanvas version.
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 
 end # end PandaCanvas

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dimitry Solovyov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +03:00
+date: 2010-10-18 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency