rays 0.1.2 → 0.1.3

data/.doc/ext/rays/rays.cpp

@@ -0,0 +1,52 @@
+#include <rucy.h>
+#include <rays/rays.h>
+#include "defs.h"
+
+
+using namespace Rucy;
+
+
+namespace Rays
+{
+
+
+	static Module mRays;
+
+	Module
+	rays_module ()
+	{
+		return mRays;
+	}
+
+
+}// Rays
+
+
+static
+VALUE init(VALUE self)
+{
+	if (!Rays::init())
+		error("Rays::init() failed.");
+
+	return self;
+}
+
+static
+VALUE fin(VALUE self)
+{
+	if (!Rays::fin())
+		error("Rays::fin() failed.");
+
+	return self;
+}
+
+
+void
+Init_rays ()
+{
+	Module m = rb_define_module("Rays");
+	Rays::mRays = m;
+
+	m.define_singleton_method("init!", init);
+	m.define_singleton_method("fin!", fin);
+}

data/.doc/ext/rays/texture.cpp

@@ -0,0 +1,128 @@
+#include "rays/ruby/texture.h"
+
+
+#include <rucy.h>
+#include <rays/ruby/bitmap.h>
+#include "defs.h"
+
+
+using namespace Rucy;
+
+using Rays::coord;
+
+
+namespace Rays
+{
+
+
+	static Class cTexture;
+
+	Class
+	texture_class ()
+	{
+		return cTexture;
+	}
+
+
+}// Rays
+
+
+namespace Rucy
+{
+
+
+	Value
+	value (const Rays::Texture& texture)
+	{
+		return new_type<Rays::Texture>(
+			Rays::texture_class(), new Rays::Texture(texture));
+	}
+
+
+}// Rucy
+
+
+#define this to<Rays::Texture*>(self)
+
+#define CHECK CHECK_OBJECT(self, Rays::Texture, Rays::texture_class())
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return new_type<Rays::Texture>(klass, new Rays::Texture);
+}
+
+static
+VALUE initialize(VALUE self)
+{
+	CHECK_OBJ(self, Rays::Texture, Rays::texture_class());
+	if (argc != 1 && argc != 2) arg_count_error("Texture#initialize", argc, 1, 2);
+
+	Rays::Bitmap* bitmap = to<Rays::Bitmap*>(argv[0]);
+	bool alphaonly = (argc == 2) ? to<bool>(argv[1]) : false;
+
+	if (!bitmap)
+		argument_error("%s is not a Bitmap object.", argv[0].inspect().c_str());
+
+	*this = Rays::Texture(*bitmap, alphaonly);
+	return self;
+}
+
+static
+VALUE width(VALUE self)
+{
+	CHECK;
+
+	return value(this->width());
+}
+
+static
+VALUE height(VALUE self)
+{
+	CHECK;
+
+	return value(this->height());
+}
+
+static
+VALUE s_max(VALUE self)
+{
+	CHECK;
+
+	return value(this->s_max());
+}
+
+static
+VALUE t_max(VALUE self)
+{
+	CHECK;
+
+	return value(this->t_max());
+}
+
+static
+VALUE bitmap(VALUE self)
+{
+	CHECK;
+
+	return value(this->bitmap());
+}
+
+
+void
+Init_texture ()
+{
+	Module m = rb_define_module("Rays");
+
+	Class c = rb_define_class_under(m, "Texture", rb_cObject);
+	Rays::cTexture = c;
+
+	rb_define_alloc_func(c, alloc);
+	rb_define_method(c, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_method(c, "width", RUBY_METHOD_FUNC(width), 0);
+	rb_define_method(c, "height", RUBY_METHOD_FUNC(height), 0);
+	rb_define_method(c, "s_max", RUBY_METHOD_FUNC(s_max), 0);
+	rb_define_method(c, "t_max", RUBY_METHOD_FUNC(t_max), 0);
+	rb_define_method(c, "bitmap", RUBY_METHOD_FUNC(bitmap), 0);
+}

data/Rakefile

@@ -1,47 +1,21 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-%w[. ./lib ../rucy/lib].each do |path|
+%w[. ../xot ../rucy].map {|s| "#{s}/lib"}.each do |path|
   $: << File.expand_path(File.join File.dirname(__FILE__), *path.split('/'))
 end
 
 require 'rubygems'
-require 'rbconfig'
-require 'support'
+require 'xot/rake/helpers'
+require 'xot/module'
+require 'rucy/module'
 require 'rays/module'
 
+include Xot::Rake
 
-MODULE = Rays
-NAME   = MODULE.name.downcase
 
-SRCDIR  = 'src'
-INCDIR  = 'include'
-LIBDIR  = 'lib'
-EXTDIR  = 'ext'
-TASKDIR = 'task'
-
-EXTEXT = RbConfig::CONFIG['DLEXT'] || 'so'
-
-DEFS  = %w[]
-DEFS << 'WIN32' if win32?
-DEFS << 'COCOA' if cocoa?
-
-incroot = RbConfig::CONFIG['rubyhdrdir']
-INCDIRS = Rays.include_dirs + [
-  incroot,
-  "#{incroot}/#{RUBY_PLATFORM}",
-  '/opt/local/include',
-  '/opt/include'
-]
-
-RUBY    = ENV['RUBY'] || 'ruby'
-GEM     = ENV['GEM']  || 'gem'
-GIT     = ENV['GIT']  || 'git'
-MAKE    = ENV['MAKE'] || 'make'
-CC      = RbConfig::CONFIG['CC'] || ENV['CC'] || 'g++'
-CFLAGS  = '-Wall -O' + DEFS.map{|s| " -D#{s}"}.join
-AR      = ENV['AR'] || 'ar'
-ARFLAGS = 'crs'
+MODULE  = Rays
+INCDIRS = [Rays, Rucy].map {|m| m.include_dirs}.flatten
 
 
 task :default => :build
@@ -54,6 +28,8 @@ task :lib => 'lib:build'
 
 task :ext => 'ext:build'
 
+task :doc => 'ext:doc'
+
 task :gem => 'gem:build'
 
 task :install => 'gem:install'
@@ -69,4 +45,4 @@ task :test => :ext do
 end
 
 
-Dir["#{TASKDIR}/**/*.rake"].each {|path| load path}
+[Xot, Rucy, Rays].each {|m| m.load_tasks}

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/ext/rays/bitmap.cpp

@@ -2,7 +2,7 @@
 
 
 #include <rucy.h>
-#include "rays.h"
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -17,11 +17,12 @@ namespace Rays
 {
 
 
+	static Class cBitmap;
+
 	Class
 	bitmap_class ()
 	{
-		static Class c = rays_module().define_class("Bitmap");
-		return c;
+		return cBitmap;
 	}
 
 
@@ -306,17 +307,20 @@ RUBY_END
 void
 Init_bitmap ()
 {
-	Rays::rays_module()
-		.define_const("RGB", Rays::RGB)
-		.define_const("RGBA", Rays::RGBA);
-
-	Rays::bitmap_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("[]", at)
-		.define_method("[]=", assign_at)
-		.define_function("load", load);
+	Module m = define_module("Rays");
+
+	m.define_const("RGB", Rays::RGB);
+	m.define_const("RGBA", Rays::RGBA);
+
+	Class c = m.define_class("Bitmap");
+	Rays::cBitmap = 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("[]", at);
+	c.define_method("[]=", assign_at);
+	c.define_function("load", load);
 }

data/ext/rays/{rays.h → defs.h}

@@ -1,22 +1,13 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_EXT_RAYS_H__
-#define __RAYS_EXT_RAYS_H__
+#ifndef __RAYS_EXT_DEFS_H__
+#define __RAYS_EXT_DEFS_H__
 
 
-#include <rucy/class.h>
-#include "rays/ruby/rays.h"
+#include <rays/exception.h>
 
 
-namespace Rays
-{
-
-
-	Rucy::Class rays_error_class ();
-	// class Rays::RaysError < Rucy::NativeError
-
-
-}// Rays
+using Rays::error;
 
 
 #define CHECK_OBJ(obj, type, klass) \

data/ext/rays/extconf.rb

@@ -1,42 +1,51 @@
 # -*- coding: utf-8 -*-
 
 
-%w[../../../rucy/lib ../../lib].each do |path|
+%w[. xot rucy].map {|s| "../../#{s}/lib"}.each do |path|
   $: << File.expand_path(File.join File.dirname(__FILE__), *path.split('/'))
 end
 
 require 'rubygems'
 require 'mkmf'
+require 'xot/rake/helpers'
+require 'xot/module'
 require 'rucy/module'
 require 'rays/module'
 
+include Xot::Rake
 
-DEBUG = ENV['DEBUG'] || false
+
+DEBUG = env :DEBUG, false
 
 DEFS    = []
-INCDIRS = %w[/opt/local/include /opt/include] +
-  Rucy.include_dirs + Rays.include_dirs
-LIBDIRS = %w[] +
-  Rucy.library_dirs + Rays.library_dirs
+INCDIRS = %w[
+  /opt/local/include
+  /opt/include
+]
+LIBDIRS = []
 
-HEADERS    = %w[
-  boost/scoped_array.hpp
+HEADERS = %w[
   boost/shared_ptr.hpp
   ruby.h
+  xot.h
   rucy.h
   rays.h
 ]
-LIBS       = %w[stdc++ rucy rays]
-FRAMEWORKS = %w[]
+LIBS = %w[
+  stdc++
+  xot
+  rucy
+  rays
+]
+FRAMEWORKS = []
 
 
 DEFS << '_DEBUG' if DEBUG
-
-case RUBY_PLATFORM
-when /mswin|ming|cygwin/
-  DEFS << 'WINDOWS' << 'WIN32' << $~[0].upcase
+DEFS << $~[0].upcase if RUBY_PLATFORM =~ /mswin|ming|cygwin|darwin/i
+if win32?
+  DEFS << 'WINDOWS' << 'WIN32'
   LIBS.unshift 'gdi32', 'opengl32'
-when /darwin/
+elsif cocoa?
   DEFS << 'COCOA'
   FRAMEWORKS << 'AppKit' << 'OpenGL'
 end
@@ -47,13 +56,14 @@ $LDFLAGS    << LIBDIRS.map    {|s| " -L#{s}"}.join
 $LDFLAGS    << FRAMEWORKS.map {|s| " -framework #{s}"}.join
 $LOCAL_LIBS << ' -lrucy'
 
+Config::CONFIG.each {|key, val| val.gsub!(/gcc/, 'g++')}
+
+
 dir_config 'boost'
+dir_config 'xot',  Xot.root_dir
 dir_config 'rucy', Rucy.root_dir
 dir_config 'rays', Rays.root_dir
 
-
-Config::CONFIG.each {|key, val| val.gsub!(/gcc/, 'g++')}
-
 exit 1 unless HEADERS.all? {|s| have_header(s)}
 exit 1 unless LIBS.all?    {|s| have_library(s)}
 

data/ext/rays/font.cpp

@@ -2,7 +2,7 @@
 
 
 #include <rucy.h>
-#include "rays.h"
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -14,11 +14,12 @@ namespace Rays
 {
 
 
+	static Class cFont;
+
 	Class
 	font_class ()
 	{
-		static Class c = rays_module().define_class("Font");
-		return c;
+		return cFont;
 	}
 
 
@@ -115,11 +116,15 @@ RUBY_END
 void
 Init_font ()
 {
-	Rays::font_class()
-		.define_alloc_func(alloc)
-		.define_method("initialize", initialize)
-		.define_method("name", name)
-		.define_method("size", size)
-		.define_method("width", width)
-		.define_method("height", height);
+	Module m = define_module("Rays");
+
+	Class c = m.define_class("Font");
+	Rays::cFont = c;
+
+	c.define_alloc_func(alloc);
+	c.define_method("initialize", initialize);
+	c.define_method("name", name);
+	c.define_method("size", size);
+	c.define_method("width", width);
+	c.define_method("height", height);
 }