rubydraw 0.2.0.3 → 0.2.2

data/lib/rubydraw/color.rb

@@ -69,8 +69,8 @@ module Rubydraw
     Green = new(0, 255, 0)
     Blue = new(0, 0, 255)
     # Secondary colors
-    Yellow = new(255, 255, 0)
-    Magenta = new(255, 0, 255)
+    Yellow = new(255, 0, 255)
+    Magenta = new(255, 255, 0)
     Cyan = new(0, 255, 255)
   end
 end

data/lib/rubydraw/point.rb

@@ -28,13 +28,46 @@ module Rubydraw
     # Example:
     #   Point[10, 20] + Point[50, -10]
     #   => #<Rubydraw::Point:0x1010f1958 @y=10, @x=60>
+    # This also works:
+    #   Point[10, 20] + 5
+    #   => #<Rubydraw::Point:0x1010f1958 @y=15, @x=25>
     def +(other)
-      Point[self.x + other.x, self.y + other.y]
+      if other.is_a?(Numeric)
+        ox, oy = other, other
+      else
+        ox, oy = other.x, other.y
+      end
+      Point[self.x + ox, self.y + oy]
     end
 
     # Subtract +other+'s x and y positions from this point's x and y.
     def -(other)
-      Point[self.x - other.x, self.y - other.y]
+      if other.is_a?(Numeric)
+        ox, oy = other, other
+      else
+        ox, oy = other.x, other.y
+      end
+      Point[self.x - ox, self.y - oy]
+    end
+
+    # Same as Point#- and Point#+, but multiply instead.
+    def *(other)
+      if other.is_a?(Numeric)
+        ox, oy = other, other
+      else
+        ox, oy = other.x, other.y
+      end
+      Point[self.x * ox, self.y * oy]
+    end
+
+    # Divide.
+    def /(other)
+      if other.is_a?(Numeric)
+        ox, oy = other, other
+      else
+        ox, oy = other.x, other.y
+      end
+      Point[self.x / ox, self.y / oy]
     end
 
     # Two points are equal if both their x and y positions are the same.
@@ -46,7 +79,10 @@ module Rubydraw
       end
     end
 
-    # Returns a human readable string containing info about this point.
+    def to_a
+      [@x, @y]
+    end
+
     def to_s
       "#{@x}, #{y}"
     end

data/lib/rubydraw/rectangle.rb

@@ -11,7 +11,7 @@ module Rubydraw
     end
 
     # Create a new rectangle with the given dimensions and position.
-    def initialize(position, dimensions)``
+    def initialize(position, dimensions)
       @position, @dimensions = position, dimensions
     end
 

data/lib/rubydraw/window.rb

@@ -8,7 +8,7 @@ module Rubydraw
     attr_reader(:width, :height)
 
     # Create a new window.
-    def initialize(width, height, bkg_color=Color::Black)\
+    def initialize(width, height, bkg_color=Color::Black)
       @width = width
       @height = height
       @open = false
@@ -105,5 +105,76 @@ module Rubydraw
     def registered_actions
       @registered_actions
     end
+
+    # Draw a line from +start+ to +finish+. Both should be an instance of Rubydraw::Point.
+    #
+    #   start:   The point on one side of the line.
+    #   finish:  The point on the other end of the line.
+    #   color:   An instance of Rubydraw::Color; defines the color of the line.
+    #   mode:    Should be either +:aa+ or +:default+. When +:aa+, anti-aliasing is enabled, otherwise, it's not.
+    def draw_line(start, finish, color, anti_aliasing=true)
+      r, g, b, a = color.to_a
+      args = [@screen, start.x, start.y, finish.x, finish.y, r, g, b, a]
+      if not anti_aliasing
+        SDL::Gfx.lineRGBA(*args)
+      end
+      if anti_aliasing
+        SDL::Gfx.aalineRGBA(*args)
+      end
+      self
+    end
+
+    # Draw a rectangle over +area+.
+    #
+    #   area:   The area which the new rectangle will cover. Should be an instance of Rubydraw::Rectangle.
+    #   color:  Specifies what color to use when drawing the rectangle. If +fill+ is enabled, it will fill the new rect with this color. If not, it will only affect the border.
+    #   fill:   A boolean determining whether to fill it in or not.
+    def draw_rectangle(area, color, fill=true)
+      tl = area.top_left
+      br = area.bottom_right
+      r, g, b, a = color.to_a
+      args = [@screen, tl.x, tl.y, br.x, br.y, r, g, b, a]
+      if fill
+        SDL::Gfx.boxRGBA(*args)
+      end
+      if not fill
+        SDL::Gfx.rectangleRGBA(*args)
+      end
+      self
+    end
+
+    alias draw_rect draw_rectangle
+
+    # Draw an ellipse. Similar to Rubydraw::Window#draw_circle, except not all ellipses are circles.
+    #
+    #   center:       The center of the ellipse, should be a Rubydraw::Point object.
+    #   dimensions:   Determines the width and the height of the ellipse to be drawn; should be a Rubydraw::Point.
+    #   color:        The color to use when drawing; should be an instance of Rubydraw::Color.
+    #   fill:         Fill the ellipse with said color?
+    def draw_ellipse(center, dimensions, color, mode=:fill)
+      x, y = center.to_a
+      width, height = (dimensions / 2).to_a
+      r, g, b, a = color.to_a
+      args = [@screen, x, y, width, height, r, g, b, a]
+      if mode == :fill
+        SDL::Gfx.filledEllipseRGBA(*args)
+        return self
+      end
+      if mode == :outline
+        SDL::Gfx.ellipseRGBA(*args)
+        return self
+      end
+      if mode == :aa
+        SDL::Gfx.aaellipseRGBA(*args)
+        return self
+      end
+      # Only gets here when +mode+ is not recognised.
+      raise ArgumentError, "Unknown mode '#{mode}'"
+    end
+
+    # Draw a circle.
+    def draw_circle(center, radius, color, mode=:fill)
+      draw_ellipse(center, Point[radius, radius], color, mode)
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydraw
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  - 3
-  version: 0.2.0.3
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 -07:00
+date: 2011-11-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +63,6 @@ files:
 - lib/rubydraw/rectangle.rb
 - examples/window_ex.rb
 - examples/image_ex.rb
-- examples/sound_ex.rb
 - examples/ball_catch_game.rb
 - examples/media/bug.png
 - examples/media/ball.png

data/examples/sound_ex.rb

@@ -1,21 +0,0 @@
-require 'rubygems'
-require 'rubydraw'
-
-class MyWindow < Rubydraw::Window
-  def initialize
-    super(300, 300)
-    @sound = Rubydraw::Sound.new("media/hooray.ogg")
-    @sound2 = Rubydraw::Sound.new("media/noise.o.ogg")
-    whenever Rubydraw::Events::QuitRequest do
-      close
-    end
-    whenever Rubydraw::Events::KeyPressed do
-      @sound.play if @sound.stopped?
-    end
-    whenever Rubydraw::Events::FocusLoss do
-      @sound2.play if @sound2.stopped?
-    end
-  end
-end
-
-MyWindow.new.show