rubydraw 0.2.7.1 → 0.2.8

data/lib/rubydraw/color.rb

@@ -99,6 +99,21 @@ module Rubydraw
       SDL::Color.new(to_a)
     end
 
+    # Return a new color resulting from mixing this color and +other+ additively.
+    def +(other, a=255)
+      r = [@red + other.red, 255].min
+      g = [@green + other.green, 255].min
+      b = [@blue + other.blue, 255].min
+      Color.new(r, g, b, a)
+    end
+
+    # Return a new color that is the average of this color and +other+.
+    def /(other, a=255)
+      r = [(@red + other.red) / 2, 255].min
+      g = [(@green + other.green) / 2, 255].min
+      b = [(@blue + other.blue) / 2, 255].min
+      Color.new(r, g, b, a)
+    end
 
     White = new(255, 255, 255)
     Black = new(0, 0, 0)
@@ -107,8 +122,13 @@ module Rubydraw
     Green = new(0, 255, 0)
     Blue = new(0, 0, 255)
     # Secondary colors
-    Yellow = new(255, 0, 255)
-    Magenta = new(255, 255, 0)
+    Yellow = new(255, 255, 0)
+    Magenta = new(255, 0, 255)
     Cyan = new(0, 255, 255)
+    # Other colors
+    Purple = new(128, 0, 255)
+    Orange = new(255, 128, 0)
+    Pink = new(255, 0, 128)
+    Grey = new(128, 128, 128)
   end
 end

data/lib/rubydraw/image.rb

@@ -4,9 +4,9 @@ module Rubydraw
   # Then to actually draw the image (doesn't happen immediatley;
   # read the documentation for Image#draw), call it's #draw method
   # and pass it the +x+ and +y+ coordinates.
-  class Image
-    # Create a new image and load the file from a path. Or, load it using
-    # an SDL surface.
+  class Image < Surface
+    # Create a new image and load the file from a path. Or, wrap an
+    # SDL::Surface.
     def initialize(arg)
       if arg.is_a?(String)
         # This must mean to load from a path.
@@ -22,14 +22,14 @@ module Rubydraw
     def load_from_path(path)  #:nodoc:
       # Check if this image has already been initialized. If it has, raise
       # an error.
-      unless @sdl_image.nil?
+      unless @sdl_surface.nil?
         raise SDLError, "Images may only be loaded once"
       end
       # In case program is being run from a different directory,
       # provide the _full_ path. Nothing relative here.
       full_path = File.expand_path path
-      @sdl_image = SDL::Image.Load(full_path)
-      if @sdl_image.pointer.null?
+      @sdl_surface = SDL::Image.Load(full_path)
+      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}"
@@ -39,60 +39,12 @@ module Rubydraw
     def load_from_surface(surface) #:nodoc:
       # Check if this image has already been initialized. If it has, raise
       # an error.
-      unless @sdl_image.nil?
+      unless @sdl_surface.nil?
         raise SDLError, "Images may only be loaded once"
       end
-      @sdl_image = surface
+      @sdl_surface = 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)
-      source_rect = Rectangle[Point[0, 0], Point[width, height]]
-      blit_rect = Rectangle[position, Point[surface.width, surface.height]]
-      SDL::BlitSurface(@sdl_image, source_rect.to_sdl, surface.to_sdl, blit_rect.to_sdl)
-      self
-    end
-
-    alias draw blit
-
-    # Rotates and/or expands the image. Note that this modifies the image
-    # itself.
-    def rotozoom!(angle, zoom, smooth=false)
-      smooth =
-          if smooth
-            1
-          else
-            0
-          end
-
-      @sdl_image = SDL::Gfx.rotozoomSurface(@sdl_image, angle, zoom, smooth)
-      raise SDLError, "Filed to perform rotozoom: #{SDL.GetError}" if @sdl_image.pointer.null?
-      return self
-    end
-
-    # Returns a rotated and/or expanded image, without modifying the
-    # reciever.
-    def rotozoom(angle, zoom, smooth=false)
-      new_image = self.class.new(@sdl_image)
-      new_image.rotozoom!(angle, zoom, smooth)
-    end
-
-    # Returns the image width
-    def width
-      @sdl_image.w
-    end
-
-    # Returns the image height
-    def height
-      @sdl_image.h
-    end
-
-    # Returns the sdl surface.
-    def to_sdl
-      @sdl_image
-    end
   end
 end

data/lib/rubydraw/surface.rb

@@ -1,8 +1,18 @@
 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)
+  # things (like Rubydraw::Image or Rubydraw::Text)
   class Surface
+    # Load an image from +path+.
+    def self.load_img(path)
+      Image.new(path)
+    end
+
+    # Create a new Rubydraw::Font with +text+ as its contents.
+    def self.load_text(contents, color)
+      Text.new(contents, color)
+    end
+
     # Create a new, blank surface with the given dimensions.
     def initialize(dimensions)
       @dimensions = dimensions
@@ -31,6 +41,8 @@ module Rubydraw
       self
     end
 
+    alias draw blit
+
     # Returns the width of this surface.
     def width
       @sdl_surface.w
@@ -45,5 +57,32 @@ module Rubydraw
     def fill(color)
       SDL.FillRect(@sdl_surface, nil, color.to_i(:surface))
     end
+
+    # Rotates and/or expands the image. Note that this modifies the image
+    # itself.
+    def rotozoom!(angle, zoom, smooth=false)
+      smooth =
+          if smooth
+            1
+          else
+            0
+          end
+
+      @sdl_surface = SDL::Gfx.rotozoomSurface(@sdl_surface, angle, zoom, smooth)
+      raise SDLError, "Filed to perform rotozoom: #{SDL.GetError}" if @sdl_surface.pointer.null?
+      self
+    end
+
+    # Returns a rotated and/or expanded image, without modifying the
+    # reciever.
+    def rotozoom(angle, zoom, smooth=false)
+      new_image = self.class.new(@sdl_surface)
+      new_image.rotozoom!(angle, zoom, smooth)
+    end
+
+    # Returns the sdl surface.
+    def to_sdl
+      @sdl_surface
+    end
   end
 end

data/lib/rubydraw/text.rb

@@ -2,7 +2,7 @@ module Rubydraw
   # Text objects are instantiazed with the font (can be a TTF file) and
   # with the text to display. They can be drawn at a position on the
   # screen.
-  class Text
+  class Text < Surface
     attr_reader(:contents, :font, :color, :size)
 
     # Create a new drawable Text object with the given font and contents.
@@ -24,33 +24,5 @@ module Rubydraw
       sdl_color = @color.to_sdl
       @sdl_surface = SDL::TTF.RenderText_Blended(sdl_text, @contents, sdl_color)
     end
-
-    # Returns the SDL surface for this object.
-    def sdl_surface
-      @sdl_surface
-    end
-
-    alias to_sdl sdl_surface
-
-    # Blit (copy) into +surface at +position+ (see Rubydraw::Point).
-    # No graphical effects are applied.
-    def blit(surface, position)
-      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
-
-    alias draw blit
-
-    # Returns the width.
-    def width
-      @sdl_surface.w
-    end
-
-    # Returns the height.
-    def height
-      @sdl_surface.h
-    end
   end
 end

data/lib/rubydraw/window.rb

@@ -5,7 +5,8 @@ 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, :bkg_color)
+    attr_reader(:fullscreen)
+    attr_accessor(:bkg_color)
 
     # Create a new window.
     def initialize(width, height, fullscreen=false, bkg_color=Color::Black)

metadata

@@ -2,7 +2,7 @@
 name: rubydraw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.7.1
+  version: 0.2.8
 platform: ruby
 authors: 
 - J. Wostenberg