minigl 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73063e68c52aec583e98389abe3d1334e8a33858
-  data.tar.gz: 511d49a8cf23a537c0abf4ca2b35f5e290b11bc7
+  metadata.gz: 683014cfbecd482d631925ec45ee1326021e024a
+  data.tar.gz: ee579a15c9f2eaf33e5ebffd6349553299b5fdbd
 SHA512:
-  metadata.gz: 28646ae5580a7df1b0a7488e2c227068c20c692614a385903040a16573451ebe891e1e222a5292db9fddac2a342a3bf398c10efb687584ef21781214953a95c4
-  data.tar.gz: 8183695054e721eca9f52ccc4962348983a9e0964cafb430cffe3c2303377216ccc81383a43c035d76b70a70ac59bd48aa18b97a11c10af2e727ab4ce75beed5
+  metadata.gz: d3751ccd5c52458864578752a7f10a71db732e5ec0514a258e3cef6feece6e30df6d1563525a00ee4f2e4c1b017045eab0a9fb6818a48997c62a03f0b7ed914c
+  data.tar.gz: fda44bd25b989ffe54b2208f6883662c2baeeb8384d7453ecb6fa0edf8286d36020c81aa42bfd38d3998458617312b398fbe867147334041f0142026d3fcd162

data/README.md

@@ -32,9 +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.1**
+**Version 2.0.2**
 
-  * 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.
+  * Small adjustment in `GameWindow#clear`, changing the format of the color
+parameter from AARRGGBB to RRGGBB (as the alpha would have no effect).
+  * Addition of the `flip` parameter to the `draw` method of `Sprite` and
+`GameObject`.

data/lib/minigl/game_object.rb

@@ -83,20 +83,22 @@ module MiniGL
     #         will be darkened, for example.
     # [angle] A rotation, in degrees, to be applied to the image, relative to
     #         its center.
+    # [flip] Specify +:horiz+ to draw the image horizontally flipped or +:vert+
+    #        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.
-    def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = 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)
       color = (alpha << 24) | color
-      if map
-        if angle
-          @img[@img_index].draw_rot @x.round - map.cam.x, @y.round - map.cam.y, z_index, angle, 0.5, 0.5, scale_x, scale_y, color
-        else
-          @img[@img_index].draw @x.round - map.cam.x, @y.round - map.cam.y, z_index, scale_x, scale_y, color
-        end
-      elsif angle
-        @img[@img_index].draw_rot @x.round, @y.round, z_index, angle, 0.5, 0.5, scale_x, scale_y, color
+      if angle
+        @img[@img_index].draw_rot @x.round - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @img[0].width : 0),
+                                  @y.round - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @img[0].height : 0),
+                                  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.round, @y.round, z_index, scale_x, scale_y, color
+        @img[@img_index].draw @x.round - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @img[0].width : 0),
+                              @y.round - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @img[0].height : 0),
+                              z_index, (flip == :horiz ? -scale_x : scale_x),
+                              (flip == :vert ? -scale_y : scale_y), color
       end
     end
 
@@ -180,22 +182,22 @@ module MiniGL
     #         will be darkened, for example.
     # [angle] A rotation, in degrees, to be applied to the image, relative to
     #         its center.
+    # [flip] Specify +:horiz+ to draw the image horizontally flipped or +:vert+
+    #        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.
-    def draw(map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = 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)
       color = (alpha << 24) | color
-      if map
-        if angle
-          @img[@img_index].draw_rot @x.round + @img_gap.x - map.cam.x,
-                                    @y.round + @img_gap.y - map.cam.y,
-                                    z_index, angle, 0.5, 0.5, scale_x, scale_y, color
-        else
-          @img[@img_index].draw @x.round + @img_gap.x - map.cam.x, @y.round + @img_gap.y - map.cam.y, z_index, scale_x, scale_y, color
-        end
-      elsif angle
-        @img[@img_index].draw_rot @x.round + @img_gap.x, @y.round + @img_gap.y, z_index, angle, 0.5, 0.5, scale_x, scale_y, color
+      if angle
+        @img[@img_index].draw_rot @x.round + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @w : 0),
+                                  @y.round + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @h : 0),
+                                  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.round + @img_gap.x, @y.round + @img_gap.y, z_index, scale_x, scale_y, color
+        @img[@img_index].draw @x.round + (flip == :horiz ? -1 : 1) * @img_gap.x - (map ? map.cam.x : 0) + (flip == :horiz ? scale_x * @w : 0),
+                              @y.round + (flip == :vert ? -1 : 1) * @img_gap.y - (map ? map.cam.y : 0) + (flip == :vert ? scale_y * @h : 0),
+                              z_index, (flip == :horiz ? -scale_x : scale_x),
+                              (flip == :vert ? -scale_y : scale_y), color
       end
     end
 

data/lib/minigl/global.rb

@@ -215,8 +215,9 @@ module MiniGL
     # Draws a rectangle with the size of the entire screen, in the given color.
     #
     # Parameters:
-    # [color] Color of the rectangle to be drawn.
+    # [color] Color of the rectangle to be drawn, in hexadecimal RRGGBB format.
     def clear(color)
+      color |= 0xff000000
       draw_quad 0, 0, color,
                 width, 0, color,
                 width, height, color,
@@ -375,7 +376,7 @@ module MiniGL
 
         k1 = [Gosu::MsLeft, Gosu::MsMiddle, Gosu::MsRight]
         k2 = [:left, :middle, :right]
-        for i in 0..2
+        (0..2).each do |i|
           if G.window.button_down? k1[i]
             @down[k2[i]] = true
             @dbl_click[k2[i]] = true if @dbl_click_timer[k2[i]]

data/test/game.rb

@@ -7,6 +7,9 @@ class MyGame < GameWindow
 
     @obj1 = GameObject.new 10, 10, 80, 80, :img1, Vector.new(-10, -10)
     @obj2 = Sprite.new 400, 0, :img1
+    @obj3 = GameObject.new 4, 50, 24, 24, :check, Vector.new(-4, -4), 2, 4
+    @obj3.set_animation 1
+    @flip = nil
 
     @font1 = Res.font :font1, 20
     @font2 = Res.font :font1, 50
@@ -63,6 +66,10 @@ class MyGame < GameWindow
       @obj1.x = Mouse.x + 10
       @obj1.y = Mouse.y + 10
     end
+    if Mouse.button_released? :right
+      if @flip.nil?; @flip = :horiz
+      else; @flip = nil; end
+    end
 
     @btn.update
     @chk.update
@@ -73,10 +80,11 @@ class MyGame < GameWindow
   end
 
   def draw
-    clear 0xffabcdef
+    clear 0xabcdef
 
     @obj1.draw nil, 1, 1, 255, 0x33ff33, 30, 1
-    @obj2.draw nil, 0.6, 1.4, 0x99
+    @obj2.draw nil, 0.6, 1.4, 0x99, 0xffffff, nil, :vert
+    @obj3.draw nil, 1, 1, 255, 0xffffff, nil, @flip
     @writer1.write_line 'Testing effect 1', 400, 260, :center, 0xffffff, :border
     @writer2.write_line 'Second effect test', 400, 280, :center, 0xffffff, :border, 0xff0000, 2
     @writer2.write_line 'Text with shadow!!', 400, 340, :center, 0xffff00, :shadow, 0, 2, 0x80

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu