rubydraw 0.2.3 → 0.2.5

data/lib/rubydraw.rb

@@ -49,6 +49,27 @@ module Rubydraw
     end
   end
 
+  def self.vinfo #:nodoc:
+    SDL.GetVideoInfo
+  end
+
+  private_class_method :vinfo
+
+  # Returns the screen width.
+  def self.screen_width
+    vinfo.current_w
+  end
+
+  # Returns the screen height.
+  def self.screen_height
+    vinfo.current_h
+  end
+
+  # Returns the screen size.
+  def self.screen_dimensions
+    Point[screen_width, screen_height]
+  end
+
   # Enable/disable key repeating. After this method is called, instances of Rubydraw::Events::KeyPressed
   # wil be continually created, until the key is released.
   #

data/lib/rubydraw/color.rb

@@ -6,6 +6,18 @@ module Rubydraw
   # instance can return its numerical value, but only Rubydraw itself
   # should need it.
   class Color
+    # Returns true if all arguments are within the valid RGB color
+    # values (0-255).
+    def self.in_bounds?(*args)
+      args.each {|element|
+        if (0..255).include?(element)
+          return true
+        else
+          return false
+        end
+      }
+    end
+
     # Shorthand new method.
     def self.[](red, green, blue, alpha = 0)
       self.new(red, green, blue, alpha)
@@ -18,6 +30,9 @@ module Rubydraw
     #
     # TODO: Add other color specs, like HSV or maybe CYMK
     def initialize(red, green, blue, alpha = 255)
+      unless self.class.in_bounds?(red, green, blue, alpha)
+        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
     end
@@ -31,8 +46,7 @@ module Rubydraw
       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 (or maybe ruby-sdl-ffi's) color
-      # is backwards. The order appears to be: +BBGGRRAA+
+      # *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)
     end

data/lib/rubydraw/image.rb

@@ -14,7 +14,7 @@ module Rubydraw
       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}"
+        raise TypeError, "Failed to load image: Expected String or SDL::Surface but got: #{arg}"
       end
       self
     end
@@ -45,20 +45,17 @@ module Rubydraw
       @sdl_image = surface
     end
 
-    # Blit (copy) into the window at +position+ (see Rubydraw::Point).
+    # Blit (copy) into +surface at +position+ (see Rubydraw::Point).
     # No graphical effects are applied.
-    #
-    # Notice that you don't blit surfaces to other surfaces when using
-    # Rubygame, but instead you draw things.
-    def draw(window, position)
+    def blit(surface, 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)
+      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)

data/lib/rubydraw/text.rb

@@ -3,7 +3,7 @@ module Rubydraw
   # with the text to display. They can be drawn at a position on the
   # screen.
   class Text
-    attr_accessor(:contents, :font, :color, :size)
+    attr_reader(: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)
@@ -18,31 +18,39 @@ module Rubydraw
       unless File.exists?(font_path)
         raise "Font file '#{font_name}' does not exist; attemped to load from '#{font_path}'"
       end
-      @drawable = SDL::TTF.OpenFont(font_path, size)
-      raise(SDLError, "Failed to initialize font: #{SDL.GetError}") if @drawable.pointer.null?
+      sdl_text = SDL::TTF.OpenFont(font_path, size)
+      raise(SDLError, "Failed to initialize font: #{SDL.GetError}") if sdl_text.pointer.null?
+
+      sdl_color = @color.to_sdl
+      @sdl_surface = SDL::TTF.RenderText_Blended(sdl_text, @contents, sdl_color)
     end
 
-    # Returns the sdl surface of this text object.
+    # Returns the SDL surface for this object.
     def sdl_surface
-      sdl_color = @color.to_sdl
-      SDL::TTF.RenderText_Blended(@drawable, @contents, sdl_color)
+      @sdl_surface
     end
 
-    # Draw the font in the given window at a position.
-    def draw(window, position)
-      source_rect = Rectangle[Point[0, 0], Point[sdl_surface.w, sdl_surface.h]]
-      blit_rect = Rectangle[position, Point[window.width, window.height]]
-      SDL::BlitSurface(sdl_surface, source_rect.to_sdl, window.sdl_surface, blit_rect.to_sdl)
+    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
+      @sdl_surface.w
     end
 
     # Returns the height.
     def height
-      sdl_surface.h
+      @sdl_surface.h
     end
   end
 end

data/lib/rubydraw/window.rb

@@ -26,11 +26,27 @@ module Rubydraw
     end
 
     def width
-      @screen.w
+      begin
+        return @screen.w
+      rescue NameError
+        if @width == 0
+          return Rubydraw.screen_width
+        else
+          return @width
+        end
+      end
     end
 
     def height
-      @screen.h
+      begin
+        return @screen.h
+      rescue NameError
+        if @height == 0
+          return Rubydraw.screen_height
+        else
+          return @height
+        end
+      end
     end
 
     # Call this method to start updating and drawing.
@@ -122,6 +138,7 @@ module Rubydraw
       @screen
     end
 
+    alias to_sdl sdl_surface
 
     # Redefine Rubydraw::Window#tick with any code you want to be executed
     # every frame, like drawing functions.

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rubydraw
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 -07:00
+date: 2011-11-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,20 +21,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
         version: "0.4"
   type: :runtime
   version_requirements: *id001
-description: |-
-  
-      Rubydraw is a high level drawing/game library,
-      like Gosu or Rubygame. Its only dependencies are
-      ruby-sdl-ffi--which it uses to access SDL
-      functions--and SDL itself (See README on how to
-      install the latter).
+description: "\n    Rubydraw is a high level drawing/game library,\n    like Gosu or Rubygame. Its only dependencies are\n    ruby-sdl-ffi--which it uses to access SDL\n    functions--and SDL itself (See README on how to\n    install the latter)."
 email: 
 executables: []
 
@@ -94,23 +79,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rubydraw is a high level drawing/graphics library, like Gosu or Rubygame.