minigl 2.2.4 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5575ec51f8c440578ef76b9056ca136c4005996f7805c92786e28d40ea7c9e4b
-  data.tar.gz: 5c162f0097923b8cfac025a2a933f6f6432e7c6cd4a8e7b3a5cefd8f5b55c992
+  metadata.gz: 79bd9440a172b26f147083ef8bd486af9adcaded814bf84473535c24704f2ded
+  data.tar.gz: 667b535e408b7d3302e45c4b3d02fe5fa20d85c4e31b8af68eaa4f1023851a68
 SHA512:
-  metadata.gz: 41075c7445649d528d30fd6cf9801be78f8831bec10f2cf2515c9786a681959125f751e2d7d8d6550700ab86f3074a1df27a5ed7e47271dc5972304ea8e6800d
-  data.tar.gz: 2c4557739d0910a795bb41229c3d58e76116b8e46d5b8ba9a34d73d556eea51faef61931a10fe23e4f9ba0b72da79ccd938df4046ad5d66c6ae071530212c42f
+  metadata.gz: 6a26a33090716a53212cf084158ed623cb9d54e28407a990e8238f2784ca679a08d42908a03c23266836e830943afde4f5176f4d8946ba7302530f895d5b347a
+  data.tar.gz: e60f740c8eec1033d01adb79af11d2960e709bd5a0df1165949622a6ba43ce49e9dc8fcb8d7f6c0ba93bd550fad1382dbf2ed73187038162561489b01f206399

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,7 +29,11 @@ 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.4
+## Version 2.2.8
 
-  * Fixed components being updated in invisible `Panel`s.
-  * Clarified the documentation of the `Map` class.
+  * Add `stop_time` parameter to the `cycle` method of `Movement` (included in `GameObject`).
+
+## 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

@@ -100,10 +100,14 @@ module MiniGL
       @anim_counter += 1
       return unless @anim_counter >= interval
 
-      @index_index += 1
-      @img_index = indices[@index_index]
-      @anim_counter = 0
-      @animate_once_control = 2 if @index_index == indices.length - 1
+      if @index_index == indices.length - 1
+        @animate_once_control = 2
+        yield if block_given?
+      else
+        @index_index += 1
+        @img_index = indices[@index_index]
+        @anim_counter = 0
+      end
     end
 
     # Resets the animation timer and immediately changes the image index to

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/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
@@ -116,6 +120,11 @@ class MyGame < GameWindow
     @objs.each_with_index do |o, i|
       o.move_free(i * 45, 3)
     end
+
+    @obj3.animate_once([1, 2, 3, 4], 15) do
+      puts 'acabou'
+    end
+    @obj3.set_animation 0 if KB.key_pressed? Gosu::KB_0
   end
 
   def draw
@@ -140,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.4
+  version: 2.2.9
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2020-06-07 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