rubygoo 0.0.5 → 0.0.6

data/lib/rubygoo/adapters/gosu_app_adapter.rb

@@ -203,8 +203,8 @@ K_DOWN = KbDown
 K_RIGHT = KbRight
 K_LEFT = KbLeft
 K_INSERT = enum += 1
-K_HOME = enum += 1
-K_END = enum += 1
+K_HOME = KbHome
+K_END = KbEnd
 K_PAGEUP = enum += 1
 K_PAGEDOWN = enum += 1
 
@@ -269,224 +269,217 @@ K_MOD_META = enum += 1
 
 
 # key/mouse event mappings
-module Mouse
-  # Hash to translate mouse button sym to string
-  MOUSE2STR = {
-    MOUSE_LEFT => "left",
-    MOUSE_MIDDLE => "middle",
-    MOUSE_RIGHT => "right"
-  }
-  # And to translate the other way...
-  STR2MOUSE = MOUSE2STR.invert()
-  # And allow numbers too (1 = left, so on)...
-  STR2MOUSE[1] = MOUSE_LEFT
-  STR2MOUSE[2] = MOUSE_MIDDLE
-  STR2MOUSE[3] = MOUSE_RIGHT
-end # module Mouse
+# Hash to translate mouse button sym to string
+MOUSE2STR = {
+  MOUSE_LEFT => "left",
+  MOUSE_MIDDLE => "middle",
+  MOUSE_RIGHT => "right"
+}
+# And to translate the other way...
+STR2MOUSE = MOUSE2STR.invert()
+# And allow numbers too (1 = left, so on)...
+STR2MOUSE[1] = MOUSE_LEFT
+STR2MOUSE[2] = MOUSE_MIDDLE
+STR2MOUSE[3] = MOUSE_RIGHT
 
-module Key
-  # All the keys which have ASCII print values
-  # It is 87 lines from here to the closing }, if you want to skip it...
-  KEY2ASCII = {
-    K_BACKSPACE => "\b",
-    K_TAB => "\t",
-    K_RETURN => "\n", #SDL docs: "\r". Win vs *nix? What about Mac?
-    K_ESCAPE => "^[",
-    K_SPACE => " ",
-    K_EXCLAIM => "!",
-    K_QUOTEDBL => "\"",
-    K_HASH => "#",
-    K_DOLLAR => "$",
-    K_AMPERSAND => "&",
-    K_QUOTE => "\'",
-    K_LEFTPAREN => "(",
-    K_RIGHTPAREN => ")",
-    K_ASTERISK => "*",
-    K_PLUS => "+",
-    K_COMMA => ",",
-    K_MINUS => "-",
-    K_PERIOD => ".",
-    K_SLASH => "/",
-    K_0 => "0",
-    K_1 => "1",
-    K_2 => "2",
-    K_3 => "3",
-    K_4 => "4",
-    K_5 => "5",
-    K_6 => "6",
-    K_7 => "7",
-    K_8 => "8",
-    K_9 => "9",
-    K_COLON => ":",
-    K_SEMICOLON => ";",
-    K_LESS => "<",
-    K_EQUALS => "=",
-    K_GREATER => ">",
-    K_QUESTION => "?",
-    K_AT => "@",
-    K_LEFTBRACKET => "[",
-    K_BACKSLASH => "\\",
-    K_RIGHTBRACKET => "]",
-    K_CARET => "^",
-    K_UNDERSCORE => "_",
-    K_BACKQUOTE => "`",
-    K_A => "a",
-    K_B => "b",
-    K_C => "c",
-    K_D => "d",
-    K_E => "e",
-    K_F => "f",
-    K_G => "g",
-    K_H => "h",
-    K_I => "i",
-    K_J => "j",
-    K_K => "k",
-    K_L => "l",
-    K_M => "m",
-    K_N => "n",
-    K_O => "o",
-    K_P => "p",
-    K_Q => "q",
-    K_R => "r",
-    K_S => "s",
-    K_T => "t",
-    K_U => "u",
-    K_V => "v",
-    K_W => "w",
-    K_X => "x",
-    K_Y => "y",
-    K_Z => "z",
-    K_KP0 => "0",
-    K_KP1 => "1",
-    K_KP2 => "2",
-    K_KP3 => "3",
-    K_KP4 => "4",
-    K_KP5 => "5",
-    K_KP6 => "6",
-    K_KP7 => "7",
-    K_KP8 => "8",
-    K_KP9 => "9",
-    K_KP_PERIOD => ".",
-    K_KP_DIVIDE => "/",
-    K_KP_MULTIPLY => "*",
-    K_KP_MINUS => "-",
-    K_KP_PLUS => "+",
-    K_KP_ENTER => "\n", #again, SDL docs say "\r"
-    K_KP_EQUALS => "=",
-  }
+# All the keys which have ASCII print values
+# It is 87 lines from here to the closing }, if you want to skip it...
+KEY2ASCII = {
+  K_BACKSPACE => "\b",
+  K_TAB => "\t",
+  K_RETURN => "\n", #SDL docs: "\r". Win vs *nix? What about Mac?
+  K_ESCAPE => "^[",
+  K_SPACE => " ",
+  K_EXCLAIM => "!",
+  K_QUOTEDBL => "\"",
+  K_HASH => "#",
+  K_DOLLAR => "$",
+  K_AMPERSAND => "&",
+  K_QUOTE => "\'",
+  K_LEFTPAREN => "(",
+  K_RIGHTPAREN => ")",
+  K_ASTERISK => "*",
+  K_PLUS => "+",
+  K_COMMA => ",",
+  K_MINUS => "-",
+  K_PERIOD => ".",
+  K_SLASH => "/",
+  K_0 => "0",
+  K_1 => "1",
+  K_2 => "2",
+  K_3 => "3",
+  K_4 => "4",
+  K_5 => "5",
+  K_6 => "6",
+  K_7 => "7",
+  K_8 => "8",
+  K_9 => "9",
+  K_COLON => ":",
+  K_SEMICOLON => ";",
+  K_LESS => "<",
+  K_EQUALS => "=",
+  K_GREATER => ">",
+  K_QUESTION => "?",
+  K_AT => "@",
+  K_LEFTBRACKET => "[",
+  K_BACKSLASH => "\\",
+  K_RIGHTBRACKET => "]",
+  K_CARET => "^",
+  K_UNDERSCORE => "_",
+  K_BACKQUOTE => "`",
+  K_A => "a",
+  K_B => "b",
+  K_C => "c",
+  K_D => "d",
+  K_E => "e",
+  K_F => "f",
+  K_G => "g",
+  K_H => "h",
+  K_I => "i",
+  K_J => "j",
+  K_K => "k",
+  K_L => "l",
+  K_M => "m",
+  K_N => "n",
+  K_O => "o",
+  K_P => "p",
+  K_Q => "q",
+  K_R => "r",
+  K_S => "s",
+  K_T => "t",
+  K_U => "u",
+  K_V => "v",
+  K_W => "w",
+  K_X => "x",
+  K_Y => "y",
+  K_Z => "z",
+  K_KP0 => "0",
+  K_KP1 => "1",
+  K_KP2 => "2",
+  K_KP3 => "3",
+  K_KP4 => "4",
+  K_KP5 => "5",
+  K_KP6 => "6",
+  K_KP7 => "7",
+  K_KP8 => "8",
+  K_KP9 => "9",
+  K_KP_PERIOD => ".",
+  K_KP_DIVIDE => "/",
+  K_KP_MULTIPLY => "*",
+  K_KP_MINUS => "-",
+  K_KP_PLUS => "+",
+  K_KP_ENTER => "\n", #again, SDL docs say "\r"
+  K_KP_EQUALS => "=",
+}
 
-  # And to translate the other way...
-  ASCII2KEY = KEY2ASCII.invert()
-  # accept uppercase letters too, return same as lowercase version:
-  ("a".."z").each{ |letter| ASCII2KEY[letter.upcase] = ASCII2KEY[letter] }
+# And to translate the other way...
+ASCII2KEY = KEY2ASCII.invert()
+# accept uppercase letters too, return same as lowercase version:
+("a".."z").each{ |letter| ASCII2KEY[letter.upcase] = ASCII2KEY[letter] }
 
-  # All the keys that are affected by the Shift key, in lower case
-  # 49 lines from here to the end of the hash
-  KEY2LOWER = {
-    K_QUOTE => "\'",
-    K_COMMA => ",",
-    K_MINUS => "-",
-    K_PERIOD => ".",
-    K_SLASH => "/",
-    K_0 => "0",
-    K_1 => "1",
-    K_2 => "2",
-    K_3 => "3",
-    K_4 => "4",
-    K_5 => "5",
-    K_6 => "6",
-    K_7 => "7",
-    K_8 => "8",
-    K_9 => "9",
-    K_SEMICOLON => ";",
-    K_EQUALS => "=",
-    K_LEFTBRACKET => "[",
-    K_BACKSLASH => "\\",
-    K_RIGHTBRACKET => "]",
-    K_BACKQUOTE => "`",
-    K_A => "a",
-    K_B => "b",
-    K_C => "c",
-    K_D => "d",
-    K_E => "e",
-    K_F => "f",
-    K_G => "g",
-    K_H => "h",
-    K_I => "i",
-    K_J => "j",
-    K_K => "k",
-    K_L => "l",
-    K_M => "m",
-    K_N => "n",
-    K_O => "o",
-    K_P => "p",
-    K_Q => "q",
-    K_R => "r",
-    K_S => "s",
-    K_T => "t",
-    K_U => "u",
-    K_V => "v",
-    K_W => "w",
-    K_X => "x",
-    K_Y => "y",
-    K_Z => "z",
-  }
+# All the keys that are affected by the Shift key, in lower case
+# 49 lines from here to the end of the hash
+KEY2LOWER = {
+  K_QUOTE => "\'",
+  K_COMMA => ",",
+  K_MINUS => "-",
+  K_PERIOD => ".",
+  K_SLASH => "/",
+  K_0 => "0",
+  K_1 => "1",
+  K_2 => "2",
+  K_3 => "3",
+  K_4 => "4",
+  K_5 => "5",
+  K_6 => "6",
+  K_7 => "7",
+  K_8 => "8",
+  K_9 => "9",
+  K_SEMICOLON => ";",
+  K_EQUALS => "=",
+  K_LEFTBRACKET => "[",
+  K_BACKSLASH => "\\",
+  K_RIGHTBRACKET => "]",
+  K_BACKQUOTE => "`",
+  K_A => "a",
+  K_B => "b",
+  K_C => "c",
+  K_D => "d",
+  K_E => "e",
+  K_F => "f",
+  K_G => "g",
+  K_H => "h",
+  K_I => "i",
+  K_J => "j",
+  K_K => "k",
+  K_L => "l",
+  K_M => "m",
+  K_N => "n",
+  K_O => "o",
+  K_P => "p",
+  K_Q => "q",
+  K_R => "r",
+  K_S => "s",
+  K_T => "t",
+  K_U => "u",
+  K_V => "v",
+  K_W => "w",
+  K_X => "x",
+  K_Y => "y",
+  K_Z => "z",
+}
 
-  # All the keys that are affected by the Shift key, in UPPER case
-  # 49 lines from here to the end of the hash
-  KEY2UPPER = {
-    K_QUOTE => "\"",
-    K_COMMA => "<",
-    K_MINUS => "_",
-    K_PERIOD => ">",
-    K_SLASH => "?",
-    K_0 => ")",
-    K_1 => "!",
-    K_2 => "@",
-    K_3 => "#",
-    K_4 => "$",
-    K_5 => "%",
-    K_6 => "^",
-    K_7 => "&",
-    K_8 => "*",
-    K_9 => "(",
-    K_SEMICOLON => ":",
-    K_EQUALS => "+",
-    K_LEFTBRACKET => "{",
-    K_BACKSLASH => "|",
-    K_RIGHTBRACKET => "}",
-    K_BACKQUOTE => "~",
-    K_A => "A",
-    K_B => "B",
-    K_C => "C",
-    K_D => "D",
-    K_E => "E",
-    K_F => "F",
-    K_G => "G",
-    K_H => "H",
-    K_I => "I",
-    K_J => "J",
-    K_K => "K",
-    K_L => "L",
-    K_M => "M",
-    K_N => "N",
-    K_O => "O",
-    K_P => "P",
-    K_Q => "Q",
-    K_R => "R",
-    K_S => "S",
-    K_T => "T",
-    K_U => "U",
-    K_V => "V",
-    K_W => "W",
-    K_X => "X",
-    K_Y => "Y",
-    K_Z => "Z",
-  }
-end #module Key
-
-include Mouse
-include Key
+# All the keys that are affected by the Shift key, in UPPER case
+# 49 lines from here to the end of the hash
+KEY2UPPER = {
+  K_QUOTE => "\"",
+  K_COMMA => "<",
+  K_MINUS => "_",
+  K_PERIOD => ">",
+  K_SLASH => "?",
+  K_0 => ")",
+  K_1 => "!",
+  K_2 => "@",
+  K_3 => "#",
+  K_4 => "$",
+  K_5 => "%",
+  K_6 => "^",
+  K_7 => "&",
+  K_8 => "*",
+  K_9 => "(",
+  K_SEMICOLON => ":",
+  K_EQUALS => "+",
+  K_LEFTBRACKET => "{",
+  K_BACKSLASH => "|",
+  K_RIGHTBRACKET => "}",
+  K_BACKQUOTE => "~",
+  K_A => "A",
+  K_B => "B",
+  K_C => "C",
+  K_D => "D",
+  K_E => "E",
+  K_F => "F",
+  K_G => "G",
+  K_H => "H",
+  K_I => "I",
+  K_J => "J",
+  K_K => "K",
+  K_L => "L",
+  K_M => "M",
+  K_N => "N",
+  K_O => "O",
+  K_P => "P",
+  K_Q => "Q",
+  K_R => "R",
+  K_S => "S",
+  K_T => "T",
+  K_U => "U",
+  K_V => "V",
+  K_W => "W",
+  K_X => "X",
+  K_Y => "Y",
+  K_Z => "Z",
+}
 
 class GosuAppAdapter
 
@@ -528,13 +521,16 @@ class GosuAppAdapter
       mods << K_RALT if @main_window.button_down? KbRightAlt
       mods << K_LCTRL if @main_window.button_down? KbLeftControl
       mods << K_RCTRL if @main_window.button_down? KbRightControl
-      mods << K_LSHIFT if @main_window.button_down? KbLeftShift
-      mods << K_RSHIFT if @main_window.button_down? KbRightShift
+      left_shift = @main_window.button_down? KbLeftShift
+      right_shift = @main_window.button_down? KbRightShift
+      mods << K_LSHIFT if left_shift
+      mods << K_RSHIFT if right_shift
+
       button_string = @main_window.button_id_to_char(id)
+      button_string ||= "?"
 
+      button_string.upcase! if left_shift or right_shift
 
-      # TODO add caps
-      button_string ||= "?"
       @app.on_event GooEvent.new(:key_pressed, { 
         :key => id, :mods => mods, :string => button_string})
     end

data/lib/rubygoo/adapters/gosu_render_adapter.rb

@@ -1,15 +1,23 @@
 module Rubygoo
+  class DelayedText
+    def initialize(font, text)
+      @font, @text = font, text
+    end
+    def draw(x, y, z, r, g, b); @font.draw(@text, x, y, z); end; 
+    def width()
+      @width ||= @font.text_width(@text).ceil
+    end
+    def height()
+      @height ||= @font.height
+    end
+  end
+
   class GosuRenderAdapter
 
     def initialize(window)
       @window = window
     end
 
-    def draw_box_filled(x1,y1,x2,y2,color)
-      c = convert_color(color)
-      @window.draw_quad x1, y1, c, x2, y1, c, x1, y2, c, x2, y2, c
-    end
-
     def draw_box(x1,y1,x2,y2,color)
       c = convert_color(color)
       @window.draw_line x1, y1, c, x2, y1, c
@@ -18,16 +26,35 @@ module Rubygoo
       @window.draw_line x1, y2, c, x1, y1, c
     end
 
-    # fill in a rect with color or full screen if no color
-    def fill(color,rect=nil)
-      if rect.nil? 
-        draw_box_filled 0, 0, @window.width, @window.height, color
-      else
-        draw_box_filled rect[0], rect[1], rect[2]+rect[0], rect[3]+rect[1], color
-      end
+    CIRCLE_STEP = 10
+    def draw_circle(cx,cy,r,color)
+      c_color = convert_color(color)
+      
+      0.step(360, CIRCLE_STEP) { |a1| 
+        a2 = a1 + CIRCLE_STEP
+        @window.draw_line cx + offset_x(a1, r), cy + offset_y(a1, r), c_color, cx + offset_x(a2, r), cy + offset_y(a2, r), c_color, 0 
+      }
+    end
+
+    def draw_circle_filled(cx,cy,r,color)
+      c_color = convert_color(color)
+
+      0.step(360, CIRCLE_STEP) { |a1| 
+        a2 = a1 + CIRCLE_STEP
+        @window.draw_triangle cx + offset_x(a1, r), cy + offset_y(a1, r), c_color, cx + offset_x(a2, r), cy + offset_y(a2, r), c_color, cx, cy, c_color, 0 
+      }
+    end
+
+    def fill_screen(color)
+      c = convert_color(color)
+      @window.draw_quad 0, 0, c, @window.width, 0, c, 0, @window.height, c, @window.width, @window.height, c
+    end
+
+    def fill(x1,y1,x2,y2,color)
+      c = convert_color(color)
+      @window.draw_quad x1, y1, c, x2, y1, c, x1, y2, c, x2, y2, c
     end
 
-    # make static for now for migration ease of rendering fonts
     def convert_color(goo_color)
       Gosu::Color.new goo_color.a,goo_color.r,goo_color.g,goo_color.b
     end
@@ -39,9 +66,9 @@ module Rubygoo
     def draw_image(img, x, y, color=nil)
       # z is unused here
       if color
-        img.draw x, y, 1,1,1,convert_color(color)
+        img.draw x, y, 0,1,1,convert_color(color)
       else
-        img.draw x, y, 1
+        img.draw x, y, 0
       end
     end
 
@@ -59,9 +86,10 @@ module Rubygoo
       font = @font_cache[font_file][font_size] ||= Font.new(@window, font_file, font_size)
 
       # TODO how do you set the color here?
-      text_image = Image.from_text(@window, text, font_file, font_size, 2, font.text_width(text).ceil+text.length*2, :left)
+#      text_image = Image.from_text(@window, text, font_file, font_size, 2, font.text_width(text).ceil, :left)
+      DelayedText.new font, text
+#      text_image = font.draw(text, 0, 0, 1)
     end
 
-
   end
 end

data/lib/rubygoo/adapters/rubygame_render_adapter.rb

@@ -10,13 +10,20 @@ module Rubygoo
       @screen.draw_box [x1,y1], [x2,y2], convert_color(color)
     end
 
-    # fill in a rect with color or full screen if no color
-    def fill(color,rect=nil)
-      if rect.nil? 
-        @screen.fill convert_color(color)
-      else
-        @screen.fill convert_color(color), rect
-      end
+    def draw_circle(cx,cy,radius,color)
+      @screen.draw_circle_a [cx,cy],radius,convert_color(color)
+    end
+
+    def draw_circle_filled(cx,cy,radius,color)
+      @screen.draw_circle_s [cx,cy],radius,convert_color(color)
+    end
+
+    def fill_screen(color)
+      @screen.draw_box_s [0,0], [@screen.width,@screen.height], convert_color(color)
+    end
+
+    def fill(x1,y1,x2,y2,color)
+      @screen.draw_box_s [x1,y1], [x2,y2], convert_color(color)
     end
 
     def convert_color(goo_color)