minigl 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d491becfcc152fa203005e847196c2e8478b16
-  data.tar.gz: a24b621bb5ba72fcfed720ef25b80bdce7df9e24
+  metadata.gz: 545d2e46bcc97bb95ef2ef8a9b150cf5492a4ca6
+  data.tar.gz: f35a2fc0ad36a5b640d11b5001521db050b04c50
 SHA512:
-  metadata.gz: 7d176e2cdc27315f39b357ba35eaaaaef109891d8187b961b30b73f13dc8b5c14e40619b3f5af470ae07ff49e4eb3f59df9ab16b396f7804611fe9141e2cc273
-  data.tar.gz: c9e3862fd8dc80b0541f2cddf9db7d83c10d9e17bbd329dd3c56cb14c0dd9d7c80fad90a30fb73f2505709276db950f4cd4429664bf3aa737e241cde35cc7173
+  metadata.gz: 0c7cf269750dd3dea9f6bd4f09b17216974dc3cfa4a28cd212d72f6e9210dfecd3a02256a8d0e2b3bf5b21d94011eeb4f703821f694d44d9c0e700ea593f16d4
+  data.tar.gz: 3a786d3aa449653647f112ca35e839817f8a74ba5d9712121d78c4d2673bfd9735678be24943a00d481244670cdd64fc7f539b3adb0e1ed8fa16827bfefebf85

data/README.md

@@ -25,10 +25,11 @@ After installing the Gosu dependencies, you can just `gem install minigl`.
 
 ## Documentation
 
-  * The library is 100% RDoc-documented [here](http://www.rubydoc.info/gems/minigl/2.0.5).
+  * The library is 100% RDoc-documented [here](http://www.rubydoc.info/gems/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.8
+## Version 2.0.9
 
-  * Added the `set_speed` option to `Movement#move`.
+  * Added the `round` option to `Sprite#draw` and `GameObject#draw`.
+  * Fixed `GameObject#draw` when drawing rotated with non-null `img_gap`.

data/lib/minigl/game_object.rb

@@ -137,9 +137,12 @@ module MiniGL
     #        to draw it vertically flipped.
     # [z_index] The z-order to draw the object. Objects with larger z-orders
     #           will be drawn on top of the ones with smaller z-orders.
+    # [round] Specify whether the drawing coordinates should be rounded to an
+    #         integer before drawing, to avoid little distortions of the image.
+    #         Only applies when the image is not rotated.
     #
     # *Obs.:* This method accepts named parameters.
-    def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil, flip = nil, z_index = 0)
+    def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil, flip = nil, z_index = 0, round = false)
       if map.is_a? Hash
         scale_x = map.fetch(:scale_x, 1)
         scale_y = map.fetch(:scale_y, 1)
@@ -148,6 +151,7 @@ module MiniGL
         angle = map.fetch(:angle, nil)
         flip = map.fetch(:flip, nil)
         z_index = map.fetch(:z_index, 0)
+        round = map.fetch(:round, false)
         map = map.fetch(:map, nil)
       end
 
@@ -158,8 +162,9 @@ module MiniGL
                                   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 - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @img[0].width : 0),
-                              @y - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @img[0].height : 0),
+        x = @x - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @img[0].width : 0)
+        y = @y - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @img[0].height : 0)
+        @img[@img_index].draw (round ? x.round : x), (round ? y.round : y),
                               z_index, (flip == :horiz ? -scale_x : scale_x),
                               (flip == :vert ? -scale_y : scale_y), color
       end
@@ -238,9 +243,12 @@ module MiniGL
     #        to draw it vertically flipped.
     # [z_index] The z-order to draw the object. Objects with larger z-orders
     #           will be drawn on top of the ones with smaller z-orders.
+    # [round] Specify whether the drawing coordinates should be rounded to an
+    #         integer before drawing, to avoid little distortions of the image.
+    #         Only applies when the image is not rotated.
     #
     # *Obs.:* This method accepts named parameters.
-    def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil, flip = nil, z_index = 0)
+    def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil, flip = nil, z_index = 0, round = false)
       if map.is_a? Hash
         scale_x = map.fetch(:scale_x, 1)
         scale_y = map.fetch(:scale_y, 1)
@@ -249,18 +257,24 @@ module MiniGL
         angle = map.fetch(:angle, nil)
         flip = map.fetch(:flip, nil)
         z_index = map.fetch(:z_index, 0)
+        round = map.fetch(:round, false)
         map = map.fetch(:map, nil)
       end
 
       color = (alpha << 24) | color
       if angle
-        @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
+        center_x = @x + @w * 0.5
+        center_y = @y + @h * 0.5
+        o_x = center_x - @x - @img_gap.x
+        o_y = center_y - @y - @img_gap.y
+        @img[@img_index].draw_rot @x + (flip == :horiz ? -1 : 1) * (@img_gap.x + o_x) - (map ? map.cam.x : 0),
+                                  @y + (flip == :vert ? -1 : 1) * (@img_gap.y + o_y) - (map ? map.cam.y : 0),
+                                  z_index, angle, o_x.to_f / @img[0].width, o_y.to_f / @img[0].height,
+                                  (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 ? @w : 0),
-                              @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? @h : 0),
+        x = @x + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + (flip == :horiz ? @w : 0)
+        y = @y + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? @h : 0)
+        @img[@img_index].draw (round ? x.round : x), (round ? y.round : y),
                               z_index, (flip == :horiz ? -scale_x : scale_x),
                               (flip == :vert ? -scale_y : scale_y), color
       end

data/test/data/img/square3.svg

@@ -0,0 +1,76 @@
+<?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="100"
+   height="100"
+   viewBox="0 0 100 100"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="square3.svg"
+   inkscape:export-filename="/home/victor/aleva/minigl/test/data/img/square3.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="8.62"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-global="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     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,-952.36216)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.2"
+       id="rect4133"
+       width="100"
+       height="100"
+       x="0"
+       y="952.36218" />
+    <rect
+       y="1002.3622"
+       x="50"
+       height="40"
+       width="40"
+       id="rect4135"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.2" />
+  </g>
+</svg>

data/test/game.rb

@@ -6,10 +6,11 @@ class MyGame < GameWindow
     super 800, 600, false
 
     # @img = Res.img :img1
-    @obj1 = GameObject.new 10, 10, 80, 80, :img1, Vector.new(-10, -10)
+    @obj1 = GameObject.new 50, 50, 40, 40, :square3, Vector.new(-50, -50)
     @obj2 = Sprite.new 400, 0, :img1
     @obj3 = GameObject.new 4, 50, 24, 24, :check, Vector.new(-4, -4), 2, 4
     @obj3.set_animation 1
+    @obj4 = Sprite.new 500, 0, :img1
     @objs = []
     8.times { @objs << GameObject.new(384, 284, 32, 32, :check, Vector.new(0, 0), 2, 4) }
     @flip = nil
@@ -43,10 +44,10 @@ class MyGame < GameWindow
 
   def update
     KB.update
-    @obj1.y -= 1 if KB.key_held? Gosu::KbUp
-    @obj1.x += 1 if KB.key_down? Gosu::KbRight
-    @obj1.y += 1 if KB.key_held? Gosu::KbDown
-    @obj1.x -= 1 if KB.key_down? Gosu::KbLeft
+    begin @obj1.y -= 0.714; @obj4.y -= 0.714 end if KB.key_held? Gosu::KbUp
+    begin @obj1.x += 0.714; @obj4.x += 0.714 end if KB.key_down? Gosu::KbRight
+    begin @obj1.y += 0.714; @obj4.y += 0.714 end if KB.key_held? Gosu::KbDown
+    begin @obj1.x -= 0.714; @obj4.x -= 0.714 end if KB.key_down? Gosu::KbLeft
     @btn.set_position rand(700), rand(550) if KB.key_pressed? Gosu::KbSpace
     @btn.enabled = !@btn.enabled if KB.key_pressed? Gosu::KbLeftControl
     @chk.checked = false if KB.key_pressed? Gosu::KbEscape
@@ -70,8 +71,8 @@ class MyGame < GameWindow
 
     Mouse.update
     if Mouse.double_click? :left
-      @obj1.x = Mouse.x + 10
-      @obj1.y = Mouse.y + 10
+      @obj1.x = Mouse.x
+      @obj1.y = Mouse.y
     end
     if Mouse.button_released? :right
       if @flip.nil?; @flip = :horiz
@@ -100,6 +101,7 @@ class MyGame < GameWindow
     @obj1.draw color: 0x33ff33, angle: (@angle == 0 ? nil : @angle)
     @obj2.draw angle: (@angle == 0 ? nil : @angle), scale_x: 0.5, scale_y: 1.4
     @obj3.draw flip: @flip
+    @obj4.draw round: true
     @objs.each { |o| o.draw }
     @writer1.write_line text: 'Testing effect 1', x: 400, y: 260, color: 0xffffff, effect: :border
     @writer2.write_line 'Second effect test', 400, 280, :center, 0xffffff, 255, :border, 0xff0000, 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -53,6 +53,8 @@ files:
 - test/data/img/square.svg
 - test/data/img/square2.png
 - test/data/img/square2.svg
+- test/data/img/square3.png
+- test/data/img/square3.svg
 - test/data/img/sub/image.png
 - test/data/img/text.png
 - test/data/img/tile1.png
@@ -111,8 +113,10 @@ test_files:
 - test/data/tileset/tileset1.png
 - test/data/img/check.png
 - test/data/img/image.png
+- test/data/img/square3.png
 - test/data/img/square.svg
 - test/data/img/tile2b.png
+- test/data/img/square3.svg
 - test/data/img/text.png
 - test/data/img/img1.png
 - test/data/img/barfg.svg