rays 0.1.6 → 0.1.7

data/include/rays/ruby/point.h

@@ -6,6 +6,8 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rucy/exception.h>
 #include <rays/point.h>
 
 
@@ -20,22 +22,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Point& obj);
-
-	Value value (const Rays::Point* obj);
-
-	template <> inline Rays::Point*
-	value_to<Rays::Point*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Point>(val, Rays::point_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Point)
 
 
 #endif//EOH

data/include/rays/ruby/shader.h

@@ -0,0 +1,27 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_SHADER_H__
+#define __RAYS_RUBY_SHADER_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rays/shader.h>
+
+
+namespace Rays
+{
+
+
+	Rucy::Class shader_class ();
+	// class Rays::Shader
+
+
+}// Rays
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Shader)
+
+
+#endif//EOH

data/include/rays/ruby/texture.h

@@ -6,6 +6,7 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
 #include <rays/texture.h>
 
 
@@ -20,22 +21,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Texture& obj);
-
-	Value value (const Rays::Texture* obj);
-
-	template <> inline Rays::Texture*
-	value_to<Rays::Texture*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Texture>(val, Rays::texture_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Texture)
 
 
 #endif//EOH

data/include/rays/ruby.h

@@ -12,6 +12,7 @@
 #include <rays/ruby/texture.h>
 #include <rays/ruby/image.h>
 #include <rays/ruby/font.h>
+#include <rays/ruby/shader.h>
 #include <rays/ruby/painter.h>
 
 

data/include/rays/shader.h

@@ -0,0 +1,48 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_SHADER_H__
+#define __RAYS_SHADER_H__
+
+
+#include <xot/pimpl.h>
+#include "rays/opengl.h"
+
+
+namespace Rays
+{
+
+
+	class Shader
+	{
+
+		typedef Shader This;
+
+		public:
+
+			Shader ();
+
+			Shader (const char* source);
+
+			~Shader ();
+
+			GLuint id () const;
+
+			bool operator == (const Shader& rhs) const;
+
+			bool operator != (const Shader& rhs) const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PImpl<Data, true> self;
+
+	};// Shader
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/texture.h

@@ -6,6 +6,7 @@
 
 #include <xot/pimpl.h>
 #include <rays/defs.h>
+#include <rays/color_space.h>
 #include <rays/opengl.h>
 
 
@@ -23,7 +24,11 @@ namespace Rays
 
 			Texture ();
 
-			Texture (const Bitmap& bitmap, bool alphaonly = false);
+			Texture (
+				int width, int height, const ColorSpace& cs = RGBA,
+				bool alpha_only = false);
+
+			Texture (const Bitmap& bitmap, bool alpha_only = false);
 
 			~Texture ();
 
@@ -33,6 +38,10 @@ namespace Rays
 
 			int height () const;
 
+			const ColorSpace& color_space () const;
+
+			bool alpha_only () const;
+
 			float s (float x) const;
 
 			float t (float y) const;
@@ -41,7 +50,9 @@ namespace Rays
 
 			float t_max () const;
 
-			const Bitmap& bitmap () const;
+			bool     dirty () const;
+
+			void set_dirty (bool b = true);
 
 			operator bool () const;
 

data/include/rays.h

@@ -8,11 +8,12 @@
 #include <rays/rays.h>
 #include <rays/exception.h>
 #include <rays/point.h>
-#include <rays/colorspace.h>
+#include <rays/color_space.h>
 #include <rays/bitmap.h>
 #include <rays/texture.h>
 #include <rays/image.h>
 #include <rays/font.h>
+#include <rays/shader.h>
 #include <rays/painter.h>
 #include <rays/opengl.h>
 

data/lib/rays/bitmap.rb

@@ -2,6 +2,7 @@
 
 
 require 'rays/ext'
+require 'rays/color_space'
 
 
 module Rays
@@ -11,26 +12,34 @@ module Rays
 
     include Enumerable
 
-    def initialize (width, height, colorspace = RGBA)
-      colorspace = case colorspace
-      when :GRAY then GRAY
-      when :RGB  then RGB
-      when :RGBA then RGBA
-      else colorspace
-      end
-      setup width, height, colorspace
+    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|
-          yield x, y, at(x, y)
+          yield self[x, y], x, y
         end
       end
     end
 
-    def size ()
-      [width, height]
+    def bounds ()
+      Bounds.new 0, 0, width, height
+    end
+
+    def to_a ()
+      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

@@ -21,79 +21,60 @@ module Rays
     alias d  depth
     alias d= depth=
 
+    def position= (*args)
+      set_position *Point.from(*args).to_a(3)
+    end
+
     alias pos  position
     alias pos= position=
 
-    def move_to! (*args)
-      case args.size
-      when 1 then self.x = self.y = args[0]
-      when 2 then self.x, self.y = args
-      when 3 then self.x, self.y, self.z = args
-      else raise ArgumentError
-      end
-      self
+    def size= (*args)
+      set_size *Point.from(*args).to_a(3)
     end
 
-    def move_to (*args)
-      dup.move_to! *args
+    def center= (*args)
+      set_center *Point.from(*args).to_a(3)
     end
 
-    def move_by! (*args)
-      case args.size
-      when 1 then self.x += args[0]; self.y += args[0]
-      when 2 then self.x += args[0]; self.y += args[1]
-      when 3 then self.x += args[0]; self.y += args[1]; self.z += args[2]
-      else raise ArgumentError
-      end
-      self
+    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
+
+    alias lt   left_top
+    alias lt=  left_top=
+    alias rt  right_top
+    alias rt= right_top=
+    alias lb   left_bottom
+    alias lb=  left_bottom=
+    alias rb  right_bottom
+    alias rb= right_bottom=
+
+    def move_to (*args)
+      dup.move_to! *args
     end
 
     def move_by (*args)
       dup.move_by! *args
     end
 
-    def resize_to! (*args)
-      case args.size
-      when 1 then self.w = self.h = args[0]
-      when 2 then self.w, self.h = args
-      when 3 then self.w, self.h, self.d = args
-      else raise ArgumentError
-      end
-      self
-    end
-
     def resize_to (*args)
       dup.resize_to! *args
     end
 
-    def resize_by! (*args)
-      case args.size
-      when 1 then self.w += args[0]; self.h += args[0]
-      when 2 then self.w += args[0]; self.h += args[1]
-      when 3 then self.w += args[0]; self.h += args[1]; self.d += args[2]
-      else raise ArgumentError
-      end
-      self
-    end
-
     def resize_by (*args)
       dup.resize_by! *args
     end
 
-    def inset_by! (*args)
-      move_by! *args
-      resize_by! *args.map {|n| -n * 2}
-      self
-    end
-
     def inset_by (*args)
       dup.inset_by! *args
     end
 
-    def center ()
-      Point.new (x + w / 2).round, (y + h / 2).round
-    end
-
     def to_a (dimension = 2)
       case dimension
       when 1 then [x, w]
@@ -103,22 +84,6 @@ module Rays
       end
     end
 
-    def [] (index)
-      case index
-      when 0 then Point.new(left,  top,    back)
-      when 1 then Point.new(right, bottom, front)
-      else raise IndexError
-      end
-    end
-
-    def []= (index, point)
-      case index
-      when 0 then self.left,  self.top,    self.back  = point.to_a(3)
-      when 1 then self.right, self.bottom, self.front = point.to_a(3)
-      else raise IndexError
-      end
-    end
-
     def <=> (o)
       ret = x <=> o.x; return ret if ret != 0
       ret = y <=> o.y; return ret if ret != 0
@@ -128,10 +93,6 @@ module Rays
             d <=> o.d
     end
 
-    def inspect ()
-      "#<Rays::Bounds x=#{x}, y=#{y}, z=#{z}, width=#{w}, height=#{h}, depth=#{d}>"
-    end
-
   end# Bounds
 
 

data/lib/rays/color.rb

@@ -11,6 +11,29 @@ module Rays
 
     include Comparable
 
+    def self.parse (str)
+      Color.new str
+    end
+
+    def initialize (*args)
+      arg0 = args[0]
+      args = parse arg0 if arg0 && arg0.kind_of?(String)
+      setup *args
+    end
+
+    def opaque? ()
+      alpha >= 1
+    end
+
+    def transparent? ()
+      alpha <= 0
+    end
+
+    def translucent? ()
+      a = alpha
+      0 < a && a < 1
+    end
+
     def to_a ()
       [red, green, blue, alpha]
     end
@@ -42,10 +65,26 @@ module Rays
             alpha <=> o.alpha
     end
 
+    def eql? (o)
+      self == o
+    end
+
     def inspect ()
       "#<Rays::Color r=#{red}, g=#{green}, b=#{blue}, a=#{alpha}>"
     end
 
+    private
+
+      def parse (str)
+        case str
+        when /^\s*##{'([\da-fA-F]{1})' * 4}?\s*$/
+          [$1, $2, $3, $4 || 'f' ].map {|s| s.to_i(16) / 15.0}
+        when /^\s*##{'([\da-fA-F]{2})' * 4}?\s*$/
+          [$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

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/ext'
+
+
+module Rays
+
+
+  class ColorSpace
+
+    def initialize (type = :RGBA, premultiplied = true)
+      setup self.class.get_type(type), premultiplied
+    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."
+    end
+
+    def self.get_color_space (obj)
+      (ColorSpace === obj) ? obj : (ColorSpace.new get_type(obj))
+    end
+
+  end# ColorSpace
+
+
+end# Rays

data/lib/rays/font.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/ext'
+
+
+module Rays
+
+
+  class Font
+
+    include Comparable
+
+    alias w width
+    alias h height
+
+    def <=> (o)
+      ret = name <=> o.name; return ret if ret != 0
+            size <=> o.size
+    end
+
+    def inspect ()
+      "#<Rays::Font name=#{name}, size=#{size}>"
+    end
+
+  end# Font
+
+
+end# Rays

data/lib/rays/image.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
+require 'forwardable'
 require 'rays/ext'
 
 
@@ -9,6 +10,27 @@ module Rays
 
   class Image
 
+    extend Forwardable
+
+    def_delegators :bitmap, :draw_string, :[], :[]=
+
+    def paint (&block)
+      painter.begin self, &block
+      self
+    end
+
+    def size ()
+      return width, height
+    end
+
+    def bounds ()
+      Bounds.new 0, 0, *size
+    end
+
+    def self.load (path, alpha_only = false)
+      load_image path, alpha_only
+    end
+
   end# Image
 
 

data/lib/rays/module.rb

@@ -4,7 +4,11 @@
 module Rays
 
 
-  extend module ModuleInfo
+  module Module
+
+    def name ()
+      super.split('::')[-2]
+    end
 
     def version ()
       open(root_dir 'VERSION') {|f| f.readline.chomp}
@@ -14,12 +18,12 @@ module Rays
       File.expand_path "../../../#{path}", __FILE__
     end
 
-    def include_dirs ()
-      %w[include].map {|dir| root_dir dir}
+    def include_dir ()
+      root_dir 'include'
     end
 
-    def lib_dirs ()
-      %w[lib].map {|dir| root_dir dir}
+    def lib_dir ()
+      root_dir 'lib'
     end
 
     def task_dir ()
@@ -37,9 +41,9 @@ module Rays
       end
     end
 
-    self
+    extend self
 
-  end# ModuleInfo
+  end# Module
 
 
 end# Rays