minigl 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6623569ecf1fbd81357b4fe2e06b22024c2ce05829298750e1574e08a02b2706
-  data.tar.gz: ded142065a95df7c458d873a6c2049f4229f3fd40863872fdf19033f07331635
+  metadata.gz: a080b868fab24c01aaa591dcb2c5b087cc2b1bd4a86b1a649691a5e53aaa27e4
+  data.tar.gz: 117867b84b262cbc6d30adb68e0756d9d3e62246ae9fb57cd03377cc564339ed
 SHA512:
-  metadata.gz: 6cbb8a59c7b77104a1a8bba97d2ab740520cc6987eda4761e438b8b36fcd30b85eaacaa6caab32884118f52dadf3b763718017114db25b09b6f416dd7e1d5588
-  data.tar.gz: 6b3db4da549096602dc258f26101f665713422f510f5623cf7e53bdb1940226dd4a97740e44446a60554e6e1ea29abfb981355ac3caa2006e8111b32dc3aa9d2
+  metadata.gz: 2c1ee1a615f081b4c6b36b547c7a187553cdf91aa5f7026c35b9d6e2087d9c9b461f2b60f37f56ce20739080be5277ee99f6b4f01bc50578c6887fc18c2cbbe8
+  data.tar.gz: c000b6516264435786de8bc90858d644cbb1938128d984fd4c75938593514b07585651a5b8363e65ebbda415c151b028c934284f65e1b14cae7b3435a5bb92b5

data/README.md

@@ -17,10 +17,10 @@ to victordavidsantos@gmail.com.
 ## Made with MiniGL
 
 Below are two full games built with MiniGL, both available for free download and also open source.
-* [Super Bombinhas](https://victords.itch.io/super-bombinhas) ([source](https://github.com/victords/super-bombinhas))
-* [ConnecMan](https://victords.itch.io/connecman) ([source](https://github.com/victords/connecman))
+* [Super Bombinhas](https://github.com/victords/super-bombinhas)
+* [ConnecMan](https://github.com/victords/connecman)
 
-*Super Bombinhas* is also available on [Steam](https://store.steampowered.com/app/1553840).
+If you create a project using MiniGL, feel free to open a PR to include it in this list.
 
 ## Installing
 
@@ -37,10 +37,10 @@ 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.3.7
+## Version 2.3.8
 
-  * Exposed the `Panel#controls`, `TextField#focused` and `DropDownList#open` properties.
-  * Fixed a bug when clicking overlapping buttons: only the click action of the button with highest z-index (or last updated if z-indexes are the same) will be triggered. **WARNING**: the click callback will only be executed if `Mouse.update` is called after the click happened. If you call `Mouse.update` every frame (which is recommended), there's nothing to worry about.
+  * Exposed `Effect`'s `lifetime`, `elapsed_time` and `time_left` properties.
+  * Added the `char_spacing` parameter to the `ImageFont` class and exposed some existing properties.
 
 ## Contributing
 

data/lib/minigl/game_object.rb

@@ -304,6 +304,14 @@ module MiniGL
     # This is +true+ when the effect's lifetime has already passed.
     attr_reader :dead
 
+    # The lifetime of the effect, in updates, i.e., how many calls to +update+
+    # must happen before the effect is marked as +dead+, since its creation.
+    attr_reader :lifetime
+
+    # The number of times +update+ has been called for this effect, while it
+    # was still active (not +dead+).
+    attr_reader :elapsed_time
+
     # Creates a new Effect.
     #
     # Parameters:
@@ -352,7 +360,7 @@ module MiniGL
       end
 
       super x, y, img, sprite_cols, sprite_rows
-      @timer = 0
+      @elapsed_time = 0
       if indices
         @indices = indices
       else
@@ -369,15 +377,21 @@ module MiniGL
 
     # Updates the effect, animating and counting its remaining lifetime.
     def update
-      unless @dead
-        animate @indices, @interval
-        @timer += 1
-        @dead = true if @timer == @lifetime
-      end
+      return if @dead
+
+      animate(@indices, @interval)
+      @elapsed_time += 1
+      @dead = true if @elapsed_time == @lifetime
     end
 
     def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil, z_index = 0)
       super unless @dead
     end
+
+    # The remaining number of calls to +update+ until the effect is marked
+    # +dead+.
+    def time_left
+      @lifetime - @elapsed_time
+    end
   end
 end

data/lib/minigl/text.rb

@@ -11,9 +11,18 @@ module MiniGL
   #   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
+    # A string containing the characters supported by this font.
+    attr_reader :chars
+
     # The height of this font in pixels.
     attr_reader :height
 
+    # The width of the white space character in this font, in pixels.
+    attr_reader :space_width
+
+    # The spacing between characters, in pixels (can be a decimal number).
+    attr_reader :char_spacing
+
     # Creates an +ImageFont+.
     #
     # Parameters:
@@ -26,16 +35,19 @@ module MiniGL
     #          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.
+    # [char_spacing] The spacing between non-white-space characters when writing text with
+    #                this font. It can be a decimal number, useful when scaling the text up.
     # [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)
+    def initialize(img_path, chars, widths, height, space_width, char_spacing = 0, 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
+      @char_spacing = char_spacing
       wa = widths.is_a?(Array)
       if wa && widths.length != chars.length
         raise 'Wrong widths array size!'
@@ -60,7 +72,17 @@ module MiniGL
     # 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 }
+      w = 0
+      text.chars.each_with_index do |c, i|
+        if c == ' '
+          w += @space_width
+        else
+          idx = @chars.index(c)
+          w += idx ? @images[idx].width : 0
+          w += @char_spacing if i < text.chars.size - 1
+        end
+      end
+      w
     end
 
     # See <code>Gosu::Font#draw_markup_rel</code> for details.
@@ -82,7 +104,7 @@ module MiniGL
         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
+        x += (scale_x * (@images[i].width + @char_spacing)).round
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu