minigl 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2641ae0e63c722a4ed3a8652c47d85b45b518ea3dc9c708c67012b37f99f5d
-  data.tar.gz: 124d39b866a2bc1d00bb38acfec0e0acbaba9033482cafc1bfdc29f19f47ea60
+  metadata.gz: db8b9de89a3372e81cfdef102808b9bbaec3fbd88a930c95cd5af2f946cb744d
+  data.tar.gz: d4fd66ee8e177e80fcbbe14808e4a8518a526fc6cec47d41adfc032da881750c
 SHA512:
-  metadata.gz: 7bddbbef6185945b823c49681c4c663198c176294059c6749c4ffd416841a3ed2c3765a7750d5b57aced798c87c54c065aba8e9549ae33c0c4b49d021a58d824
-  data.tar.gz: 66289bb1502ba721672ef45e597fc4100415167fb2285c22ae647862eb775680b162560e3d0ab815597924d2990ce45e85d1de85fd38d36a16f8891532bc5bf2
+  metadata.gz: c966227f4b6a7d020c5e07c601fc18d8ea6603f07f6d661bc92127ae1335b02118e71ed997c2f25fd1c9089ae0e4730d61d0395a82ef0c2e495025b25fd019c3
+  data.tar.gz: e603e887d2c595c61e16bdeee8fd1b928414cf895caa7f98dd69b2aed0cf7bf2eb2dd0d115a460b07797d19ce3dccfeafc825151935012c62bc94671fdd90f2d

data/README.md

@@ -29,9 +29,9 @@ 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.5
+## Version 2.3.6
 
-  * Updated Ruby and Gosu dependencies to support Ruby 3.0 and Gosu 1.1.
+  * Added inverted ramps (for sloped ceilings, still has some issues).
 
 ## Contributing
 

data/lib/minigl/movement.rb

@@ -66,6 +66,10 @@ module MiniGL
     # from left to right when +false+).
     attr_reader :left
 
+    # Whether the ramp is vertically inverted, i.e., the face that is parallel
+    # to the x-axis faces up and the sloped face faces down.
+    attr_reader :inverted
+
     attr_reader :ratio # :nodoc:
     attr_reader :factor # :nodoc:
 
@@ -85,12 +89,16 @@ module MiniGL
     #     highest).
     # [left] Whether the height of the ramp increases from left to right. Use
     #        +false+ for a ramp that goes down from left to right.
-    def initialize(x, y, w, h, left)
+    # [inverted] Whether the ramp is vertically inverted, i.e., the face that
+    #            is parallel to the x-axis faces up and the sloped face faces
+    #            down.
+    def initialize(x, y, w, h, left, inverted = false)
       @x = x
       @y = y
       @w = w
       @h = h
       @left = left
+      @inverted = inverted
       @ratio = @h.to_f / @w
       @factor = @w / Math.sqrt(@w**2 + @h**2)
     end
@@ -101,6 +109,7 @@ module MiniGL
     # [obj] The object to check contact with. It must have the +x+, +y+, +w+
     #       and +h+ accessible attributes determining its bounding box.
     def contact?(obj)
+      return false if @inverted
       obj.x + obj.w > @x && obj.x < @x + @w && obj.x.round(6) == get_x(obj).round(6) && obj.y.round(6) == get_y(obj).round(6)
     end
 
@@ -111,44 +120,44 @@ module MiniGL
     # [obj] The object to check intersection with. It must have the +x+, +y+,
     #       +w+ and +h+ accessible attributes determining its bounding box.
     def intersect?(obj)
-      obj.x + obj.w > @x && obj.x < @x + @w && obj.y > get_y(obj) && obj.y < @y + @h
+      obj.x + obj.w > @x && obj.x < @x + @w &&
+        (@inverted ? obj.y < get_y(obj) && obj.y + obj.h > @y : obj.y > get_y(obj) && obj.y < @y + @h)
     end
 
     # :nodoc:
     def check_can_collide(m)
-      y = get_y(m) + m.h
+      y = get_y(m) + (@inverted ? 0 : m.h)
       @can_collide = m.x + m.w > @x && @x + @w > m.x && m.y < y && m.y + m.h > y
     end
 
     def check_intersection(obj)
-      if @can_collide and intersect? obj
-        counter = @left && obj.prev_speed.x > 0 || !@left && obj.prev_speed.x < 0
-        if obj.prev_speed.y > 0 && counter
-          dx = get_x(obj) - obj.x
-          s = (obj.prev_speed.y.to_f / obj.prev_speed.x).abs
-          dx /= s + @ratio
-          obj.x += dx
-        end
-        obj.y = get_y obj
-        if counter && obj.bottom != self
-          obj.speed.x *= @factor
-        end
-        obj.speed.y = 0
+      return unless @can_collide && intersect?(obj)
+
+      counter = @left && obj.prev_speed.x > 0 || !@left && obj.prev_speed.x < 0
+      if counter && (@inverted ? obj.prev_speed.y < 0 : obj.prev_speed.y > 0)
+        dx = get_x(obj) - obj.x
+        s = (obj.prev_speed.y.to_f / obj.prev_speed.x).abs
+        dx /= s + @ratio
+        obj.x += dx
       end
+      if counter && obj.bottom != self
+        obj.speed.x *= @factor
+      end
+
+      obj.speed.y = 0
+      obj.y = get_y(obj)
     end
 
     def get_x(obj)
-      return obj.x if @left && obj.x + obj.w > @x + @w
-      return @x + (1.0 * (@y + @h - obj.y - obj.h) * @w / @h) - obj.w if @left
-      return obj.x if obj.x < @x
-      @x + (1.0 * (obj.y + obj.h - @y) * @w / @h)
+      return obj.x if @left && obj.x + obj.w > @x + @w || !@left && obj.x < @x
+      offset = (@inverted ? obj.y - @y : @y + @h - obj.y - obj.h).to_f * @w / @h
+      @left ? @x + offset - obj.w : @x + @w - offset
     end
 
     def get_y(obj)
-      return @y - obj.h if @left && obj.x + obj.w > @x + @w
-      return @y + (1.0 * (@x + @w - obj.x - obj.w) * @h / @w) - obj.h if @left
-      return @y - obj.h if obj.x < @x
-      @y + (1.0 * (obj.x - @x) * @h / @w) - obj.h
+      return @y + (@inverted ? @h : -obj.h) if @left && obj.x + obj.w > @x + @w || !@left && obj.x < @x
+      offset = (@left ? @x + @w - obj.x - obj.w : obj.x - @x).to_f * @h / @w
+      @inverted ? @y + @h - offset : @y + offset - obj.h
     end
   end
 
@@ -340,11 +349,6 @@ module MiniGL
       @x += @speed.x
       @y += @speed.y
 
-      # Keeping contact with ramp
-      # if @speed.y == 0 and @speed.x.abs <= G.ramp_contact_threshold and @bottom.is_a? Ramp
-      #   @y = @bottom.get_y(self)
-      #   puts 'aqui'
-      # end
       ramps.each do |r|
         r.check_intersection self
       end

data/test/mov_game.rb

@@ -13,7 +13,7 @@ class MyGame < GameWindow
       Block.new(0, 600, 800, 1, false),
       Block.new(-1, 0, 1, 600, false),
       Block.new(800, 0, 1, 600, false),
-      Block.new(300, 430, 50, 50),
+      Block.new(300, 430, 250, 50),
       # Block.new(375, 550, 50, 50, true),
       # Block.new(150, 200, 20, 300, false),
       # Block.new(220, 300, 100, 20, true),
@@ -26,6 +26,12 @@ class MyGame < GameWindow
       Ramp.new(500, 500, 150, 100, true),
       Ramp.new(650, 300, 150, 200, true),
       Ramp.new(650, 500, 150, 100, true),
+      Ramp.new(0, 100, 100, 100, false, true),
+      Ramp.new(100, 0, 150, 100, false, true),
+      Ramp.new(700, 100, 100, 100, true, true),
+      Ramp.new(550, 0, 150, 100, true, true),
+      # Ramp.new(250, 250, 75, 75, false, true),
+      Ramp.new(525, 250, 75, 200, true, true),
     ]
 
     # @cycle = [Vector.new(100, 530), Vector.new(650, 500)]
@@ -67,9 +73,9 @@ class MyGame < GameWindow
                 o.x, o.y + o.h, 0xffffffff, 0
     end
     @ramps.each do |r|
-      draw_triangle r.left ? r.x + r.w : r.x, r.y, 0xffffffff,
-                    r.x + r.w, r.y + r.h, 0xffffffff,
-                    r.x, r.y + r.h, 0xffffffff, 0
+      draw_triangle r.left ? r.x + r.w : r.x, r.inverted ? r.y + r.h : r.y, 0xffffffff,
+                    r.x + r.w, r.inverted ? r.y : r.y + r.h, 0xffffffff,
+                    r.x, r.inverted ? r.y : r.y + r.h, 0xffffffff, 0
     end
   end
 end

metadata

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