rubydraw 0.1.8 → 0.1.9

data/lib/rubydraw.rb

@@ -1,11 +1,15 @@
 # The only dependency
 require 'ruby-sdl-ffi'
 
+# The extention must be loaded first.
+require 'ext/string'
+
 # Require all the rubydraw files
 files = %w[
   window
   image
   sound
+  text
   events
   event_queue
   keys
@@ -14,7 +18,6 @@ files = %w[
   sdl_error
   rectangle]
 files.each {|f| require("rubydraw/" + f)}
-require 'ext/string'
 
 # Rubydraw is a high level game/graphics library, like Gosu or Rubygame, and is written completely
 # in Ruby. Its only dependency is ruby-sdl-ffi, which it uses to access SDL functions. Also, thanks,
@@ -30,7 +33,11 @@ module Rubydraw
   # Initialize SDL.
   def self.initialize_sdl
     if SDL::Init(SDL::INIT_EVERYTHING) != 0
-      raise DrawError "Could not initialize SDL"
+      raise SDLError "Failed to initialize SDL: #{SDL.GetError}"
+    end
+    # Initialize fonts.
+    if (SDL::TTF.WasInit == 0 and not SDL::TTF.Init == 0)
+      raise SDLError "Failed to initialize SDL TTF: #{SDL.GetError}"
     end
   end
 end

data/lib/rubydraw/color.rb

@@ -1,29 +1,30 @@
 module Rubydraw
   # Instances of Color are created with four arguments: Red, green,
-  # blue, and alpha. The last is 0 by default, and all should have
-  # values ranging from 0 to 255. Use this to specify colors instead
-  # hex numbers. Each color instance can return its numerical value,
-  # but only Rubydraw itself should need it.
+  # blue, and alpha (see Rubydraw::Color#initialize) The last is 0
+  # by default, and all should have values ranging from 0 to 255.
+  # Use this to specify colors instead of hex numbers. Each color
+  # instance can return its numerical value, but only Rubydraw itself
+  # should need it.
   class Color
-    #Red = 0x00_00_ff_00
-    #Green = 0x00_ff_00_00
-    #Blue = 0xff_00_00_00
-    #Black = 0x00_00_00_00
-    #White = 0xff_ff_ff_00
+    # Shorthand new method.
+    def self.[](red, green, blue, alpha = 0)
+      self.new(red, green, blue, alpha)
+    end
+
     attr_reader(:red, :green, :blue, :alpha)
 
     # Create a new color with the given red, green, blue, and alpha
     # values. Alpha is 0 by default.
     #
-    # TODO: Add other color specs, like HSV or maybe (but probably not) CYMK
-    def initialize(red, green, blue, alpha = 0)
+    # TODO: Add other color specs, like HSV or maybe CYMK
+    def initialize(red, green, blue, alpha = 255)
       @red, @green, @blue, @alpha = red, green, blue, alpha
+      calc_num_val
     end
 
-    # Convert this color to a numerical value. It only makes sense in
-    # hexidecimal or binary format; e.g. red would be equal to
-    # +0x0000ff00+.
-    def to_i
+    # Calculate and store the numerical value in @num_val. You shouldn't
+    # need this (see Rubydraw::Color.new).
+    def calc_num_val
       # Get the hex string for each value.
       hex_alpha = (@alpha.to_s(16)).color_string
       hex_red = (@red.to_s(16)).color_string
@@ -33,9 +34,34 @@ module Rubydraw
       # *Note:* it appears that SDL's (or maybe ruby-sdl-ffi's) color
       # is backwards. The order appears to be: +BBGGRRAA+
       color_str = hex_blue + hex_green + hex_red + hex_alpha
-      color_str.to_i(16)
+      @num_val = color_str.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
     end
 
+    # Returns an Array containing each +rgba+ value.
+    #
+    # 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>
+    #   color.to_ary
+    #   => [200, 60, 5, 255]
+    def to_a
+      [@red, @blue, @green, @alpha]
+    end
+
+    # Create an SDL::Color equivilent to this Rubydraw::Color.
+    def to_sdl
+      SDL::Color.new(to_a)
+    end
+
+
     White = new(255, 255, 255)
     Black = new(0, 0, 0)
     # The primary colors

data/lib/rubydraw/events.rb

@@ -191,6 +191,16 @@ module Rubydraw
       def initialize(position, relative_position)
         @position, @relative_position = position, relative_position
       end
+
+      # Returns the new x positon of the mouse.
+      def x
+        @position.x
+      end
+
+      # Returns the new y mouse positon.
+      def y
+        @position.y
+      end
     end
 
     # Created either when the window gains or loses focus. This is the parent class for

data/lib/rubydraw/image.rb

@@ -25,9 +25,11 @@ module Rubydraw
     # Notice that you don't blit surfaces to other surfaces when using
     # Rubygame, but instead you draw things.
     def draw(window, position)
-      source_rect = SDL::Rect.new([0, 0, width, height])
-      blit_rect = SDL::Rect.new([position.x, position.y, window.width, window.height])
-      SDL::BlitSurface(@sdl_image, source_rect, window.sdl_surface, blit_rect)
+      #source_rect = Rectangle[Point[0, 0], width, height]
+      #blit_rect = Rectangle[position, window.width, window.height]
+      source_rect = Rectangle[width, height, Point[0, 0]]
+      blit_rect = Rectangle[window.width, window.height, position]
+      SDL::BlitSurface(@sdl_image, source_rect.to_sdl, window.sdl_surface, blit_rect.to_sdl)
       self
     end
 

data/lib/rubydraw/rectangle.rb

@@ -5,6 +5,11 @@ module Rubydraw
   class Rectangle
     attr_reader(:position, :width, :height)
 
+    # Shorthand new method
+    def self.[](width, height, position)
+      self.new(width, height, position)
+    end
+
     # Create a new rectangle with the given dimensions and position.
     def initialize(width, height, position)
       @width, @height, @position = width, height, position
@@ -28,9 +33,14 @@ module Rubydraw
       Point[x + @width, y + @height]
     end
 
-    # Returns if the given point is inside this rectangle. See Rubydraw::Point::inside?
+    # Returns if the given point is inside this rectangle. See Rubydraw::Point#inside?
     def contains?(point)
       point.inside?(top_left, bottom_right)
     end
+
+    # Returns an SDL::Rectangle equal to this one.
+    def to_sdl
+      SDL::Rect.new([x, y, width, height])
+    end
   end
 end

data/lib/rubydraw/text.rb

@@ -0,0 +1,23 @@
+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
+    attr_accessor(:font, :contents, :size, :color)
+    # Create a new drawable Text object with the given font and contents.
+    def initialize(font, contents, color = Rubydraw::Color::White, size = 25)
+      @font, @contents, @size, @color = font, contents, size, color
+      @drawable = SDL::TTF.OpenFont(font, size)
+      raise(SDLError, "Failed to initialize font: #{SDL.GetError}") if @drawable.pointer.null?
+    end
+
+    # Draw the font in the given window at a position.
+    def draw(window, position)
+      sdl_color = @color.to_sdl
+      sdl_surface = SDL::TTF.RenderText_Blended(@drawable, @contents, sdl_color)
+      source_rect = Rectangle[sdl_surface.w, sdl_surface.h, Point[0, 0]]
+      blit_rect = Rectangle[window.width, window.height, position]
+      SDL::BlitSurface(sdl_surface, source_rect.to_sdl, window.sdl_surface, blit_rect.to_sdl)
+    end
+  end
+end

data/lib/rubydraw/window.rb

@@ -5,6 +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(:width, :height)
+
     # Create a new window.
     def initialize(width, height, bkg_color=Color::Black)
       unless height.is_a?(Numeric) and width.is_a?(Numeric)
@@ -100,28 +102,21 @@ module Rubydraw
     def tick
     end
 
-    # Return the width of this window.
-    def width
-      @width
-    end
-
-    # Return the height of this window.
-    def height
-      @height
-    end
-
-    # Send +selector+ to +reciever+ when +event+ happens, and include the specific event
-    # instace as a parameter if send_params = true.
-
-    # Execute the given block on the appearance of an instance of +event+.
+    # Execute the given block on the appearance of an instance of +event+ and pass that
+    # instance to the block.
     #
     # Example:
     #    class MyWindow < Rubydraw::Window
     #      def initialize
     #        super(300, 300)
-    #
-    #        register_action(Rubydraw::Events::MouseMove) {|event| new_pos = event.position; puts "Mouse moved to #{new_pos.x}, #{new_pos.y}"}
-    #        register_action(Rubydraw::Events::QuitRequest) {puts "Goodbye!"; close}
+    #        whenever(Rubydraw::Events::QuitRequest) do
+    #          puts "Goodbye!"
+    #          close
+    #        end
+    #        whenever(Rubydraw::Events::MouseMove) do |event|
+    #          new_pos = event.position
+    #          puts "Mouse moved to #{new_pos.x}, #{new_pos.y}.}"
+    #        end
     #      end
     #    end
     def whenever(event, &block)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydraw
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 -07:00
+date: 2011-11-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - lib/rubydraw/window.rb
 - lib/rubydraw/image.rb
 - lib/rubydraw/sound.rb
+- lib/rubydraw/text.rb
 - lib/rubydraw/sdl_error.rb
 - lib/rubydraw/keys.rb
 - lib/rubydraw/event_queue.rb