implement Color#opacity=

6 files changed, 73 insertions, 55 deletions

diff --git a/lib/ruby2d/color.rb b/lib/ruby2d/color.rb
index 5616140..e429e5c 100644
--- a/lib/ruby2d/color.rb
+++ b/lib/ruby2d/color.rb
@@ -2,6 +2,26 @@
 
 module Ruby2D
   class Color
+    # Color::Set represents an array of colors
+    class Set
+      def initialize(colors)
+        @colors = colors.map{|c| Color.new(c)}
+      end
+
+      def [](i)
+        @colors[i]
+      end
+
+      def length
+        @colors.length
+      end
+
+      def opacity=(opacity)
+        @colors.each do |color|
+          color.opacity = opacity
+        end
+      end
+    end
     
     attr_reader :r, :g, :b, :a
     
@@ -65,6 +85,20 @@ module Ruby2D
         el.is_a?(Numeric) && (0.0..1.0).include?(el)
       }
     end
+
+    def self.from(input)
+      # If a valid array of colors, return a Color::Set with those colors
+      # Else return single color
+      if input.is_a? Array and input.all? { |el| Color.is_valid? el }
+        Color::Set.new(input)
+      else
+        Color.new(input)
+      end
+    end
+
+    def opacity=(opacity)
+      @a = opacity
+    end
     
     private
     
diff --git a/lib/ruby2d/quad.rb b/lib/ruby2d/quad.rb
index 13e2b6e..676fb2f 100644
--- a/lib/ruby2d/quad.rb
+++ b/lib/ruby2d/quad.rb
@@ -17,14 +17,14 @@ module Ruby2D
     def initialize(x1=0, y1=0, x2=100, y2=0, x3=100, y3=100, x4=100, y4=100, c='white')
       @type_id = 2
       @x1, @y1, @x2, @y2, @x3, @y3, @x4, @y4 = x1, y1, x2, y2, x3, y3, x4, y4
-      @color = c
-      update_color(c)
+      
+      self.color = c
       add
     end
     
     def color=(c)
-      @color = c
-      update_color(c)
+      @color = Color.from(c)
+      update_color(@color)
     end
     
     def add
@@ -42,30 +42,21 @@ module Ruby2D
     private
     
     def update_color(c)
-      
-      # If a valid color, use it for each vertex
-      if Color.is_valid? c
-        @c1 = Color.new(c)
-        @c2 = Color.new(c)
-        @c3 = Color.new(c)
-        @c4 = Color.new(c)
-        
-      elsif c.class == Array && c.length < 4
-        raise Error, "Quads require 4 colors, one for each vertex. Only " <<
-                     "#{c.length} were given."
-        
-      # If a valid array of colors, assign them to each vertex, respectively
-      elsif c.all? { |el| Color.is_valid? el }
-        @c1 = Color.new(c[0])
-        @c2 = Color.new(c[1])
-        @c3 = Color.new(c[2])
-        @c4 = Color.new(c[3])
-        
+      if c.is_a? Color::Set
+        if c.length == 4
+          @c1 = c[0]
+          @c2 = c[1]
+          @c3 = c[2]
+          @c4 = c[3]
+        else
+          raise ArgumentError, "Quads require 4 colors, one for each vertex. #{c.length} were given."
+        end
       else
-        raise Error, "Not a valid color for #{self.class}"
+        @c1 = c
+        @c2 = c
+        @c3 = c
+        @c4 = c
       end
-      
     end
-    
   end
 end
diff --git a/lib/ruby2d/rectangle.rb b/lib/ruby2d/rectangle.rb
index 25f73b1..14fef3f 100644
--- a/lib/ruby2d/rectangle.rb
+++ b/lib/ruby2d/rectangle.rb
@@ -7,9 +7,10 @@ module Ruby2D
     
     def initialize(x=0, y=0, w=200, h=100, c='white')
       @type_id = 2
-      @x, @y, @width, @height, @color = x, y, w, h, c
+      @x, @y, @width, @height = x, y, w, h
       update_coords(x, y, w, h)
-      update_color(c)
+
+      self.color = c
       add
     end
     
diff --git a/lib/ruby2d/square.rb b/lib/ruby2d/square.rb
index cc9ba21..43d6c14 100644
--- a/lib/ruby2d/square.rb
+++ b/lib/ruby2d/square.rb
@@ -7,10 +7,11 @@ module Ruby2D
     
     def initialize(x=0, y=0, s=100, c='white')
       @type_id = 2
-      @x, @y, @color = x, y, c
+      @x, @y = x, y
       @width = @height = @size = s
       update_coords(x, y, s, s)
-      update_color(c)
+
+      self.color = c
       add
     end
     
diff --git a/lib/ruby2d/text.rb b/lib/ruby2d/text.rb
index ca27ab8..524b840 100644
--- a/lib/ruby2d/text.rb
+++ b/lib/ruby2d/text.rb
@@ -17,7 +17,7 @@ module Ruby2D
       @type_id = 5
       @x, @y, @size = x, y, size
       @text = text.to_s
-      @color = Color.new(c)
+      self.color = c
       init
       add
     end
diff --git a/lib/ruby2d/triangle.rb b/lib/ruby2d/triangle.rb
index 91e9fb2..764787a 100644
--- a/lib/ruby2d/triangle.rb
+++ b/lib/ruby2d/triangle.rb
@@ -13,14 +13,14 @@ module Ruby2D
       @x1, @y1 = x1, y1
       @x2, @y2 = x2, y2
       @x3, @y3 = x3, y3
-      @color = c
-      update_color(c)
+
+      self.color = c
       add
     end
     
     def color=(c)
-      update_color(c)
-      @color = c
+      @color = Color.from(c)
+      update_color(@color)
     end
     
     def add
@@ -38,28 +38,19 @@ module Ruby2D
     private
     
     def update_color(c)
-      
-      # If a valid color, use it for each vertex
-      if Color.is_valid? c
-        @c1 = Color.new(c)
-        @c2 = Color.new(c)
-        @c3 = Color.new(c)
-        
-      elsif c.class == Array && c.length < 3
-        raise Error, "Triangles require 3 colors, one for each vertex. Only " <<
-                     "#{c.length} were given."
-        
-      # If a valid array of colors, assign them to each vertex, respectively
-      elsif c.all? { |el| Color.is_valid? el }
-        @c1 = Color.new(c[0])
-        @c2 = Color.new(c[1])
-        @c3 = Color.new(c[2])
-        
+      if c.is_a? Color::Set
+        if c.length == 3
+          @c1 = c[0]
+          @c2 = c[1]
+          @c3 = c[2]
+        else
+          raise ArgumentError, "Triangles require 3 colors, one for each vertex. #{c.length} were given."
+        end
       else
-        raise Error, "Not a valid color for #{self.class}"
+        @c1 = c
+        @c2 = c
+        @c3 = c
       end
-      
     end
-    
   end
 end