minigl 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83e7665eabd1944e064d1faa88667d75b27a385
-  data.tar.gz: f69b0515549217f87b7362eb7eeb8db49857470b
+  metadata.gz: 3638cd0876552f96b482a2b5986581916a27a5f9
+  data.tar.gz: a6e059c49297f45b360e225394b687bb2650a0a9
 SHA512:
-  metadata.gz: e4807073c42583847ea31183c56a2e86c0be3eedb999902facd382c055062e7cebbd4592fa6dac1f3da2285947d302f01595e2bde5f48a74d057f804323438d0
-  data.tar.gz: 3eb9adcbe982982070c1cdaf8fade39273856947dfe3e2edd841e5cf14126a690fb1a303b06f89fbc53971c4fa745171c5b25d6ddcb96efe6316a7d15fe65bca
+  metadata.gz: 2ac542ef6d3fe0140636b591b26336c23ed4b8fe1c7188c751f89e439a7099c2e0baaaff1e7fdae65f9d1529a73757792c9c147282e2f83418ac8e00254dad13
+  data.tar.gz: 68dbca5b83d9600c2d2b75c11b4c69aabd536a9a41722e0f1e1235af27e7bf195cad88809571770a9e91d61e025e777df13ed479dc8eb6e0f814c8e48d588530

data/README.md

@@ -32,10 +32,10 @@ this [working game example](https://github.com/victords/aventura-do-saber).
   * An auxiliary, tutorial-like documentation is under construction
 [here](https://github.com/victords/minigl/wiki).
 
-**Version 1.3.9**
+**Version 1.3.10**
 
-  * Fixed gosu dependency (~> 0.7).
+  * Split the `center` parameter in `Button` and `ToggleButton` constructors
+into `center_x` and `center_y` (see doc. for details).
 
-**P.S.** I'm sorry for the few last releases which brought so few
-improvements to the library... Still, I think this is better than leaving those
-small errors uncorrected.
+**P.S.** This version can cause incompatibility because of the parameter order
+in the constructors of `Button` and `ToggleButton`.

data/lib/minigl/forms.rb

@@ -19,7 +19,7 @@ module AGL
 
     # This constructor is for internal use of the subclasses only. Do not
     # instantiate objects of this class.
-    def initialize x, y, font, text, text_color, disabled_text_color
+    def initialize(x, y, font, text, text_color, disabled_text_color)
       @x = x
       @y = y
       @font = font
@@ -49,9 +49,12 @@ module AGL
     # [text_color] Color of the button text, in hexadecimal RRGGBB format.
     # [disabled_text_color] Color of the button text, when it's disabled, in
     #                       hexadecimal RRGGBB format.
-    # [center] Whether the button text should be centered in its area (the
-    #          area is defined by the image size, when an image is given, or
-    #          by the +width+ and +height+ parameters, otherwise).
+    # [center_x] Whether the button text should be horizontally centered in its
+    #            area (the area is defined by the image size, if an image is
+    #            given, or by the +width+ and +height+ parameters, otherwise).
+    # [center_y] Whether the button text should be vertically centered in its
+    #            area (the area is defined by the image size, if an image is
+    #            given, or by the +width+ and +height+ parameters, otherwise).
     # [margin_x] The x offset, from the button x-coordinate, to draw the text.
     #            This parameter is used only if +center+ is false.
     # [margin_y] The y offset, from the button y-coordinate, to draw the text.
@@ -68,8 +71,8 @@ module AGL
     #          parameters.
     # [action] The block of code executed when the button is clicked (or by
     #          calling the +click+ method).
-    def initialize x, y, font, text, img, text_color = 0, disabled_text_color = 0, center = true, margin_x = 0, margin_y = 0,
-                   width = nil, height = nil, params = nil, &action
+    def initialize(x, y, font, text, img, text_color = 0, disabled_text_color = 0, center_x = true, center_y = true,
+                   margin_x = 0, margin_y = 0, width = nil, height = nil, params = nil, &action)
       super x, y, font, text, text_color, disabled_text_color
       @img =
         if img; Res.imgs img, 1, 4, true
@@ -80,14 +83,12 @@ module AGL
       @h =
         if img; @img[0].height
         else; height; end
-      if center
-        @text_x = x + @w / 2 if @w
-        @text_y = y + @h / 2 if @h
-      else
-        @text_x = x + margin_x
-        @text_y = y + margin_y
-      end
-      @center = center
+      if center_x; @text_x = x + @w / 2 if @w
+      else; @text_x = x + margin_x; end
+      if center_y; @text_y = y + @h / 2 if @h
+      else; @text_y = y + margin_y; end
+      @center_x = center_x
+      @center_y = center_y
       @action = action
       @params = params
 
@@ -155,17 +156,12 @@ module AGL
     # Parameters:
     # [x] The new x-coordinate for the button.
     # [y] The new y-coordinate for the button.
-    def set_position x, y
-      d_x = x - @x
-      d_y = y - @y
+    def set_position(x, y)
+      if @center_x; @text_x = x + @w / 2
+      else; @text_x += x - @x; end
+      if @center_y; @text_y = y + @h / 2
+      else; @text_y += y - @y; end
       @x = x; @y = y
-      if @center
-        @text_x = x + @w / 2
-        @text_y = y + @h / 2
-      else
-        @text_x += d_x
-        @text_y += d_y
-      end
     end
 
     # Draws the button in the screen.
@@ -175,22 +171,24 @@ module AGL
     #         vary between 0 (fully transparent) and 255 (fully opaque).
     # [z_index] The z-order to draw the object. Objects with larger z-orders
     #           will be drawn on top of the ones with smaller z-orders.
-    def draw alpha = 0xff, z_index = 0
+    def draw(alpha = 0xff, z_index = 0)
       return unless @visible
 
       color = (alpha << 24) | 0xffffff
       text_color = (alpha << 24) | (@enabled ? @text_color : @disabled_text_color)
       @img[@img_index].draw @x, @y, z_index, 1, 1, color if @img
       if @text
-        if @center
-          @font.draw_rel @text, @text_x, @text_y, z_index, 0.5, 0.5, 1, 1, text_color
+        if @center_x or @center_y
+          rel_x = @center_x ? 0.5 : 0
+          rel_y = @center_y ? 0.5 : 0
+          @font.draw_rel @text, @text_x, @text_y, z_index, rel_x, rel_y, 1, 1, text_color
         else
           @font.draw @text, @text_x, @text_y, z_index, 1, 1, text_color
         end
       end
     end
 
-    def enabled= value # :nodoc:
+    def enabled=(value) # :nodoc:
       @enabled = value
       @state = :up
       @img_index = 3
@@ -217,9 +215,9 @@ module AGL
     #     puts "button was checked" if checked
     #     # do something with params
     #   }
-    def initialize x, y, font, text, img, checked = false, text_color = 0, disabled_text_color = 0, center = true, margin_x = 0, margin_y = 0,
-                   width = nil, height = nil, params = nil, &action
-      super x, y, font, text, nil, text_color, disabled_text_color, center, margin_x, margin_y, width, height, params, &action
+    def initialize(x, y, font, text, img, checked = false, text_color = 0, disabled_text_color = 0, center_x = true, center_y = true,
+                   margin_x = 0, margin_y = 0, width = nil, height = nil, params = nil, &action)
+      super x, y, font, text, nil, text_color, disabled_text_color, center_x, center_y, margin_x, margin_y, width, height, params, &action
       @img =
         if img; Res.imgs img, 2, 4, true
         else; nil; end
@@ -229,10 +227,8 @@ module AGL
       @h =
         if img; @img[0].height
         else; height; end
-      if center
-        @text_x = x + @w / 2
-        @text_y = y + @h / 2
-      end
+      @text_x = x + @w / 2 if center_x
+      @text_y = y + @h / 2 if center_y
       @checked = checked
     end
 
@@ -258,12 +254,12 @@ module AGL
     #
     # Parameters:
     # [value] The state to be set (+true+ for checked, +false+ for unchecked).
-    def checked= value
+    def checked=(value)
       click if value != @checked
       @checked = value
     end
 
-    def enabled= value # :nodoc:
+    def enabled=(value) # :nodoc:
       @enabled = value
       @state = :up
       @img_index = @checked ? 7 : 6
@@ -320,8 +316,8 @@ module AGL
     #                   field is changed, either by user input or by calling
     #                   +text=+. The new text is passed as a first parameter
     #                   to this block, followed by +params+. Can be +nil+.
-    def initialize x, y, font, img, cursor_img = nil, disabled_img = nil, margin_x = 0, margin_y = 0, max_length = 100, active = false, text = "",
-                   allowed_chars = nil, text_color = 0, disabled_text_color = 0, selection_color = 0, params = nil, &on_text_changed
+    def initialize(x, y, font, img, cursor_img = nil, disabled_img = nil, margin_x = 0, margin_y = 0, max_length = 100, active = false, text = '',
+                   allowed_chars = nil, text_color = 0, disabled_text_color = 0, selection_color = 0, params = nil, &on_text_changed)
       super x, y, font, text, text_color, disabled_text_color
       @img = Res.img img
       @w = @img.width
@@ -417,10 +413,10 @@ module AGL
       end
 
       ############################### Keyboard ##############################
-      shift = ((KB.key_down? @k[53]) or (KB.key_down? @k[54]))
-      if ((KB.key_pressed? @k[53]) or (KB.key_pressed? @k[54])) # shift
+      shift = (KB.key_down?(@k[53]) or KB.key_down?(@k[54]))
+      if KB.key_pressed?(@k[53]) or KB.key_pressed?(@k[54]) # shift
         @anchor1 = @cur_node if @anchor1.nil?
-      elsif ((KB.key_released? @k[53]) or (KB.key_released? @k[54]))
+      elsif KB.key_released?(@k[53]) or KB.key_released?(@k[54])
         @anchor1 = nil if @anchor2.nil?
       end
       inserted = false
@@ -530,7 +526,7 @@ module AGL
     # [value] The new text to be set. If it's longer than the +max_length+
     #         parameter used in the constructor, it will be truncated to
     #         +max_length+ characters.
-    def text= value
+    def text=(value)
       @text = value[0...@max_length]
       @nodes.clear; @nodes << @text_x
       x = @nodes[0]
@@ -547,7 +543,7 @@ module AGL
 
     # Returns the currently selected text.
     def selected_text
-      return "" if @anchor2.nil?
+      return '' if @anchor2.nil?
       min = @anchor1 < @anchor2 ? @anchor1 : @anchor2
       max = min == @anchor1 ? @anchor2 : @anchor1
       @text[min..max]
@@ -572,7 +568,7 @@ module AGL
     # Parameters:
     # [x] The new x-coordinate for the text field.
     # [y] The new y-coordinate for the text field.
-    def set_position x, y
+    def set_position(x, y)
       d_x = x - @x
       d_y = y - @y
       @x = x; @y = y
@@ -590,7 +586,7 @@ module AGL
     #         values vary between 0 (fully transparent) and 255 (fully opaque).
     # [z_index] The z-order to draw the object. Objects with larger z-orders
     #           will be drawn on top of the ones with smaller z-orders.
-    def draw alpha = 0xff, z_index = 0
+    def draw(alpha = 0xff, z_index = 0)
       return unless @visible
 
       color = (alpha << 24) | ((@enabled or @disabled_img) ? 0xffffff : 0x808080)
@@ -620,12 +616,12 @@ module AGL
       end
     end
 
-    def enabled= value # :nodoc:
+    def enabled=(value) # :nodoc:
       @enabled = value
       unfocus unless @enabled
     end
 
-    def visible= value # :nodoc:
+    def visible=(value) # :nodoc:
       @visible = value
       unfocus unless @visible
     end
@@ -652,7 +648,7 @@ module AGL
       @cur_node = index
     end
 
-    def insert_char char
+    def insert_char(char)
       return unless @allowed_chars.index char and @text.length < @max_length
       @text.insert @cur_node, char
       @nodes.insert @cur_node + 1, @nodes[@cur_node] + @font.text_width(char)
@@ -664,7 +660,7 @@ module AGL
       @on_text_changed.call @text, @params if @on_text_changed
     end
 
-    def remove_interval will_insert = false
+    def remove_interval(will_insert = false)
       min = @anchor1 < @anchor2 ? @anchor1 : @anchor2
       max = min == @anchor1 ? @anchor2 : @anchor1
       interval_width = 0
@@ -683,10 +679,10 @@ module AGL
       @on_text_changed.call @text, @params if @on_text_changed and not will_insert
     end
 
-    def remove_char back
+    def remove_char(back)
       @cur_node -= 1 if back
       char_width = @font.text_width(@text[@cur_node])
-      @text[@cur_node] = ""
+      @text[@cur_node] = ''
       @nodes.delete_at @cur_node + 1
       for i in (@cur_node + 1)..(@nodes.size - 1)
         @nodes[i] -= char_width

data/test/game.rb

@@ -5,21 +5,21 @@ class MyGame < Gosu::Window
   def initialize
     super 800, 600, false # creating a 800 x 600 window, not full screen
     Game.initialize self, Vector.new(0, 1), 10, 2
-    
+
     @obj1 = GameObject.new 10, 10, 80, 80, :img1, Vector.new(-10, -10)
     @obj2 = Sprite.new 400, 0, :img1
-    
+
     @font = Res.font :font1, 20
     @writer = TextHelper.new @font, 5
-    @btn = Button.new(10, 560, @font, "Test", :btn, 0x008000, 0x808080, 0, 0, 0, 0, 0, "friends") { |x| puts "hello #{x}" }
+    @btn = Button.new(10, 560, @font, 'Test', :btn, 0x008000, 0x808080, true, false, 0, 4, 0, 0, 'friends') { |x| puts "hello #{x}" }
     @btn.enabled = false
-    @chk = ToggleButton.new(740, 300, @font, "Click me", :check, false, 0xffffff, 0x808080, false, 36, 5, 0, 0, "friends") { |c, x|
+    @chk = ToggleButton.new(40, 300, @font, 'Click me', :check, false, 0xffffff, 0x808080, false, true, 36, 0, 0, 0, 'friends') { |c, x|
              puts "hello #{x}, checked: #{c}"
            }
-    @txt = TextField.new(10, 520, @font, :text, nil, nil, 15, 5, 16, false, "", nil, 0, 0, 0x0000ff, "test") { |t, x| puts "field #{x}, text: #{t}" }
+    @txt = TextField.new(10, 520, @font, :text, nil, nil, 15, 5, 16, false, '', nil, 0, 0, 0x0000ff, 'test') { |t, x| puts "field #{x}, text: #{t}" }
     @txt.visible = false
   end
-  
+
   def needs_cursor?
     true
   end
@@ -36,13 +36,13 @@ class MyGame < Gosu::Window
     @chk.enabled = !@chk.enabled if KB.key_pressed? Gosu::KbRightControl
     @txt.visible = !@txt.visible if KB.key_pressed? Gosu::KbReturn
     @txt.enabled = !@txt.enabled if KB.key_pressed? Gosu::KbLeftAlt
-    
+
     Mouse.update
     if Mouse.double_click? :left
       @obj1.x = Mouse.x + 10
       @obj1.y = Mouse.y + 10
     end
-    
+
     @btn.update
     @chk.update
     @txt.update
@@ -55,7 +55,7 @@ class MyGame < Gosu::Window
                            "across multiple lines, respecting a limit width. "\
                            "Furthermore, the text must be right-aligned.",
                            780, 300, 300, :right, 0xff0000, 255, 1
-    
+
     @btn.draw 0xcc
     @chk.draw
     @txt.draw

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu