minigl 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0de5c7f62aa915f3f4b27bb395d9521f93f21e855192da3e0ae7e9de90b91b6
-  data.tar.gz: 1f771f1c1281032ed119d3f4717bbd181c838b124b666df6c70b1e130b298ef3
+  metadata.gz: 46eaeb260b03c9bcfbac716d7568b01c081d66760d71dc540ca9046050f7d89d
+  data.tar.gz: 3de3cd79bd21324af047f1705d641374e92c986ec0f02badf0a5fd9206f228e8
 SHA512:
-  metadata.gz: 745596ac394298301ef9cb3d9490aa447931a160de16505634715c888ac31d267b6b059120b15cb48d6ef7f792f889dde07bb0b5c0e41af44204c72232cc6dd0
-  data.tar.gz: 8306f0e0f22122ccd0e7df3ccf318539132b96028aee6f724ff355a9fc2fb63245f1aed8650e3bfdc9910b3868595c7a05719b04578d04034874b3ba32e8e601
+  metadata.gz: 33675d555bd833c359f548bff9c16ef95da819ecc084ecbc657c60016d5e3d18255cd19da03252b212e53bb8600a5a0c4c9f4ab4893261377a7f4f20a03d991b
+  data.tar.gz: 3f9ed35d874c81bca4544a42c7f6106c0f3b26ba69bf5bfcba59f201297588be32aa6a2f697f2ea4ffde846e8f46fd2d42c5bc68142ec925cf9f8cd6bc5542cf

data/README.md

@@ -42,12 +42,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.4.1
+## Version 2.4.3
 
-  * Expose `Sprite`'s `img` attribute.
-  * Fix `Effect#draw`'s `z_index` parameter.
+  * Fixed a collision checking bug in `Movement#move`.
 
 ## 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
+Also, you can support my work by purchasing any of my games on [itch.io](https://victords.itch.io) or [Super Bombinhas on Steam](https://store.steampowered.com/app/1553840).

data/lib/minigl/forms.rb

@@ -365,7 +365,7 @@ module MiniGL
         elsif mouse_rel
           @img_index = 1
           @state = :over
-          Mouse.add_click(@z_index || 0, method(:perform_action))
+          enqueue_action
         else
           @img_index = 2
         end
@@ -444,6 +444,10 @@ module MiniGL
 
     private
 
+    def enqueue_action
+      Mouse.add_click(@z_index || 0, method(:perform_action))
+    end
+
     def perform_action
       @action.call(@params) if @action
     end
@@ -524,7 +528,7 @@ module MiniGL
 
       super
       @img_index *= 2
-      @img_index += 1 if @checked
+      @img_index += 1 if @checked && !@toggling || !@checked && @toggling
     end
 
     # Sets the state of the button to the value given.
@@ -544,8 +548,14 @@ module MiniGL
 
     private
 
+    def enqueue_action
+      super
+      @toggling = true
+    end
+
     def perform_action
       @checked = !@checked
+      @toggling = false
       @action.call(@checked, @params) if @action
     end
   end
@@ -720,7 +730,7 @@ module MiniGL
         end
         set_cursor_visible
       elsif Mouse.button_pressed? :left
-        Mouse.add_click(@z_index || 0, method(:focus))
+        Mouse.add_click(@z_index || 0, method(:focus_and_set_anchor))
       elsif Mouse.button_down? :left
         if @anchor1 and not @double_clicked
           set_node_by_mouse
@@ -912,7 +922,6 @@ module MiniGL
     def focus
       @focused = true
       set_node_by_mouse
-      @anchor1 = @cur_node
       @anchor2 = nil
       @double_clicked = false
       set_cursor_visible
@@ -996,6 +1005,11 @@ module MiniGL
 
   private
 
+    def focus_and_set_anchor
+      focus
+      @anchor1 = @cur_node
+    end
+
     def set_cursor_visible
       @cursor_visible = true
       @cursor_timer = 0

data/lib/minigl/game_object.rb

@@ -271,18 +271,20 @@ module MiniGL
       end
 
       color = (alpha << 24) | color
+      img_gap_scale_x = scale_image_gap? ? scale_x : 1
+      img_gap_scale_y = scale_image_gap? ? scale_y : 1
       if angle
         center_x = @x + @w * 0.5
         center_y = @y + @h * 0.5
-        o_x = center_x - @x - @img_gap.x
-        o_y = center_y - @y - @img_gap.y
-        @img[@img_index].draw_rot @x + (flip == :horiz ? -1 : 1) * (@img_gap.x + o_x) - (map ? map.cam.x : 0),
-                                  @y + (flip == :vert ? -1 : 1) * (@img_gap.y + o_y) - (map ? map.cam.y : 0),
+        o_x = center_x - @x - @img_gap.x * img_gap_scale_x
+        o_y = center_y - @y - @img_gap.y * img_gap_scale_y
+        @img[@img_index].draw_rot @x + (flip == :horiz ? -1 : 1) * (@img_gap.x * img_gap_scale_x + o_x) - (map ? map.cam.x : 0),
+                                  @y + (flip == :vert ? -1 : 1) * (@img_gap.y * img_gap_scale_y + o_y) - (map ? map.cam.y : 0),
                                   z_index, angle, o_x.to_f / (@img[0].width * scale_x), o_y.to_f / (@img[0].height * scale_y),
                                   (flip == :horiz ? -scale_x : scale_x), (flip == :vert ? -scale_y : scale_y), color
       else
-        x = @x + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + (flip == :horiz ? @w : 0)
-        y = @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? @h : 0)
+        x = @x + (flip == :horiz ? -1 : 1) * @img_gap.x * img_gap_scale_x - (map ? map.cam.x : 0) + (flip == :horiz ? @w : 0)
+        y = @y + (flip == :vert ? -1 : 1) * @img_gap.y * img_gap_scale_y - (map ? map.cam.y : 0) + (flip == :vert ? @h : 0)
         @img[@img_index].draw (round ? x.round : x), (round ? y.round : y),
                               z_index, (flip == :horiz ? -scale_x : scale_x),
                               (flip == :vert ? -scale_y : scale_y), color
@@ -297,6 +299,12 @@ module MiniGL
       return Rectangle.new(0, 0, G.window.width, G.window.height).intersect? r if map.nil?
       map.cam.intersect? r
     end
+
+    # override this if you don't want the image_gap to be scaled when drawing
+    # the object scaled.
+    def scale_image_gap?
+      true
+    end
   end
 
   # Represents a visual effect, i.e., a graphic - usually animated - that shows

data/lib/minigl/movement.rb

@@ -40,6 +40,10 @@ module MiniGL
     def bounds
       Rectangle.new @x, @y, @w, @h
     end
+
+    def to_s
+      "Block(#{@x}, #{@y}, #{@w}, #{@h}#{@passable ? ", passable" : ''})"
+    end
   end
 
   # Represents a ramp, i.e., an inclined structure which allows walking over
@@ -301,48 +305,28 @@ module MiniGL
           end
         else
           # Diagonal
-          x_aim = @x + @speed.x + (rt ? @w : 0); x_lim_def = x_aim
-          y_aim = @y + @speed.y + (dn ? @h : 0); y_lim_def = y_aim
+          x_aim = @x + @speed.x + (rt ? @w : 0); x_lim_def = [x_aim, nil]
+          y_aim = @y + @speed.y + (dn ? @h : 0); y_lim_def = [y_aim, nil]
           coll_list.each do |c|
-            if c.passable; x_lim = x_aim
-            elsif rt; x_lim = c.x
-            else; x_lim = c.x + c.w
-            end
-            if dn; y_lim = c.y
-            elsif c.passable; y_lim = y_aim
-            else; y_lim = c.y + c.h
-            end
+            find_limits(c, x_aim, y_aim, x_lim_def, y_lim_def, up, rt, dn, lf)
+          end
 
-            if c.passable
-              y_lim_def = y_lim if dn && @y + @h <= y_lim && y_lim < y_lim_def
-            elsif (rt && @x + @w > x_lim) || (lf && @x < x_lim)
-              # Can't limit by x, will limit by y
-              y_lim_def = y_lim if (dn && y_lim < y_lim_def) || (up && y_lim > y_lim_def)
-            elsif (dn && @y + @h > y_lim) || (up && @y < y_lim)
-              # Can't limit by y, will limit by x
-              x_lim_def = x_lim if (rt && x_lim < x_lim_def) || (lf && x_lim > x_lim_def)
+          if x_lim_def[0] != x_aim && y_lim_def[0] != y_aim
+            x_time = (x_lim_def[0] - @x - (lf ? 0 : @w)).to_f / @speed.x
+            y_time = (y_lim_def[0] - @y - (up ? 0 : @h)).to_f / @speed.y
+            if x_time < y_time
+              stop_at_x(x_lim_def[0], lf)
+              move_bounds = Rectangle.new(@x, up ? @y + @speed.y : @y, @w, @h + @speed.y.abs)
+              stop_at_y(y_lim_def[0], up) if move_bounds.intersect?(y_lim_def[1].bounds)
             else
-              x_time = 1.0 * (x_lim - @x - (@speed.x < 0 ? 0 : @w)) / @speed.x
-              y_time = 1.0 * (y_lim - @y - (@speed.y < 0 ? 0 : @h)) / @speed.y
-              if x_time > y_time
-                # Will limit by x
-                x_lim_def = x_lim if (rt && x_lim < x_lim_def) || (lf && x_lim > x_lim_def)
-              elsif (dn && y_lim < y_lim_def) || (up && y_lim > y_lim_def)
-                y_lim_def = y_lim
-              end
-            end
-          end
-          if x_lim_def != x_aim
-            @speed.x = 0
-            if lf; @x = x_lim_def
-            else; @x = x_lim_def - @w
-            end
-          end
-          if y_lim_def != y_aim
-            @speed.y = 0
-            if up; @y = y_lim_def
-            else; @y = y_lim_def - @h
+              stop_at_y(y_lim_def[0], up)
+              move_bounds = Rectangle.new(lf ? @x + @speed.x : @x, @y, @w + @speed.x.abs, @h)
+              stop_at_x(x_lim_def[0], lf) if move_bounds.intersect?(x_lim_def[1].bounds)
             end
+          elsif x_lim_def[0] != x_aim
+            stop_at_x(x_lim_def[0], lf)
+          elsif y_lim_def[0] != y_aim
+            stop_at_y(y_lim_def[0], up)
           end
         end
       end
@@ -606,5 +590,68 @@ module MiniGL
       end
       limit
     end
+
+    def find_limits(obj, x_aim, y_aim, x_lim_def, y_lim_def, up, rt, dn, lf)
+      x_lim =
+        if obj.passable
+          x_aim
+        elsif rt
+          obj.x
+        else
+          obj.x + obj.w
+        end
+
+      y_lim =
+        if dn
+          obj.y
+        elsif obj.passable
+          y_aim
+        else
+          obj.y + obj.h
+        end
+
+      x_v = x_lim_def[0]; y_v = y_lim_def[0]
+      if obj.passable
+        if dn && @y + @h <= y_lim && y_lim < y_v
+          y_lim_def[0] = y_lim
+          y_lim_def[1] = obj
+        end
+      elsif (rt && @x + @w > x_lim) || (lf && @x < x_lim)
+        # Can't limit by x, will limit by y
+        if (dn && y_lim < y_v) || (up && y_lim > y_v)
+          y_lim_def[0] = y_lim
+          y_lim_def[1] = obj
+        end
+      elsif (dn && @y + @h > y_lim) || (up && @y < y_lim)
+        # Can't limit by y, will limit by x
+        if (rt && x_lim < x_v) || (lf && x_lim > x_v)
+          x_lim_def[0] = x_lim
+          x_lim_def[1] = obj
+        end
+      else
+        x_time = (x_lim - @x - (lf ? 0 : @w)).to_f / @speed.x
+        y_time = (y_lim - @y - (up ? 0 : @h)).to_f / @speed.y
+        if x_time > y_time
+          # Will limit by x
+          if (rt && x_lim < x_v) || (lf && x_lim > x_v)
+            x_lim_def[0] = x_lim
+            x_lim_def[1] = obj
+          end
+        elsif (dn && y_lim < y_v) || (up && y_lim > y_v)
+          y_lim_def[0] = y_lim
+          y_lim_def[1] = obj
+        end
+      end
+    end
+
+    def stop_at_x(x, moving_left)
+      @speed.x = 0
+      @x = moving_left ? x : x - @w
+    end
+
+    def stop_at_y(y, moving_up)
+      @speed.y = 0
+      @y = moving_up ? y : y - @h
+    end
   end
 end

data/test/collision.rb

@@ -0,0 +1,49 @@
+require_relative '../lib/minigl'
+
+include MiniGL
+
+class CollisionTest < GameWindow
+  def initialize
+    super(300, 300, false)
+
+    @object = GameObject.new(0, 150, 50, 50, :img1)
+    @object.max_speed.x = @object.max_speed.y = 1000
+    @blocks = [
+      Block.new(0, 0, 100, 100),
+      Block.new(100, 0, 100, 100),
+      Block.new(200, 100, 100, 100),
+      Block.new(200, 200, 100, 100),
+    ]
+  end
+
+  def update
+    KB.update
+
+    forces = Vector.new
+    if KB.key_pressed?(Gosu::KB_Z)
+      @object.x = 0
+      @object.y = 150
+    end
+    forces = Vector.new(60, -100) if KB.key_pressed?(Gosu::KB_X)
+    if KB.key_pressed?(Gosu::KB_C)
+      @object.x = 100
+      @object.y = 250
+    end
+    forces = Vector.new(100, -60) if KB.key_pressed?(Gosu::KB_V)
+    if KB.key_pressed?(Gosu::KB_B)
+      @object.x = 100
+      @object.y = 150
+    end
+
+    @object.move(forces, @blocks, [], true)
+  end
+
+  def draw
+    @blocks.each_with_index do |block, i|
+      draw_rect(block.x, block.y, block.w, block.h, i.even? ? 0xffffffff : 0xffcccccc)
+    end
+    draw_rect(@object.x, @object.y, @object.w, @object.h, 0xffffffff)
+  end
+end
+
+CollisionTest.new.show

data/test/game.rb

@@ -6,7 +6,7 @@ class MyGame < GameWindow
     super 800, 600, false
 
     # @img = Res.img :img1
-    @obj1 = GameObject.new 75, 75, 60, 60, :square3, Vector.new(-75, -75)
+    @obj1 = GameObject.new 75, 75, 40, 40, :square3, Vector.new(-50, -50)
     @obj2 = Sprite.new 400, 0, :img1
     @obj3 = GameObject.new 4, 50, 24, 24, :check, Vector.new(-4, -4), 2, 4
     @obj3.set_animation 1
@@ -137,7 +137,7 @@ class MyGame < GameWindow
     clear 0xabcdef
 
     # @img.draw_rot 400, 100, 0, @angle, 1, 1
-    @obj1.draw color: 0x33ff33, angle: (@angle == 0 ? nil : @angle), scale_x: 1.5, scale_y: 1.5
+    @obj1.draw color: 0x33ff33, angle: (@angle == 0 ? nil : @angle), scale_x: 1.5
     @obj2.draw angle: (@angle == 0 ? nil : @angle), scale_x: 0.5, scale_y: 1.4
     @obj3.draw flip: @flip
     @obj4.draw round: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -47,6 +47,7 @@ files:
 - lib/minigl/map.rb
 - lib/minigl/movement.rb
 - lib/minigl/text.rb
+- test/collision.rb
 - test/data/font/font1.ttf
 - test/data/img/barbg.png
 - test/data/img/barbg.svg
@@ -108,6 +109,7 @@ signing_key:
 specification_version: 4
 summary: MiniGL
 test_files:
+- test/collision.rb
 - test/game.rb
 - test/game_object_tests.rb
 - test/iso_game.rb