minigl 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859235b4f4ca7a187676a2b0ca361c9e68342446
-  data.tar.gz: 3ffb1d97296310a592421f6a87f2792778f75308
+  metadata.gz: 820be7bb9e24c286a9ca663fbf70cc370a0d11a2
+  data.tar.gz: f372d5c224eff4a4626ab37927046e95a1856b25
 SHA512:
-  metadata.gz: 6999c1e096ba097a8f3581ff17ca25fecbf6483c9db382f941a1721f9079f5410c12eda60d5da30d59ee81504940c8e595a44998014f09fb281a1a6756a9dc12
-  data.tar.gz: d095c9838aab0c9c153ef3a5bf2c6534aae66df9696afad6e9e35d27fc5024c5235cb2f9d794afa0e05bccf47bee2d94415c2943330075115f595e812a144318
+  metadata.gz: f74e6b225327cd6698ad5fefb440f6d7fdac65f03cc5ef5a316fd8cff853739c5a116d6c613c31a343142246efa1fd2a4bfdbe1ae6d7b12ef899d85f3d39ec89
+  data.tar.gz: bd8055ded3952b4029e44ec6710a52146fb54a04b2a6e89e3edcf1228b3fdda045270f62b82b1881b3cd6afb50b184fec644d73ac182dc504e63476a6d15ec90

data/lib/minigl/global.rb

@@ -164,6 +164,8 @@ module AGL
 		def self.initialize
 			@@imgs = Hash.new
 			@@global_imgs = Hash.new
+			@@tilesets = Hash.new
+			@@global_tilesets = Hash.new
 			@@sounds = Hash.new
 			@@global_sounds = Hash.new
 			@@fonts = Hash.new
@@ -186,18 +188,18 @@ module AGL
 			a[id] = imgs
 		end
 	
-		def self.tileset id, global = false
-			if global; a = @@global_imgs; else; a = @@imgs; end
+		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/img/tileset/#{id}.png"
-			tileset = Gosu::Image.load_tiles Game.window, s, C::TileSize, C::TileSize, true
+			s = "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
 	
 		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/se/" + id.to_s.split('_').join('/') + ext
+			s = "data/sound/" + id.to_s.split('_').join('/') + ext
 			sound = Gosu::Sample.new Game.window, s
 			a[id] = sound
 		end
@@ -205,7 +207,7 @@ module AGL
 		def self.song id, global = false, ext = ".ogg"
 			if global; a = @@global_sounds; else; a = @@sounds; end
 			return a[id] if a[id]
-			s = "data/sound/bgm/" + id.to_s.split('_').join('/') + ext
+			s = "data/song/" + id.to_s.split('_').join('/') + ext
 			song = Gosu::Song.new Game.window, s
 			a[id] = song
 		end
@@ -224,6 +226,7 @@ module AGL
 	
 		def self.clear
 			@@imgs.clear
+			@@tilesets.clear
 			@@sounds.clear
 			@@fonts.clear
 		end

data/test/res_tests.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require_relative '../lib/minigl'
+include AGL
+
+class SpriteTest < Test::Unit::TestCase
+	def setup
+		@window = Gosu::Window.new 800, 600, false
+		Game.initialize @window
+	end
+	
+	def test_tileset
+		t1 = Res.tileset :tileset1
+		assert_equal 9, t1.length
+		assert_equal 32, t1[0].width
+		assert_equal 32, t1[0].width
+		Res.clear
+		t1 = Res.tileset :tileset1, 48, 48
+		assert_equal 4, t1.length
+		assert_equal 48, t1[0].width
+		assert_equal 48, t1[0].width
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -36,21 +36,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- Rakefile
-- data/font/font1.ttf
-- data/img/image.png
-- data/img/img1.png
 - lib/minigl.rb
 - lib/minigl/forms.rb
-- lib/minigl/game_object.rb
 - lib/minigl/global.rb
+- lib/minigl/text.rb
 - lib/minigl/map.rb
 - lib/minigl/movement.rb
-- lib/minigl/text.rb
+- lib/minigl/game_object.rb
+- data/tileset/tileset1.png
+- data/img/image.png
+- data/img/img1.png
+- data/font/font1.ttf
+- Rakefile
+- LICENSE
+- README.md
 - test/game.rb
 - test/game_object_tests.rb
+- test/res_tests.rb
 - test/map_tests.rb
 - test/movement_tests.rb
 homepage: https://github.com/victords/minigl
@@ -73,12 +75,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: MiniGL
 test_files:
-- test/movement_tests.rb
-- test/map_tests.rb
 - test/game.rb
 - test/game_object_tests.rb
+- test/res_tests.rb
+- test/map_tests.rb
+- test/movement_tests.rb