rays 0.1.12 → 0.1.13

data/include/rays/ruby/matrix.h

@@ -21,7 +21,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Matrix)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Matrix)
 
 
 namespace Rucy

data/include/rays/ruby/point.h

@@ -22,7 +22,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Point)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Point)
 
 
 namespace Rucy

data/include/rays/ruby/polygon.h

@@ -0,0 +1,52 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_POLYGON_H__
+#define __RAYS_RUBY_POLYGON_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rays/polygon.h>
+
+
+namespace Rays
+{
+
+
+	Rucy::Class polygon_class ();
+	// class Rays::Polygon
+
+	Rucy::Class polygon_line_class ();
+	// class Rays::Polygon::Line
+
+
+}// Rays
+
+
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon)
+
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon::Line)
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Polygon> ()
+	{
+		return Rays::polygon_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Rays::Polygon::Line> ()
+	{
+		return Rays::polygon_line_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/rays/ruby/polyline.h

@@ -0,0 +1,41 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_POLYLINE_H__
+#define __RAYS_RUBY_POLYLINE_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rays/polyline.h>
+
+
+namespace Rays
+{
+
+
+	Rucy::Class polyline_class ();
+	// class Rays::Polyline
+
+
+}// Rays
+
+
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polyline)
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Polyline> ()
+	{
+		return Rays::polyline_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/rays/ruby/shader.h

@@ -21,7 +21,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Shader)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Shader)
 
 
 namespace Rucy

data/include/rays/shader.h

@@ -5,13 +5,17 @@
 
 
 #include <xot/pimpl.h>
-#include "rays/opengl.h"
+#include <rays/defs.h>
+#include <rays/coord.h>
 
 
 namespace Rays
 {
 
 
+	class Image;
+
+
 	class Shader
 	{
 
@@ -19,25 +23,49 @@ namespace Rays
 
 		public:
 
-			Shader ();
-
-			Shader (const char* source);
+			Shader (const char* source = NULL);
 
 			~Shader ();
 
-			GLuint id () const;
+			void set_uniform (const char* name, int arg1);
+
+			void set_uniform (const char* name, int arg1, int arg2);
+
+			void set_uniform (const char* name, int arg1, int arg2, int arg3);
+
+			void set_uniform (const char* name, int arg1, int arg2, int arg3, int arg4);
+
+			void set_uniform (const char* name, const int* args, size_t size);
+
+			void set_uniform (const char* name, float arg1);
 
-			bool operator == (const Shader& rhs) const;
+			void set_uniform (const char* name, float arg1, float arg2);
 
-			bool operator != (const Shader& rhs) const;
+			void set_uniform (const char* name, float arg1, float arg2, float arg3);
+
+			void set_uniform (const char* name, float arg1, float arg2, float arg3, float arg4);
+
+			void set_uniform (const char* name, const float* args, size_t size);
+
+			void set_uniform (const char* name, const Coord2& vec2);
+
+			void set_uniform (const char* name, const Coord3& vec3);
+
+			void set_uniform (const char* name, const Coord4& vec4);
+
+			void set_uniform (const char* name, const Image& texture);
 
 			operator bool () const;
 
 			bool operator ! () const;
 
+			friend bool operator == (const This& lhs, const This& rhs);
+
+			friend bool operator != (const This& lhs, const This& rhs);
+
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Shader
 

data/lib/rays.rb

@@ -8,9 +8,14 @@ require 'rays/point'
 require 'rays/bounds'
 require 'rays/color'
 require 'rays/color_space'
+require 'rays/matrix'
+
+require 'rays/polyline'
+require 'rays/polygon'
+require 'rays/polygon_line'
 require 'rays/bitmap'
-require 'rays/texture'
 require 'rays/image'
 require 'rays/font'
 require 'rays/shader'
+
 require 'rays/painter'

data/lib/rays/bitmap.rb

@@ -2,7 +2,6 @@
 
 
 require 'rays/ext'
-require 'rays/color_space'
 
 
 module Rays
@@ -12,10 +11,6 @@ module Rays
 
     include Enumerable
 
-    def initialize (width, height, color_space = :RGBA)
-      setup width, height, ColorSpace.get_color_space(color_space)
-    end
-
     def each ()
       height.times do |y|
         width.times do |x|
@@ -32,16 +27,6 @@ module Rays
       map {|o| o}
     end
 
-    def []= (x, y, *args)
-      args.flatten!
-      case args[0]
-      when Color
-        set_at x, y, args[0]
-      when Numeric
-        set_at x, y, *args
-      end
-    end
-
   end# Bitmap
 
 

data/lib/rays/bounds.rb

@@ -11,40 +11,29 @@ module Rays
   class Bounds
 
     include Comparable
+    include Enumerable
 
-    alias w  width
     alias w= width=
+    alias w  width
 
-    alias h  height
     alias h= height=
+    alias h  height
 
-    alias d  depth
     alias d= depth=
+    alias d  depth
 
-    def position= (*args)
-      set_position *Point.from(*args).to_a(3)
-    end
-
-    alias pos  position
     alias pos= position=
+    alias pos  position
 
-    def size= (*args)
-      set_size *Point.from(*args).to_a(3)
-    end
-
-    def center= (*args)
-      set_center *Point.from(*args).to_a(3)
-    end
-
-    alias left_top                position
-    def  right_top    ()          position.move_by w - 1,     0 end
-    def   left_bottom ()          position.move_by     0, h - 1 end
+    alias left_top        position
+    def  right_top    ()  position        .move_by w - 1,     0 end
+    def   left_bottom ()  position        .move_by     0, h - 1 end
     def  right_bottom () (position + size).move_by!   -1,    -1 end
 
-    def  left_top=    (*args) p = Point.from *args; self.left,  self.top    = p.x, p.y;  left_top end
-    def right_top=    (*args) p = Point.from *args; self.right, self.top    = p.x, p.y; right_top end
-    def  left_bottom= (*args) p = Point.from *args; self.left,  self.bottom = p.x, p.y;  left_bottom end
-    def right_bottom= (*args) p = Point.from *args; self.right, self.bottom = p.x, p.y; right_bottom end
+    def  left_top=    (*args) p = Point.new *args; self.left,  self.top    = p.x, p.y;  left_top end
+    def right_top=    (*args) p = Point.new *args; self.right, self.top    = p.x, p.y; right_top end
+    def  left_bottom= (*args) p = Point.new *args; self.left,  self.bottom = p.x, p.y;  left_bottom end
+    def right_bottom= (*args) p = Point.new *args; self.right, self.bottom = p.x, p.y; right_bottom end
 
     alias lt   left_top
     alias lt=  left_top=
@@ -75,7 +64,12 @@ module Rays
       dup.inset_by! *args
     end
 
+    def each (dimension = 2, &block)
+      to_a(dimension).each &block
+    end
+
     def to_a (dimension = 2)
+      # TODO: return [lt, rb]
       case dimension
       when 1 then [x, w]
       when 2 then [x, y, w, h]

data/lib/rays/color.rb

@@ -10,24 +10,19 @@ module Rays
   class Color
 
     include Comparable
+    include Enumerable
 
-    def self.color (*args)
-      c = case arg0 = args[0]
-      when Color                  then arg0
-      when Symbol                 then COLORS[arg0]
-      when /^\s*#[\da-fA-F]+\s*$/ then Color.new arg0
-      when String                 then COLORS[arg0.intern]
-      else                             Color.new *args
-      end
-      raise ArgumentError, "invalid argument '#{args}.'" unless c
-      c
-    end
+    alias r= red=
+    alias r  red
 
-    def initialize (*args)
-      arg0 = args[0]
-      args = parse arg0 if arg0 && arg0.kind_of?(String)
-      setup *args
-    end
+    alias g= green=
+    alias g  green
+
+    alias b= blue=
+    alias b  blue
+
+    alias a= alpha=
+    alias a  alpha
 
     def opaque? ()
       alpha >= 1
@@ -42,12 +37,16 @@ module Rays
       0 < a && a < 1
     end
 
+    def each (&block)
+      to_a.each &block
+    end
+
     def to_a ()
       [red, green, blue, alpha]
     end
 
     def to_s ()
-      to_a.map {|o| o.to_s}
+      to_a.to_s
     end
 
     def [] (index)
@@ -77,6 +76,10 @@ module Rays
             alpha <=> o.alpha
     end
 
+    def hash ()
+      red.hash + green.hash + blue.hash + alpha.hash
+    end
+
     def eql? (o)
       self == o
     end
@@ -85,36 +88,6 @@ module Rays
       "#<#{self.class.name} #{to_s}>"
     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],
-      no:      [0, 0],
-      none:    [0, 0],
-      nil:     [0, 0],
-    }.inject({}) {|h, (k, v)| h[k] = Color.new *v; h}
-
-    private
-
-      RE_RGBA     = /^\s*##{'([\da-fA-F]{1})' * 4}?\s*$/
-      RE_RRGGBBAA = /^\s*##{'([\da-fA-F]{2})' * 4}?\s*$/
-
-      def parse (str)
-        case str
-        when RE_RGBA
-          [$1, $2, $3, $4 || 'f' ].map {|s| s.to_i(16) / 15.0}
-        when RE_RRGGBBAA
-          [$1, $2, $3, $4 || 'ff'].map {|s| s.to_i(16) / 255.0}
-        else raise ArgumentError, "can not parse '#{str}'."
-        end
-      end
-
   end# Color
 
 

data/lib/rays/color_space.rb

@@ -9,25 +9,25 @@ module Rays
 
   class ColorSpace
 
-    def initialize (type = :RGBA, premultiplied = true)
-      setup self.class.get_type(type), premultiplied
+    include Comparable
+
+    def <=> (o)
+      type <=> o.type
+    end
+
+    def hash ()
+      type.hash
     end
 
-    def self.get_type (obj)
-      case obj
-      when Integer        then obj
-      when String, Symbol then const_get obj
-      else raise ArgumentError, "can not convert '#{obj}' to ColorSpace type."
-      end
-    rescue NameError
-      raise "ColoeSpace::#{obj} is not found."
+    def eql? (o)
+      self == o
     end
 
-    def self.get_color_space (obj)
-      (ColorSpace === obj) ? obj : (ColorSpace.new get_type(obj))
+    def inspect ()
+      "#<#{self.class.name} #{to_s}>"
     end
 
-  end# ColorSpace
+  end# Color
 
 
 end# Rays