rays 0.1.2 → 0.1.3

data/ext/rays/image.cpp

@@ -2,9 +2,9 @@
 
 
 #include <rucy.h>
-#include "rays.h"
-#include "rays/ruby/bitmap.h"
-#include "rays/ruby/texture.h"
+#include <rays/ruby/bitmap.h>
+#include <rays/ruby/texture.h>
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -16,11 +16,12 @@ namespace Rays
 {
 
 
+	static Class cImage;
+
 	Class
 	image_class ()
 	{
-		static Class c = rays_module().define_class("Image");
-		return c;
+		return cImage;
 	}
 
 
@@ -154,13 +155,17 @@ RUBY_END
 void
 Init_image ()
 {
-	Rays::image_class()
-		.define_alloc_func(alloc)
-		.define_method("initialize", initialize)
-		.define_method("width", width)
-		.define_method("height", height)
-		.define_method("color_space", color_space)
-		.define_method("bitmap", bitmap)
-		.define_method("texture", texture)
-		.define_function("load", load);
+	Module m = define_module("Rays");
+
+	Class c = m.define_class("Image");
+	Rays::cImage = c;
+
+	c.define_alloc_func(alloc);
+	c.define_method("initialize", initialize);
+	c.define_method("width", width);
+	c.define_method("height", height);
+	c.define_method("color_space", color_space);
+	c.define_method("bitmap", bitmap);
+	c.define_method("texture", texture);
+	c.define_function("load", load);
 }

data/ext/rays/native.cpp

@@ -1,4 +1,8 @@
 #include <rucy.h>
+#include "defs.h"
+
+
+using namespace Rucy;
 
 
 void Init_rays ();
@@ -13,7 +17,7 @@ extern "C" void
 Init_native ()
 {
 	if (!Rucy::init())
-		Rucy::raise(rb_eLoadError, "Rucy::init() failed.");
+		raise(rb_eLoadError, "Rucy::init() failed.");
 
 	Init_rays();
 	Init_bitmap();

data/ext/rays/painter.cpp

@@ -2,9 +2,9 @@
 
 
 #include <rucy.h>
-#include "rays.h"
-#include "rays/ruby/image.h"
-#include "rays/ruby/font.h"
+#include <rays/ruby/image.h>
+#include <rays/ruby/font.h>
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -16,11 +16,12 @@ namespace Rays
 {
 
 
+	static Class cPainter;
+
 	Class
 	painter_class ()
 	{
-		static Class c = rays_module().define_class("Painter");
-		return c;
+		return cPainter;
 	}
 
 
@@ -95,24 +96,24 @@ RUBY_DEF0(end)
 RUBY_END
 
 static
-RUBY_DEF0(push)
+RUBY_DEF0(push_matrix)
 {
 	CHECK;
 
-	if (!this->push())
-		error("Painter#push() failed.");
+	if (!this->push_matrix())
+		error("Painter#push_matrix() failed.");
 
 	return self;
 }
 RUBY_END
 
 static
-RUBY_DEF0(pop)
+RUBY_DEF0(pop_matrix)
 {
 	CHECK;
 
-	if (!this->pop())
-		error("Painter#pop() failed.");
+	if (!this->pop_matrix())
+		error("Painter#pop_matrix() failed.");
 
 	return self;
 }
@@ -542,32 +543,36 @@ RUBY_END
 void
 Init_painter ()
 {
-	Rays::painter_class()
-		.define_alloc_func(alloc)
-
-		.define_method("canvas", canvas)
-		.define_method("begin", begin)
-		.define_method("end", end)
-		.define_method("push", push)
-		.define_method("pop", pop)
-
-		.define_private_method("draw_line", line)
-		.define_private_method("draw_rect", rect)
-		.define_private_method("draw_ellipse", ellipse)
-		.define_private_method("draw_arc", arc)
-		.define_private_method("draw_image", image)
-		.define_private_method("draw_text", text)
-
-		.define_method("get_fill", get_fill)
-		.define_method("set_fill", set_fill)
-		.define_method("no_fill",  no_fill)
-		.define_method("get_stroke", get_stroke)
-		.define_method("set_stroke", set_stroke)
-		.define_method("no_stroke",  no_stroke)
-		.define_method("get_clear", get_clear)
-		.define_method("set_clear", set_clear)
-		.define_method("no_clear",  no_clear)
-		.define_method("get_clip", get_clip)
-		.define_method("set_clip", set_clip)
-		.define_method("no_clip",  no_clip);
+	Module m = define_module("Rays");
+
+	Class c = m.define_class("Painter");
+	Rays::cPainter = c;
+
+	c.define_alloc_func(alloc);
+
+	c.define_method("canvas", canvas);
+	c.define_method("begin", begin);
+	c.define_method("end", end);
+	c.define_method("push_matrix", push_matrix);
+	c.define_method("pop_matrix", pop_matrix);
+
+	c.define_private_method("draw_line", line);
+	c.define_private_method("draw_rect", rect);
+	c.define_private_method("draw_ellipse", ellipse);
+	c.define_private_method("draw_arc", arc);
+	c.define_private_method("draw_image", image);
+	c.define_private_method("draw_text", text);
+
+	c.define_method("get_fill", get_fill);
+	c.define_method("set_fill", set_fill);
+	c.define_method("no_fill",  no_fill);
+	c.define_method("get_stroke", get_stroke);
+	c.define_method("set_stroke", set_stroke);
+	c.define_method("no_stroke",  no_stroke);
+	c.define_method("get_clear", get_clear);
+	c.define_method("set_clear", set_clear);
+	c.define_method("no_clear",  no_clear);
+	c.define_method("get_clip", get_clip);
+	c.define_method("set_clip", set_clip);
+	c.define_method("no_clip",  no_clip);
 }

data/ext/rays/rays.cpp

@@ -1,6 +1,6 @@
 #include <rucy.h>
 #include <rays/rays.h>
-#include "rays.h"
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -10,19 +10,12 @@ namespace Rays
 {
 
 
+	static Module mRays;
+
 	Module
 	rays_module ()
 	{
-		static Module m = define_module("Rays");
-		return m;
-	}
-
-	Class
-	rays_error_class ()
-	{
-		static Class c =
-			rays_module().define_class("RaysError", native_error_class());
-		return c;
+		return mRays;
 	}
 
 
@@ -53,9 +46,9 @@ RUBY_END
 void
 Init_rays ()
 {
-	Rays::rays_error_class();
+	Module m = define_module("Rays");
+	Rays::mRays = m;
 
-	Rays::rays_module()
-		.define_singleton_method("init!", init)
-		.define_singleton_method("fin!", fin);
+	m.define_singleton_method("init!", init);
+	m.define_singleton_method("fin!", fin);
 }

data/ext/rays/texture.cpp

@@ -2,8 +2,8 @@
 
 
 #include <rucy.h>
-#include "rays.h"
-#include "rays/ruby/bitmap.h"
+#include <rays/ruby/bitmap.h>
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -15,11 +15,12 @@ namespace Rays
 {
 
 
+	static Class cTexture;
+
 	Class
 	texture_class ()
 	{
-		static Class c = rays_module().define_class("Texture");
-		return c;
+		return cTexture;
 	}
 
 
@@ -119,12 +120,16 @@ RUBY_END
 void
 Init_texture ()
 {
-	Rays::texture_class()
-		.define_alloc_func(alloc)
-		.define_method("initialize", initialize)
-		.define_method("width", width)
-		.define_method("height", height)
-		.define_method("s_max", s_max)
-		.define_method("t_max", t_max)
-		.define_method("bitmap", bitmap);
+	Module m = define_module("Rays");
+
+	Class c = m.define_class("Texture");
+	Rays::cTexture = c;
+
+	c.define_alloc_func(alloc);
+	c.define_method("initialize", initialize);
+	c.define_method("width", width);
+	c.define_method("height", height);
+	c.define_method("s_max", s_max);
+	c.define_method("t_max", t_max);
+	c.define_method("bitmap", bitmap);
 }

data/include/rays.h

@@ -6,6 +6,7 @@
 
 #include <rays/defs.h>
 #include <rays/rays.h>
+#include <rays/exception.h>
 #include <rays/colorspace.h>
 #include <rays/bitmap.h>
 #include <rays/texture.h>
@@ -13,8 +14,8 @@
 #include <rays/font.h>
 #include <rays/transform.h>
 #include <rays/painter.h>
-#include <rays/helpers.h>
 #include <rays/opengl.h>
+#include <rays/helpers.h>
 
 
 #endif//EOH

data/include/rays/colorspace.h

@@ -14,7 +14,7 @@ namespace Rays
 	enum ColorSpaceType
 	{
 
-		COLORSPACE_UNKNOWN = UNKNOWN,
+		COLORSPACE_UNKNOWN = Xot::UNKNOWN,
 
 		GRAY_8, GRAY_16, GRAY_24, GRAY_32, GRAY_float,
 

data/include/rays/defs.h

@@ -4,28 +4,21 @@
 #define __RAYS_DEFS_H__
 
 
-#include <string>
+#include <xot/defs.h>
+#include <xot/string.h>
 
 
 namespace Rays
 {
 
 
-	typedef unsigned char  uchar;
+	using namespace Xot::Types;
 
-	typedef unsigned short ushort;
+	using Xot::String;
 
-	typedef unsigned int   uint;
-
-	typedef unsigned long  ulong;
 
 	typedef float coord;
 
-	typedef std::string String;
-
-
-	enum {UNKNOWN = 0};
-
 
 }// Rays
 

data/include/rays/exception.h

@@ -0,0 +1,41 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_EXCEPTION_H__
+#define __RAYS_EXCEPTION_H__
+
+
+#include <stdexcept>
+#include <rays/defs.h>
+
+
+namespace Rays
+{
+
+
+	class RaysException : public std::runtime_error
+	{
+
+		typedef std::runtime_error Super;
+
+		public:
+
+			RaysException (const char* format = NULL, ...);
+
+			~RaysException () throw();
+
+			const char* what () const throw();
+
+		private:
+
+			String text;
+
+	};// RaysException
+
+
+	void error (const char* format = NULL, ...);
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/painter.h

@@ -17,7 +17,7 @@ namespace Rays
 	enum ShapeType
 	{
 
-		SHAPE_UNKNOWN  = UNKNOWN,
+		SHAPE_UNKNOWN  = Xot::UNKNOWN,
 
 		POINTS         = GL_POINTS,
 
@@ -62,9 +62,9 @@ namespace Rays
 
 			bool end ();
 
-			bool push ();
+			bool push_matrix ();
 
-			bool pop ();
+			bool pop_matrix ();
 
 			//
 			// high level drawing methods

data/lib/rays/module.rb

@@ -15,7 +15,15 @@ module Rays
     end
 
     def library_dirs ()
-      [File.join(root_dir, 'lib')]
+      %w[lib ext].map {|dir| File.join root_dir, dir}
+    end
+
+    def task_dir ()
+      File.join root_dir, 'task'
+    end
+
+    def load_tasks ()
+      Dir["#{task_dir}/**/*.rake"].each {|path| load path}
     end
 
     def version ()

data/rays.gemspec

@@ -7,12 +7,15 @@ require 'rake'
 require 'rays/module'
 
 
-FILES = FileList[*%w[
-  ChangeLog
+MODULE = Rays
+NAME   = MODULE.name.downcase
+
+
+FILES = FileList[*%W[
   README
+  ChangeLog
   Rakefile
-  support.rb
-  rays.gemspec
+  #{NAME}.gemspec
   VERSION
   task/**/*.rake
   ext/**/*.rb
@@ -26,20 +29,27 @@ FILES = FileList[*%w[
   test/**/*.rb
 ]]
 
+RDOCS = FileList[*%W[
+  README
+  .doc/ext/**/*.cpp
+]]
+
+
 Gem::Specification.new do |s|
-  s.name        = 'rays'
+  s.name        = NAME
   s.summary     = 'A Drawing Engine using OpenGL.'
   s.description = 'This library helps you to develop graphics application with OpenGL.'
-  s.version     = Rays.version
+  s.version     = MODULE.version
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = 'http://github.com/xord/rays'
+  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 'xot'
   s.add_runtime_dependency 'rucy'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'gemcutter'
@@ -48,7 +58,7 @@ Gem::Specification.new do |s|
   s.test_files = FileList['test/**/test_*.rb'].to_a
 
   s.has_rdoc         = true
-  s.extra_rdoc_files = ['README']
+  s.extra_rdoc_files = RDOCS.to_a
 
   s.extensions << 'Rakefile'
 end