minigl 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a470da63cb5c4c17b9d980b5dd01523813c0f1
-  data.tar.gz: 09b1aa58f421e06a697208b872a103663ff8f0f5
+  metadata.gz: ba735bed35dcb47ec7023231533a5f02abde38fe
+  data.tar.gz: 3fa15e9e6eed7895295f3e610a7319e8094276e9
 SHA512:
-  metadata.gz: 3d006bec2dd92ea67a2b21f6509c9f7a104ca7055592862f2f0173124f59edaeb03e2ca8efc1dadc6801758a9cdabb5ece287c1c50754f7a34a88be82c2b0fc4
-  data.tar.gz: 5664c64facfa2d3b3f670e1542ae380734fafab5d6b0f0d3b4e76a6b66da81a97859cd21e812ed17e6fc60880de360af0e86a2e23006526e9d4f05d44efb37b9
+  metadata.gz: 7e95d7e26cb0b7d1594a874f62de328c34364186bc30615091d811386e40143bcd47329b3dcb831faf475ef5f45567f975294b52505745f9a006302c1ce2e1fd
+  data.tar.gz: 38ea70665e7bf11dc36dc1c1ba4bc21808280382fc9a04a1510946cf3b2fc01cac88a8810f328046533d7f8fdc636cd90897fe5aaeb4ebd60d0177a99bb028ec

data/README.md

@@ -21,22 +21,16 @@ compiling extensions. Visit
 [this page](https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux) for
 details.
 
-After installing the gosu dependencies, you can just `gem install minigl`.
+After installing the Gosu dependencies, you can just `gem install minigl`.
 
-Please note:
+## Documentation
 
-  * The test package is not complete! Most of the functionality
-provided by the gem is difficult to test automatically, but you can check the
-examples provided with the gem.
-  * The library is 100% RDoc-documented.
-  * An auxiliary, tutorial-like documentation is under construction
-[here](https://github.com/victords/minigl/wiki/How-To).
+  * The library is 100% RDoc-documented [here](http://www.rubydoc.info/gems/minigl/2.0.5).
+  * 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.0.5
+## Version 2.0.6
 
-  * Further refined the ramp physics.
-  * Flexibilized the `move_free` method with the possibility of passing an angle
-as argument, instead of a point.
-  * Added `on_changed` event for the `DropDownList` control.
-  * Adjusted `draw` in `Sprite` and `GameObject` so that, when drawing objects
-rotated or not rotated, the origin of the image is consistent.
+  * Fixed the `draw` method of `GameObject` when using both scale and flip.
+  * Flexibilized the `move_carrying` method from `Movement` with the possibility
+of specifying a forces vector instead of an aim and fixed speed.

data/lib/minigl/game_object.rb

@@ -215,13 +215,13 @@ module MiniGL
 
       color = (alpha << 24) | color
       if angle
-        @img[@img_index].draw_rot @x + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + @img[0].width * scale_x * 0.5,
-                                  @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + @img[0].height * scale_y * 0.5,
+        @img[@img_index].draw_rot @x + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + @w * 0.5,
+                                  @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + @h * 0.5,
                                   z_index, angle, 0.5, 0.5, (flip == :horiz ? -scale_x : scale_x),
                                   (flip == :vert ? -scale_y : scale_y), color
       else
-        @img[@img_index].draw @x + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @w : 0),
-                              @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @h : 0),
+        @img[@img_index].draw @x + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + (flip == :horiz ? @w : 0),
+                              @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? @h : 0),
                               z_index, (flip == :horiz ? -scale_x : scale_x),
                               (flip == :vert ? -scale_y : scale_y), color
       end

data/lib/minigl/movement.rb

@@ -342,12 +342,14 @@ module MiniGL
     end
 
     # Moves this object as an elevator (i.e., potentially carrying other
-    # objects) towards a given point.
+    # objects) with the specified forces or towards a given point.
     #
     # Parameters:
-    # [aim] A Vector specifying where the object will move to.
-    # [speed] The constant speed at which the object will move. This must be
-    #         provided as a scalar, not a vector.
+    # [arg] A Vector specifying either the forces acting on this object or a
+    #       point towards the object should move.
+    # [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),
@@ -358,17 +360,26 @@ 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 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)
+    def move_carrying(arg, speed, obstacles, obst_obstacles, obst_ramps)
+      if speed
+        x_d = arg.x - @x; y_d = arg.y - @y
+        distance = Math.sqrt(x_d**2 + y_d**2)
 
-      if distance == 0
-        @speed.x = @speed.y = 0
-        return
-      end
+        if distance == 0
+          @speed.x = @speed.y = 0
+          return
+        end
 
-      @speed.x = 1.0 * x_d * speed / distance
-      @speed.y = 1.0 * y_d * speed / distance
+        @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
+      end
 
       x_aim = @x + @speed.x; y_aim = @y + @speed.y
       passengers = []
@@ -382,15 +393,19 @@ module MiniGL
       end
 
       prev_x = @x; prev_y = @y
-      if @speed.x > 0 && x_aim >= aim.x || @speed.x < 0 && x_aim <= aim.x
-        @x = aim.x; @speed.x = 0
-      else
-        @x = x_aim
-      end
-      if @speed.y > 0 && y_aim >= aim.y || @speed.y < 0 && y_aim <= aim.y
-        @y = aim.y; @speed.y = 0
+      if speed
+        if @speed.x > 0 && x_aim >= arg.x || @speed.x < 0 && x_aim <= arg.x
+          @x = arg.x; @speed.x = 0
+        else
+          @x = x_aim
+        end
+        if @speed.y > 0 && y_aim >= arg.y || @speed.y < 0 && y_aim <= arg.y
+          @y = arg.y; @speed.y = 0
+        else
+          @y = y_aim
+        end
       else
-        @y = y_aim
+        @x = x_aim; @y = y_aim
       end
 
       forces = Vector.new @x - prev_x, @y - prev_y

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -90,38 +90,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: MiniGL
 test_files:
-- test/map_tests.rb
-- test/movement_tests.rb
-- test/iso_game.rb
+- test/mov_game.rb
 - test/game_object_tests.rb
 - test/game.rb
+- test/iso_game.rb
 - test/vector_tests.rb
-- test/mov_game.rb
+- test/map_tests.rb
+- test/movement_tests.rb
 - test/res_tests.rb
 - test/test.png
-- test/data/img/image.png
-- test/data/img/barfg.svg
-- test/data/img/img1.png
+- test/data/tileset/tileset1.png
+- test/data/font/font1.ttf
+- test/data/sound/1.wav
+- test/data/img/check.png
 - test/data/img/tile2.png
-- test/data/img/square.png
+- test/data/img/image.png
+- test/data/img/tile1.png
 - test/data/img/tile1b.png
+- test/data/img/barbg.svg
+- test/data/img/text.png
 - test/data/img/btn.png
+- test/data/img/barfg.svg
+- test/data/img/square.png
+- test/data/img/tile1.svg
+- test/data/img/barbg.png
+- test/data/img/img1.png
 - test/data/img/barfg.png
-- test/data/img/square.svg
 - test/data/img/tile2.svg
-- test/data/img/check.png
+- test/data/img/square.svg
 - test/data/img/tile2b.png
-- test/data/img/barbg.svg
-- test/data/img/barbg.png
-- test/data/img/tile1.png
-- 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