minigl 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d947f9f6b2942d8c013e40a3bcb133c05e568b5
-  data.tar.gz: 73a2e40462939be5c50da793498365fee9b6317a
+  metadata.gz: a86c42ce7c6ca9f79f56802e343f9cc86444088a
+  data.tar.gz: ac13807120b6a030599ee04df958d1bdfde33a0a
 SHA512:
-  metadata.gz: efbef16eee12d57c33ce6083ac0ec633658c46a9f0a32a1ecde2ec76f386f924d69f0a412fd70087d627bb05f692b3c44da3cc1a597a9ed45fd93e9089b01dd6
-  data.tar.gz: 9c794f33476e267e804fac724c396da080918b8fb7fb6ea0fc047fabda804afa3ff4509a5937676acee0c6a540b1193b072f33dfd1081989ab5d0ea59ea3ad98
+  metadata.gz: 2222057067a8f1db28f43be8d116605ed574beb73574eb050c1f5bde0fb23558507e1750253128c01157e6685022647eeba2dc164094a3bfdb9eff7d64effce5
+  data.tar.gz: be9b5881dd8d36b826a2706933a22bfcae2fd2d1df41e471b36f77bfa46ed22da4ea9c71c7c69bb5a4fda0cb18a298714cdacb75fd25fd96b9bea167540f5e39

data/lib/minigl/forms.rb

@@ -61,13 +61,15 @@ module AGL
 				end
 			end
 		end
-	
-		def draw
-			@img[@img_index].draw @x, @y, 0
+		
+		def draw text_color = 0, alpha = 0xff
+			color = (alpha << 24) | 0xffffff
+			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, 0xff000000
+				@font.draw_rel @text, @text_x, @text_y, 0, 0.5, 0.5, 1, 1, text_color
 			else
-				@font.draw @text, @text_x, @text_y, 0, 1, 1, 0xff000000
+				@font.draw @text, @text_x, @text_y, 0, 1, 1, text_color
 			end
 		end
 	end
@@ -341,24 +343,28 @@ module AGL
 			set_cursor_visible
 		end
 		
-		def draw
-			@img.draw @x, @y, 0
-			@font.draw @text, @text_x, @text_y, 0, 1, 1, 0xff000000
+		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
-				Game.window.draw_quad @nodes[@anchor1], @text_y, 0x80000000,
-				                      @nodes[@anchor2] + 1, @text_y, 0x80000000,
-				                      @nodes[@anchor2] + 1, @text_y + @font.height, 0x80000000,
-				                      @nodes[@anchor1], @text_y + @font.height, 0x80000000, 0
+				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
-					Game.window.draw_quad @nodes[@cur_node], @text_y, 0xff000000,
-					                      @nodes[@cur_node] + 1, @text_y, 0xff000000,
-					                      @nodes[@cur_node] + 1, @text_y + @font.height, 0xff000000,
-					                      @nodes[@cur_node], @text_y + @font.height, 0xff000000, 0
+					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

data/lib/minigl/game_object.rb

@@ -28,11 +28,18 @@ module AGL
 			end
 		end
 		
-		def draw map = nil
+		def draw map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil
+			color = (alpha << 24) | color
 			if map
-				@img[@img_index].draw @x.round - map.cam.x, @y.round - map.cam.y, 0
+				if angle
+					@img[@img_index].draw_rot @x.round - map.cam.x, @y.round - map.cam.y, 0, angle, 0.5, 0.5, scale_x, scale_y, color
+				else
+					@img[@img_index].draw @x.round - map.cam.x, @y.round - map.cam.y, 0, scale_x, scale_y, color
+				end
+			elsif angle
+				@img[@img_index].draw_rot @x.round, @y.round, 0, angle, 0.5, 0.5, scale_x, scale_y, color
 			else
-				@img[@img_index].draw @x.round, @y.round, 0
+				@img[@img_index].draw @x.round, @y.round, 0, scale_x, scale_y, color
 			end
 		end
 	end
@@ -66,12 +73,20 @@ module AGL
 			false
 		end
 		
-		def draw map = nil
+		def draw map = nil, scale_x = 1, scale_y = 1, alpha = 0xff, color = 0xffffff, angle = nil
+			color = (alpha << 24) | color
 			if map
-				@img[@img_index].draw @x.round + @img_gap.x - map.cam.x,
-						                @y.round + @img_gap.y - map.cam.y, 0 if @img
+				if angle
+					@img[@img_index].draw_rot @x.round + @img_gap.x - map.cam.x,
+					                          @y.round + @img_gap.y - map.cam.y,
+					                          0, angle, 0.5, 0.5, scale_x, scale_y, color
+				else
+					@img[@img_index].draw @x.round + @img_gap.x - map.cam.x, @y.round + @img_gap.y - map.cam.y, 0, scale_x, scale_y, color
+				end
+			elsif angle
+				@img[@img_index].draw_rot @x.round + @img_gap.x, @y.round + @img_gap.y, 0, angle, 0.5, 0.5, scale_x, scale_y, color
 			else
-				@img[@img_index].draw @x.round + @img_gap.x, @y.round + @img_gap.y, 0 if @img
+				@img[@img_index].draw @x.round + @img_gap.x, @y.round + @img_gap.y, 0, scale_x, scale_y, color
 			end
 		end
 	end

data/test/game.rb

@@ -6,11 +6,13 @@ class MyGame < Gosu::Window
     super 800, 600, false # creating a 800 x 600 window, not full screen
     Game.initialize self, Vector.new(0, 1), 10, 2, 20
     
-    @img = Res.img :img1
+    @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
-    @x = 0
-    @y = 0
+    @btn = Button.new(10, 560, @font, "Test", :btn, false, 15, 5) {}
+    @txt = TextField.new 10, 520, @font, :text, nil, "", 15, 5, 16
   end
   
   def needs_cursor?
@@ -19,24 +21,31 @@ class MyGame < Gosu::Window
 
   def update
     KB.update
-    @y -= 1 if KB.key_held? Gosu::KbUp
-    @x += 1 if KB.key_down? Gosu::KbRight
-    @y += 1 if KB.key_held? Gosu::KbDown
-    @x -= 1 if KB.key_down? Gosu::KbLeft
+    @obj1.y -= 1 if KB.key_held? Gosu::KbUp
+    @obj1.x += 1 if KB.key_down? Gosu::KbRight
+    @obj1.y += 1 if KB.key_held? Gosu::KbDown
+    @obj1.x -= 1 if KB.key_down? Gosu::KbLeft
     
     Mouse.update
     if Mouse.double_click? :left
-      @x = Mouse.x - @img.width / 2
-      @y = Mouse.y - @img.height / 2
+      @obj1.x = Mouse.x + 10
+      @obj1.y = Mouse.y + 10
     end
+    
+    @btn.update
+    @txt.update
   end
 
   def draw
-    @img.draw @x, @y, 0
+    @obj1.draw nil, 1, 1, 0x80, 0x33ff33, 30
+    @obj2.draw nil, 0.6, 1.4, 0x99
     @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
+    
+    @btn.draw 0x008000, 0xcc
+    @txt.draw 0, 0x0000ff
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -40,8 +40,10 @@ files:
 - README.md
 - Rakefile
 - data/font/font1.ttf
+- data/img/btn.png
 - data/img/image.png
 - data/img/img1.png
+- data/img/text.png
 - data/tileset/tileset1.png
 - lib/minigl.rb
 - lib/minigl/forms.rb