minigl 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6075180b99d1cf18a53a683353828675ed18ca8
-  data.tar.gz: c01f4bd208021a2bff3f2c1aa3f86eac0c7ff093
+  metadata.gz: f2d4aee75d7720a8a267a10b165430543f95768f
+  data.tar.gz: 6f5617de1e50714495a7f9e2f86213c33b7a8fb3
 SHA512:
-  metadata.gz: 6981a60cbd32da81a0c96553536dd77b440ccd913cd1a612a23b64292051ec69924e6ed2058df2de72ef75a5db4f5869edec3ded25963d8012b999b17575285a
-  data.tar.gz: 15e2fc67ac2b072da7e3a80b026fe5787b2df7804451aedd28d4e5a0f9e70dfd6ec299be7463b38e354279b87c27a6a9660d4fa00aaae6ae7f32fcad35d534ad
+  metadata.gz: f27a68517fb4284d1cf04c07e1c50402150915abc683432ef410c7c71ce2aba12bb951941a5a14e0a50372e155312812d97065c90f308b4c8aadbcb533d264fb
+  data.tar.gz: 7282c90ab81911f85445f54af4cd32e0ebd99f920fc346768c364028faddd913d04698db13aa73c9571d82b1dd70cffaf0fdf397960c9e079f1cf4968a874118

data/README.md

@@ -4,6 +4,7 @@ MiniGL is a minimal **2D Game** Library, available as a Ruby gem, and built on
 top of the [Gosu](http://www.libgosu.org/) gem.
 
 It provides the following features:
+
   * Resource management (images, sounds, ...)
   * Input manipulation (keyboard, mouse, ...)
   * UI (text, buttons, text fields, ...)
@@ -13,6 +14,15 @@ It provides the following features:
 More functionalities are coming. Feel free to contribute! You can send feedback
 to victordavidsantos@gmail.com.
 
+## Installing
+
+MiniGL was built on top of the Gosu gem, version 0.7.50. This gem has its own
+dependencies for compiling extensions. Visit
+[this page](https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux) for
+details.
+
+After installing Gosu, you can just `gem install minigl`.
+
 Please note:
 
   * The test package is not complete! Most of the functionality
@@ -22,11 +32,10 @@ this [working game example](https://github.com/victords/aventura-do-saber).
   * An auxiliary, tutorial-like documentation is under construction
 [here](https://github.com/victords/minigl/wiki).
 
-**Version 1.3.3**
-
-  * Added `mass` attribute to the GameObject class and Movement module.
-  * Added readers for the attributes of `Ramp`.
-  * Added z-index support to all drawing functions.
+**Version 1.3.4**
 
-**WARNING**: this version can generate incompatibility, because the `move`
-method of `Movement` now requires the calling object to have a `mass` attribute.
+  * Fixed issue when running the game from a directory other than the directory
+of the game script.
+  * Added `prefix=` method to `Res`, allowing specification of the prefix for
+the 'data' directory.
+  * Added the `limit_cam` and `isometric` options to the `Map` class.

data/lib/minigl/global.rb

@@ -5,24 +5,24 @@ module AGL
 	# A Struct with two attributes, x and y (in this order), representing a point
 	# in a bidimensional space.
 	Vector = Struct.new :x, :y
-	
+
 	# This class represents a rectangle by its x and y coordinates and width and
 	# height.
 	class Rectangle
 		# The x-coordinate of the rectangle.
 		attr_accessor :x
-		
+
 		# The y-coordinate of the rectangle.
 		attr_accessor :y
-		
+
 		# The width of the rectangle.
 		attr_accessor :w
-		
+
 		# The height of the rectangle.
 		attr_accessor :h
-		
+
 		# Creates a new rectangle.
-		# 
+		#
 		# Parameters:
 		# [x] The x-coordinate of the rectangle.
 		# [y] The y-coordinate of the rectangle.
@@ -31,22 +31,22 @@ module AGL
 		def initialize x, y, w, h
 			@x = x; @y = y; @w = w; @h = h
 		end
-		
+
 		# Returns whether this rectangle intersects another.
-		# 
+		#
 		# Parameters:
 		# [r] The rectangle to check intersection with.
 		def intersects r
 			@x < r.x + r.w && @x + @w > r.x && @y < r.y + r.h && @y + @h > r.y
 		end
 	end
-	
+
 	# The main class for a MiniGL game, holds references to globally accessible
 	# objects and constants.
 	class Game
 		# Initializes a MiniGL game. This method must be called before any feature
 		# provided by the library can be used.
-		# 
+		#
 		# Parameters:
 		# [window] An instance of a class which inherits from
 		#          <code>Gosu::Window</code>. This will be the game window, used
@@ -72,31 +72,31 @@ module AGL
 			@@kb_held_delay = kb_held_delay
 			@@kb_held_interval = kb_held_interval
 			@@double_click_delay = double_click_delay
-			
+
 			KB.initialize
 			Mouse.initialize
 			Res.initialize
 		end
-		
+
 		# Returns a reference to the game window.
 		def self.window; @@window; end
-		
+
 		# Returns a Vector representing the force of gravity. See +initialize+ for
 		# details.
 		def self.gravity; @@gravity; end
-		
+
 		# Returns the value of kb_held_delay. See +initialize+ for details.
 		def self.kb_held_delay; @@kb_held_delay; end
-		
+
 		# Returns the value of kb_held_interval. See +initialize+ for details.
 		def self.kb_held_interval; @@kb_held_interval; end
-		
+
 		# Returns the value of double_click_delay. See +initialize+ for details.
 		def self.double_click_delay; @@double_click_delay; end
 	end
-	
+
 	#class JSHelper
-	
+
 	# Exposes methods for controlling keyboard events.
 	class KB
 		# This is called by <code>Game.initialize</code>. Don't call it
@@ -127,7 +127,7 @@ module AGL
 			@@held_timer = {}
 			@@held_interval = {}
 		end
-		
+
 		# Updates the state of all keys.
 		def self.update
 			@@held_timer.each do |k, v|
@@ -137,12 +137,12 @@ module AGL
 					@@held_timer.delete k
 				end
 			end
-			
+
 			@@held_interval.each do |k, v|
 				if v < Game.kb_held_interval; @@held_interval[k] += 1
 				else; @@held_interval[k] = 0; end
 			end
-			
+
 			@@prev_down = @@down.clone
 			@@down.clear
 			@@keys.each do |k|
@@ -155,10 +155,10 @@ module AGL
 				end
 			end
 		end
-		
+
 		# Returns whether the given key is down in the current frame and was not
 		# down in the frame before.
-		# 
+		#
 		# Parameters:
 		# [key] Code of the key to be checked. The available codes are <code>
 		#       Gosu::KbUp, Gosu::KbDown, Gosu::KbReturn, Gosu::KbEscape,
@@ -181,34 +181,34 @@ module AGL
 		def self.key_pressed? key
 			@@prev_down.index(key).nil? and @@down.index(key)
 		end
-		
+
 		# Returns whether the given key is down in the current frame.
-		# 
+		#
 		# Parameters:
 		# [key] Code of the key to be checked. See +key_pressed?+ for details.
 		def self.key_down? key
 			@@down.index(key)
 		end
-		
+
 		# Returns whether the given key is not down in the current frame but was
 		# down in the frame before.
-		# 
+		#
 		# Parameters:
 		# [key] Code of the key to be checked. See +key_pressed?+ for details.
 		def self.key_released? key
 			@@prev_down.index(key) and @@down.index(key).nil?
 		end
-		
+
 		# Returns whether the given key is being held down. See
 		# <code>Game.initialize</code> for details.
-		# 
+		#
 		# Parameters:
 		# [key] Code of the key to be checked. See +key_pressed?+ for details.
 		def self.key_held? key
 			@@held_interval[key] == Game.kb_held_interval
 		end
 	end
-	
+
 	# Exposes methods for controlling mouse events.
 	class Mouse
 		# This is called by <code>Game.initialize</code>. Don't call it
@@ -219,18 +219,18 @@ module AGL
 			@@dbl_click = {}
 			@@dbl_click_timer = {}
 		end
-		
+
 		# Updates the mouse position and the state of all buttons.
 		def self.update
 			@@prev_down = @@down.clone
 			@@down.clear
 			@@dbl_click.clear
-			
+
 			@@dbl_click_timer.each do |k, v|
 				if v < Game.double_click_delay; @@dbl_click_timer[k] += 1
 				else; @@dbl_click_timer.delete k; end
 			end
-			
+
 			k1 = [Gosu::MsLeft, Gosu::MsMiddle, Gosu::MsRight]
 			k2 = [:left, :middle, :right]
 			for i in 0..2
@@ -242,57 +242,57 @@ module AGL
 					@@dbl_click_timer[k2[i]] = 0
 				end
 			end
-			
+
 			@@x = Game.window.mouse_x.round
 			@@y = Game.window.mouse_y.round
 		end
-		
+
 		# Returns the x-coordinate of the mouse cursor in the screen.
 		def self.x; @@x; end
-		
+
 		# Returns the y-coordinate of the mouse cursor in the screen.
 		def self.y; @@y; end
-		
+
 		# Returns whether the given button is down in the current frame and was
 		# not down in the frame before.
-		# 
+		#
 		# Parameters:
 		# [btn] Button to be checked. Valid values are +:left+, +:middle+ and
 		#       +:right+
 		def self.button_pressed? btn
 			@@down[btn] and not @@prev_down[btn]
 		end
-		
+
 		# Returns whether the given button is down in the current frame.
-		# 
+		#
 		# Parameters:
 		# [btn] Button to be checked. Valid values are +:left+, +:middle+ and
 		#       +:right+
 		def self.button_down? btn
 			@@down[btn]
 		end
-		
+
 		# Returns whether the given button is not down in the current frame, but
 		# was down in the frame before.
-		# 
+		#
 		# Parameters:
 		# [btn] Button to be checked. Valid values are +:left+, +:middle+ and
 		#       +:right+
 		def self.button_released? btn
 			@@prev_down[btn] and not @@down[btn]
 		end
-		
+
 		# Returns whether the given button has just been double clicked.
-		# 
+		#
 		# Parameters:
 		# [btn] Button to be checked. Valid values are +:left+, +:middle+ and
 		#       +:right+
 		def self.double_click? btn
 			@@dbl_click[btn]
 		end
-		
+
 		# Returns whether the mouse cursor is currently inside the given area.
-		# 
+		#
 		# Parameters:
 		# [x] The x-coordinate of the top left corner of the area.
 		# [y] The y-coordinate of the top left corner of the area.
@@ -302,7 +302,7 @@ module AGL
 			@@x >= x and @@x < x + w and @@y >= y and @@y < y + h
 		end
 	end
-	
+
 	# This class is responsible for resource management. It keeps references to
 	# all loaded resources until a call to +clear+ is made. Resources can be
 	# loaded as global, so that their references won't be removed even when
@@ -328,10 +328,19 @@ module AGL
 			@@global_songs = Hash.new
 			@@fonts = Hash.new
 			@@global_fonts = Hash.new
-		end
-		
+			@@prefix = File.expand_path(File.dirname($0)) + '/'
+			puts @@prefix
+    end
+
+    # Set a custom prefix for loading resources. By default, the prefix is the
+    # directory of the game script.
+    def self.prefix= value
+      value += '/' if value[-1] != '/'
+      @@prefix = value
+    end
+
 		# Returns a <code>Gosu::Image</code> object.
-		# 
+		#
 		# Parameters:
 		# [id] A string or symbol representing the path to the image. If the file
 		#      is inside 'data/img', only the file name is needed. If it's inside
@@ -350,16 +359,16 @@ module AGL
 		def self.img id, global = false, tileable = false, ext = ".png"
 			if global; a = @@global_imgs; else; a = @@imgs; end
 			return a[id] if a[id]
-			s = "data/img/" + id.to_s.split('_').join('/') + ext
+			s = @@prefix + "data/img/" + id.to_s.split('_').join('/') + ext
 			img = Gosu::Image.new Game.window, s, tileable
 			a[id] = img
 		end
-		
+
 		# Returns an array of <code>Gosu::Image</code> objects, using the image as
 		# a spritesheet. The image with index 0 will be the top left sprite, and
 		# the following indices raise first from left to right and then from top
 		# to bottom.
-		# 
+		#
 		# Parameters:
 		# [id] A string or symbol representing the path to the image. See +img+
 		#      for details.
@@ -373,16 +382,16 @@ module AGL
 		def self.imgs id, sprite_cols, sprite_rows, global = false, ext = ".png"
 			if global; a = @@global_imgs; else; a = @@imgs; end
 			return a[id] if a[id]
-			s = "data/img/" + id.to_s.split('_').join('/') + ext
+			s = @@prefix + "data/img/" + id.to_s.split('_').join('/') + ext
 			imgs = Gosu::Image.load_tiles Game.window, s, -sprite_cols, -sprite_rows, false
 			a[id] = imgs
 		end
-		
+
 		# Returns an array of <code>Gosu::Image</code> objects, using the image as
 		# a tileset. Works the same as +imgs+, except you must provide the tile
 		# size instead of the number of columns and rows, and that the images will
 		# be loaded as tileable.
-		# 
+		#
 		# Parameters:
 		# [id] A string or symbol representing the path to the image. It must be
 		#      specified the same way as in +img+, but the base directory is
@@ -397,14 +406,14 @@ module AGL
 		def self.tileset id, tile_width = 32, tile_height = 32, global = false, ext = ".png"
 			if global; a = @@global_tilesets; else; a = @@tilesets; end
 			return a[id] if a[id]
-			s = "data/tileset/" + id.to_s.split('_').join('/') + ext
+			s = @@prefix + "data/tileset/" + id.to_s.split('_').join('/') + ext
 			tileset = Gosu::Image.load_tiles Game.window, s, tile_width, tile_height, true
 			a[id] = tileset
 		end
-		
+
 		# Returns a <code>Gosu::Sample</code> object. This should be used for
 		# simple and short sound effects.
-		# 
+		#
 		# Parameters:
 		# [id] A string or symbol representing the path to the sound. It must be
 		#      specified the same way as in +img+, but the base directory is
@@ -417,14 +426,14 @@ module AGL
 		def self.sound id, global = false, ext = ".wav"
 			if global; a = @@global_sounds; else; a = @@sounds; end
 			return a[id] if a[id]
-			s = "data/sound/" + id.to_s.split('_').join('/') + ext
+			s = @@prefix + "data/sound/" + id.to_s.split('_').join('/') + ext
 			sound = Gosu::Sample.new Game.window, s
 			a[id] = sound
 		end
-		
+
 		# Returns a <code>Gosu::Song</code> object. This should be used for the
 		# background musics of your game.
-		# 
+		#
 		# Parameters:
 		# [id] A string or symbol representing the path to the song. It must be
 		#      specified the same way as in +img+, but the base directory is
@@ -437,15 +446,15 @@ module AGL
 		def self.song id, global = false, ext = ".ogg"
 			if global; a = @@global_songs; else; a = @@songs; end
 			return a[id] if a[id]
-			s = "data/song/" + id.to_s.split('_').join('/') + ext
+			s = @@prefix + "data/song/" + id.to_s.split('_').join('/') + ext
 			song = Gosu::Song.new Game.window, s
 			a[id] = song
 		end
-		
+
 		# Returns a <code>Gosu::Font</code> object. Fonts are needed to draw text
 		# and used by MiniGL elements like buttons, text fields and TextHelper
 		# objects.
-		# 
+		#
 		# Parameters:
 		# [id] A string or symbol representing the path to the song. It must be
 		#      specified the same way as in +img+, but the base directory is
@@ -461,11 +470,11 @@ module AGL
 			if global; a = @@global_fonts; else; a = @@fonts; end
 			id_size = "#{id}_#{size}"
 			return a[id_size] if a[id_size]
-			s = "data/font/" + id.to_s.split('_').join('/') + ext
+			s = @@prefix + "data/font/" + id.to_s.split('_').join('/') + ext
 			font = Gosu::Font.new Game.window, s, size
 			a[id_size] = font
 		end
-		
+
 		# Releases the memory used by all non-global resources.
 		def self.clear
 			@@imgs.clear

data/lib/minigl/map.rb

@@ -7,16 +7,16 @@ module AGL
 	class Map
 		# A Vector where x is the tile width and y is the tile height.
 		attr_reader :tile_size
-		
+
 		# A Vector where x is the horizontal tile count and y the vertical count.
 		attr_reader :size
-		
+
 		# A Rectangle representing the region of the map that is currently
 		# visible.
 		attr_reader :cam
-		
+
 		# Creates a new map.
-		# 
+		#
 		# Parameters:
 		# [t_w] The width of the tiles.
 		# [t_h] The height of the tiles.
@@ -24,60 +24,85 @@ module AGL
 		# [t_y_count] The vertical count of tiles in the map.
 		# [scr_w] Width of the viewport for the map.
 		# [scr_h] Height of the viewport for the map.
-		def initialize t_w, t_h, t_x_count, t_y_count, scr_w = 800, scr_h = 600
+    # [isometric] Whether to use a isometric map. By default, an ortogonal map
+    #             is used.
+		# [limit_cam] Whether the camera should respect the bounds of the map
+		#             (i.e., when given coordinates that would imply regions
+		#             outside the map to appear in the screen, the camera would
+		#             move to the nearest position where only the map shows up
+		#             in the screen).
+		def initialize t_w, t_h, t_x_count, t_y_count, scr_w = 800, scr_h = 600, isometric = false, limit_cam = true
 			@tile_size = Vector.new t_w, t_h
 			@size = Vector.new t_x_count, t_y_count
 			@cam = Rectangle.new 0, 0, scr_w, scr_h
-			@max_x = t_x_count * t_w - scr_w
-			@max_y = t_y_count * t_h - scr_h
+			@limit_cam = limit_cam
+			@isometric = isometric
+      if isometric
+        initialize_isometric
+      elsif limit_cam
+        @max_x = t_x_count * t_w - scr_w
+        @max_y = t_y_count * t_h - scr_h
+      end
+      set_camera 0, 0
 		end
-		
+
 		# Returns a Vector with the total size of the map, in pixels (x for the
 		# width and y for the height).
 		def get_absolute_size
-			Vector.new(@tile_size.x * @size.x, @tile_size.y * @size.y)
+			return Vector.new(@tile_size.x * @size.x, @tile_size.y * @size.y) unless @isometric
+			avg = (@size.x + @size.y) * 0.5
+			Vector.new (avg * @tile_size.x).to_i, (avg * @tile_size.y).to_i
 		end
-		
+
 		# Returns a Vector with the coordinates of the center of the map.
 		def get_center
-			Vector.new(@tile_size.x * @size.x / 2, @tile_size.y * @size.y / 2)
+			abs_size = get_absolute_size
+			Vector.new(abs_size.x * 0.5, abs_size.y * 0.5)
 		end
-		
+
 		# Returns the position in the screen corresponding to the given tile
 		# indices.
-		# 
+		#
 		# Parameters:
 		# [map_x] The index of the tile in the horizontal direction. It must be in
 		#         the interval <code>0..t_x_count</code>.
 		# [map_y] The index of the tile in the vertical direction. It must be in
 		#         the interval <code>0..t_y_count</code>.
 		def get_screen_pos map_x, map_y
-			Vector.new(map_x * @tile_size.x - @cam.x, map_y * @tile_size.y - @cam.y)
+			return Vector.new(map_x * @tile_size.x - @cam.x, map_y * @tile_size.y - @cam.y) unless @isometric
+			Vector.new ((map_x - map_y - 1) * @tile_size.x * 0.5) - @cam.x + @x_offset,
+			           ((map_x + map_y) * @tile_size.y * 0.5) - @cam.y
 		end
-		
+
 		# Returns the tile in the map that corresponds to the given position in
 		# the screen, as a Vector, where x is the horizontal index and y the
 		# vertical index.
-		# 
+		#
 		# Parameters:
 		# [scr_x] The x-coordinate in the screen.
 		# [scr_y] The y-coordinate in the screen.
 		def get_map_pos scr_x, scr_y
-			Vector.new((scr_x + @cam.x) / @tile_size.x, (scr_y + @cam.y) / @tile_size.y)
+			return Vector.new((scr_x + @cam.x) / @tile_size.x, (scr_y + @cam.y) / @tile_size.y) unless @isometric
+
+      # Obtém a posição transformada para as coordenadas isométricas
+			v = get_isometric_position scr_x, scr_y
+
+			# Depois divide pelo tamanho do quadrado para achar a posição da matriz
+			Vector.new((v.x * @inverse_square_size).to_i, (v.y * @inverse_square_size).to_i)
 		end
-		
+
 		# Verifies whether a tile is inside the map.
-		# 
+		#
 		# Parameters:
 		# [v] A Vector representing the tile, with x as the horizontal index and
 		#     y as the vertical index.
 		def is_in_map v
 			v.x >= 0 && v.y >= 0 && v.x < @size.x && v.y < @size.y
 		end
-		
+
 		# Sets the top left corner of the viewport to the given position of the
 		# map. Note that this is not the position in the screen.
-		# 
+		#
 		# Parameters:
 		# [cam_x] The x-coordinate inside the map, in pixels (not a tile index).
 		# [cam_y] The y-coordinate inside the map, in pixels (not a tile index).
@@ -86,9 +111,9 @@ module AGL
 			@cam.y = cam_y
 			set_bounds
 		end
-		
+
 		# Moves the viewport by the given amount of pixels.
-		# 
+		#
 		# Parameters:
 		# [x] The amount of pixels to move horizontally. Negative values will
 		#     cause the camera to move to the left.
@@ -99,7 +124,7 @@ module AGL
 			@cam.y += y
 			set_bounds
 		end
-		
+
 		# Iterates through the currently visible tiles, providing the horizontal
 		# tile index, the vertical tile index, the x-coordinate (in pixels) and
 		# the y-coordinate (in pixels), of each tile, in that order, to a given
@@ -113,37 +138,124 @@ module AGL
 		def foreach
 			for j in @min_vis_y..@max_vis_y
 				for i in @min_vis_x..@max_vis_x
-					yield i, j, i * @tile_size.x - @cam.x, j * @tile_size.y - @cam.y
+					pos = get_screen_pos i, j
+					yield i, j, pos.x, pos.y
 				end
 			end
 		end
-		
+
 	private
-		
+    Sqrt2Div2 = Math.sqrt(2) / 2
+    MinusPiDiv4 = -Math::PI / 4
+
 		def set_bounds
-			@cam.x = @cam.x.round
-			@cam.y = @cam.y.round
-			@cam.x = 0 if @cam.x < 0
-			@cam.x = @max_x if @cam.x > @max_x
-			@cam.y = 0 if @cam.y < 0
-			@cam.y = @max_y if @cam.y > @max_y
-			
-			@min_vis_x = @cam.x / @tile_size.x
-			@min_vis_y = @cam.y / @tile_size.y
-			@max_vis_x = (@cam.x + @cam.w - 1) / @tile_size.x
-			@max_vis_y = (@cam.y + @cam.h - 1) / @tile_size.y
-			
+			if @isometric
+        v1 = get_isometric_position(0, 0)
+        v2 = get_isometric_position(@cam.w - 1, 0)
+        v3 = get_isometric_position(@cam.w - 1, @cam.h - 1)
+        v4 = get_isometric_position(0, @cam.h - 1)
+
+        if @limit_cam
+          if v1.x < -@max_offset
+            offset = -(v1.x + @max_offset)
+            @cam.x += offset * Sqrt2Div2
+            @cam.y += offset * Sqrt2Div2 / @tile_ratio
+            v1.x = -@max_offset
+          end
+          if v2.y < -@max_offset
+            offset = -(v2.y + @max_offset)
+            @cam.x -= offset * Sqrt2Div2
+            @cam.y += offset * Sqrt2Div2 / @tile_ratio
+            v2.y = -@max_offset
+          end
+          if v3.x > @iso_abs_size.x + @max_offset
+            offset = v3.x - @iso_abs_size.x - @max_offset
+            @cam.x -= offset * Sqrt2Div2
+            @cam.y -= offset * Sqrt2Div2 / @tile_ratio
+            v3.x = @iso_abs_size.x + @max_offset
+          end
+          if v4.y > @iso_abs_size.y + @max_offset
+            offset = v4.y - @iso_abs_size.y - @max_offset
+            @cam.x += offset * Sqrt2Div2
+            @cam.y -= offset * Sqrt2Div2 / @tile_ratio
+            v4.y = @iso_abs_size.y + @max_offset
+          end
+        end
+
+        @min_vis_x = get_map_pos(0, 0).x
+				@min_vis_y = get_map_pos(@cam.w - 1, 0).y
+				@max_vis_x = get_map_pos(@cam.w - 1, @cam.h - 1).x
+				@max_vis_y = get_map_pos(0, @cam.h - 1).y
+			else
+        if @limit_cam
+          @cam.x = 0 if @cam.x < 0
+          @cam.x = @max_x if @cam.x > @max_x
+          @cam.y = 0 if @cam.y < 0
+          @cam.y = @max_y if @cam.y > @max_y
+        end
+				@min_vis_x = @cam.x / @tile_size.x
+				@min_vis_y = @cam.y / @tile_size.y
+				@max_vis_x = (@cam.x + @cam.w - 1) / @tile_size.x
+				@max_vis_y = (@cam.y + @cam.h - 1) / @tile_size.y
+			end
+      @cam.x = @cam.x.round
+      @cam.y = @cam.y.round
+
 			if @min_vis_y < 0; @min_vis_y = 0
 			elsif @min_vis_y > @size.y - 1; @min_vis_y = @size.y - 1; end
-			
+
 			if @max_vis_y < 0; @max_vis_y = 0
 			elsif @max_vis_y > @size.y - 1; @max_vis_y = @size.y - 1; end
-			
+
 			if @min_vis_x < 0; @min_vis_x = 0
 			elsif @min_vis_x > @size.x - 1; @min_vis_x = @size.x - 1; end
-			
+
 			if @max_vis_x < 0; @max_vis_x = 0
 			elsif @max_vis_x > @size.x - 1; @max_vis_x = @size.x - 1; end
 		end
+
+    def initialize_isometric
+      @x_offset = (@size.y * 0.5 * @tile_size.x).round
+      @tile_ratio = @tile_size.x.to_f / @tile_size.y
+      square_size = @tile_size.x * Sqrt2Div2
+      @inverse_square_size = 1 / square_size
+      @iso_abs_size = Vector.new(square_size * @size.x, square_size * @size.y)
+      a = (@size.x + @size.y) * 0.5 * @tile_size.x
+      @isometric_offset_x = (a - square_size * @size.x) * 0.5
+      @isometric_offset_y = (a - square_size * @size.y) * 0.5
+      if @limit_cam
+        actual_cam_h = @cam.h * @tile_ratio
+        @max_offset = actual_cam_h < @cam.w ? actual_cam_h : @cam.w
+        @max_offset *= Sqrt2Div2
+      end
+    end
+
+    def get_isometric_position scr_x, scr_y
+      # Escreve a posição em relação a origem (no centro do mapa)
+      center = get_center
+      position = Vector.new scr_x + @cam.x - center.x, scr_y + @cam.y - center.y
+
+      # Multiplica por tile_ratio para obter tiles quadrados
+      position.y *= @tile_ratio
+
+      # O centro do mapa também é deslocado
+      center.y *= @tile_ratio
+
+      # Rotaciona o vetor posição -45°
+      position = rotate position, MinusPiDiv4
+
+      # Retorna a referência da posição para o canto da tela
+      position.x += center.x; position.y += center.y
+
+      # O mapa quadrado está centralizado no centro do losango, precisa retornar ao canto da tela
+      position.x -= @isometric_offset_x; position.y -= @isometric_offset_y
+      position
+    end
+
+		def rotate v, angle
+			sin = Math.sin angle
+			cos = Math.cos angle
+			Vector.new cos * v.x - sin * v.y, sin * v.x + cos * v.y
+		end
 	end
 end

data/test/game_object_tests.rb

@@ -6,8 +6,9 @@ class SpriteTest < Test::Unit::TestCase
 	def setup
 		@window = Gosu::Window.new 800, 600, false
 		Game.initialize @window
+    Res.prefix = File.expand_path(File.dirname(__FILE__))
 	end
-	
+
 	def test_sprite_position
 		s = Sprite.new 10, 20, :image
 		assert_equal 10, s.x
@@ -16,7 +17,7 @@ class SpriteTest < Test::Unit::TestCase
 		assert_equal -100, s.x
 		assert_equal 200, s.y
 	end
-	
+
 	def test_sprite_animation
 		s = Sprite.new 10, 20, :image, 3, 1
 		indices = [0, 1, 2]
@@ -32,8 +33,9 @@ class GameObjectTest < Test::Unit::TestCase
 	def setup
 		@window = Gosu::Window.new 800, 600, false
 		Game.initialize @window
+    Res.prefix = File.expand_path(File.dirname(__FILE__))
 	end
-	
+
 	def test_game_object_attributes
 		o = GameObject.new 10, 20, 3, 1, :image
 		assert_equal 10, o.x
@@ -45,7 +47,7 @@ class GameObjectTest < Test::Unit::TestCase
 		assert_equal 0, o.stored_forces.x
 		assert_equal 0, o.stored_forces.y
 	end
-	
+
 	def test_game_object_animation
 		o = GameObject.new 10, 20, 3, 1, :image, nil, 3, 1
 		indices = [0, 1, 2]

data/test/iso_game.rb

@@ -0,0 +1,40 @@
+require_relative '../lib/minigl'
+include AGL
+
+class MyGame < Gosu::Window
+	def initialize
+		super 800, 600, false
+		Game.initialize self
+
+		@tile1 = Res.img :tile2
+		@tile2 = Res.img :tile2b
+		@map = Map.new 25, 17, 200, 200, 800, 600, true
+		@p = Vector.new -1, -1
+	end
+
+	def needs_cursor?
+		true
+	end
+
+	def update
+		KB.update
+		Mouse.update
+		p = @map.get_map_pos Mouse.x, Mouse.y
+		@p = p if @map.is_in_map p
+
+		@map.move_camera 0, -5 if KB.key_down? Gosu::KbUp
+		@map.move_camera 5, 0 if KB.key_down? Gosu::KbRight
+		@map.move_camera 0, 5 if KB.key_down? Gosu::KbDown
+		@map.move_camera -5, 0 if KB.key_down? Gosu::KbLeft
+    @map.set_camera 0, 0 if KB.key_down? Gosu::KbReturn
+	end
+
+	def draw
+		@map.foreach do |i, j, x, y|
+			if i == @p.x and j == @p.y; @tile2.draw x, y, 0
+			else; @tile1.draw x, y, 0; end
+		end
+	end
+end
+
+MyGame.new.show

data/test/res_tests.rb

@@ -2,12 +2,13 @@ require 'test/unit'
 require_relative '../lib/minigl'
 include AGL
 
-class SpriteTest < Test::Unit::TestCase
+class ResTest < Test::Unit::TestCase
 	def setup
 		@window = Gosu::Window.new 800, 600, false
 		Game.initialize @window
+    Res.prefix = File.expand_path(File.dirname(__FILE__))
 	end
-	
+
 	def test_tileset
 		t1 = Res.tileset :tileset1
 		assert_equal 9, t1.length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -39,13 +39,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- data/font/font1.ttf
-- data/img/btn.png
-- data/img/check.png
-- data/img/image.png
-- data/img/img1.png
-- data/img/text.png
-- data/tileset/tileset1.png
 - lib/minigl.rb
 - lib/minigl/forms.rb
 - lib/minigl/game_object.rb
@@ -55,6 +48,7 @@ files:
 - lib/minigl/text.rb
 - test/game.rb
 - test/game_object_tests.rb
+- test/iso_game.rb
 - test/map_tests.rb
 - test/movement_tests.rb
 - test/res_tests.rb
@@ -86,5 +80,6 @@ test_files:
 - test/movement_tests.rb
 - test/map_tests.rb
 - test/game.rb
+- test/iso_game.rb
 - test/res_tests.rb
 - test/game_object_tests.rb