minigl 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda5e695d12ea20cd3a5a85554b55f8fd1bb29e7
-  data.tar.gz: f864987fbf4fe1a042a4a48191ac2b12625e4602
+  metadata.gz: 7634ee7a54cf6f5d281f87adc9b3de17d482a1a3
+  data.tar.gz: aaf44d14e4b36c3819fc3b4f942408458cda8ce9
 SHA512:
-  metadata.gz: c8850221370b6f6a77412059b6743a341adefbc5f91bbcffff09b24ce351eaa1782c3f1f440d2aba17cf1ed326710ea906a1cac6cac5ed81da79ec5cef188348
-  data.tar.gz: 2629a2fe8113011548014bfb651afb2b408e921d188a6ab2abd03c352a867000cf39f4f723a52d8cc24cbcf5d98c44c186b51e99b295bc67b19850d05bbfba6c
+  metadata.gz: 4bd3a5e2eab16ceba4f5e2123ff78a9b41a819f4e9982318b3ef8642c97a0b0e1605cb38d80ebff2ba78fa8b3933154b9240c64d63f5195376ca54f871320d9a
+  data.tar.gz: a07592a6a9b7ccc542dda21cdf2403d36ac46f2c045409f6b9ed3fd6467f36d3d4805ce68d5aad794c018fd7b2f8ce9c9c8021a9225220819a766da0c46b8cc3

data/README.md

@@ -32,29 +32,9 @@ examples provided with the gem.
   * An auxiliary, tutorial-like documentation is under construction
 [here](https://github.com/victords/minigl/wiki/How-To).
 
-## Version 2.0.3
-
-  * Flexibilization of various methods and constructors with named parameters.
-Please note I haven't used the "official" Ruby syntax for named parameters, but
-the "first parameter as hash" technique (in order to keep the positional call
-available), so you will need to be careful to include all the mandatory
-parameters in your hash, or you could face some strange errors (you can find out
-the mandatory parameters in the documentation). Here is the list of flexibilized
-methods:
-    * `GameWindow::new`
-    * `Sprite#draw`
-    * `GameObject#draw`
-    * `TextHelper#write_line`
-    * `Button::new`
-    * `ToggleButton::new`
-    * `TextField::new`
-    * `ProgressBar::new`
-    * `DropDownList::new`
-  * Flexibilization of `Mouse::over?` with the possibility of passing a single
-parameter (a `Rectangle` object) instead of four coordinates.
-  * Passing of the `set_animation` method from `GameObject` to `Sprite`, so the
-sprites also support it (`GameObject` still supports because it inherits from
-`Sprite`).
-  * Change of the parameter order in `TextHelper#write_line`, so that `alpha`
-comes right after `color`, and not after all the `effect_...` parameters. **This
-could generate incompatibility.**
+## Version 2.0.4
+
+  * Adjustment in the ramp physics.
+  * Adjustment in the `move_carrying` method (from `Movement`) to perform
+collision checking for the carried objects (and corresponding adjustment in the
+`cycle` method).

data/lib/minigl/movement.rb

@@ -235,7 +235,7 @@ module MiniGL
 
       if @bottom.is_a? Ramp
         if @bottom.ratio >= G.ramp_slip_threshold
-          forces.x = (@bottom.left ? -1 : 1) * G.ramp_slip_force
+          forces.x += (@bottom.left ? -1 : 1) * G.ramp_slip_force
         elsif forces.x > 0 && @bottom.left || forces.x < 0 && !@bottom.left
           forces.x *= @bottom.factor
         end
@@ -352,7 +352,13 @@ module MiniGL
     #             checking, and carried along when colliding from above.
     #             Obstacles must be instances of Block (or derived classes),
     #             or objects that <code>include Movement</code>.
-    def move_carrying(aim, speed, obstacles)
+    # [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(aim, speed, obstacles, obst_obstacles, obst_ramps)
       x_d = aim.x - @x; y_d = aim.y - @y
       distance = Math.sqrt(x_d**2 + y_d**2)
 
@@ -375,11 +381,10 @@ module MiniGL
         end
       end
 
+      prev_x = @x; prev_y = @y
       if @speed.x > 0 && x_aim >= aim.x || @speed.x < 0 && x_aim <= aim.x
-        passengers.each do |p| p.x += aim.x - @x end
         @x = aim.x; @speed.x = 0
       else
-        passengers.each do |p| p.x += @speed.x end
         @x = x_aim
       end
       if @speed.y > 0 && y_aim >= aim.y || @speed.y < 0 && y_aim <= aim.y
@@ -388,7 +393,24 @@ module MiniGL
         @y = y_aim
       end
 
-      passengers.each do |p| p.y = @y - p.h 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 }
+      end
+      G.gravity = prev_g
     end
 
     # Moves this object, without performing any collision checking, towards
@@ -440,10 +462,16 @@ module MiniGL
     #             checking, and carried along when colliding from above.
     #             Obstacles must be instances of Block (or derived classes),
     #             or objects that <code>include Movement</code>.
-    def cycle(points, speed, obstacles = nil)
+    # [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 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
+        move_carrying points[@cur_point], speed, obstacles, obst_obstacles, obst_ramps
       else
         move_free points[@cur_point], speed
       end

data/test/iso_game.rb

@@ -1,10 +1,9 @@
 require_relative '../lib/minigl'
 include MiniGL
 
-class MyGame < Gosu::Window
+class MyGame < GameWindow
   def initialize
     super 800, 600, false
-    GameWindow.initialize self
 
     @tile1 = Res.img :tile2
     @tile2 = Res.img :tile2b
@@ -31,7 +30,7 @@ class MyGame < Gosu::Window
 
   def draw
     @map.foreach do |i, j, x, y|
-      if i == @p.x and j == @p.y; @tile2.draw x, y, 0
+      if (i - @p.x).abs <= 1 and (j - @p.y).abs <= 1; @tile2.draw x, y, 0
       else; @tile1.draw x, y, 0; end
     end
   end

data/test/mov_game.rb

@@ -12,22 +12,25 @@ 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(375, 550, 50, 50, true),
       # Block.new(150, 200, 20, 300, false),
       # Block.new(220, 300, 100, 20, true),
       # Block.new(485, 490, 127, 10, false),
     ]
     @ramps = [
-      Ramp.new(200, 550, 200, 50, true),
-      Ramp.new(0, 200, 150, 300, false),
-      Ramp.new(150, 500, 150, 100, false),
-      Ramp.new(500, 500, 150, 100, true),
-      Ramp.new(650, 300, 150, 200, true),
+      # Ramp.new(200, 550, 200, 50, true),
+      # Ramp.new(0, 200, 150, 300, false),
+      # Ramp.new(150, 500, 150, 100, false),
+      # Ramp.new(500, 500, 150, 100, true),
+      # Ramp.new(650, 300, 150, 200, true),
       # Ramp.new(650, 500, 150, 100, true),
     ]
 
-    @cyc_obj = GameObject.new(0, 0, 50, 50, :square)
-    @cycle = [Vector.new(0, 0), Vector.new(430, 107), Vector.new(265, 324)]
+    @cycle = [Vector.new(100, 530), Vector.new(650, 500)]
+    @cyc_obj = GameObject.new(@cycle[0].x, @cycle[0].y, 50, 50, :square)
+    @cyc_obj.instance_eval('@passable = true')
+    @obsts.push @cyc_obj
   end
 
   def update
@@ -49,7 +52,7 @@ class MyGame < GameWindow
     end
     @obj.move(forces, @obsts, @ramps)
     # puts @obj.x
-    @cyc_obj.cycle(@cycle, 5, [@obj])
+    @cyc_obj.cycle(@cycle, 5, [@obj], @obsts, @ramps)
     # puts @obj.bottom
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: A minimal 2D Game Library built on top of the Gosu gem.
@@ -84,52 +84,52 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: MiniGL
 test_files:
-- test/vector_tests.rb
-- test/movement_tests.rb
 - test/map_tests.rb
-- test/game.rb
+- test/movement_tests.rb
 - test/iso_game.rb
-- test/res_tests.rb
 - test/game_object_tests.rb
+- test/game.rb
+- test/vector_tests.rb
 - test/mov_game.rb
+- test/res_tests.rb
 - test/test.png
-- test/data/tileset/tileset1.png
-- test/data/img/barfg.png
-- test/data/img/tile2b.png
-- test/data/img/barfgr.svg
+- test/data/img/image.png
+- test/data/img/barfg.svg
+- test/data/img/img1.png
+- test/data/img/tile2.png
 - test/data/img/barfgl.svg
-- test/data/img/tile1.png
-- test/data/img/barfgl.png
-- test/data/img/btn.png
-- test/data/img/barfgr.png
 - test/data/img/square.png
 - test/data/img/tile1b.png
-- test/data/img/text.png
-- test/data/img/img1.png
+- test/data/img/btn.png
+- test/data/img/barfg.png
 - test/data/img/square.svg
-- test/data/img/barbg.svg
-- test/data/img/tile1.svg
-- test/data/img/image.png
-- test/data/img/check.png
 - test/data/img/tile2.svg
-- test/data/img/barfg.svg
+- test/data/img/check.png
+- test/data/img/tile2b.png
+- test/data/img/barbg.svg
 - test/data/img/barbg.png
-- test/data/img/tile2.png
-- test/data/sound/1.wav
+- test/data/img/tile1.png
+- test/data/img/barfgr.png
+- test/data/img/barfgl.png
+- test/data/img/barfgr.svg
+- test/data/img/text.png
+- test/data/img/tile1.svg
 - test/data/font/font1.ttf
+- test/data/tileset/tileset1.png
+- test/data/sound/1.wav
 - test/data/img/sub/image.png