minigl 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86c42ce7c6ca9f79f56802e343f9cc86444088a
-  data.tar.gz: ac13807120b6a030599ee04df958d1bdfde33a0a
+  metadata.gz: 33a7e31b76d2c0a419ac03bc766d6007650129df
+  data.tar.gz: 2fb3a8a9df9915b64e241b09363d3191494d2297
 SHA512:
-  metadata.gz: 2222057067a8f1db28f43be8d116605ed574beb73574eb050c1f5bde0fb23558507e1750253128c01157e6685022647eeba2dc164094a3bfdb9eff7d64effce5
-  data.tar.gz: be9b5881dd8d36b826a2706933a22bfcae2fd2d1df41e471b36f77bfa46ed22da4ea9c71c7c69bb5a4fda0cb18a298714cdacb75fd25fd96b9bea167540f5e39
+  metadata.gz: 676c67bd7a8475cd4f46dab03cad823d40b20b7b1e504b3b443d074d441f72473af077cf37dffb2c4830a17c2d86289ad5fa9c6d948d32fc80977cb1cbbb988f
+  data.tar.gz: a680e44471368044703cd69557329ffc70340a9281c796d992c54a959ce4214b1c05e84f2ec74dfe126cddf9b2fdc3045b1a344d878e7e79d660ca265b836124

data/README.md

@@ -21,8 +21,8 @@ this [working game example](https://github.com/victords/aventura-do-saber).
   * The [documentation](https://github.com/victords/minigl/wiki) is under
 construction.
 
-**Version 1.2.2**
+**Version 1.2.4**
 
-  * Adjust in `Res.font` to distinguish fonts loaded with different sizes.
-  * Adjust in `TextField` to draw cursor image in the correct position and
-z-index.
+  * Moved color options from `draw` to `initialize` in `Button` and `TextField`.
+  * Added focus control to `TextField`.
+  * Marked some methods of various classes as private.

data/lib/minigl/forms.rb

@@ -2,12 +2,13 @@ require_relative 'global'
 
 module AGL
 	class Button
-		def initialize x, y, font, text, img, center = true, margin_x = 0, margin_y = 0, &action
+		def initialize x, y, font, text, img, text_color = 0, center = true, margin_x = 0, margin_y = 0, &action
 			@x = x
 			@y = y
 			@font = font
 			@text = text
 			@img = Res.imgs img, 1, 3, true
+			@text_color = text_color
 			@w = @img[0].width
 			@h = @img[0].height
 			if center
@@ -62,9 +63,9 @@ module AGL
 			end
 		end
 		
-		def draw text_color = 0, alpha = 0xff
+		def draw alpha = 0xff
 			color = (alpha << 24) | 0xffffff
-			text_color = (alpha << 24) | text_color
+			text_color = (alpha << 24) | @text_color
 			@img[@img_index].draw @x, @y, 0, 1, 1, color
 			if @center
 				@font.draw_rel @text, @text_x, @text_y, 0, 0.5, 0.5, 1, 1, text_color
@@ -77,7 +78,8 @@ module AGL
 	class TextField
 		attr_reader :text
 		
-		def initialize x, y, font, img, cursor_img = nil, text = "", margin_x = 0, margin_y = 0, max_length = 100
+		def initialize x, y, font, img, cursor_img = nil, margin_x = 0, margin_y = 0, max_length = 100, active = false,
+		               text = "", text_color = 0, selection_color = 0
 			@x = x
 			@y = y
 			@font = font
@@ -85,14 +87,17 @@ module AGL
 			@w = @img.width
 			@h = @img.height
 			@cursor_img = Res.img(cursor_img) if cursor_img
+			@max_length = max_length
+			@active = active
 			@text = text
 			@text_x = x + margin_x
 			@text_y = y + margin_y
-			@max_length = max_length
+			@text_color = text_color
+			@selection_color = selection_color
 			
 			@nodes = [x + margin_x]
 			@cur_node = 0
-			@cursor_visible = true
+			@cursor_visible = false
 			@cursor_timer = 0
 			
 			@k = [
@@ -135,30 +140,48 @@ module AGL
 			@text[min..max]
 		end
 		
+		def focus
+			@active = true
+		end
+		
 		def update
 			################################ Mouse ################################
 			if Mouse.over? @x, @y, @w, @h
-				if Mouse.double_click? :left
+				if not @active and Mouse.button_pressed? :left
+					@active = true
+				end
+			elsif Mouse.button_pressed? :left
+				@anchor1 = @anchor2 = nil
+				@cursor_visible = false
+				@cursor_timer = 0
+				@active = false
+			end
+			
+			return unless @active
+			
+			if Mouse.double_click? :left
+				if @nodes.size > 1
 					@anchor1 = 0
 					@anchor2 = @nodes.size - 1
 					@cur_node = @anchor2
-					set_cursor_visible
-				elsif Mouse.button_pressed? :left
-					set_node_by_mouse
-					@anchor1 = @cur_node
-					@anchor2 = nil
-					set_cursor_visible
+					@double_clicked = true
 				end
-			end
-			if Mouse.button_down? :left
-				if @anchor1
+				set_cursor_visible
+			elsif Mouse.button_pressed? :left
+				set_node_by_mouse
+				@anchor1 = @cur_node
+				@anchor2 = nil
+				@double_clicked = false
+				set_cursor_visible
+			elsif Mouse.button_down? :left
+				if @anchor1 and not @double_clicked
 					set_node_by_mouse
 					if @cur_node != @anchor1; @anchor2 = @cur_node
 					else; @anchor2 = nil; end
 					set_cursor_visible
 				end
 			elsif Mouse.button_released? :left
-				if @anchor1
+				if @anchor1 and not @double_clicked
 					if @cur_node != @anchor1; @anchor2 = @cur_node
 					else; @anchor1 = nil; end
 				end
@@ -282,6 +305,35 @@ module AGL
 			end
 		end
 		
+		def draw alpha = 0xff
+			color = (alpha << 24) | 0xffffff
+			text_color = (alpha << 24) | @text_color
+			@img.draw @x, @y, 0, 1, 1, color
+			@font.draw @text, @text_x, @text_y, 0, 1, 1, text_color
+			
+			if @anchor1 and @anchor2
+				selection_color = ((alpha / 2) << 24) | @selection_color
+				Game.window.draw_quad @nodes[@anchor1], @text_y, selection_color,
+				                      @nodes[@anchor2] + 1, @text_y, selection_color,
+				                      @nodes[@anchor2] + 1, @text_y + @font.height, selection_color,
+				                      @nodes[@anchor1], @text_y + @font.height, selection_color, 0
+			end
+			
+			if @cursor_visible
+				if @cursor_img
+					@cursor_img.draw @nodes[@cur_node] - @cursor_img.width / 2, @text_y, 0
+				else
+					cursor_color = alpha << 24
+					Game.window.draw_quad @nodes[@cur_node], @text_y, cursor_color,
+					                      @nodes[@cur_node] + 1, @text_y, cursor_color,
+					                      @nodes[@cur_node] + 1, @text_y + @font.height, cursor_color,
+					                      @nodes[@cur_node], @text_y + @font.height, cursor_color, 0
+				end
+			end
+		end
+		
+	private
+		
 		def set_cursor_visible
 			@cursor_visible = true
 			@cursor_timer = 0
@@ -342,31 +394,5 @@ module AGL
 			end
 			set_cursor_visible
 		end
-		
-		def draw text_color = 0, selection_color = 0, alpha = 0xff
-			color = (alpha << 24) | 0xffffff
-			text_color = (alpha << 24) | text_color
-			@img.draw @x, @y, 0, 1, 1, color
-			@font.draw @text, @text_x, @text_y, 0, 1, 1, text_color
-			
-			if @anchor1 and @anchor2
-				selection_color = ((alpha / 2) << 24) | selection_color
-				Game.window.draw_quad @nodes[@anchor1], @text_y, selection_color,
-				                      @nodes[@anchor2] + 1, @text_y, selection_color,
-				                      @nodes[@anchor2] + 1, @text_y + @font.height, selection_color,
-				                      @nodes[@anchor1], @text_y + @font.height, selection_color, 0
-			end
-			
-			if @cursor_visible
-				if @cursor_img; @cursor_img.draw @nodes[@cur_node] - @cursor_img.width / 2, @text_y, 0
-				else
-					cursor_color = (alpha << 24) | 0
-					Game.window.draw_quad @nodes[@cur_node], @text_y, cursor_color,
-					                      @nodes[@cur_node] + 1, @text_y, cursor_color,
-					                      @nodes[@cur_node] + 1, @text_y + @font.height, cursor_color,
-					                      @nodes[@cur_node], @text_y + @font.height, cursor_color, 0
-				end
-			end
-		end
 	end
 end

data/lib/minigl/map.rb

@@ -3,7 +3,7 @@ require_relative 'global'
 module AGL
 	class Map
 		attr_reader :tile_size, :size, :cam
-	
+		
 		def initialize t_w, t_h, t_x_count, t_y_count, scr_w = 800, scr_h = 600
 			@tile_size = Vector.new t_w, t_h
 			@size = Vector.new t_x_count, t_y_count
@@ -11,39 +11,49 @@ module AGL
 			@max_x = t_x_count * t_w - scr_w
 			@max_y = t_y_count * t_h - scr_h
 		end
-	
+		
 		def get_absolute_size
 			Vector.new(@tile_size.x * @size.x, @tile_size.y * @size.y)
 		end
-	
+		
 		def get_center
 			Vector.new(@tile_size.x * @size.x / 2, @tile_size.y * @size.y / 2)
 		end
-	
+		
 		def get_screen_pos map_x, map_y
 			Vector.new(map_x * @tile_size.x - @cam.x, map_y * @tile_size.y - @cam.y)
 		end
-	
+		
 		def get_map_pos scr_x, scr_y
 			Vector.new((scr_x + @cam.x) / @tile_size.x, (scr_y + @cam.y) / @tile_size.y)
 		end
-	
+		
 		def is_in_map v
 			v.x >= 0 && v.y >= 0 && v.x < @size.x && v.y < @size.y
 		end
-	
+		
 		def set_camera cam_x, cam_y
 			@cam.x = cam_x
 			@cam.y = cam_y
 			set_bounds
 		end
-	
+		
 		def move_camera x, y
 			@cam.x += x
 			@cam.y += y
 			set_bounds
 		end
-	
+		
+		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
+				end
+			end
+		end
+		
+	private
+		
 		def set_bounds
 			@cam.x = @cam.x.round
 			@cam.y = @cam.y.round
@@ -51,31 +61,23 @@ module AGL
 			@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 @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 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
-				end
-			end
-		end
 	end
 end

data/lib/minigl/movement.rb

@@ -173,52 +173,6 @@ module AGL
 			end
 			check_contact obst, ramps
 		end
-		def check_contact obst, ramps
-			@top = @bottom = @left = @right = nil
-			obst.each do |o|
-				x2 = @x + @w; y2 = @y + @h; x2o = o.x + o.w; y2o = o.y + o.h
-				@right = o if !o.passable && x2.round(6) == o.x.round(6) && y2 > o.y && @y < y2o
-				@left = o if !o.passable && @x.round(6) == x2o.round(6) && y2 > o.y && @y < y2o
-				@bottom = o if y2.round(6) == o.y.round(6) && x2 > o.x && @x < x2o
-				@top = o if !o.passable && @y.round(6) == y2o.round(6) && x2 > o.x && @x < x2o
-			end		
-			if @bottom.nil?
-				ramps.each do |r|
-					if r.contact? self
-						@bottom = r
-						break
-					end
-				end
-			end
-		end
-		def find_right_limit coll_list
-			limit = @x + @w + @speed.x
-			coll_list.each do |c|
-				limit = c.x if !c.passable && c.x < limit
-			end
-			limit
-		end
-		def find_left_limit coll_list
-			limit = @x + @speed.x
-			coll_list.each do |c|
-				limit = c.x + c.w if !c.passable && c.x + c.w > limit
-			end
-			limit
-		end
-		def find_down_limit coll_list
-			limit = @y + @h + @speed.y
-			coll_list.each do |c|
-				limit = c.y if c.y < limit && c.y >= @y + @h
-			end
-			limit
-		end
-		def find_up_limit coll_list
-			limit = @y + @speed.y
-			coll_list.each do |c|
-				limit = c.y + c.h if !c.passable && c.y + c.h > limit
-			end
-			limit
-		end
 	
 		def move_carrying aim, speed, obstacles
 			x_d = aim.x - @x; y_d = aim.y - @y
@@ -286,5 +240,58 @@ module AGL
 			end
 			cur_point
 		end
+		
+	private
+		
+		def check_contact obst, ramps
+			@top = @bottom = @left = @right = nil
+			obst.each do |o|
+				x2 = @x + @w; y2 = @y + @h; x2o = o.x + o.w; y2o = o.y + o.h
+				@right = o if !o.passable && x2.round(6) == o.x.round(6) && y2 > o.y && @y < y2o
+				@left = o if !o.passable && @x.round(6) == x2o.round(6) && y2 > o.y && @y < y2o
+				@bottom = o if y2.round(6) == o.y.round(6) && x2 > o.x && @x < x2o
+				@top = o if !o.passable && @y.round(6) == y2o.round(6) && x2 > o.x && @x < x2o
+			end		
+			if @bottom.nil?
+				ramps.each do |r|
+					if r.contact? self
+						@bottom = r
+						break
+					end
+				end
+			end
+		end
+		
+		def find_right_limit coll_list
+			limit = @x + @w + @speed.x
+			coll_list.each do |c|
+				limit = c.x if !c.passable && c.x < limit
+			end
+			limit
+		end
+		
+		def find_left_limit coll_list
+			limit = @x + @speed.x
+			coll_list.each do |c|
+				limit = c.x + c.w if !c.passable && c.x + c.w > limit
+			end
+			limit
+		end
+		
+		def find_down_limit coll_list
+			limit = @y + @h + @speed.y
+			coll_list.each do |c|
+				limit = c.y if c.y < limit && c.y >= @y + @h
+			end
+			limit
+		end
+		
+		def find_up_limit coll_list
+			limit = @y + @speed.y
+			coll_list.each do |c|
+				limit = c.y + c.h if !c.passable && c.y + c.h > limit
+			end
+			limit
+		end
 	end
 end

data/lib/minigl/text.rb

@@ -5,7 +5,8 @@ module AGL
 			@line_spacing = line_spacing
 		end
 	
-		def write_line text, x, y, mode = :left, color = 0xffffffff
+		def write_line text, x, y, mode = :left, color = 0, alpha = 0xff
+			color = (alpha << 24) | color
 			rel =
 				case mode
 				when :left then 0
@@ -16,7 +17,8 @@ module AGL
 			@font.draw_rel text, x, y, 0, rel, 0, 1, 1, color
 		end
 	
-		def write_breaking text, x, y, width, mode = :left, color = 0xffffffff
+		def write_breaking text, x, y, width, mode = :left, color = 0, alpha = 0xff
+			color = (alpha << 24) | color
 			text.split("\n").each do |p|
 				if mode == :justified
 					y = write_paragraph_justified p, x, y, width, color
@@ -33,6 +35,8 @@ module AGL
 			end
 		end
 	
+	private
+		
 		def write_paragraph text, x, y, width, rel, color
 			line = ""
 			line_width = 0

data/test/game.rb

@@ -4,15 +4,15 @@ include AGL
 class MyGame < Gosu::Window
   def initialize
     super 800, 600, false # creating a 800 x 600 window, not full screen
-    Game.initialize self, Vector.new(0, 1), 10, 2, 20
+    Game.initialize self, Vector.new(0, 1), 10, 2
     
     @obj1 = GameObject.new 10, 10, 80, 80, :img1, Vector.new(-10, -10)
     @obj2 = Sprite.new 400, 0, :img1
     
     @font = Res.font :font1, 20
     @writer = TextHelper.new @font, 5
-    @btn = Button.new(10, 560, @font, "Test", :btn, false, 15, 5) {}
-    @txt = TextField.new 10, 520, @font, :text, nil, "", 15, 5, 16
+    @btn = Button.new(10, 560, @font, "Test", :btn, 0x008000, false, 15, 5) {}
+    @txt = TextField.new 10, 520, @font, :text, nil, 15, 5, 16, false, "", 0, 0x0000ff
   end
   
   def needs_cursor?
@@ -44,8 +44,8 @@ class MyGame < Gosu::Window
                            "Furthermore, the text must be right-aligned.",
                            780, 300, 300, :right
     
-    @btn.draw 0x008000, 0xcc
-    @txt.draw 0, 0x0000ff
+    @btn.draw 0xcc
+    @txt.draw
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu