rays 0.1.3 → 0.1.4

data/lib/rays/color.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/ext'
+
+
+module Rays
+
+
+  class Color
+
+    include Comparable
+
+    def to_a ()
+      [red, green, blue, alpha]
+    end
+
+    def [] (index)
+      case index
+      when 0 then red
+      when 1 then green
+      when 2 then blue
+      when 3 then alpha
+      else raise IndexError
+      end
+    end
+
+    def []= (index, val)
+      case index
+      when 0 then self.red   = val
+      when 1 then self.green = val
+      when 2 then self.blue  = val
+      when 3 then self.alpha = val
+      else raise IndexError
+      end
+    end
+
+    def <=> (o)
+      ret = red   <=> o.red;   return ret if ret != 0
+      ret = green <=> o.green; return ret if ret != 0
+      ret = blue  <=> o.blue;  return ret if ret != 0
+            alpha <=> o.alpha
+    end
+
+    def inspect ()
+      "#<Rays::Color r=#{red}, g=#{green}, b=#{blue}, a=#{alpha}>"
+    end
+
+  end# Color
+
+
+end# Rays

data/lib/rays/ext.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/native'

data/lib/rays/image.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require 'rays/native'
+require 'rays/ext'
 
 
 module Rays

data/lib/rays/module.rb

@@ -22,8 +22,15 @@ module Rays
       File.join root_dir, 'task'
     end
 
-    def load_tasks ()
-      Dir["#{task_dir}/**/*.rake"].each {|path| load path}
+    def load_tasks (*names)
+      if names.empty?
+        Dir["#{task_dir}/**/*.rake"].each {|path| load path}
+      else
+        names.each do |name|
+          path = "#{task_dir}/#{name}.rake"
+          load path if File.exist? path
+        end
+      end
     end
 
     def version ()

data/lib/rays/painter.rb

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
 
-require 'rays/native'
+require 'xot/blockutil'
+require 'rays/ext'
 
 
 module Rays
@@ -9,50 +10,25 @@ module Rays
 
   class Painter
 
-    attr_accessor :font
+    alias end end_paint
 
-    def initialize ()
-      @font = Rays::Font.new
-    end
-
-    def line (*args)
-      args = args[0] if !args.empty? && args[0] === Array
-      draw_rect *args
-    end
-
-    def rect (*args)
-      args = args[0] if !args.empty? && args[0] === Array
-      draw_rect *args
-    end
-
-    def ellipse (*args)
-      args = args[0] if !args.empty? && args[0] === Array
-      draw_ellipse *args
-    end
-
-    def arc (*args)
-      args = args[0] if !args.empty? && args[0] === Array
-      draw_arc *args
-    end
-
-    alias image draw_image
-
-    def text (*args)
-      case args.size
-      when 1 then args << 0 << 0 << @font
-      when 2 then args << 0 << @font
-      when 3 then args << @font
+    def begin (&block)
+      if block
+        begin_paint
+        Xot::BlockUtil.instance_eval_or_block_call self, &block
+        end_paint
+      else
+        begin_paint
       end
-      draw_text *args
     end
 
-    def clear (*args)
-      send :clear=, *args unless args.empty?
-      get_clear
+    def background (*args)
+      send :background=, *args unless args.empty?
+      get_background
     end
 
-    def clear= (*args)
-      send_set :set_clear, :no_clear, args
+    def background= (*args)
+      send_set :set_background, :no_background, args
     end
 
     def fill (*args)
@@ -82,12 +58,35 @@ module Rays
       send_set :set_clip, :no_clip, args
     end
 
+    def font (*args)
+      send :font=, *args unless args.empty?
+      get_font
+    end
+
+    def font= (*args)
+      send_set :set_font, nil, args
+    end
+
+    def push (&block)
+      push_matrix
+      push_attrs
+      if block
+        block.call
+        pop
+      end
+    end
+
+    def pop ()
+      pop_attrs
+      pop_matrix
+    end
+
     private
 
       def send_set (set, no, args)
-        args = args[0] if args[0].kind_of?(Array)
+        args = args[0] if Array === args[0]
         if args.size == 1 && [nil, :no, :none].include?(args[0])
-          send no
+          no ? send(no) : send(set, nil)
         else
           send set, *args
         end

data/lib/rays/point.rb

@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/ext'
+
+
+module Rays
+
+
+  class Point
+
+    include Comparable
+
+    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
+    end
+
+    def move_to (*args)
+      dup.move_to! *args
+    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
+    end
+
+    def move_by (*args)
+      dup.move_by! *args
+    end
+
+    def to_a (dimension = 2)
+      case dimension
+      when 1 then [x]
+      when 2 then [x, y]
+      when 3 then [x, y, z]
+      else raise ArgumentError
+      end
+    end
+
+    def [] (index)
+      case index
+      when 0 then x
+      when 1 then y
+      when 2 then z
+      else raise IndexError
+      end
+    end
+
+    def []= (index, val)
+      case index
+      when 0 then self.x = val
+      when 1 then self.y = val
+      when 2 then self.z = val
+      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
+            z <=> o.z
+    end
+
+    def inspect ()
+      "#<Rays::Point x=#{self.x}, y=#{self.y}, z=#{self.z}>"
+    end
+
+  end# Point
+
+
+end# Rays

data/lib/rays/texture.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require 'rays/native'
+require 'rays/ext'
 
 
 module Rays

data/rays.gemspec

@@ -1,64 +1,43 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-$: << File.join(File.dirname(__FILE__), 'lib')
+$: << File.expand_path('../lib', __FILE__)
 
-require 'rake'
 require 'rays/module'
 
 
-MODULE = Rays
-NAME   = MODULE.name.downcase
-
-
-FILES = FileList[*%W[
-  README
-  ChangeLog
-  Rakefile
-  #{NAME}.gemspec
-  VERSION
-  task/**/*.rake
-  ext/**/*.rb
-  ext/**/*.h
-  ext/**/*.cpp
-  include/**/*.h
-  lib/**/*.rb
-  src/**/*.h
-  src/**/*.cpp
-  src/**/*.mm
-  test/**/*.rb
-]]
-
-RDOCS = FileList[*%W[
-  README
-  .doc/ext/**/*.cpp
-]]
+Gem::Specification.new do |s|
+  def glob (*patterns)
+    patterns.map {|pat| Dir.glob(pat).to_a}.flatten
+  end
 
+  mod   = Rays
+  name  = mod.name.downcase
+  rdocs = glob *%w[README .doc/ext/**/*.cpp]
 
-Gem::Specification.new do |s|
-  s.name        = NAME
+  s.name        = name
   s.summary     = 'A Drawing Engine using OpenGL.'
   s.description = 'This library helps you to develop graphics application with OpenGL.'
-  s.version     = MODULE.version
+  s.version     = mod.version
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "http://github.com/xord/#{NAME}"
+  s.homepage = "http://github.com/xord/#{name}"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'
-  s.require_paths         << 'ext'
 
+  s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'xot'
   s.add_runtime_dependency 'rucy'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'gemcutter'
 
-  s.files      = FILES.to_a
-  s.test_files = FileList['test/**/test_*.rb'].to_a
-
+  s.files            = `git ls-files`.split $/
+  s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
+  s.test_files       = s.files.grep %r{^(test|spec|features)/}
+  s.extra_rdoc_files = rdocs.to_a
   s.has_rdoc         = true
-  s.extra_rdoc_files = RDOCS.to_a
 
   s.extensions << 'Rakefile'
 end

data/src/bounds.cpp

@@ -0,0 +1,234 @@
+#include "rays/bounds.h"
+
+
+namespace Rays
+{
+
+
+	Bounds::Bounds (coord size)
+	{
+		set(size);
+	}
+
+	Bounds::Bounds (coord width, coord height, coord depth)
+	{
+		set(width, height, depth);
+	}
+
+	Bounds::Bounds (coord x, coord y, coord width, coord height)
+	{
+		set(x, y, width, height);
+	}
+
+	Bounds::Bounds (
+		coord x, coord y, coord z, coord width, coord height, coord depth)
+	{
+		set(x, y, z, width, height, depth);
+	}
+
+	Bounds
+	Bounds::dup () const
+	{
+		return *this;
+	}
+
+	Bounds&
+	Bounds::set (coord size)
+	{
+		return set(size, size, 0);
+	}
+
+	Bounds&
+	Bounds::set (coord width, coord height, coord depth)
+	{
+		this->x      =
+		this->y      =
+		this->z      = 0;
+		this->width  = width;
+		this->height = height;
+		this->depth  = depth;
+		return *this;
+	}
+
+	Bounds&
+	Bounds::set (coord x, coord y, coord width, coord height)
+	{
+		return set(x, y, 0, width, height, 0);
+	}
+
+	Bounds&
+	Bounds::set (coord x, coord y, coord z, coord width, coord height, coord depth)
+	{
+		this->x      = x;
+		this->y      = y;
+		this->z      = z;
+		this->width  = width;
+		this->height = height;
+		this->depth  = depth;
+		return *this;
+	}
+
+	bool
+	Bounds::get (coord* x, coord* y, coord* width, coord* height) const
+	{
+		return get(x, y, NULL, width, height, NULL);
+	}
+
+	bool
+	Bounds::get (
+		coord* x, coord* y, coord* z, coord* width, coord* height, coord* depth) const
+	{
+		if (!x && !y && !z && !width && !height && !depth)
+			return false;
+
+		if (x)      *x      = this->x;
+		if (y)      *y      = this->y;
+		if (z)      *z      = this->z;
+		if (width)  *width  = this->width;
+		if (height) *height = this->height;
+		if (depth)  *depth  = this->depth;
+		return true;
+	}
+
+	void
+	Bounds::set_left (coord left)
+	{
+		width -= left - x;
+		x = left;
+	}
+
+	coord
+	Bounds::left () const
+	{
+		return x;
+	}
+
+	void
+	Bounds::set_right (coord right)
+	{
+		width = right - x + 1;
+	}
+
+	coord
+	Bounds::right () const
+	{
+		return x + width - 1;
+	}
+
+	void
+	Bounds::set_top (coord top)
+	{
+		height -= top - y;
+		y = top;
+	}
+
+	coord
+	Bounds::top () const
+	{
+		return y;
+	}
+
+	void
+	Bounds::set_bottom (coord bottom)
+	{
+		height = bottom - y + 1;
+	}
+
+	coord
+	Bounds::bottom () const
+	{
+		return y + height - 1;
+	}
+
+	void
+	Bounds::set_back (coord back)
+	{
+		depth -= back - z;
+		z = back;
+	}
+
+	coord
+	Bounds::back () const
+	{
+		return z;
+	}
+
+	void
+	Bounds::set_front (coord front)
+	{
+		depth = front - z + 1;
+	}
+
+	coord
+	Bounds::front () const
+	{
+		return z + depth - 1;
+	}
+
+	Point&
+	Bounds::position ()
+	{
+		return ((Point*) this)[0];
+	}
+
+	const Point&
+	Bounds::position () const
+	{
+		return const_cast<This*>(this)->position();
+	}
+
+	Point&
+	Bounds::size ()
+	{
+		return ((Point*) this)[1];
+	}
+
+	const Point&
+	Bounds::size () const
+	{
+		return const_cast<This*>(this)->size();
+	}
+
+	coord*
+	Bounds::array ()
+	{
+		return (coord*) this;
+	}
+
+	const coord*
+	Bounds::array () const
+	{
+		return const_cast<Bounds*>(this)->array();
+	}
+
+	Bounds::operator bool () const
+	{
+		return width >= 0 && height >= 0 && depth >= 0;
+	}
+
+	bool
+	Bounds::operator ! () const
+	{
+		return !operator bool();
+	}
+
+	bool
+	operator == (const Bounds& lhs, const Bounds& rhs)
+	{
+		return
+			lhs.x == rhs.x &&
+			lhs.y == rhs.y &&
+			lhs.z == rhs.z &&
+			lhs.width  == rhs.width  &&
+			lhs.height == rhs.height &&
+			lhs.depth  == rhs.depth;
+	}
+
+	bool
+	operator != (const Bounds& lhs, const Bounds& rhs)
+	{
+		return !operator==(lhs, rhs);
+	}
+
+
+}// Rays