minigl 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b03d2bc58b9642caa459346389f4d8a9368bdf
-  data.tar.gz: a16bbf130daa7014e576450145ab8acd8db57aea
+  metadata.gz: 73063e68c52aec583e98389abe3d1334e8a33858
+  data.tar.gz: 511d49a8cf23a537c0abf4ca2b35f5e290b11bc7
 SHA512:
-  metadata.gz: 7c5ca7adb1c4b297affa552ed1a7e1f7fc723c47e09172363e1049b0fb625247c1efd95d3961433fda7675ce9a8add42bc75c41decf930d1e6fdd01d2a892e13
-  data.tar.gz: 0400e96968260c4a45791ed85b9e37659f6bfcf0d267919b1fabd61e0bc222d5a1622f58395a2f6ecbb9428fb56274a47223c5a61ae5bb6a93f5a36746c27d44
+  metadata.gz: 28646ae5580a7df1b0a7488e2c227068c20c692614a385903040a16573451ebe891e1e222a5292db9fddac2a342a3bf398c10efb687584ef21781214953a95c4
+  data.tar.gz: 8183695054e721eca9f52ccc4962348983a9e0964cafb430cffe3c2303377216ccc81383a43c035d76b70a70ac59bd48aa18b97a11c10af2e727ab4ce75beed5

data/README.md

@@ -32,16 +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.0**
+**Version 2.0.1**
 
-MiniGL 2.0.0 is finally released!
-
-It brings new features, improvements to existing features and some bug fixes.
-For details on what has changed, visit
-[the changelog](https://github.com/victords/minigl/wiki/Changelog-(2.0.0)).
-
-As the semantic versioning implies, **this version is incompatible with the 1.x
-series**, so you'll need to adjust your code a little if you wish to upgrade.
-
-A new tutorial has to be built, because there have been some changes even in the
-basics of the usage. So please be patient while it doesn't come out!
+  * Adjustment in the ramp slip system. Parameterized the force applied by steep
+ramps (`G.ramp_slip_force`).
+  * Adjustment in the methods that change the prefix and directories used by
+`Res`, allowing empty prefixes/directory names.

data/lib/minigl/forms.rb

@@ -813,7 +813,7 @@ module MiniGL
         @fg_color = fg
       else # String or Symbol
         @fg = Res.img fg
-        @fg_path = "#{Res.prefix}img/#{fg.to_s.gsub('_', '/')}.png"
+        @fg_path = "#{Res.prefix}#{Res.img_dir}#{fg.to_s.gsub(Res.separator, '/')}.png"
         puts @fg_path
       end
       @fg_margin_x = fg_margin_x

data/lib/minigl/global.rb

@@ -142,6 +142,10 @@ module MiniGL
       # <code>GameWindow#initialize</code> for details.
       attr_accessor :ramp_slip_threshold
 
+      # Gets or sets the value of ramp_slip_force. See
+      # <code>GameWindow#initialize</code> for details.
+      attr_accessor :ramp_slip_force
+
       # Gets or sets the value of kb_held_delay. See
       # <code>GameWindow#initialize</code> for details.
       attr_accessor :kb_held_delay
@@ -178,6 +182,8 @@ module MiniGL
     # [ramp_slip_threshold] The maximum ratio between height and width of a ramp
     #                       above which the objects will always slip down when
     #                       trying to 'climb' that ramp.
+    # [ramp_slip_force] The force that will be applied in the horizontal
+    #                   direction when the object is slipping from a steep ramp.
     # [kb_held_delay] The number of frames a key must be held by the user
     #                 before the "held" event (that can be checked with
     #                 <code>KB.key_held?</code>) starts to trigger.
@@ -189,7 +195,7 @@ module MiniGL
     #                      (checked with <code>Mouse.double_click?</code>).
     def initialize(scr_w, scr_h, fullscreen = true,
                    gravity = Vector.new(0, 1), min_speed = Vector.new(0.01, 0.01),
-                   ramp_contact_threshold = 10, ramp_slip_threshold = 1.2,
+                   ramp_contact_threshold = 4, ramp_slip_threshold = 1.2, ramp_slip_force = 0.1,
                    kb_held_delay = 40, kb_held_interval = 5, double_click_delay = 8)
       super scr_w, scr_h, fullscreen
       G.window = self
@@ -197,6 +203,7 @@ module MiniGL
       G.min_speed = min_speed
       G.ramp_contact_threshold = ramp_contact_threshold
       G.ramp_slip_threshold = ramp_slip_threshold
+      G.ramp_slip_force = ramp_slip_force
       G.kb_held_delay = kb_held_delay
       G.kb_held_interval = kb_held_interval
       G.double_click_delay = double_click_delay
@@ -501,37 +508,37 @@ module MiniGL
       # directory of the game script. The prefix is the directory under which
       # 'img', 'sound', 'song', etc. folders are located.
       def prefix=(value)
-        value += '/' if value[-1] != '/'
+        value += '/' if value != '' and value[-1] != '/'
         @prefix = value
       end
 
       # Sets the path to image files (under +prefix+). Default is 'img'.
       def img_dir=(value)
-        value += '/' if value[-1] != '/'
+        value += '/' if value != '' and value[-1] != '/'
         @img_dir = value
       end
 
       # Sets the path to tilset files (under +prefix+). Default is 'tileset'.
       def tileset_dir=(value)
-        value += '/' if value[-1] != '/'
+        value += '/' if value != '' and value[-1] != '/'
         @tileset_dir = value
       end
 
       # Sets the path to sound files (under +prefix+). Default is 'sound'.
       def sound_dir=(value)
-        value += '/' if value[-1] != '/'
+        value += '/' if value != '' and value[-1] != '/'
         @sound_dir = value
       end
 
       # Sets the path to song files (under +prefix+). Default is 'song'.
       def song_dir=(value)
-        value += '/' if value[-1] != '/'
+        value += '/' if value != '' and value[-1] != '/'
         @song_dir = value
       end
 
       # Sets the path to font files (under +prefix+). Default is 'font'.
       def font_dir=(value)
-        value += '/' if value[-1] != '/'
+        value += '/' if value != '' and value[-1] != '/'
         @font_dir = value
       end
 

data/lib/minigl/movement.rb

@@ -67,6 +67,7 @@ module MiniGL
     attr_reader :left
 
     attr_reader :ratio # :nodoc:
+    attr_reader :factor # :nodoc:
 
     # Creates a new ramp.
     #
@@ -91,7 +92,7 @@ module MiniGL
       @h = h
       @left = left
       @ratio = @h.to_f / @w
-      @factor = Math.cos(@w / Math.sqrt(@w**2 + @h**2))
+      @factor = @w / Math.sqrt(@w**2 + @h**2)
     end
 
     # Checks if an object is in contact with this ramp (standing over it).
@@ -129,7 +130,7 @@ module MiniGL
           obj.x += dx
         end
         obj.y = get_y obj
-        if counter
+        if counter && obj.bottom != self
           obj.speed.x *= @factor
         end
         obj.speed.y = 0
@@ -232,8 +233,12 @@ module MiniGL
       forces.x = 0 if (forces.x < 0 and @left) or (forces.x > 0 and @right)
       forces.y = 0 if (forces.y < 0 and @top) or (forces.y > 0 and @bottom)
 
-      if @bottom.is_a? Ramp and @bottom.ratio >= G.ramp_slip_threshold
-        forces.x = (@bottom.left ? -1 : 1) * 0.1
+      if @bottom.is_a? Ramp
+        if @bottom.ratio >= G.ramp_slip_threshold
+          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
       end
 
       @speed.x += forces.x / @mass; @speed.y += forces.y / @mass

data/test/mov_game.rb

@@ -18,11 +18,12 @@ class MyGame < GameWindow
       # Block.new(485, 490, 127, 10, false),
     ]
     @ramps = [
-      # Ramp.new(200, 550, 200, 50, true),
-      Ramp.new(0, 300, 150, 200, false),
+      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)

data/test/res_tests.rb

@@ -24,14 +24,22 @@ class ResTest < Test::Unit::TestCase
     assert_nothing_raised do
       img1 = Res.img :img1
     end
+
     Res.img_dir = 'img/sub'
     assert_nothing_raised do
       img2 = Res.img :image
     end
+
     Res.img_dir = 'img'
     Res.separator = '~'
     assert_nothing_raised do
       img3 = Res.img 'sub~image'
     end
+
+    Res.prefix = File.expand_path(File.dirname(__FILE__))
+    Res.img_dir = ''
+    assert_nothing_raised do
+      img4 = Res.img :test
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -55,6 +55,7 @@ files:
 - test/data/img/img1.png
 - test/data/img/square.png
 - test/data/img/square.svg
+- test/data/img/sub/image.png
 - test/data/img/text.png
 - test/data/img/tile1.png
 - test/data/img/tile1.svg
@@ -71,6 +72,7 @@ files:
 - test/mov_game.rb
 - test/movement_tests.rb
 - test/res_tests.rb
+- test/test.png
 - test/vector_tests.rb
 homepage: https://github.com/victords/minigl
 licenses:
@@ -105,6 +107,7 @@ test_files:
 - test/res_tests.rb
 - test/game_object_tests.rb
 - test/mov_game.rb
+- test/test.png
 - test/data/tileset/tileset1.png
 - test/data/img/barfg.png
 - test/data/img/tile2b.png
@@ -129,3 +132,4 @@ test_files:
 - test/data/img/tile2.png
 - test/data/sound/1.wav
 - test/data/font/font1.ttf
+- test/data/img/sub/image.png