rubygoo 0.0.3 → 0.0.4

data/lib/rubygoo/adapters/gosu_render_adapter.rb

@@ -1,53 +1,67 @@
-class GosuRenderAdapter
+module Rubygoo
+  class GosuRenderAdapter
 
-  def initialize(window)
-    @window = window
-  end
+    def initialize(window)
+      @window = window
+    end
 
-  def draw_box(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_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
 
-  # fill in a rect with color or full screen if no color
-  def fill(color,rect=nil)
-    if rect.nil? 
-      draw_box 0, 0, @window.width, @window.height, color
-    else
-      draw_box rect[0], rect[1], rect[2], rect[3], color
+    def draw_box(x1,y1,x2,y2,color)
+      c = convert_color(color)
+      @window.draw_line x1, y1, c, x2, y1, c
+      @window.draw_line x2, y1, c, x2, y2, c
+      @window.draw_line x2, y2, c, x1, y2, c
+      @window.draw_line x1, y2, c, x1, y1, c
     end
-  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
+    # 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
+    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
 
-  def start_drawing(); end
+    def start_drawing(); end
 
-  def finish_drawing(); end
+    def finish_drawing(); end
 
-  def draw_image(img, x, y)
-    # z is unused here
-    img.draw x, y, 1
-  end
+    def draw_image(img, x, y, color=nil)
+      # z is unused here
+      if color
+        img.draw x, y, 1,1,1,convert_color(color)
+      else
+        img.draw x, y, 1
+      end
+    end
 
-  def size_text(text, font_file, font_size)
-    @font_cache ||= {}
-    @font_cache[font_file] ||= {}
-    font = @font_cache[font_file][font_size] ||= Font.new(@window, font_file, font_size)
+    def size_text(text, font_file, font_size)
+      @font_cache ||= {}
+      @font_cache[font_file] ||= {}
+      font = @font_cache[font_file][font_size] ||= Font.new(@window, font_file, font_size)
 
-    return [font.text_width(text),font.height]
-  end
+      return [font.text_width(text),font.height]
+    end
 
-  def render_text(text, font_file, font_size, color)
-    @font_cache ||= {}
-    @font_cache[font_file] ||= {}
-    font = @font_cache[font_file][font_size] ||= Font.new(@window, font_file, font_size)
+    def render_text(text, font_file, font_size, color)
+      @font_cache ||= {}
+      @font_cache[font_file] ||= {}
+      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, 9999, :left)
-  end
+      # 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)
+    end
 
 
+  end
 end

data/lib/rubygoo/adapters/rubygame_app_adapter.rb

@@ -1,37 +1,44 @@
-class RubygameAppAdapter
+require 'rubygame'
+include Rubygame
+include Mouse
+include Key
 
-  def initialize(app)
-    @app = app
-  end
+module Rubygoo
 
-  def update(time)
-    @app.update time
-  end
+  class RubygameAppAdapter
 
-  def draw(target)
-    @app.draw target
-  end
+    def initialize(app)
+      @app = app
+    end
 
-  # TODO convert keys?!?
-  def on_event(event)
-    case event
-    when KeyUpEvent
-      @app.on_event GooEvent.new(:key_released, { 
-        :key => event.key, :mods => event.mods, :string => event.string})
-    when KeyDownEvent
-      @app.on_event GooEvent.new(:key_pressed, { 
-        :key => event.key, :mods => event.mods, :string => event.string})
-    when MouseUpEvent
-      @app.on_event GooEvent.new(:mouse_up, { 
-        :x => event.pos[0], :y => event.pos[1], :button => event.button})
-    when MouseDownEvent
-      @app.on_event GooEvent.new(:mouse_down, { 
-        :x => event.pos[0], :y => event.pos[1], :button => event.button})
-    when MouseMotionEvent
-      @app.on_event GooEvent.new(:mouse_motion, { 
-        :x => event.pos[0], :y => event.pos[1]})
+    def update(time)
+      @app.update time
     end
-  end
 
+    def draw(target)
+      @app.draw target
+    end
+
+    # TODO convert keys?!?
+    def on_event(event)
+      case event
+      when KeyUpEvent
+        @app.on_event GooEvent.new(:key_released, { 
+          :key => event.key, :mods => event.mods, :string => event.string})
+      when KeyDownEvent
+        @app.on_event GooEvent.new(:key_pressed, { 
+          :key => event.key, :mods => event.mods, :string => event.string})
+      when MouseUpEvent
+        @app.on_event GooEvent.new(:mouse_up, { 
+          :x => event.pos[0], :y => event.pos[1], :button => event.button})
+      when MouseDownEvent
+        @app.on_event GooEvent.new(:mouse_down, { 
+          :x => event.pos[0], :y => event.pos[1], :button => event.button})
+      when MouseMotionEvent
+        @app.on_event GooEvent.new(:mouse_motion, { 
+          :x => event.pos[0], :y => event.pos[1]})
+      end
+    end
+  end
 
 end

data/lib/rubygoo/adapters/rubygame_render_adapter.rb

@@ -1,51 +1,53 @@
-class RubygameRenderAdapter
+module Rubygoo
+  class RubygameRenderAdapter
 
-  def initialize(screen)
-    @screen = screen
-    TTF.setup
-  end
+    def initialize(screen)
+      @screen = screen
+      TTF.setup
+    end
 
-  def draw_box(x1,y1,x2,y2,color)
-    @screen.draw_box [x1,y1], [x2,y2], convert_color(color)
-  end
+    def draw_box(x1,y1,x2,y2,color)
+      @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
+    # 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
     end
-  end
 
-  def convert_color(goo_color)
-    [goo_color.r,goo_color.g,goo_color.b,goo_color.a]
-  end
+    def convert_color(goo_color)
+      [goo_color.r,goo_color.g,goo_color.b,goo_color.a]
+    end
 
-  def start_drawing(); end
+    def start_drawing(); end
 
-  def finish_drawing()
-    @screen.flip
-  end
+    def finish_drawing()
+      @screen.flip
+    end
 
-  def draw_image(img, x, y)
-    img.blit @screen, [x,y]
-  end
+    def draw_image(img, x, y, color=nil)
+      img.blit @screen, [x,y]
+    end
 
-  def size_text(text, font_file, font_size)
-    @font_cache ||= {}
-    @font_cache[font_file] ||= {}
-    font = @font_cache[font_file][font_size] ||= TTF.new(font_file, font_size)
+    def size_text(text, font_file, font_size)
+      @font_cache ||= {}
+      @font_cache[font_file] ||= {}
+      font = @font_cache[font_file][font_size] ||= TTF.new(font_file, font_size)
 
-    font.size_text text
-  end
+      font.size_text text
+    end
 
-  def render_text(text, font_file, font_size, color)
-    @font_cache ||= {}
-    @font_cache[font_file] ||= {}
-    font = @font_cache[font_file][font_size] ||= TTF.new(font_file, font_size)
+    def render_text(text, font_file, font_size, color)
+      @font_cache ||= {}
+      @font_cache[font_file] ||= {}
+      font = @font_cache[font_file][font_size] ||= TTF.new(font_file, font_size)
 
-    text_image = font.render text, true, convert_color(color)
-  end
+      text_image = font.render text, true, convert_color(color)
+    end
 
+  end
 end

data/lib/rubygoo/app.rb

@@ -1,80 +1,93 @@
-class App < Container
+module Rubygoo
+  class App < Container
 
-  DEFAULT_PARAMS = {:theme=>'default',:x=>10,:y=>10,:width=>600,:height=>480,:data_dir=>File.join(File.dirname(__FILE__),"..","..","themes")}
-  attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer
+    DEFAULT_PARAMS = {:theme=>'default',:x=>10,:y=>10,:width=>600,:height=>480,:data_dir=>File.join(File.dirname(__FILE__),"..","..","themes"),:mouse_cursor => true}
+    attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer
 
-  def initialize(opts={})
-    merged_opts = DEFAULT_PARAMS.merge opts
-    @widgets = []
-    @tabbed_widgets = []
-    @focussed_widget = 0
-    theme_name = merged_opts[:theme]
-    @data_dir = merged_opts[:data_dir]
-    @theme_name = theme_name
-    @theme = load_theme theme_name
-    @renderer = merged_opts[:renderer]
-    super merged_opts
-  end
+    def initialize(opts={})
+      merged_opts = DEFAULT_PARAMS.merge opts
+      @widgets = []
+      @tabbed_widgets = []
+      @focussed_widget = 0
+      theme_name = merged_opts[:theme]
+      @data_dir = merged_opts[:data_dir]
+      @theme_name = theme_name
+      @theme = load_theme theme_name
+      @renderer = merged_opts[:renderer]
+      super merged_opts
 
-  def app()
-    self
-  end
+      # should this go here?
+      @mouse_opt = merged_opts[:mouse_cursor]
+      if @mouse_opt
+        @mouse = MouseCursor.new
+        @mouse.parent = self
+        @mouse.app = self.app
+        @mouse.added
+      end
+    end
 
-  def load_theme(theme_name)
-    @theme_dir = File.join(@data_dir,theme_name)
-    @theme = YAML::load_file(File.join(@theme_dir,"config.yml"))
-  end
+    def app()
+      self
+    end
 
-  def draw(screen)
-    screen.start_drawing
-    super screen
-    screen.finish_drawing
-  end
+    def load_theme(theme_name)
+      @theme_dir = File.join(@data_dir,theme_name)
+      @theme = YAML::load_file(File.join(@theme_dir,"config.yml"))
+    end
 
-  def add_tabbed_widget(w)
-    w.focus_priority = @tabbed_widgets.size unless w.focus_priority
-    @focussed_widget = 1
-    w.focus if @tabbed_widgets.empty?
-    @tabbed_widgets << w 
-    @tabbed_widgets.sort_by {|w| w.focus_priority}
-  end
+    def draw(screen)
+      @renderer.start_drawing
+      super @renderer
+      @mouse.draw @renderer if @mouse_opt
+      @renderer.finish_drawing
+    end
 
-  def focus_back()
-    @tabbed_widgets[@focussed_widget].unfocus
-    @focussed_widget += 1
-    @focussed_widget %= @tabbed_widgets.size
-    @tabbed_widgets[@focussed_widget].focus
-  end
+    def add_tabbed_widget(w)
+      w.focus_priority = @tabbed_widgets.size unless w.focus_priority
+      @focussed_widget = 1
+      w.focus if @tabbed_widgets.empty?
+      @tabbed_widgets << w 
+      @tabbed_widgets.sort_by {|w| w.focus_priority}
+    end
 
-  def focus_forward()
-    @tabbed_widgets[@focussed_widget].unfocus
-    @focussed_widget -= 1
-    @focussed_widget %= @tabbed_widgets.size
-    @tabbed_widgets[@focussed_widget].focus
-  end
+    def focus_back()
+      @tabbed_widgets[@focussed_widget].unfocus
+      @focussed_widget += 1
+      @focussed_widget %= @tabbed_widgets.size
+      @tabbed_widgets[@focussed_widget].focus
+    end
+
+    def focus_forward()
+      @tabbed_widgets[@focussed_widget].unfocus
+      @focussed_widget -= 1
+      @focussed_widget %= @tabbed_widgets.size
+      @tabbed_widgets[@focussed_widget].focus
+    end
 
-  # this is where all the rubygame to rubygoo event mapping will
-  # happen
-  def on_event(event)
-    case event.event_type
-    when :key_released
-      modal_keyboard_call :key_released, event
-    when :key_pressed
-      case event.data[:key]
-      when K_TAB
-        if event.data[:mods].include? K_LSHIFT or event.data[:mods].include? K_RSHIFT
-          focus_back
+    def on_event(event)
+      case event.event_type
+      when :key_released
+        modal_keyboard_call :key_released, event
+      when :key_pressed
+        case event.data[:key]
+        when K_TAB
+          if event.data[:mods].include? K_LSHIFT or event.data[:mods].include? K_RSHIFT
+            focus_back
+          else
+            focus_forward
+          end
         else
-          focus_forward
+          modal_keyboard_call :key_pressed, event
         end
       else
-        modal_keyboard_call :key_pressed, event
+        # ALL mouse events go here
+        modal_mouse_call event.event_type, event
+
+        if event.event_type == :mouse_motion
+          @mouse.mouse_motion event if @mouse_opt
+        end
       end
-    else
-      # ALL mouse events go here
-      modal_mouse_call event.event_type, event
     end
-  end
 
+  end
 end
-

data/lib/rubygoo/button.rb

@@ -1,53 +1,55 @@
-class Button < Widget
-  can_fire :pressed
-  def initialize(text, opts={})
-    super opts
-    @text = text
-  end
-
-  def added()
-    font = theme_property :font
-    @font_size = theme_property :font_size
-    @color = theme_property :color
-    @bg_color = theme_property :bg_color
-    @border_color = theme_property :border_color
-    @focus_color = theme_property :focus_color
-    @font_file = File.join(@app.theme_dir,font)
-
-    @rendered_text ||= @app.renderer.render_text @text, @font_file, @font_size, @color
-    @rect = Rect.new [@x-@x_pad,@y-@y_pad,@rendered_text.width+2*@x_pad,@rendered_text.height+2*@y_pad]
-  end
+module Rubygoo
+  class Button < Widget
+    can_fire :pressed
+    def initialize(text, opts={})
+      super opts
+      @text = text
+    end
 
-  # called when there is a mouse click
-  def mouse_up(event)
-    fire :pressed, event
-  end
+    def added()
+      font = theme_property :font
+      @font_size = theme_property :font_size
+      @color = theme_property :color
+      @bg_color = theme_property :bg_color
+      @border_color = theme_property :border_color
+      @focus_color = theme_property :focus_color
+      @font_file = File.join(@app.theme_dir,font)
+
+      @rendered_text ||= @app.renderer.render_text @text, @font_file, @font_size, @color
+      @rect = Rect.new [@x-@x_pad,@y-@y_pad,@rendered_text.width+2*@x_pad,@rendered_text.height+2*@y_pad]
+    end
 
-  # called when a key press is sent to us
-  def key_pressed(event)
-    case event.data[:key]
-    when K_SPACE
+    # called when there is a mouse click
+    def mouse_up(event)
       fire :pressed, event
     end
-  end
 
-  def draw(adapter)
-    if @focussed
-      adapter.fill @focus_color, @rect
-    elsif @bg_color
-      adapter.fill @bg_color, @rect
-    end
-    if @border_color
-      x1 = @rect[0]
-      y1 = @rect[1]
-      x2 = @rect[2] + x1
-      y2 = @rect[3] + y1
-      adapter.draw_box x1, y1, x2, y2, @border_color
+    # called when a key press is sent to us
+    def key_pressed(event)
+      case event.data[:key]
+      when K_SPACE
+        fire :pressed, event
+      end
     end
 
+    def draw(adapter)
+      if @focussed
+        adapter.fill @focus_color, @rect
+      elsif @bg_color
+        adapter.fill @bg_color, @rect
+      end
+      if @border_color
+        x1 = @rect[0]
+        y1 = @rect[1]
+        x2 = @rect[2] + x1
+        y2 = @rect[3] + y1
+        adapter.draw_box x1, y1, x2, y2, @border_color
+      end
 
-    adapter.draw_image @rendered_text, @x, @y
 
+      adapter.draw_image @rendered_text, @x, @y, @color
+
+    end
   end
 end