rubydraw 0.2.8 → 0.2.9

data/examples/ball_catch_game.rb

@@ -3,7 +3,7 @@ require 'rubydraw'
 
 class GameWindow < Rubydraw::Window
   def initialize
-    super(500, 500, false, Rubydraw::Color::White)
+    super(Point[500, 500], [], Rubydraw::Color::White)
     @score = 0
     @score_text = Rubydraw::Text.new("", Rubydraw::Color::Black)
     @game_objects = []

data/examples/image_ex.rb

@@ -4,7 +4,7 @@ require 'rubydraw'
 class MyWindow < Rubydraw::Window
   # Create a new window with an bug image inside it
   def initialize
-    super(300, 300)
+    super(Point[300, 300])
     @image = Rubydraw::Image.new("media/bug.png")
     whenever Rubydraw::Events::QuitRequest do
       close

data/examples/window_ex.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'rubydraw'
 
 class MyWindow < Rubydraw::Window
-  def initialize(width, height)
-    super(width, height)
+  def initialize(dimensions)
+    super(dimensions)
     puts "New window created with width: #{@width} and height #{@height}"
     whenever Rubydraw::Events::QuitRequest do
       close
@@ -16,4 +16,4 @@ w = gets.to_i
 print "Window width: "
 h = gets.to_i
 
-window = MyWindow.new(w, h).show
+window = MyWindow.new(Point[w, h]).show

data/lib/rubydraw.rb

@@ -8,6 +8,7 @@ require 'ext/object'
 # Require all the rubydraw files
 files = %w[
   window
+  flags
   surface
   image
   sound

data/lib/rubydraw/color.rb

@@ -57,9 +57,9 @@ module Rubydraw
     end
 
     # Convert this color to a numerical value, which only makes sense when
-    # read as a hex number, e.g. red would be: +0000ff00+.
+    # read as a hex number.
     #
-    # Also see the comments in: Rubydraw::Color#calc_num_val.
+    # Also see the comments in: Rubydraw::Color#calc_num_vals.
     def to_i(format)
       if format == :surface or format == :display_fullscreen
         return @surface_num_val
@@ -83,10 +83,10 @@ module Rubydraw
     #
     # Example:
     #   color = Rubydraw::Color.new(red = 200, green = 60, blue = 5, alpha = 255)
-    #   => #<Rubydraw::Color:0x10039cf50 @green=60, @red=200, @alpha=255, @num_val=87869695, @blue=5>
+    #   => #<Rubydraw::Color: (@red: 200, @green: 60, @blue: 5, @alpha: 255)>
     #   color.to_ary
     #   => [200, 60, 5, 255]
-    def to_a
+    def to_ary
       [@red, @blue, @green, @alpha]
     end
 
@@ -96,7 +96,7 @@ module Rubydraw
 
     # Create an SDL::Color equivilent to this Rubydraw::Color.
     def to_sdl
-      SDL::Color.new(to_a)
+      SDL::Color.new(to_ary)
     end
 
     # Return a new color resulting from mixing this color and +other+ additively.

data/lib/rubydraw/events.rb

@@ -21,7 +21,7 @@ module Rubydraw
     # each event class if it matches the SDL event. No case statements here.
     def self.match(sdl_event)
       event_classes = Event.all_subclasses.compact
-      rubydraw_event = UnknownEvent.new
+      rubydraw_event = UnknownEvent.new(sdl_event)
       # Remove all the classes that don't want to be included in the search
       event_classes.delete_if {|event_class| not event_class.wants_to_match?}
       event_classes.each {|event_class| rubydraw_event = event_class.from_sdl_event(sdl_event) if event_class.matches?(sdl_event)}
@@ -64,6 +64,18 @@ module Rubydraw
     # A special event class that is called when no Rubydraw event is matched to an
     # SDL event.
     class UnknownEvent < Event
+      # The SDL event should be passed so that the programmer using this library can still
+      # attempt to implement behavior, but it will have to match and SDL event, not a
+      # Rubydraw::Events::Event.
+      def from_sdl_event(sdl_event)
+        self.new(sdl_event)
+      end
+
+      attr_reader(:sdl_event)
+
+      def initialize(sdl_event)
+        @sdl_event = sdl_event
+      end
     end
 
     # Provides methods used in both Rubydraw::Events::KeyPressed and
@@ -211,7 +223,8 @@ module Rubydraw
       end
     end
 
-    # Created when the window gains focus.
+    # Created when the window gains focus, e.g. clicking on the window after previously using
+    # another application.
     class FocusGain < FocusEvent
       def self.wants_to_match?
         true
@@ -220,11 +233,10 @@ module Rubydraw
       # Redefine Event#matches? because both this class and Rubydraw::Events::FocusLoss use
       # SDL::ActiveEvent.
       def self.matches?(sdl_event)
-        result = false
         if super(sdl_event)
-          result = sdl_event.gain == 1
+          return sdl_event.gain == 1
         end
-        result
+        return false
       end
     end
 
@@ -237,20 +249,48 @@ module Rubydraw
       # Redefine Event#matches? because both this class and Rubydraw::Events::FocuGain use
       # SDL::ActiveEvent
       def self.matches?(sdl_event)
-        result = false
         if super(sdl_event)
-          result = sdl_event.gain == 0
+          return sdl_event.gain == 0
         end
-        result
+        return false
       end
     end
 
     # Created when the user attempts to close the window.
     class QuitRequest < Event
-
       def self.matching_sdl_type
         SDL::QUIT
       end
     end
+
+    # Created when the user resizes the window. This can only happen if Rubydraw::Flags::Resizable
+    # is passed when the window is created.
+    class WindowResize < Event
+      def self.matching_sdl_type
+        SDL::VIDEORESIZE
+      end
+
+      def self.from_sdl_event(sdl_event)
+        self.new(Point[sdl_event.w, sdl_event.h])
+      end
+
+      attr_accessor(:dimensions)
+
+      def initialize(dimensions)
+        @dimensions = dimensions
+      end
+
+      def width
+        @dimensions.x
+      end
+
+      def height
+        @dimensions.y
+      end
+
+      alias :x :width
+
+      alias :y :height
+    end
   end
 end

data/lib/rubydraw/flags.rb

@@ -0,0 +1,20 @@
+module Rubydraw
+  # Contains constants for new window flags, such as Fullscreen and Resizable.
+  module Flags
+    # Collapse +flags+ using a bitwise or (thanks to Rubygame for most of this
+    # chunk of code)
+    #
+    # Example:
+    #   Rubydraw::Flags.collapse(0b10, 0b1000, 0b100000)
+    #   => 42 #(0b101010)
+    def self.collapse(*flags)
+      first_mem = flags[0]
+      flags = first_mem if first_mem.is_a?(Array)
+      flags.inject(0) {|total, num|
+        num | total}
+    end
+
+    Fullscreen = SDL::FULLSCREEN
+    Resizable = SDL::RESIZABLE
+  end
+end

data/lib/rubydraw/image.rb

@@ -32,7 +32,7 @@ module Rubydraw
       if @sdl_surface.pointer.null?
         # SDL couln't load the image; usually happens because it doesn't
         # exist.
-        raise Rubydraw::SDLError "Failed to load image: #{SDL.GetError}"
+        raise SDLError, "Failed to load image: #{SDL.GetError}"
       end
     end
 

data/lib/rubydraw/point.rb

@@ -79,7 +79,7 @@ module Rubydraw
       end
     end
 
-    def to_a
+    def to_ary
       [@x, @y]
     end
 

data/lib/rubydraw/window.rb

@@ -5,34 +5,29 @@ module Rubydraw
   # (which starts when Rubydraw::Window#open is called) is *not* forked! It will break
   # when Rubydraw::Window#close is called.
   class Window
-    attr_reader(:fullscreen)
     attr_accessor(:bkg_color)
 
     # Create a new window.
-    def initialize(width, height, fullscreen=false, bkg_color=Color::Black)
+    def initialize(dimensions, flags=[], bkg_color=Color::Black)
+      width, height = dimensions.to_ary
+      @fullscreen = flags.include?(Rubydraw::Flags::Fullscreen)
       if width < 0
         raise SDLError, "New window width cannot be less than zero"
       end
       if height < 0
         raise SDLError, "New window height cannot be less than zero"
       end
-      if height == 0
-        # Compensate for the height of the window bar itself, the menu bar at the top
-        # of the screen, and a space of around 4px at the bottom of the screen. Not
-        # sure what the numbers would be for anything other than Mac OSX; more info
-        # would be appreciated.
-        height = Rubydraw::screen_height - 48
+      unless flags.include?(Flags::Fullscreen)
+        if height == 0
+          # Compensate for the height of the window bar itself, the menu bar at the top
+          # of the screen, and a space of around 4px at the bottom of the screen. Not
+          # sure what the numbers would be for anything other than Mac OSX; more info
+          # would be appreciated.
+          height = Rubydraw::screen_height - 48
+        end
       end
-      @width, @height = width, height
-      @fullscreen = fullscreen
-      @bkg_color = bkg_color
+      @width, @height, @flags, @bkg_color = width, height, Flags.collapse(flags), bkg_color
       @open = false
-      @flags =
-          if fullscreen
-            SDL::FULLSCREEN
-          else
-            0
-          end
 
       @event_queue = EventQueue.new
 
@@ -133,10 +128,6 @@ module Rubydraw
     # Rubydraw::Window#register_action on how to use it.
     def handle_events
       events = @event_queue.get_events
-
-      #events.each {|event|
-      #  block = @registered_actions[event.class]
-      #  block.call(event) unless block.nil?}
       events.each { |event|
         blocks = @registered_actions[event.class]
         unless blocks.nil?
@@ -144,12 +135,13 @@ module Rubydraw
         end }
     end
 
-    # This causes the main loop to exit. Use Rubydraw::Window#close to close the
-    # window, not this.
+    # Causes the main loop to exit as soon as it get the chance to.
     def break_main_loop
       @open = false
     end
 
+    private :break_main_loop
+
     # Returns if this window is open.
     def open?
       @open
@@ -196,7 +188,7 @@ module Rubydraw
     #
     #   area:   The area which the new rectangle will cover. Should be an instance of Rubydraw::Rectangle.
     #   color:  Specifies what color to use when drawing the rectangle. If +fill+ is enabled, it will fill the new rect with this color. If not, it will only affect the border.
-    #   fill:   A boolean determining whether to fill it in or not.
+    #   fill:   A boolean determining whether to fill it in or not. (anti-aliasing is not needed because all the lines are perfectly straigt)
     def draw_rectangle(area, color, fill=true)
       tl = area.top_left
       br = area.bottom_right
@@ -218,8 +210,7 @@ module Rubydraw
     #   center:         The center of the ellipse, should be a Rubydraw::Point object.
     #   dimensions:     Determines the width and the height of the ellipse to be drawn; should be a Rubydraw::Point.
     #   color:          The color to use when drawing; should be an instance of Rubydraw::Color.
-    #   fill:           Fill the ellipse with said color?
-    #   anti_aliasing:  When set to true, smoothing happens.
+    #   mode:           Can be one of three modes; +:fill+, +:outline+, or +:aa+. When set to +:fill+, it will draw a *solid* ellipse. When it is +:outline+, it renders without filling. When set to +:aa+ (anti-aliasing), it will draw without filling and smooth the border.
     def draw_ellipse(center, dimensions, color, mode=:fill)
       x, y = center.to_a
       width, height = (dimensions / 2).to_a

metadata

@@ -2,7 +2,7 @@
 name: rubydraw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 -07:00
+date: 2011-12-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,6 +36,7 @@ files:
 - README
 - lib/rubydraw.rb
 - lib/rubydraw/window.rb
+- lib/rubydraw/flags.rb
 - lib/rubydraw/surface.rb
 - lib/rubydraw/image.rb
 - lib/rubydraw/sound.rb