minigl 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf74cda701aadb5941c6b9e7a35c1ef534fcb55608bfc6cf9e2614fce53e48c5
-  data.tar.gz: 53ba4be1ad4f60c97ba926986d8909df7f7db2eb9706f25a7a62f3f1c91ed68c
+  metadata.gz: a7d451a982c58c436b84bd5de4bf52f2f6762d69d7275043aadf330b60d8ba63
+  data.tar.gz: 1d699e8182002420b17beac84e0d5601ddbca86cbd17c3425e09f73aa00bd819
 SHA512:
-  metadata.gz: 97699a40a88821a6506e4bf8861d0917c71753424b94131bcbecd7e7355ba484575114df951a423d0998307cfed731f18f80e6551de9bd2f539618a1bf562ddf
-  data.tar.gz: 79ebb0b3647c2e80bb43d1927c42f6ba027970d6fe11c273aba72bc2747cf9207c6cfc2868928bdd772b7eee7296e388d1a58924c03290e13c659a56bb08e34b
+  metadata.gz: 941b9be8b09c005054527c571a9adfda1cdbe76090b974ee518b40f51ab9bf38fb3515a2874d2647abe68db2ccb87a07fbbbc944eb276560d972132f41556488
+  data.tar.gz: 37c59f05e5b10d8f8728a2c612e5bf132875946ca0a673de9a7e0176c3302a61cde07743a8a8b3b4c435ab54daaf3a2ab7ce44013a2645d393f295154be84614

data/README.md

@@ -29,8 +29,8 @@ 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.0
+## Version 2.2.1
 
-  * Added the `tileable` option to `Res::imgs`.
-  * Added the `anchor` option to all form components.
-  * Added the `Panel` class, to easily group form components - take a look at the docs!
+  * Added the `Label` class.
+  * Made the `x`, `y`, `w` and `h` of `Panel`s accessible.
+  * Fixed bug in `TextField` with starting text.

data/lib/minigl/forms.rb

@@ -23,7 +23,7 @@ module MiniGL
   end
 
   # This class is an abstract ancestor for all form components (Button,
-  # ToggleButton and TextField).
+  # ToggleButton, TextField, DropDownList and ProgressBar).
   class Component
     # The horizontal coordinate of the component
     attr_reader :x
@@ -75,6 +75,18 @@ module MiniGL
 
   # Represents a container of form components.
   class Panel
+    # The horizontal position of the panel from the top left corner of the window.
+    attr_reader :x
+
+    # The vertical position of the panel from the top left corner of the window.
+    attr_reader :y
+
+    # The width of the panel in pixels.
+    attr_reader :w
+
+    # The height of the panel in pixels.
+    attr_reader :h
+
     # Whether the components inside this panel are enabled.
     attr_reader :enabled
 
@@ -636,7 +648,9 @@ module MiniGL
       @text_y = y + margin_y * @scale_y
       @selection_color = selection_color
 
-      @nodes = [x + margin_x * @scale_x]
+      @nodes = [@text_x]
+      send(:text=, text, false) if text
+
       @cur_node = 0
       @cursor_visible = false
       @cursor_timer = 0
@@ -840,7 +854,7 @@ module MiniGL
     # [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, trigger_changed = true)
       @text = value[0...@max_length]
       @nodes.clear; @nodes << @text_x
       x = @nodes[0]
@@ -852,7 +866,7 @@ module MiniGL
       @anchor1 = nil
       @anchor2 = nil
       set_cursor_visible
-      @on_text_changed.call @text, @params if @on_text_changed
+      @on_text_changed.call @text, @params if trigger_changed && @on_text_changed
     end
 
     # Sets the locale used by the text field to detect keys. Only 'en-us' and
@@ -1241,7 +1255,7 @@ module MiniGL
     # Parameters:
     # [x] The x-coordinate of the object.
     # [y] The y-coordinate of the object.
-    # [font] Font to be used by the buttons that compose the drop-donwn list.
+    # [font] Font to be used by the buttons that compose the drop-down list.
     # [img] Image of the main button, i.e., the one at the top, that toggles
     #       visibility of the other buttons (the "option" buttons).
     # [opt_img] Image for the "option" buttons, as described above.
@@ -1389,10 +1403,11 @@ module MiniGL
           G.window.draw_quad b.x, b.y, c,
                              b.x + b.w, b.y, c,
                              b.x + b.w, b.y + b.h, c,
-                             b.x, b.y + b.h, c, z_index if b.visible
+                             b.x, b.y + b.h, c, z_index + 1 if b.visible
         end
       end
-      @buttons.each { |b| b.draw alpha, z_index, color }
+      @buttons[0].draw(alpha, z_index, color)
+      @buttons[1..-1].each { |b| b.draw alpha, z_index + 1, color }
     end
 
     private
@@ -1407,4 +1422,64 @@ module MiniGL
       end
     end
   end
+
+  # This class represents a label.
+  class Label < Component
+    # Creates a new label.
+    #
+    # Parameters:
+    # [x] The x-coordinate of the label.
+    # [y] The x-coordinate of the label.
+    # [font] Font that will be used to draw the label's text.
+    # [text] The label's text.
+    # [text_color] The default text color.
+    # [disabled_text_color] The text color when the label is disabled.
+    # [scale_x] The horizontal scale factor.
+    # [scale_y] The vertical scale factor.
+    # [anchor] See parameter with the same name in <code>Panel#initialize</code> for details.
+    def initialize(x, y = nil, font = nil, text = nil, text_color = 0, disabled_text_color = 0, scale_x = 1, scale_y = 1, anchor = nil)
+      if x.is_a? Hash
+        y = x[:y]
+        font = x[:font]
+        text = x[:text]
+        text_color = x.fetch(:text_color, 0)
+        disabled_text_color = x.fetch(:disabled_text_color, 0)
+        scale_x = x.fetch(:scale_x, 1)
+        scale_y = x.fetch(:scale_y, 1)
+        anchor = x.fetch(:anchor, nil)
+        x = x[:x]
+      end
+
+      @scale_x = scale_x
+      @scale_y = scale_y
+      @w = font.text_width(text) * scale_x
+      @h = font.height * scale_y
+      @anchor_offset_x = x; @anchor_offset_y = y
+      @anchor, x, y = FormUtils.check_anchor(anchor, x, y, @w, @h)
+      super(x, y, font, text, text_color, disabled_text_color)
+    end
+
+    # Draws the label.
+    #
+    # Parameters:
+    # [alpha] The opacity with which the label will be drawn. Allowed 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.
+    # [color] Color to apply a filter to the text.
+    def draw(alpha = 255, z_index = 0, color = 0xffffff)
+      c = @enabled ? @text_color : @disabled_text_color
+      r1 = c >> 16
+      g1 = (c & 0xff00) >> 8
+      b1 = (c & 0xff)
+      r2 = color >> 16
+      g2 = (color & 0xff00) >> 8
+      b2 = (color & 0xff)
+      r1 *= r2; r1 /= 255
+      g1 *= g2; g1 /= 255
+      b1 *= b2; b1 /= 255
+      color = (alpha << 24) | (r1 << 16) | (g1 << 8) | b1
+      @font.draw(@text, @x, @y, z_index, @scale_x, @scale_y, color)
+    end
+  end
 end

data/test/game.rb

@@ -33,9 +33,10 @@ class MyGame < GameWindow
       puts "mudou de #{a} para #{b}"
     }
 
-    @panel = Panel.new(10, 10,720, 520, [
+    @panel = Panel.new(10, 10, 720, 520, [
       Button.new(x: 5, y: 5, font: @font1, text: 'Teste', img: :btn),
-      TextField.new(x: 5, y: 40, font: @font1, img: :text, margin_x: 5, margin_y: 5, anchor: :top_left),
+      Label.new(0, 70, @font1, 'Teste de label', 0xcccccc, 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),
       Button.new(x: 5, y: 5, font: @font1, text: 'Teste', img: :btn, anchor: :northeast),
@@ -45,8 +46,7 @@ class MyGame < GameWindow
       ToggleButton.new(x: 5, y: 40, img: :check, center_x: false, margin_x: 36, anchor: :east),
       Button.new(x: 5, y: 5, font: @font1, text: 'Teste', img: :btn, anchor: :southwest),
       Button.new(x: 0, y: 5, font: @font1, text: 'Teste', img: :btn, anchor: :south),
-      ProgressBar.new(0, 40, 200, 20, :barbg, :barfg, 3456, 70, 2, 2, @font1, 0xff000080, nil, nil, 1, 1, :bottom),
-
+      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)
 
     @eff = Effect.new(100, 100, :check, 2, 4, 10, nil, nil, '1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -94,42 +94,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: MiniGL
 test_files:
-- test/game_object_tests.rb
-- test/vector_tests.rb
-- test/movement_tests.rb
 - test/res_tests.rb
 - test/iso_game.rb
 - test/mov_game.rb
 - test/map_tests.rb
 - test/game.rb
+- test/game_object_tests.rb
+- test/vector_tests.rb
+- test/movement_tests.rb
 - test/test.png
 - test/data/font/font1.ttf
 - test/data/img/square.svg
-- test/data/img/btn.png
-- test/data/img/square3.svg
-- test/data/img/image.png
-- test/data/img/tile2.svg
-- test/data/img/tile2.png
+- test/data/img/barbg.png
+- test/data/img/img1.png
 - test/data/img/tile1.png
-- test/data/img/check.png
-- test/data/img/barbg.svg
-- test/data/img/barfg.png
+- test/data/img/tile2b.png
+- test/data/img/text.png
+- test/data/img/btn.png
+- test/data/img/square2.svg
 - test/data/img/square2.png
-- test/data/img/square.png
+- test/data/img/barfg.png
 - test/data/img/tile1b.png
-- test/data/img/img1.png
+- test/data/img/tile2.png
+- test/data/img/check.png
+- test/data/img/tile2.svg
 - test/data/img/square3.png
+- test/data/img/square3.svg
+- test/data/img/image.png
 - test/data/img/tile1.svg
-- test/data/img/barbg.png
-- test/data/img/square2.svg
-- test/data/img/text.png
+- test/data/img/square.png
+- test/data/img/barbg.svg
 - test/data/img/barfg.svg
-- test/data/img/tile2b.png
-- test/data/sound/1.wav
 - test/data/tileset/tileset1.png
+- test/data/sound/1.wav
 - test/data/img/sub/image.png