lib/rays/painter.rb in rays-0.1.6 vs lib/rays/painter.rb in rays-0.1.7

@@ -1,95 +1,158 @@
 # -*- coding: utf-8 -*-
 
 
 require 'xot/block_util'
 require 'rays/ext'
+require 'rays/color'
 
 
 module Rays
 
 
   class Painter
 
-    alias end end_paint
-
-    def begin (&block)
-      if block
-        begin_paint
-        Xot::BlockUtil.instance_eval_or_block_call self, &block
-        end_paint
-      else
-        begin_paint
-      end
+    def background (*args, &block)
+      set_or_get :background=, :get_background, args, block
     end
 
-    def background (*args)
-      send :background=, *args unless args.empty?
-      get_background
-    end
-
     def background= (*args)
-      send_set :set_background, :no_background, args
+      send_set :set_background, :get_background, :no_background, args, :color
     end
 
-    def fill (*args)
-      send :fill=, *args unless args.empty?
-      get_fill
+    def fill (*args, &block)
+      set_or_get :fill=, :get_fill, args, block
     end
 
     def fill= (*args)
-      send_set :set_fill, :no_fill, args
+      send_set :set_fill, :get_fill, :no_fill, args, :color
     end
 
-    def stroke (*args)
-      send :stroke=, *args unless args.empty?
-      get_stroke
+    def stroke (*args, &block)
+      set_or_get :stroke=, :get_stroke, args, block
     end
 
     def stroke= (*args)
-      send_set :set_stroke, :no_stroke, args
+      send_set :set_stroke, :get_stroke, :no_stroke, args, :color
     end
 
-    def clip (*args)
-      send :clip=, *args unless args.empty?
-      get_clip
+    def clip (*args, &block)
+      set_or_get :clip=, :get_clip, args, block
     end
 
     def clip= (*args)
-      send_set :set_clip, :no_clip, args
+      send_set :set_clip, :get_clip, :no_clip, args
     end
 
-    def font (*args)
-      send :font=, *args unless args.empty?
-      get_font
+    def font (*args, &block)
+      set_or_get :font=, :get_font, args, block
     end
 
     def font= (*args)
-      send_set :set_font, nil, args
+      send_set :set_font, :get_font, nil, args
     end
 
+    def color (fill, stroke = nil, &block)
+      org = [self.fill, self.stroke]
+      self.fill, self.stroke = fill, stroke
+      if block
+        Xot::BlockUtil.instance_eval_or_block_call self, &block
+        self.fill, self.stroke = org
+      end
+      org
+    end
+
+    def attach (shader, uniforms = {})
+      shader =
+        case shader
+        when Shader then shader
+        when String then Shader.new shader
+        else raise ArgumentError
+        end
+      attach_shader shader
+      uniforms.each {|name, args| set_uniform name, *args}
+      shader
+    end
+
+    alias detach detach_shader
+
     def push (&block)
       push_matrix
-      push_attrs
+      push_attr
+      push_shader
       if block
-        block.call
+        Xot::BlockUtil.instance_eval_or_block_call self, &block
         pop
       end
     end
 
     def pop ()
-      pop_attrs
+      pop_shader
+      pop_attr
       pop_matrix
     end
 
+    def begin (*args, &block)
+      begin_paint
+      Xot::BlockUtil.instance_eval_or_block_call self, *args, &block
+      end_paint
+    end
+
     private
 
-      def send_set (set, no, args)
-        args = args[0] if Array === args[0]
-        if args.size == 1 && [nil, :no, :none].include?(args[0])
-          no ? send(no) : send(set, nil)
+      NONES = [:no, :none]
+
+      def send_set (setter, getter, no, args, mode = nil)
+        args = args[0] if args[0].kind_of? Array
+        raise ArgumentError if args.empty?
+
+        arg0 = args[0]
+        if args.size == 1 && (!arg0 || NONES.include?(arg0))
+          no ? send(no) : send(setter, nil)
         else
-          send set, *args
+          case mode
+          when :color then args = to_color(args)
+          end
+          send setter, *args
+        end
+        send getter
+      end
+
+      def set_or_get (setter, getter, args, block)
+        unless args.empty?
+          set_or_push setter, getter, args, block
+        else
+          send getter
+        end
+      end
+
+      def set_or_push (setter, getter, args, block)
+        org = send getter
+        send setter, *args
+        if block
+          Xot::BlockUtil.instance_eval_or_block_call self, &block
+          send setter, org
+        end
+        org
+      end
+
+      COLORS = {
+        black:   [0, 0, 0],
+        red:     [1, 0, 0],
+        green:   [0, 1, 0],
+        blue:    [0, 0, 1],
+        yellow:  [1, 1, 0],
+        cyan:    [0, 1, 1],
+        magenta: [1, 0, 1],
+        white:   [1, 1, 1],
+        gray:    [0.5, 0.5, 0.5],
+      }.inject({}) {|hash, (name, array)| hash[name] = Color.new *array; hash}
+
+      def to_color (args)
+        case arg0 = args[0]
+        when Symbol then [COLORS[arg0]]
+        when String then [(arg0 =~ /^\s*#[\da-fA-F]+\s*$/) ? Color.new(arg0) : COLORS[arg0.intern]]
+        else args
         end
       end
 
   end# Painter