rubydraw 0.2.2.5 → 0.2.3

data/lib/rubydraw/image.rb

@@ -5,9 +5,26 @@ module Rubydraw
   # 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 in the given window and load the image from
-    # +path.+
-    def initialize(path)
+    # Create a new image and load the file from a path. Or, load it using
+    # an SDL surface.
+    def initialize(arg)
+      if arg.is_a?(String)
+        # This must mean to load from a path.
+        load_from_path(arg)
+      elsif arg.is_a?(SDL::Surface)
+        load_from_surface(arg)
+      else
+        raise TypeError, "Failed to load image: Expected String or SDL::Surface but got #{arg}"
+      end
+      self
+    end
+
+    def load_from_path(path)  #:nodoc:
+      # Check if this image has already been initialize. If it has, raise
+      # an error.
+      unless @sdl_image.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
@@ -19,6 +36,15 @@ module Rubydraw
       end
     end
 
+    def load_from_surface(surface) #:nodoc:
+      # 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"
+      end
+      @sdl_image = surface
+    end
+
     # Blit (copy) into the window at +position+ (see Rubydraw::Point).
     # No graphical effects are applied.
     #
@@ -27,10 +53,34 @@ module Rubydraw
     def draw(window, position)
       source_rect = Rectangle[Point[0, 0], Point[width, height]]
       blit_rect = Rectangle[position, Point[window.width, window.height]]
+      #source_rect = Rectangle[Point[0, 0], Point[window.width, window.height]]
+      #blit_rect = Rectangle[position, Point[window.width, window.height]]
       SDL::BlitSurface(@sdl_image, source_rect.to_sdl, window.sdl_surface, blit_rect.to_sdl)
       self
     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_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

data/lib/rubydraw/text.rb

@@ -4,6 +4,7 @@ module Rubydraw
   # screen.
   class Text
     attr_accessor(:contents, :font, :color, :size)
+
     # Create a new drawable Text object with the given font and contents.
     def initialize(contents, color, font_name="Times New Roman", size = 25)
       @font, @contents, @size, @color = font_name, contents, size, color

data/lib/rubydraw/window.rb

@@ -5,7 +5,7 @@ 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(:width, :height, :fullscreen, :bkg_color)
+    attr_reader(:fullscreen, :bkg_color)
 
     # Create a new window.
     def initialize(width, height, fullscreen=false, bkg_color=Color::Black)
@@ -25,6 +25,14 @@ module Rubydraw
       @registered_actions = {}
     end
 
+    def width
+      @screen.w
+    end
+
+    def height
+      @screen.h
+    end
+
     # Call this method to start updating and drawing.
     def show
       @open = true

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydraw
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  - 5
-  version: 0.2.2.5
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 -07:00
+date: 2011-11-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency