minigl 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a008a59987965b59eb3079c99aa5a2b60f82fbd
-  data.tar.gz: 4e3e3eca4a1f661d932a3cabc06c1af59d91bf05
+  metadata.gz: f2d491becfcc152fa203005e847196c2e8478b16
+  data.tar.gz: a24b621bb5ba72fcfed720ef25b80bdce7df9e24
 SHA512:
-  metadata.gz: 300cfcd662ddaa79cfcd52adb847412acdfd4adcca706d1803dd566b7ce73f9ce2b05fe11eeb73a3d7ba04ea23fddfac41bf71e811424e1d23746ae297b32d4d
-  data.tar.gz: 97f6e31b2896c911599f676c16700ad8300e9aacef9602dcbfc2617c03537dd2895316a4e0e813aa70acd2d7599783fc02088b3c3b8c4fc38da95c8c7e92f850
+  metadata.gz: 7d176e2cdc27315f39b357ba35eaaaaef109891d8187b961b30b73f13dc8b5c14e40619b3f5af470ae07ff49e4eb3f59df9ab16b396f7804611fe9141e2cc273
+  data.tar.gz: c9e3862fd8dc80b0541f2cddf9db7d83c10d9e17bbd329dd3c56cb14c0dd9d7c80fad90a30fb73f2505709276db950f4cd4429664bf3aa737e241cde35cc7173

data/README.md

@@ -29,7 +29,6 @@ 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.0.7
+## Version 2.0.8
 
-  * Fixed the camera position for maps smaller than the screen.
-  * Added `animate_once` method to `Sprite`.
+  * Added the `set_speed` option to `Movement#move`.

data/lib/minigl/movement.rb

@@ -225,28 +225,37 @@ module MiniGL
     #        objects that <code>include Movement</code>.
     # [ramps] An array of ramps to be considered in the collision checking.
     #         Ramps must be instances of Ramp (or derived classes).
-    def move(forces, obst, ramps)
-      forces.x += G.gravity.x; forces.y += G.gravity.y
-      forces.x += @stored_forces.x; forces.y += @stored_forces.y
-      @stored_forces.x = @stored_forces.y = 0
-
-      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
-        if @bottom.ratio > G.ramp_slip_threshold
-          forces.x += (@bottom.left ? -1 : 1) * (@bottom.ratio - G.ramp_slip_threshold) * G.ramp_slip_force / G.ramp_slip_threshold
-        elsif forces.x > 0 && @bottom.left || forces.x < 0 && !@bottom.left
-          forces.x *= @bottom.factor
+    # [set_speed] Set this flag to +true+ to cause the +forces+ vector to be
+    #             treated as a speed vector, i.e., the object's speed will be
+    #             directly set to the given values. The force of gravity will
+    #             also be ignored in this case.
+    def move(forces, obst, ramps, set_speed = false)
+      if set_speed
+        @speed.x = forces.x
+        @speed.y = forces.y
+      else
+        forces.x += G.gravity.x; forces.y += G.gravity.y
+        forces.x += @stored_forces.x; forces.y += @stored_forces.y
+        @stored_forces.x = @stored_forces.y = 0
+
+        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
+          if @bottom.ratio > G.ramp_slip_threshold
+            forces.x += (@bottom.left ? -1 : 1) * (@bottom.ratio - G.ramp_slip_threshold) * G.ramp_slip_force / G.ramp_slip_threshold
+          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
       end
 
-      @speed.x += forces.x / @mass; @speed.y += forces.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
-
       @prev_speed = @speed.clone
 
       x = @speed.x < 0 ? @x + @speed.x : @x

data/test/data/img/square2.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="50"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="square2.svg"
+   inkscape:export-filename="/home/victor/aleva/minigl/test/data/img/square2.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.68"
+     inkscape:cx="11.429795"
+     inkscape:cy="25"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1002.3622)">
+    <rect
+       style="fill:#99ffff;fill-opacity:1;stroke:none"
+       id="rect3753"
+       width="50"
+       height="50"
+       x="0"
+       y="1002.3622" />
+  </g>
+</svg>

data/test/mov_game.rb

@@ -7,7 +7,8 @@ class MyGame < GameWindow
     super 800, 600, false
 
     @obj = GameObject.new(0, 0, 50, 50, :square)
-    # @obj.max_speed.x = 3
+    @obj2 = GameObject.new(100, 0, 50, 50, :square2)
+
     @obsts = [
       Block.new(0, 600, 800, 1, false),
       Block.new(-1, 0, 1, 600, false),
@@ -39,26 +40,26 @@ class MyGame < GameWindow
     forces = Vector.new(0, 0)
     if @obj.bottom
       forces.y -= 15 if KB.key_pressed?(Gosu::KbSpace)
-      if KB.key_down?(Gosu::KbLeft)
-        forces.x -= 0.5
-      end
-      if KB.key_down?(Gosu::KbRight)
-        forces.x += 0.5
-      end
+      forces.x -= 0.5 if KB.key_down?(Gosu::KbLeft)
+      forces.x += 0.5 if KB.key_down?(Gosu::KbRight)
       forces.x -= @obj.speed.x * 0.1
     else
       forces.x -= 0.2 if KB.key_down?(Gosu::KbLeft)
       forces.x += 0.2 if KB.key_down?(Gosu::KbRight)
     end
     @obj.move(forces, @obsts, @ramps)
-    # puts @obj.x
-    # @cyc_obj.cycle(@cycle, 5, [@obj], @obsts, @ramps)
-    # puts @obj.bottom
+
+    speed = Vector.new(0, 0)
+    speed.y -= 3 if KB.key_down? Gosu::KbW
+    speed.y += 3 if KB.key_down? Gosu::KbS
+    speed.x -= 3 if KB.key_down? Gosu::KbA
+    speed.x += 3 if KB.key_down? Gosu::KbD
+    @obj2.move(speed, @obsts, @ramps, true)
   end
 
   def draw
     @obj.draw
-    # @cyc_obj.draw
+    @obj2.draw
     @obsts.each do |o|
       draw_quad o.x, o.y, 0xffffffff,
                 o.x + o.w, o.y, 0xffffffff,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -51,6 +51,8 @@ files:
 - test/data/img/img1.png
 - test/data/img/square.png
 - test/data/img/square.svg
+- test/data/img/square2.png
+- test/data/img/square2.svg
 - test/data/img/sub/image.png
 - test/data/img/text.png
 - test/data/img/tile1.png
@@ -116,6 +118,8 @@ test_files:
 - test/data/img/barfg.svg
 - test/data/img/barbg.svg
 - test/data/img/tile2.png
+- test/data/img/square2.svg
+- test/data/img/square2.png
 - test/data/img/tile2.svg
 - test/data/img/square.png
 - test/data/img/barbg.png