rubydraw 0.1.5 → 0.1.7.1

data/examples/image_ex.rb

@@ -24,5 +24,4 @@ class MyWindow < Rubydraw::Window
   end
 end
 
-w = MyWindow.new
-w.open
+w = MyWindow.new.show

data/examples/sound_ex.rb

@@ -18,4 +18,4 @@ class MyWindow < Rubydraw::Window
   end
 end
 
-MyWindow.new.open
+MyWindow.new.show

data/examples/window_ex.rb

@@ -19,7 +19,7 @@ w = gets.to_i
 print "Window width: "
 h = gets.to_i
 
-window = MyWindow.new(w, h).open
+window = MyWindow.new(w, h).show
 
 # Wait for a while to let the user enjoy the window
 sleep 10

data/lib/ext/string.rb

@@ -0,0 +1,14 @@
+class String
+  # Sets the size for this string, but does not modify the string.
+  # Appends 0 to the beginning if original is one in legnth. (Used
+  # in Rubydraw::Color#to_i)
+  def color_string
+    new_str = self[0..1]
+    if new_str.size == 1
+      result = "0" + new_str
+    else
+      result = new_str
+    end
+    result
+  end
+end

data/lib/rubydraw.rb

@@ -10,8 +10,10 @@ files = %w[
   event_queue
   keys
   point
+  color
   sdl_error]
 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,

data/lib/rubydraw/color.rb

@@ -0,0 +1,50 @@
+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.
+  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
+    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)
+      @red, @green, @blue, @alpha = red, green, blue, alpha
+    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
+      # 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 (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)
+    end
+
+    White = new(255, 255, 255)
+    Black = new(0, 0, 0)
+    # The primary colors
+    Red = new(255, 0, 0)
+    Green = new(0, 255, 0)
+    Blue = new(0, 0, 255)
+    # Secondary colors
+    Yellow = new(255, 255, 0)
+    Magenta = new(255, 0, 255)
+    Cyan = new(0, 255, 255)
+  end
+end

data/lib/rubydraw/window.rb

@@ -6,7 +6,7 @@ module Rubydraw
   # when Rubydraw::Window#close is called.
   class Window
     # Create a new window.
-    def initialize(width, height)
+    def initialize(width, height, bkg_color=Color::Black)
       unless height.is_a?(Numeric) and width.is_a?(Numeric)
         # Raise an error
         raise SDLError "Window width and height have to be a number."
@@ -19,10 +19,12 @@ module Rubydraw
       @event_queue = EventQueue.new
 
       @registered_actions = {}
+
+      @bkg_color = bkg_color
     end
 
     # Call this method to start updating and drawing.
-    def open
+    def show
       @open = true
       # Behold, the main loop. Drumroll!
       @screen = SDL::SetVideoMode(@width, @height, 0, 0)
@@ -44,7 +46,13 @@ module Rubydraw
     # Clear the window's contents by filling it with black. A bit of a cheat; I don't
     # know if there is a better way to do this.
     def clear
-      SDL::FillRect(@screen, nil, 0)
+      fill_with(@bkg_color)
+    end
+
+    # 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)
     end
 
     # Call this method to tell SDL to quit drawing. The loop (started in
@@ -55,6 +63,8 @@ module Rubydraw
       SDL.QuitSubSystem(SDL::INIT_VIDEO)
     end
 
+    alias quit close
+
     # Collect and handle new events by executing blocks in +@regestered_events+. See
     # Rubydraw::Window#register_action on how to use it.
     def handle_events

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rubydraw
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 89
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 7
+  - 1
+  version: 0.1.7.1
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 -07:00
+date: 2011-11-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +50,7 @@ extra_rdoc_files: []
 files: 
 - README
 - lib/rubydraw.rb
+- lib/ext/string.rb
 - lib/rubydraw/window.rb
 - lib/rubydraw/image.rb
 - lib/rubydraw/sound.rb
@@ -57,6 +59,7 @@ files:
 - lib/rubydraw/event_queue.rb
 - lib/rubydraw/events.rb
 - lib/rubydraw/point.rb
+- lib/rubydraw/color.rb
 - examples/window_ex.rb
 - examples/image_ex.rb
 - examples/sound_ex.rb