minigl 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820be7bb9e24c286a9ca663fbf70cc370a0d11a2
-  data.tar.gz: f372d5c224eff4a4626ab37927046e95a1856b25
+  metadata.gz: ee71302e4c1c310af7e3c6357b99d7678c26c7a2
+  data.tar.gz: 828af95552ce471ca273253326553c483421ea23
 SHA512:
-  metadata.gz: f74e6b225327cd6698ad5fefb440f6d7fdac65f03cc5ef5a316fd8cff853739c5a116d6c613c31a343142246efa1fd2a4bfdbe1ae6d7b12ef899d85f3d39ec89
-  data.tar.gz: bd8055ded3952b4029e44ec6710a52146fb54a04b2a6e89e3edcf1228b3fdda045270f62b82b1881b3cd6afb50b184fec644d73ac182dc504e63476a6d15ec90
+  metadata.gz: 679b54d84b1c9df920e8fa425532554c1ee4d9abc651c38bf222e74dcb9469548aad710656be78e5d7807bfad6d576cb60fba73c03887f426ffaf6ba6d8c310b
+  data.tar.gz: d36f9fee78e3fcd54a47d422f5bfa82fee2479e6ec47f7d2ffe560703ba09e063645017f0c490a2f4363472d70f59f3029dc5a6e79f935e3957c8e50c1095702

data/README.md

@@ -10,7 +10,8 @@ It provides the following features:
   * Basic physics and collision checking
   * Animated objects
 
-More functionalities are coming. Feel free to contribute! 
+More functionalities are coming. Feel free to contribute! You can send feedback
+to victordavidsantos@gmail.com.
 
 Please note:
 

data/lib/minigl/global.rb

@@ -2,23 +2,28 @@ require 'gosu'
 
 module AGL
 	Vector = Struct.new :x, :y
-
+	
 	class Rectangle
 		attr_accessor :x, :y, :w, :h
-	
+		
 		def initialize x, y, w, h
 			@x = x; @y = y; @w = w; @h = h
 		end
-	
+		
 		def intersects r
 			@x < r.x + r.w && @x + @w > r.x && @y < r.y + r.h && @y + @h > r.y
 		end
 	end
 	
 	class Game
-		def self.initialize window, gravity = Vector.new(0, 1)
+		def self.initialize window, gravity = Vector.new(0, 1),
+		                    kb_held_delay = 40, kb_held_interval = 5,
+		                    double_click_delay = 8
 			@@window = window
 			@@gravity = gravity
+			@@kb_held_delay = kb_held_delay
+			@@kb_held_interval = kb_held_interval
+			@@double_click_delay = double_click_delay
 			
 			KB.initialize
 			Mouse.initialize
@@ -27,10 +32,13 @@ module AGL
 		
 		def self.window; @@window; end
 		def self.gravity; @@gravity; end
+		def self.kb_held_delay; @@kb_held_delay; end
+		def self.kb_held_interval; @@kb_held_interval; end
+		def self.double_click_delay; @@double_click_delay; end
 	end
 	
 	#class JSHelper
-
+	
 	class KB
 		def self.initialize
 			@@keys = [
@@ -57,18 +65,18 @@ module AGL
 			@@held_timer = {}
 			@@held_interval = {}
 		end
-	
+		
 		def self.update
 			@@held_timer.each do |k, v|
-				if v < 40; @@held_timer[k] += 1
+				if v < Game.kb_held_delay; @@held_timer[k] += 1
 				else
 					@@held_interval[k] = 0
 					@@held_timer.delete k
 				end
 			end
-		
+			
 			@@held_interval.each do |k, v|
-				if v < 5; @@held_interval[k] += 1
+				if v < Game.kb_held_interval; @@held_interval[k] += 1
 				else; @@held_interval[k] = 0; end
 			end
 			
@@ -84,24 +92,24 @@ module AGL
 				end
 			end
 		end
-	
+		
 		def self.key_pressed? key
 			@@prev_down.index(key).nil? and @@down.index(key)
 		end
-	
+		
 		def self.key_down? key
 			@@down.index(key)
 		end
-	
+		
 		def self.key_released? key
 			@@prev_down.index(key) and @@down.index(key).nil?
 		end
-	
+		
 		def self.key_held? key
-			@@held_interval[key] == 5
+			@@held_interval[key] == Game.kb_held_interval
 		end
 	end
-
+	
 	class Mouse
 		def self.initialize
 			@@down = {}
@@ -109,17 +117,17 @@ module AGL
 			@@dbl_click = {}
 			@@dbl_click_timer = {}
 		end
-	
+		
 		def self.update
 			@@prev_down = @@down.clone
 			@@down.clear
 			@@dbl_click.clear
-		
+			
 			@@dbl_click_timer.each do |k, v|
-				if v < 8; @@dbl_click_timer[k] += 1
+				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
@@ -131,30 +139,30 @@ module AGL
 					@@dbl_click_timer[k2[i]] = 0
 				end
 			end
-		
+			
 			@@x = Game.window.mouse_x.round
 			@@y = Game.window.mouse_y.round
 		end
-	
+		
 		def self.x; @@x; end
 		def self.y; @@y; end
-	
+		
 		def self.button_pressed? btn
 			@@down[btn] and not @@prev_down[btn]
 		end
-	
+		
 		def self.button_down? btn
 			@@down[btn]
 		end
-	
+		
 		def self.button_released? btn
 			@@prev_down[btn] and not @@down[btn]
 		end
-	
+		
 		def self.double_click? btn
 			@@dbl_click[btn]
 		end
-	
+		
 		def self.over? x, y, w, h
 			@@x >= x and @@x < x + w and @@y >= y and @@y < y + h
 		end
@@ -171,7 +179,7 @@ module AGL
 			@@fonts = Hash.new
 			@@global_fonts = Hash.new
 		end
-	
+		
 		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]
@@ -179,7 +187,7 @@ module AGL
 			img = Gosu::Image.new Game.window, s, tileable
 			a[id] = img
 		end
-	
+		
 		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]
@@ -187,7 +195,7 @@ module AGL
 			imgs = Gosu::Image.load_tiles Game.window, s, -sprite_cols, -sprite_rows, false
 			a[id] = 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]
@@ -195,7 +203,7 @@ module AGL
 			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]
@@ -203,7 +211,7 @@ module AGL
 			sound = Gosu::Sample.new Game.window, s
 			a[id] = sound
 		end
-	
+		
 		def self.song id, global = false, ext = ".ogg"
 			if global; a = @@global_sounds; else; a = @@sounds; end
 			return a[id] if a[id]
@@ -219,11 +227,11 @@ module AGL
 			font = Gosu::Font.new Game.window, s, size
 			a[id] = font
 		end
-	
+		
 #		def self.text id
 #			G.texts[G.lang][id.to_sym]
 #		end
-	
+		
 		def self.clear
 			@@imgs.clear
 			@@tilesets.clear

data/test/game.rb

@@ -4,10 +4,11 @@ include AGL
 class MyGame < Gosu::Window
   def initialize
     super 800, 600, false # creating a 800 x 600 window, not full screen
-    Game.initialize self  # initializing MiniGL for this window
+    Game.initialize self, Vector.new(0, 1), 10, 2, 20
     
     @img = Res.img :img1
     @font = Res.font :font1, 20
+    @writer = TextHelper.new @font, 5
     @x = 0
     @y = 0
   end
@@ -18,13 +19,13 @@ class MyGame < Gosu::Window
 
   def update
     KB.update
-    @y -= 1 if KB.key_down? Gosu::KbUp
+    @y -= 1 if KB.key_held? Gosu::KbUp
     @x += 1 if KB.key_down? Gosu::KbRight
-    @y += 1 if KB.key_down? Gosu::KbDown
+    @y += 1 if KB.key_held? Gosu::KbDown
     @x -= 1 if KB.key_down? Gosu::KbLeft
     
     Mouse.update
-    if Mouse.button_pressed? :left
+    if Mouse.double_click? :left
       @x = Mouse.x - @img.width / 2
       @y = Mouse.y - @img.height / 2
     end
@@ -32,7 +33,10 @@ class MyGame < Gosu::Window
 
   def draw
     @img.draw @x, @y, 0
-    @font.draw "Testing fonts", 20, 560, 0
+    @writer.write_breaking "Testing multiple line text.\nThis should draw text "\
+                           "across multiple lines, respecting a limit width. "\
+                           "Furthermore, the text must be right-aligned.",
+                           780, 300, 300, :right
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -36,25 +36,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
+- data/font/font1.ttf
+- data/img/image.png
+- data/img/img1.png
+- data/tileset/tileset1.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/game_object.rb
-- data/tileset/tileset1.png
-- data/img/image.png
-- data/img/img1.png
-- data/font/font1.ttf
-- Rakefile
-- LICENSE
-- README.md
+- lib/minigl/text.rb
 - test/game.rb
 - test/game_object_tests.rb
-- test/res_tests.rb
 - test/map_tests.rb
 - test/movement_tests.rb
+- test/res_tests.rb
 homepage: https://github.com/victords/minigl
 licenses:
 - GPL-2
@@ -75,13 +75,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 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
+- test/game_object_tests.rb