panda_canvas 0.4.1 → 0.4.2

data/lib/panda_canvas/canvas.rb

@@ -24,7 +24,8 @@ module PandaCanvas
     end
 
     # Sets the font with name +font_name+ and +height+ in pixels to be used when drawing text.
-    def font(font_name, height)
+    # All subsequent text drawing calls will use the given font.
+    def font(height, font_name=Gosu::default_font_name)
       key = [font_name, height]
       if @used_fonts.include? key
         @font = @used_fonts[key]
@@ -42,7 +43,7 @@ module PandaCanvas
     end
 
     # Draws text +s+ in coordinates +x+ and +y+ with a given +color+.
-    def text(s, x, y, color)
+    def text(s, x, y, color=0xffffffff)
       color = sym_color(color) if color.is_a? Symbol
       @font.draw(s, x, y, 0, 1, 1, color)
     end
@@ -53,7 +54,7 @@ module PandaCanvas
     # If it is 1.0, the text will be to the left of +x+.
     # If it is 0.5, it will be centered on +x+.
     # The same applies to +rel_y+.
-    def text_rel(s, x, y, rel_x, rel_y, color)
+    def text_rel(s, x, y, rel_x, rel_y, color=0xffffffff)
       color = sym_color(color) if color.is_a? Symbol
       @font.draw_rel(s, x, y, 0, rel_x, rel_y, 1, 1, color)
     end

data/lib/panda_canvas/clean_room.rb

@@ -8,7 +8,7 @@ module PandaCanvas
     FLUSH = [:flush].freeze
 
     # Signature set for defaults that are executed in each update event.
-    CANVAS_UPDATE = [[:font, Gosu::default_font_name, 12]]
+    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
@@ -33,19 +33,6 @@ module PandaCanvas
       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 @@
 module PandaCanvas
 
   # PandaCanvas version.
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 
 end # end PandaCanvas

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Dimitry Solovyov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +03:00
+date: 2010-10-19 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency