rubydraw 0.2.9.3 → 0.3.0

data/lib/rubydraw.rb

@@ -1,5 +1,6 @@
-# The only dependency
+# Require dependencies
 require 'ruby-sdl-ffi'
+require '2DArray'
 
 # The extentions must be loaded first, except for +aliases.rb+
 require 'ext/string'

data/lib/rubydraw/color.rb

@@ -18,9 +18,15 @@ module Rubydraw
       }
     end
 
+    # Create a new color from an array with the format [r, g, b, a].
+    # Ignores any extraneous values.
+    def self.from_ary(ary)
+      return self.new(ary[0], ary[1], ary[2], ary[3])
+    end
+
     # Shorthand new method.
-    def self.[](red, green, blue, alpha = 0)
-      self.new(red, green, blue, alpha)
+    def self.[](*args)
+      self.new(*args)
     end
 
     attr_reader(:red, :green, :blue, :alpha)
@@ -29,7 +35,7 @@ module Rubydraw
     # values. Alpha is 0 by default.
     #
     # TODO: Add other color specs, like HSV or maybe CYMK
-    def initialize(red, green, blue, alpha = 255)
+    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

data/lib/rubydraw/point.rb

@@ -79,6 +79,8 @@ module Rubydraw
       end
     end
 
+    alias :eql? :==
+
     def to_ary
       [@x, @y]
     end

data/lib/rubydraw/surface.rb

@@ -84,5 +84,109 @@ module Rubydraw
     def to_sdl
       @sdl_surface
     end
+
+    # This is a private method because it doesn't lock the SDL surface (too
+    # much locking and unlocking for Rubydraw::Surface#pixels). Use
+    # Rubydraw::Surface#get_pixel.
+    #
+    # Credit goes to Rubygame and the SDL docs for showing how to access this
+    # information.
+    def basic_get_pix(point)
+      bpp = @sdl_surface.format.BytesPerPixel
+      p = @sdl_surface.pixels + (point.y * @sdl_surface.pitch + point.x * bpp)
+
+      pcolor =
+          case bpp
+            when 1
+              p.get_uint8(0)
+            when 2
+              p.get_uint16(0)
+            when 3
+              if (FFI::Platform::BYTE_ORDER == FFI::Platform::BIG_ENDIAN)
+                (ptr.get_uint8(0) << 16)|(ptr.get_uint8(1) << 8)|ptr.get_uint8(2)
+              else
+                ptr.get_uint8(0)|(ptr.get_uint8(1) << 8)|(ptr.get_uint8(2) << 16)
+              end
+            when 4
+              p.get_uint32(0)
+          end
+
+      r, g, b, a = SDL.GetRGBA(pcolor, @sdl_surface.format)
+      Rubydraw::Color.new(r, g, b, a)
+    end
+
+    # This is a private method because it doesn't lock the SDL surface (too
+    # much locking and unlocking for Rubydraw::Surface#pixels_do). Use
+    # Rubydraw::Surface#set_pixel.
+    #
+    # Credit goes to Rubygame and the SDL docs for showing how to access this
+    # information.
+    def basic_set_pix(point, new_color)
+      color = new_color.to_i(:surface)
+
+      bpp = @sdl_surface.format.BytesPerPixel
+      p = @sdl_surface.pixels + (point.y * @sdl_surface.pitch + point.x * bpp)
+
+      case bpp
+        when 1
+          p.put_uint8(0, color)
+        when 2
+          p.put_uint16(0, color)
+        when 3
+          if (FFI::Platform::BYTE_ORDER == FFI::Platform::BIG_ENDIAN)
+            p.put_uint8(0, (color >> 16) & 0xff)
+            p.put_uint8(1, (color >> 8) & 0xff)
+            p.put_uint8(2, color & 0xff)
+          else
+            p.put_uint8(0, color & 0xff)
+            p.put_uint8(1, (color >> 8) & 0xff)
+            p.put_uint8(2, (color >> 16) & 0xff)
+          end
+        when 4
+          p.put_uint32(0, color)
+      end
+
+      return new_color
+    end
+
+    private :basic_set_pix
+    private :basic_get_pix
+
+    # Returns the color of the pixel at +point+.
+    def get_pixel(point)
+      SDL.LockSurface(@sdl_surface)
+      result = basic_get_pix(point)
+      SDL.UnlockSurface(@sdl_surface)
+      return result
+    end
+
+    # Sets the color at +point+.
+    def set_pixel(point, new)
+      SDL.LockSurface(@sdl_surface)
+      result = basic_set_pix(point, new)
+      SDL.UnlockSurface(@sdl_surface)
+      return result
+    end
+
+    # Returns a two-dimensional array (from https://rubygems.org/gems/2DArray)
+    # containing each pixel color at its proper position.
+    #
+    # There's probably a better way to implement this... :/
+    def pixels
+      ary = Array2D.new(width, height)
+      x = 0
+      y = 0
+      SDL.LockSurface(@sdl_surface)
+      ary.each { |elem, elem_x, elem_y|
+        ary[elem_x, elem_y] = basic_get_pix(Point[elem_x, elem_y]) }
+      SDL.UnlockSurface(@sdl_surface)
+      ary
+    end
+
+    # Returns the area of this surface; e.g. if +width+ were 5 and +height+ were
+    # 4, this method would return 20.
+    def area
+      width * height
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rubydraw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.9.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-03 00:00:00 -07:00
+date: 2011-12-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,18 @@ dependencies:
         version: "0.4"
   type: :runtime
   version_requirements: *id001
-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)."
+- !ruby/object:Gem::Dependency 
+  name: 2DArray
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id002
+description: "\n    Rubydraw is a high level drawing/game library,\n    like Gosu or Rubygame.\n    Dependancies: ruby-sdl-ffi, SDL (not a ruby gem),\n    and 2DArray."
 email: 
 executables: []