gridmap 0.2 → 0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQ0ZjJiMmFkNmFmYTBjMGFmZjVmYjdmM2YyYmNmMjZmYWYxNmMxZg==
+    OWI3MjAwZmM4MTgyNmQ3MDljYzE1MzI5NTc2NTQzOTYyMTlhZmM2Nw==
   data.tar.gz: !binary |-
-    YTBhMDVmYzc1ZTE2ZGY3NzA0MzVkYTcyNzcwYzhkMzljOTQ2YjkwMg==
+    MWM1OGU4Y2RmNWJlMzljMzUxZWIxYTU1OWM2OGY2NTdkY2IzZmMwZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWJiNDVhZjgxZGI4YmQxNDczMjM1YmJhNzk0YTA2NWMyYWE1NjQ1NDBlODIy
-    ZmZhYWM1MzgyNTU5YmZhZmZmMTZlMGVmZTJmZmMwZWRkNGE1MTIzZDQ5ZmUy
-    ZDYyZDE3ZTcxMzA5YWFlYmFkNGYwOWNlOGYxMjkxYjE3MTI4NWU=
+    ODBhNjI2ZTlmNjZkOTRkYTkyNTY3OTNkZTUyMjZkM2U5YjQxYzRhOWE0ZmM4
+    MDRlOWQ2NGJhZDFmMmQ5ZDc0ZWIyNDIxY2I2MGYxNTBjZjgzNGU4ZWQ2OWE2
+    YzJlZTYzNmQyZWYwMGZjOTEwNWVjYTJjNzY1ZGIzZmIyYzc4MzM=
   data.tar.gz: !binary |-
-    YWJhODA1ODcwN2NhYzVlMzU5NGM3YWUxZjlkZTU2OTBjYmE1ZTg0MzVmMDhj
-    NDM3N2Q1NzViYmU0ZmYwYjcxNDM4NDVlZDZiYTQwOGI0OWQxMmExMTA2MWMy
-    MzMyNjYzODY0MTUwMjMwODc3OTcyOTQ5OWVkZGIwZWE5M2UwNmU=
+    NmNmYTMxYTc5ZWQzYjAxODM3N2MzNzZlYTNlMTRlZjliMjQ4MGI5ODNjYmZi
+    NGI4Yzk2Mzg5MjFhMGExNWUzMWY1NjdiZjQxNjE0M2MyMDhkOWYxMzhkYjBk
+    YTNiMWI5NGIxOTE0ZTc4Y2EyOWI2ZTRmMGU0ODNiN2FmZTgzODg=

data/lib/gridmap.rb

@@ -1,14 +1,25 @@
+require 'gosu' 
+
 class Gridmap < Array
 	attr_reader :tile_size, :grid_width, :grid_height, :pixel_width, :pixel_height, :connected_tiles, :orientated_tiles
-  	def initialize(map_path, symbol_details, tile_size)
-  		@tile_size = tile_size
-  		@connected_tiles = []
-  		@orientated_tiles = []
+  	def initialize(window, map_path, symbol_details, images, tile_size)
+  		@window 			= window
+  		@map_path 			= map_path
+  		@symbol_details		= symbol_details
+  		@images 			= images
+  		@tile_size 			= tile_size
+
+  		make_map
+  		define_tiles
+	end
 
-	   	IO.readlines(map_path).each_with_index do |line, y|
+	def make_map
+		@connected_tiles 	= []
+  		@orientated_tiles 	= []
+		IO.readlines(@map_path).each_with_index do |line, y|
 	      	gridline = []
 	      	line.chomp.split("").each_with_index do |symbol, x|
-	      		t = Tile.new(x, y, tile_size, symbol_details[symbol])
+	      		t = Tile.new(x, y, @tile_size, @symbol_details[symbol])
 	      		gridline 			<< t
 	      		@connected_tiles 	<< t if t.details[:connected]
 	      		@orientated_tiles 	<< t if t.details[:orientated]
@@ -16,15 +27,20 @@ class Gridmap < Array
 	      	self << gridline
 	    end
 
+	    #Checks to make sure all lines are the same length.
+	    line_count = self.first.count
+	    self.each {|line| if line.count != line_count
+	    						raise StandardError, "The lines in your map file are not all the same length." end}
+
 	    #Since all lines should contain the same number of characters, the width is set by counting the number of characters in the first line.
 		@grid_width  = self.first.count - 1
 		@grid_height = self.count - 1
 
-		@pixel_width = (@grid_width + 1) * tile_size
-		@pixel_height = (@grid_height + 1) * tile_size
+		@pixel_width = (@grid_width + 1) * @tile_size
+		@pixel_height = (@grid_height + 1) * @tile_size
 	end
 
-	def define_tiles(window, images)
+	def define_tiles
 		#The check method checks a tile with the given grid co-ordinates to see if it is connected or not.
 		#The logic here prevents a tile from being checked if it lies outside the grid.
 		def check(x, y)
@@ -85,7 +101,7 @@ class Gridmap < Array
 				img_key = :quad
 			end
 
-			tile.image = Gosu::Image.new(window, images[img_key], true)
+			tile.image = Gosu::Image.new(@window, @images[img_key], true)
 		end
 
 		angle_orientated_tiles
@@ -96,7 +112,7 @@ class Gridmap < Array
 				unless tile.details[:connected]
 					#img_key is inferred from the tile's type!
 					img_key = tile.details[:type].to_sym
-					tile.image = Gosu::Image.new(window, images[img_key], true)
+					tile.image = Gosu::Image.new(@window, @images[img_key], true)
 				end
 			end
 		end
@@ -129,13 +145,30 @@ class Gridmap < Array
 	def find_tile(x, y)
 		self[(y / @tile_size).floor][(x / @tile_size).floor]
 	end
+
+	def change_level(new_map, *p)
+		puts "changing level"
+		#Clears the current grid
+		self.count.times { self.pop }
+
+		@map_path = new_map
+		#Replaces instance variables with param variables if they exist.
+		@symbol_details = p[0] if p[0]
+		@images 		= p[1] if p[1]
+		@tile_size		= p[2] if p[2]
+
+		make_map
+  		define_tiles
+	end
 end
 
 class Tile
-	attr_reader :x, :y
-	attr_accessor :angle, :centre_point, :connections, :details, :image, :z
+	attr_reader :x, :y, :pixel_x, :pixel_y, :centre_point
+	attr_accessor :angle, :details, :image, :z, :connections
 	def initialize(x, y, size, details)
 		@x, @y, @size, @details = x, y, size, details
+		@pixel_x 	= @x * size
+		@pixel_y 	= @y * size
 		
 		@offset_x 	= details[:offset_x] if details[:offset_x]
 		@offset_y 	= details[:offset_y] if details[:offset_y]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridmap
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Normangorman