rubydraw 0.2.5 → 0.2.7

data/lib/rubydraw.rb

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

data/lib/rubydraw/color.rb

@@ -34,31 +34,51 @@ module Rubydraw
         raise IndexError, "One or more color values are out of bounds (must be between 0 and 255)"
       end
       @red, @green, @blue, @alpha = red, green, blue, alpha
-      calc_num_val
+      calc_num_vals
     end
 
-    # Calculate and store the numerical value in @num_val. You shouldn't
-    # need this (see Rubydraw::Color.new).
-    def calc_num_val
+    # Calculate and store the numerical values. You shouldn't need
+    # this (see Rubydraw::Color.new).
+    def calc_num_vals
       # Get the hex string for each value.
       hex_alpha = (@alpha.to_s(16)).color_string
       hex_red = (@red.to_s(16)).color_string
       hex_green = (@green.to_s(16)).color_string
       hex_blue = (@blue.to_s(16)).color_string
-      # Construct a hex string using the previously determined hex colors.
-      # *Note:* it appears that SDL's colors are in the format +BBGGRRAA+.
-      color_str = hex_blue + hex_green + hex_red + hex_alpha
-      @num_val = color_str.to_i(16)
+      # Construct a hex string (only compatible with surfaces other than
+      # the window) using the previously determined hex colors. Not sure
+      # how alpha comes in here yet... I'll figure it out.
+      surf_color_string = hex_red + hex_green + hex_blue
+      @surface_num_val = surf_color_string.to_i(16)
+      # *Note:* SDL's color format for the display is different than other
+      # ordinary surfaces. It is: +BBGGRRAA+.
+      display_color_string = hex_blue + hex_green + hex_red + hex_alpha
+      @display_num_val = display_color_string.to_i(16)
     end
 
     # Convert this color to a numerical value, which only makes sense when
     # read as a hex number, e.g. red would be: +0000ff00+.
     #
     # Also see the comments in: Rubydraw::Color#calc_num_val.
-    def to_i
-      @num_val
+    def to_i(format)
+      if format == :surface or format == :display_fullscreen
+        return @surface_num_val
+      end
+      if format == :display
+        return @display_num_val
+      end
+      raise ArgumentError, "Unrecognized color format \"@{format}\""
+    end
+
+    # Returns the complimentary color.
+    def invert
+      Color.new(255 - @red, 255 - @green, 255 - @blue, @alpha)
     end
 
+    alias complimentary invert
+    alias opposite invert
+    alias reverse invert
+
     # Returns an Array containing each +rgba+ value.
     #
     # Example:
@@ -70,6 +90,10 @@ module Rubydraw
       [@red, @blue, @green, @alpha]
     end
 
+    def to_s
+      "#<#{self.class}: (@red: #{@red}, @green: #{@green}, @blue: #{@blue}, @alpha: #{@alpha})>"
+    end
+
     # Create an SDL::Color equivilent to this Rubydraw::Color.
     def to_sdl
       SDL::Color.new(to_a)

data/lib/rubydraw/image.rb

@@ -20,7 +20,7 @@ module Rubydraw
     end
 
     def load_from_path(path)  #:nodoc:
-      # Check if this image has already been initialize. If it has, raise
+      # Check if this image has already been initialized. If it has, raise
       # an error.
       unless @sdl_image.nil?
         raise SDLError, "Images may only be loaded once"
@@ -45,6 +45,8 @@ module Rubydraw
       @sdl_image = surface
     end
 
+    private :load_from_path, :load_from_surface
+
     # Blit (copy) into +surface at +position+ (see Rubydraw::Point).
     # No graphical effects are applied.
     def blit(surface, position)

data/lib/rubydraw/surface.rb

@@ -0,0 +1,49 @@
+module Rubydraw
+  # The basic class whose instances can blit themselves to other surfaces or the window.
+  # You can only manipulate the surface's pixels, but there are subclasses to do other
+  # things (like Rubydraw::Image or Rubydraw::Font)
+  class Surface
+    # Create a new, blank surface with the given dimensions.
+    def initialize(dimensions)
+      @dimensions = dimensions
+      pixel_format = SDL.GetVideoInfo.vfmt
+      rmsk, gmsk, bmsk, amsk = 0xff0000, 0x00ff00, 0x0000ff, 0x000000
+      depth = pixel_format.BitsPerPixel
+      @sdl_surface = SDL.CreateRGBSurface(0, dimensions.x, dimensions.y, depth, rmsk, gmsk, bmsk, amsk)
+      if @sdl_surface.pointer.null?
+        raise SDLError, "Failed to create Rubydraw surface: #{SDL.GetError}"
+      end
+      self
+    end
+
+    # Blit (copy) into +surface at +position+ (see Rubydraw::Point).
+    # No graphical effects are applied.
+    def blit(surface, position)
+      if surface.nil?
+        raise SDLError, "Surface to blit to cannot be nil"
+      end
+      if position.nil?
+        raise SDLError, "Position to blit at cannot be nil"
+      end
+      source_rect = Rectangle[Point[0, 0], Point[width, height]]
+      blit_rect = Rectangle[position, Point[surface.width, surface.height]]
+      SDL::BlitSurface(@sdl_surface, source_rect.to_sdl, surface.to_sdl, blit_rect.to_sdl)
+      self
+    end
+
+    # Returns the width of this surface.
+    def width
+      @sdl_surface.w
+    end
+
+    # Returns the height of this surface.
+    def height
+      @sdl_surface.h
+    end
+
+    # Fills this surface with the given color.
+    def fill(color)
+      SDL.FillRect(@sdl_surface, nil, color.to_i(:surface))
+    end
+  end
+end

data/lib/rubydraw/window.rb

@@ -9,16 +9,29 @@ module Rubydraw
 
     # Create a new window.
     def initialize(width, height, fullscreen=false, bkg_color=Color::Black)
+      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
+      end
       @width, @height = width, height
       @fullscreen = fullscreen
       @bkg_color = bkg_color
       @open = false
       @flags =
-      if fullscreen
-        SDL::FULLSCREEN
-      else
-        0
-      end
+          if fullscreen
+            SDL::FULLSCREEN
+          else
+            0
+          end
 
       @event_queue = EventQueue.new
 
@@ -78,7 +91,17 @@ module Rubydraw
     # Fill the entire window with a Rubydraw::Color. Do this by feeding SDL the numeric
     # verion of the color; see Rubydraw::Color#to_i
     def fill_with(color)
-      SDL::FillRect(@screen, nil, color.to_i)
+      SDL::FillRect(@screen, nil, convert(color))
+    end
+
+    # Convert +color+ to the display format.
+    def convert(color)
+      puts @fullscreen
+      if @fullscreen
+        return color.to_i(:display_fullscreen)
+      else
+        return color.to_i(:display)
+      end
     end
 
     # Call this method to tell SDL to quit drawing. The loop (started in
@@ -114,11 +137,11 @@ module Rubydraw
       #events.each {|event|
       #  block = @registered_actions[event.class]
       #  block.call(event) unless block.nil?}
-      events.each {|event|
+      events.each { |event|
         blocks = @registered_actions[event.class]
         unless blocks.nil?
-          blocks.each {|b| b.call(event) unless b.nil?}
-        end}
+          blocks.each { |b| b.call(event) unless b.nil? }
+        end }
     end
 
     # This causes the main loop to exit. Use Rubydraw::Window#close to close the

metadata

@@ -2,7 +2,7 @@
 name: rubydraw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 -07:00
+date: 2011-12-01 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/surface.rb
 - lib/rubydraw/image.rb
 - lib/rubydraw/sound.rb
 - lib/rubydraw/text.rb