minigl 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17cfec4fd44f2a4796d2be16f7de9d19ab5be6d9d3dce59fb5e0154c9fb153ae
-  data.tar.gz: 542db7203b4c9cec72be26037058ab9fec3487078da77c4099056ea0a96dace2
+  metadata.gz: e0362df674b485b64cd44d6b167377b2d46d6c33fd9b2d65428fe75e8de9e027
+  data.tar.gz: d91ae820bfc76cb9895f43227646028b23927cffe2e4b226f3b2b14779fe08a3
 SHA512:
-  metadata.gz: 87bd0c8b076fa41be74210c657dd7eeaf90ce1d7768a211018de80d7c807b6b5a776b76c317998e660d60c09550b772f2dd6783f53556fd50c746c3c27f67fcf
-  data.tar.gz: e47d4b80ec4979ca6e8b63c6b818d247a3ff9af939447d4b4bf68d2d01c0fb934211311ee2c1abb41014981703ef0d8cf72fc7bcaa313cadc9432b81fbd6fe93
+  metadata.gz: 70af1a521abd0f23110b62b2c88a1de5f1fd94aeb664fc8c9e4ca8cd414a024c0ac93037889b9b8431598c7e63cf11e62b00f657213f5eb68957da70ca4fdfc5
+  data.tar.gz: 685115af1a42dc3662af276580771b0be33eae0348fd54e1f11f679c2de26a10f8d158a9d00cf0e67ae42ae5bab2af4841adbf466aca38b46b6e75665ca3b773

data/README.md

@@ -5,9 +5,9 @@ top of the [Gosu](http://www.libgosu.org/) gem.
 
 It provides the following features:
 
-  * Resource management (images, sounds, ...)
-  * Input manipulation (keyboard, mouse, ...)
-  * UI (text, buttons, text fields, ...)
+  * Resource management (images, sound effects, songs, tilesets, fonts)
+  * Input manipulation (keyboard, mouse, joystick)
+  * UI (text, buttons, text fields, drop-down lists, progress bars)
   * Basic physics and collision checking
   * Animated objects
 
@@ -29,6 +29,12 @@ After installing the Gosu dependencies, you can just `gem install minigl`.
   * The [wiki](https://github.com/victords/minigl/wiki) is a work in progress with tutorials and examples.
   * Test package and examples aren't complete!
 
-## Version 2.2.5
+## Version 2.3.0
 
-  * Fixed `Sprite#animate_once` and added the possibility of passing a callback.
+  * Added the `ImageFont` class.
+  * Added scale and line spacing options to `TextHelper` methods.
+
+## Contributing
+
+Contributions are very welcome. Feel free to fork and send pull requests.
+Also, you can support my work by donating bitcoins to this wallet: bc1qsp7mypdqvkt88xtnarmaytt0etxfccxr5pt5tk

data/lib/minigl/forms.rb

@@ -37,6 +37,9 @@ module MiniGL
     # The height of the component
     attr_reader :h
 
+    # The text of the component
+    attr_reader :text
+
     attr_reader :anchor, :anchor_offset_x, :anchor_offset_y # :nodoc:
 
     # Determines whether the control is enabled, i.e., will process user input.
@@ -52,6 +55,8 @@ module MiniGL
     # for each specific component class.
     attr_accessor :params
 
+    attr_accessor :panel # :nodoc:
+
     def initialize(x, y, font, text, text_color, disabled_text_color) # :nodoc:
       @x = x
       @y = y
@@ -127,6 +132,7 @@ module MiniGL
       controls.each do |c|
         _, x, y = FormUtils.check_anchor(c.anchor, c.anchor_offset_x, c.anchor_offset_y, c.w, c.h, @w, @h)
         c.set_position(@x + x, @y + y)
+        c.panel = self
       end
 
       if img
@@ -537,9 +543,6 @@ module MiniGL
 
   # This class represents a text field (input).
   class TextField < Component
-    # The current text inside the text field.
-    attr_reader :text
-
     # The current 'locale' used for detecting the keys. THIS FEATURE IS
     # INCOMPLETE!
     attr_reader :locale
@@ -1460,6 +1463,22 @@ module MiniGL
       super(x, y, font, text, text_color, disabled_text_color)
     end
 
+    # Changes the label's text.
+    #
+    # Parameters:
+    # [new_text] The new text to show in the label.
+    def text=(new_text)
+      @text = new_text
+      @w = @font.text_width(@text) * @scale_x
+      x = @anchor_offset_x; y = @anchor_offset_y
+      _, x, y = FormUtils.check_anchor(@anchor, x, y, @w, @h, panel ? panel.w : G.window.width, panel ? panel.h : G.window.height)
+      if panel
+        set_position(panel.x + x, panel.y + y)
+      else
+        set_position(x, y)
+      end
+    end
+
     # Draws the label.
     #
     # Parameters:

data/lib/minigl/game_object.rb

@@ -82,7 +82,10 @@ module MiniGL
     # [interval] The amount of frames between each change in the image index.
     #            See +animate+ for details.
     def animate_once(indices, interval)
-      return if @animate_once_control == 2
+      if @animate_once_control == 2
+        return if indices == @animate_once_indices && interval == @animate_once_interval
+        @animate_once_control = 0
+      end
 
       unless @animate_once_control == 1
         @anim_counter = 0

data/lib/minigl/global.rb

@@ -247,9 +247,7 @@ module MiniGL
     end
   end
 
-  #class JSHelper
-
-  # Exposes methods for controlling keyboard events.
+  # Exposes methods for controlling keyboard and gamepad events.
   module KB
     class << self
       # This is called by <code>GameWindow.initialize</code>. Don't call it
@@ -278,7 +276,27 @@ module MiniGL
           Gosu::KB_PAGE_UP, Gosu::KB_PERIOD, Gosu::KB_RETURN, Gosu::KB_RIGHT,
           Gosu::KB_RIGHT_ALT, Gosu::KB_RIGHT_BRACKET, Gosu::KB_RIGHT_CONTROL,
           Gosu::KB_RIGHT_META, Gosu::KB_RIGHT_SHIFT, Gosu::KB_SEMICOLON,
-          Gosu::KB_SLASH, Gosu::KB_SPACE, Gosu::KB_TAB, Gosu::KB_UP
+          Gosu::KB_SLASH, Gosu::KB_SPACE, Gosu::KB_TAB, Gosu::KB_UP,
+          Gosu::GP_0_BUTTON_0, Gosu::GP_0_BUTTON_1, Gosu::GP_0_BUTTON_2, Gosu::GP_0_BUTTON_3,
+          Gosu::GP_0_BUTTON_4, Gosu::GP_0_BUTTON_5, Gosu::GP_0_BUTTON_6, Gosu::GP_0_BUTTON_7,
+          Gosu::GP_0_BUTTON_8, Gosu::GP_0_BUTTON_9, Gosu::GP_0_BUTTON_10, Gosu::GP_0_BUTTON_11,
+          Gosu::GP_0_BUTTON_12, Gosu::GP_0_BUTTON_13, Gosu::GP_0_BUTTON_14, Gosu::GP_0_BUTTON_15,
+          Gosu::GP_0_DOWN, Gosu::GP_0_LEFT, Gosu::GP_0_RIGHT, Gosu::GP_0_UP,
+          Gosu::GP_1_BUTTON_0, Gosu::GP_1_BUTTON_1, Gosu::GP_1_BUTTON_2, Gosu::GP_1_BUTTON_3,
+          Gosu::GP_1_BUTTON_4, Gosu::GP_1_BUTTON_5, Gosu::GP_1_BUTTON_6, Gosu::GP_1_BUTTON_7,
+          Gosu::GP_1_BUTTON_8, Gosu::GP_1_BUTTON_9, Gosu::GP_1_BUTTON_10, Gosu::GP_1_BUTTON_11,
+          Gosu::GP_1_BUTTON_12, Gosu::GP_1_BUTTON_13, Gosu::GP_1_BUTTON_14, Gosu::GP_1_BUTTON_15,
+          Gosu::GP_1_DOWN, Gosu::GP_1_LEFT, Gosu::GP_1_RIGHT, Gosu::GP_1_UP,
+          Gosu::GP_2_BUTTON_0, Gosu::GP_2_BUTTON_1, Gosu::GP_2_BUTTON_2, Gosu::GP_2_BUTTON_3,
+          Gosu::GP_2_BUTTON_4, Gosu::GP_2_BUTTON_5, Gosu::GP_2_BUTTON_6, Gosu::GP_2_BUTTON_7,
+          Gosu::GP_2_BUTTON_8, Gosu::GP_2_BUTTON_9, Gosu::GP_2_BUTTON_10, Gosu::GP_2_BUTTON_11,
+          Gosu::GP_2_BUTTON_12, Gosu::GP_2_BUTTON_13, Gosu::GP_2_BUTTON_14, Gosu::GP_2_BUTTON_15,
+          Gosu::GP_2_DOWN, Gosu::GP_2_LEFT, Gosu::GP_2_RIGHT, Gosu::GP_2_UP,
+          Gosu::GP_3_BUTTON_0, Gosu::GP_3_BUTTON_1, Gosu::GP_3_BUTTON_2, Gosu::GP_3_BUTTON_3,
+          Gosu::GP_3_BUTTON_4, Gosu::GP_3_BUTTON_5, Gosu::GP_3_BUTTON_6, Gosu::GP_3_BUTTON_7,
+          Gosu::GP_3_BUTTON_8, Gosu::GP_3_BUTTON_9, Gosu::GP_3_BUTTON_10, Gosu::GP_3_BUTTON_11,
+          Gosu::GP_3_BUTTON_12, Gosu::GP_3_BUTTON_13, Gosu::GP_3_BUTTON_14, Gosu::GP_3_BUTTON_15,
+          Gosu::GP_3_DOWN, Gosu::GP_3_LEFT, Gosu::GP_3_RIGHT, Gosu::GP_3_UP,
         ]
         @down = []
         @prev_down = []

data/lib/minigl/movement.rb

@@ -360,17 +360,16 @@ module MiniGL
     # [speed] If the first argument is a forces vector, then this should be
     #         +nil+. If it is a point, then this is the constant speed at which
     #         the object will move (provided as a scalar, not a vector).
-    # [obstacles] An array of obstacles to be considered in the collision
-    #             checking, and carried along when colliding from above.
-    #             Obstacles must be instances of Block (or derived classes),
-    #             or objects that <code>include Movement</code>.
-    # [obst_obstacles] Obstacles that should be considered when moving objects
-    #                  from the +obstacles+ array, i.e., these obstacles won't
-    #                  interfere in the elevator's movement, but in the movement
-    #                  of the objects being carried.
-    # [obst_ramps] Ramps to consider when moving objects from the +obstacles+
-    #              array, as described for +obst_obstacles+.
-    def move_carrying(arg, speed, obstacles, obst_obstacles, obst_ramps)
+    # [carried_objs] An array of objects that can potentially be carried by
+    #                this object while it moves. The objects must respond to
+    #                +x+, +y+, +w+ and +h+.
+    # [obstacles] Obstacles that should be considered for collision checking
+    #             with the carried objects, if they include the +Movement+
+    #             module, and with this object too, if moving with forces.
+    # [ramps] Ramps that should be considered for the carried objects, if they
+    #         include the +Movement+ module, and for this object too, if moving
+    #         with forces.
+    def move_carrying(arg, speed, carried_objs, obstacles, ramps)
       if speed
         x_d = arg.x - @x; y_d = arg.y - @y
         distance = Math.sqrt(x_d**2 + y_d**2)
@@ -382,18 +381,11 @@ module MiniGL
 
         @speed.x = 1.0 * x_d * speed / distance
         @speed.y = 1.0 * y_d * speed / distance
-      else
-        arg += G.gravity
-        @speed.x += arg.x / @mass; @speed.y += arg.y / @mass
-        @speed.x = 0 if @speed.x.abs < G.min_speed.x
-        @speed.y = 0 if @speed.y.abs < G.min_speed.y
-        @speed.x = (@speed.x <=> 0) * @max_speed.x if @speed.x.abs > @max_speed.x
-        @speed.y = (@speed.y <=> 0) * @max_speed.y if @speed.y.abs > @max_speed.y
+        x_aim = @x + @speed.x; y_aim = @y + @speed.y
       end
 
-      x_aim = @x + @speed.x; y_aim = @y + @speed.y
       passengers = []
-      obstacles.each do |o|
+      carried_objs.each do |o|
         if @x + @w > o.x && o.x + o.w > @x
           foot = o.y + o.h
           if foot.round(6) == @y.round(6) || @speed.y < 0 && foot < @y && foot > y_aim
@@ -415,25 +407,30 @@ module MiniGL
           @y = y_aim
         end
       else
-        @x = x_aim; @y = y_aim
+        move(arg, obstacles, ramps)
       end
 
       forces = Vector.new @x - prev_x, @y - prev_y
       prev_g = G.gravity.clone
       G.gravity.x = G.gravity.y = 0
       passengers.each do |p|
-        prev_speed = p.speed.clone
-        prev_forces = p.stored_forces.clone
-        prev_bottom = p.bottom
-        p.speed.x = p.speed.y = 0
-        p.stored_forces.x = p.stored_forces.y = 0
-        p.instance_exec { @bottom = nil }
-        p.move forces * p.mass, obst_obstacles, obst_ramps
-        p.speed.x = prev_speed.x
-        p.speed.y = prev_speed.y
-        p.stored_forces.x = prev_forces.x
-        p.stored_forces.y = prev_forces.y
-        p.instance_exec(prev_bottom) { |b| @bottom = b }
+        if p.class.included_modules.include?(Movement)
+          prev_speed = p.speed.clone
+          prev_forces = p.stored_forces.clone
+          prev_bottom = p.bottom
+          p.speed.x = p.speed.y = 0
+          p.stored_forces.x = p.stored_forces.y = 0
+          p.instance_exec { @bottom = nil }
+          p.move(forces * p.mass, obstacles, ramps)
+          p.speed.x = prev_speed.x
+          p.speed.y = prev_speed.y
+          p.stored_forces.x = prev_forces.x
+          p.stored_forces.y = prev_forces.y
+          p.instance_exec(prev_bottom) { |b| @bottom = b }
+        else
+          p.x += forces.x
+          p.y += forces.y
+        end
       end
       G.gravity = prev_g
     end
@@ -504,16 +501,32 @@ module MiniGL
     #                  of the objects being carried.
     # [obst_ramps] Ramps to consider when moving objects from the +obstacles+
     #              array, as described for +obst_obstacles+.
-    def cycle(points, speed, obstacles = nil, obst_obstacles = nil, obst_ramps = nil)
-      @cur_point = 0 if @cur_point.nil?
-      if obstacles
-        move_carrying points[@cur_point], speed, obstacles, obst_obstacles, obst_ramps
-      else
-        move_free points[@cur_point], speed
+    # [stop_time] Optional stop time (in frames) when the object reaches each of
+    #             the points.
+    def cycle(points, speed, obstacles = nil, obst_obstacles = nil, obst_ramps = nil, stop_time = 0)
+      unless @cycle_setup
+        @cur_point = 0 if @cur_point.nil?
+        if obstacles
+          move_carrying points[@cur_point], speed, obstacles, obst_obstacles, obst_ramps
+        else
+          move_free points[@cur_point], speed
+        end
       end
       if @speed.x == 0 and @speed.y == 0
-        if @cur_point == points.length - 1; @cur_point = 0
-        else; @cur_point += 1; end
+        unless @cycle_setup
+          @cycle_timer = 0
+          @cycle_setup = true
+        end
+        if @cycle_timer >= stop_time
+          if @cur_point == points.length - 1
+            @cur_point = 0
+          else
+            @cur_point += 1
+          end
+          @cycle_setup = false
+        else
+          @cycle_timer += 1
+        end
       end
     end
 

data/lib/minigl/text.rb

@@ -1,4 +1,100 @@
 module MiniGL
+  # This class represents a font and exposes most of the methods from +Gosu::Font+,
+  # but allows the font to be created from an image, allowing for better customization
+  # and also using the +retro+ option.
+  #
+  # The image used to load the font must meet these criteria:
+  # * The characters should be laid out in lines of the same height in pixels.
+  # * The full image must have a height that is a multiple of that line height.
+  # * The characters should occupy the maximum available space in each line, i.e.,
+  #   if a character fits in the current line it must not be placed in the next
+  #   one. In the last line there can be any amount of free space at the end.
+  class ImageFont
+    # The height of this font in pixels.
+    attr_reader :height
+
+    # Creates an +ImageFont+.
+    #
+    # Parameters:
+    # [img_path] Identifier of an image fitting the description in the class documentation,
+    #            as used in +Res.img+.
+    # [chars] A string containing all characters that will be present in the image, in the
+    #         same order as they appear in the image. Do not include white space.
+    # [widths] An integer representing the width of the chars in pixels, if this is a fixed
+    #          width font, or an array containing the width of each char, in the same order
+    #          as they appear in the +chars+ string.
+    # [height] The height of the lines in the image (see description above).
+    # [space_width] The width of the white space character in this font.
+    # [global] Parameter that will be passed to +Res.img+ when loading the image.
+    # [ext] Parameter that will be passed to +Res.img+ when loading the image.
+    # [retro] Parameter that will be passed to +Res.img+ when loading the image.
+    def initialize(img_path, chars, widths, height, space_width, global = true, ext = '.png', retro = nil)
+      retro = Res.retro_images if retro.nil?
+      img = Res.img(img_path, global, false, ext, retro)
+      @chars = chars
+      @images = []
+      @height = height
+      @space_width = space_width
+      wa = widths.is_a?(Array)
+      if wa && widths.length != chars.length
+        raise 'Wrong widths array size!'
+      end
+      x = y = 0
+      (0...chars.length).each do |i|
+        @images.push(img.subimage(x, y, wa ? widths[i] : widths, height))
+        new_x = x + (wa ? widths[i] : widths)
+        if i < chars.length - 1 && new_x + (wa ? widths[i+1] : widths) > img.width
+          x = 0
+          y += height
+        else
+          x = new_x
+        end
+      end
+    end
+
+    # Returns the width, in pixels, of a given string written by this font.
+    #
+    # Parameters:
+    # [text] The string to be measured
+    def markup_width(text)
+      text.chars.reduce(0) { |w, c| if c == ' '; w += @space_width; else; i = @chars.index(c); w += i ? @images[i].width : 0; end }
+    end
+
+    # See <code>Gosu::Font#draw_markup_rel</code> for details.
+    def draw_markup_rel(text, x, y, z, rel_x, rel_y, scale_x, scale_y, color)
+      text = text.to_s unless text.is_a?(String)
+      if rel_x == 0.5
+        x -= scale_x * markup_width(text) / 2
+      elsif rel_x == 1
+        x -= scale_x * markup_width(text)
+      end
+      if rel_y == 0.5
+        y -= scale_y * @height / 2
+      elsif rel_y == 1
+        y -= scale_x * @height
+      end
+      text.each_char do |c|
+        if c == ' '
+          x += scale_x * @space_width
+          next
+        end
+        i = @chars.index(c)
+        next if i.nil?
+        @images[i].draw(x, y, z, scale_x, scale_y, color)
+        x += scale_x * @images[i].width
+      end
+    end
+
+    # See <code>Gosu::Font#draw_markup</code> for details.
+    def draw_markup(text, x, y, z, scale_x, scale_y, color)
+      draw_markup_rel(text, x, y, z, 0, 0, scale_x, scale_y, color)
+    end
+
+    alias :draw_text_rel :draw_markup_rel
+    alias :draw_text :draw_markup
+    alias :text_width :markup_width
+  end
+
   # This class provides methods for easily drawing one or multiple lines of
   # text, with control over the text alignment and coloring.
   class TextHelper
@@ -8,9 +104,11 @@ module MiniGL
     # [font] A <code>Gosu::Font</code> that will be used to draw the text.
     # [line_spacing] When drawing multiple lines, the distance, in pixels,
     #                between each line.
-    def initialize(font, line_spacing = 0)
+    def initialize(font, line_spacing = 0, scale_x = 1, scale_y = 1)
       @font = font
       @line_spacing = line_spacing
+      @scale_x = scale_x
+      @scale_y = scale_y
     end
 
     # Draws a single line of text.
@@ -48,7 +146,7 @@ module MiniGL
     # mandatory.
     def write_line(text, x = nil, y = nil, mode = :left, color = 0, alpha = 0xff,
                    effect = nil, effect_color = 0, effect_size = 1, effect_alpha = 0xff,
-                   z_index = 0)
+                   z_index = 0, scale_x = nil, scale_y = nil)
       if text.is_a? Hash
         x = text[:x]
         y = text[:y]
@@ -60,9 +158,13 @@ module MiniGL
         effect_size = text.fetch(:effect_size, 1)
         effect_alpha = text.fetch(:effect_alpha, 0xff)
         z_index = text.fetch(:z_index, 0)
+        scale_x = text.fetch(:scale_x, nil)
+        scale_y = text.fetch(:scale_y, nil)
         text = text[:text]
       end
 
+      scale_x = @scale_x if scale_x.nil?
+      scale_y = @scale_y if scale_y.nil?
       color = (alpha << 24) | color
       rel =
         case mode
@@ -74,19 +176,19 @@ module MiniGL
       if effect
         effect_color = (effect_alpha << 24) | effect_color
         if effect == :border
-          @font.draw_markup_rel text, x - effect_size, y - effect_size, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x, y - effect_size, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x + effect_size, y - effect_size, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x + effect_size, y, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x + effect_size, y + effect_size, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x, y + effect_size, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x - effect_size, y + effect_size, z_index, rel, 0, 1, 1, effect_color
-          @font.draw_markup_rel text, x - effect_size, y, z_index, rel, 0, 1, 1, effect_color
+          @font.draw_markup_rel text, x - effect_size, y - effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x, y - effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x + effect_size, y - effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x + effect_size, y, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x + effect_size, y + effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x, y + effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x - effect_size, y + effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
+          @font.draw_markup_rel text, x - effect_size, y, z_index, rel, 0, scale_x, scale_y, effect_color
         elsif effect == :shadow
-          @font.draw_markup_rel text, x + effect_size, y + effect_size, z_index, rel, 0, 1, 1, effect_color
+          @font.draw_markup_rel text, x + effect_size, y + effect_size, z_index, rel, 0, scale_x, scale_y, effect_color
         end
       end
-      @font.draw_markup_rel text, x, y, z_index, rel, 0, 1, 1, color
+      @font.draw_markup_rel text, x, y, z_index, rel, 0, scale_x, scale_y, color
     end
 
     # Draws text, breaking lines when needed and when explicitly caused by the
@@ -94,7 +196,7 @@ module MiniGL
     #
     # Parameters:
     # [text] The text to be drawn. Line breaks are allowed. You can use the
-	#        `<b>` tag for bold, `<i>` for italic and `<c=rrggbb>` for colors.
+	  #        `<b>` tag for bold, `<i>` for italic and `<c=rrggbb>` for colors.
     # [x] The horizontal reference for drawing the text. Works like in
     #     +write_line+ for the +:left+, +:right+ and +:center+ modes. For the
     #     +:justified+ mode, works the same as for +:left+.
@@ -109,11 +211,14 @@ module MiniGL
     #         transparent) to 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 write_breaking(text, x, y, width, mode = :left, color = 0, alpha = 0xff, z_index = 0)
+    def write_breaking(text, x, y, width, mode = :left, color = 0, alpha = 0xff, z_index = 0, scale_x = nil, scale_y = nil, line_spacing = nil)
+      line_spacing = @line_spacing if line_spacing.nil?
+      scale_x = @scale_x if scale_x.nil?
+      scale_y = @scale_y if scale_y.nil?
       color = (alpha << 24) | color
       text.split("\n").each do |p|
         if mode == :justified
-          y = write_paragraph_justified p, x, y, width, color, z_index
+          y = write_paragraph_justified p, x, y, width, color, z_index, scale_x, scale_y, line_spacing
         else
           rel =
             case mode
@@ -122,40 +227,40 @@ module MiniGL
             when :right then 1
             else 0
             end
-          y = write_paragraph p, x, y, width, rel, color, z_index
+          y = write_paragraph p, x, y, width, rel, color, z_index, scale_x, scale_y, line_spacing
         end
       end
     end
 
   private
 
-    def write_paragraph(text, x, y, width, rel, color, z_index)
+    def write_paragraph(text, x, y, width, rel, color, z_index, scale_x, scale_y, line_spacing)
       line = ''
       line_width = 0
       text.split(' ').each do |word|
-        w = @font.markup_width word
-        if line_width + w > width
-          @font.draw_markup_rel line.chop, x, y, z_index, rel, 0, 1, 1, color
+        w = @font.markup_width(word)
+        if line_width + w * scale_x > width
+          @font.draw_markup_rel line.chop, x, y, z_index, rel, 0, scale_x, scale_y, color
           line = ''
           line_width = 0
-          y += @font.height + @line_spacing
+          y += (@font.height + line_spacing) * scale_y
         end
         line += "#{word} "
-        line_width += @font.markup_width "#{word} "
+        line_width += @font.markup_width("#{word} ") * scale_x
       end
-      @font.draw_markup_rel line.chop, x, y, z_index, rel, 0, 1, 1, color unless line.empty?
-      y + @font.height + @line_spacing
+      @font.draw_markup_rel line.chop, x, y, z_index, rel, 0, scale_x, scale_y, color unless line.empty?
+      y + (@font.height + line_spacing) * scale_y
     end
 
-    def write_paragraph_justified(text, x, y, width, color, z_index)
-      space_width = @font.text_width ' '
+    def write_paragraph_justified(text, x, y, width, color, z_index, scale_x, scale_y, line_spacing)
+      space_width = @font.text_width(' ') * scale_x
       spaces = [[]]
       line_index = 0
       new_x = x
       words = text.split(' ')
       words.each do |word|
-        w = @font.markup_width word
-        if new_x + w > x + width
+        w = @font.markup_width(word)
+        if new_x + w * scale_x > x + width
           space = x + width - new_x + space_width
           index = 0
           while space > 0
@@ -170,7 +275,7 @@ module MiniGL
 
           new_x = x
         end
-        new_x += @font.markup_width(word) + space_width
+        new_x += @font.markup_width(word) * scale_x + space_width
         spaces[line_index] << space_width
       end
 
@@ -178,11 +283,11 @@ module MiniGL
       spaces.each do |line|
         new_x = x
         line.each do |s|
-          @font.draw_markup words[index], new_x, y, z_index, 1, 1, color
-          new_x += @font.markup_width(words[index]) + s
+          @font.draw_markup(words[index], new_x, y, z_index, scale_x, scale_y, color)
+          new_x += @font.markup_width(words[index]) * scale_x + s
           index += 1
         end
-        y += @font.height + @line_spacing
+        y += (@font.height + line_spacing) * scale_y
       end
       y
     end

data/test/game.rb

@@ -35,7 +35,7 @@ class MyGame < GameWindow
 
     @panel = Panel.new(10, 10, 720, 520, [
       Button.new(x: 5, y: 5, font: @font1, text: 'Teste', img: :btn),
-      Label.new(0, 70, @font1, 'Teste de label', 0xcccccc, 0x666666, 1, 1, :north),
+      @lbl = Label.new(0, 70, @font1, 'Teste de label', 0, 0x666666, 1, 1, :north),
       TextField.new(x: 5, y: 40, font: @font1, text: 'Opa', img: :text, margin_x: 5, margin_y: 5, anchor: :top_left),
       Button.new(x: 0, y: 5, font: @font1, text: 'Teste', img: :btn, anchor: :top),
       DropDownList.new(x: 0, y: 40, width: 150, height: 25, font: @font1, options: ['olá amigos', 'opção 2', 'terceira'], anchor: :north),
@@ -49,6 +49,8 @@ class MyGame < GameWindow
       ProgressBar.new(0, 40, 200, 20, :barbg, :barfg, 3456, 70, 2, 2, @font1, 0xff000080, nil, nil, 1, 1, :bottom)
     ], :text, :tiled, true, 2, 2, :bottom_right)
 
+    @lbl2 = Label.new(x: 5, y: 5, font: @font1, text: 'top-right corner label test', anchor: :top_right)
+
     @eff = Effect.new(100, 100, :check, 2, 4, 10, nil, nil, '1')
 
     @angle = 0
@@ -79,6 +81,8 @@ class MyGame < GameWindow
     @panel.visible = !@panel.visible if KB.key_pressed? Gosu::KbM
 
     @panel.add_component(Button.new(x: 5, y: 5, font: @font1, text: 'Teste', img: :btn, anchor: :southeast)) if KB.key_pressed?(Gosu::KbB)
+    @lbl.text = 'Test of changed text' if KB.key_pressed?(Gosu::KB_C)
+    @lbl2.text = 'Shorter text' if KB.key_pressed?(Gosu::KB_X)
 
     @pb.increase 1 if KB.key_down? Gosu::KbD
     @pb.decrease 1 if KB.key_down? Gosu::KbA
@@ -145,6 +149,7 @@ class MyGame < GameWindow
     @chk.draw
     @txt.draw
     @pb.draw 0x66
+    @lbl2.draw
 
     @panel.draw(204, 10)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -93,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: MiniGL