rays 0.1.2 → 0.1.3

data/src/cocoa/bitmap.mm

@@ -14,6 +14,9 @@ namespace Rays
 	static CGBitmapInfo
 	make_bitmapinfo (const ColorSpace& cs)
 	{
+		// Q: What color spaces does CGBitmapContextCreate support?
+		// http://developer.apple.com/library/mac/#qa/qa1037/_index.html
+
 		CGBitmapInfo info = 0;
 
 		if (cs.is_alpha_first())

data/src/colorspace.cpp

@@ -48,7 +48,7 @@ namespace Rays
 			8, 8, 8, 8, 8, 8, 8, 8, 8, 8, // RGB(A), BGR(A)
 			32, 32, 32, 32, 32, 32,       // RGB(A), BGR(A) float
 		};
-		if (type_ < 0 || COLORSPACE_LAST <= type_) return BPPS[UNKNOWN];
+		if (type_ < 0 || COLORSPACE_LAST <= type_) return BPPS[COLORSPACE_UNKNOWN];
 		return BPPS[type_];
 	}
 
@@ -70,7 +70,7 @@ namespace Rays
 			96, 128, 128,          // RGB(A) float
 			96, 128, 128,          // BGR(A) float
 		};
-		if (type_ < 0 || COLORSPACE_LAST <= type_) return BPPS[UNKNOWN];
+		if (type_ < 0 || COLORSPACE_LAST <= type_) return BPPS[COLORSPACE_UNKNOWN];
 		return BPPS[type_];
 	}
 

data/src/exception.cpp

@@ -0,0 +1,49 @@
+#include "rays/exception.h"
+
+
+#define VA_STRING(format, result) \
+	String result; \
+	do \
+	{ \
+		if (format) \
+		{ \
+			va_list args; \
+			va_start(args, format); \
+			result = Xot::stringf(format, args); \
+			va_end(args); \
+		} \
+	} \
+	while (false)
+
+
+namespace Rays
+{
+
+
+	RaysException::RaysException (const char* format, ...)
+	:	Super("")
+	{
+		VA_STRING(format, s);
+		text = s;
+	}
+
+	RaysException::~RaysException () throw()
+	{
+	}
+
+	const char*
+	RaysException::what () const throw()
+	{
+		return text.c_str();
+	}
+
+
+	void
+	error (const char* format, ...)
+	{
+		VA_STRING(format, s);
+		throw RaysException(s.c_str());
+	}
+
+
+}// Rays

data/src/painter.cpp

@@ -52,12 +52,12 @@ namespace Rays
 
 		coord right () const
 		{
-			return x + width - 1;
+			return x + width;
 		}
 
 		coord bottom () const
 		{
-			return y + height - 1;
+			return y + height;
 		}
 
 		void set (coord x, coord y, coord width, coord height)
@@ -237,7 +237,7 @@ namespace Rays
 		no_clip();
 		clear();
 
-		return push();
+		return push_matrix();
 	}
 
 	bool
@@ -245,7 +245,7 @@ namespace Rays
 	{
 		if (!self->painting) return false;
 
-		pop();
+		pop_matrix();
 
 		self->painting = false;
 
@@ -256,14 +256,14 @@ namespace Rays
 	}
 
 	bool
-	Painter::push ()
+	Painter::push_matrix ()
 	{
 		glPushMatrix();
 		return true;
 	}
 
 	bool
-	Painter::pop ()
+	Painter::pop_matrix ()
 	{
 		glPopMatrix();
 		return true;

data/src/texture.cpp

@@ -1,7 +1,6 @@
 #include "rays/texture.h"
 
 
-#include <boost/scoped_array.hpp>
 #include <rays/bitmap.h>
 
 
@@ -195,11 +194,14 @@ namespace Rays
 		if (src_offset >= (src_Bpp / src_Bpc))
 			return false;
 
-		for (int y = 0; y < dest->height(); ++y)
+		int width  = std::min(src.width(),  dest->width());
+		int height = std::min(src.height(), dest->height());
+
+		for (int y = 0; y < height; ++y)
 		{
 			const uchar* s = src.  at<uchar>(0, y) + src_offset * src_Bpc;
 			      uchar* d = dest->at<uchar>(0, y);
-			copy_pixels(src_Bpp, dest->width(), d, dest_Bpp, s, src_Bpp);
+			copy_pixels(src_Bpp, width, d, dest_Bpp, s, src_Bpp);
 		}
 
 		return true;

metadata

@@ -2,7 +2,7 @@
 name: rays
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - snori
@@ -10,10 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rucy
+  name: xot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -24,7 +24,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rucy
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -32,10 +32,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: gemcutter
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -45,6 +45,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: This library helps you to develop graphics application with OpenGL.
 email: snori@xord.org
 executables: []
@@ -53,19 +64,21 @@ extensions:
 - Rakefile
 extra_rdoc_files: 
 - README
+- .doc/ext/rays/bitmap.cpp
+- .doc/ext/rays/font.cpp
+- .doc/ext/rays/image.cpp
+- .doc/ext/rays/native.cpp
+- .doc/ext/rays/painter.cpp
+- .doc/ext/rays/rays.cpp
+- .doc/ext/rays/texture.cpp
 files: 
-- ChangeLog
 - README
+- ChangeLog
 - Rakefile
-- support.rb
 - rays.gemspec
 - VERSION
-- task/ext.rake
-- task/gem.rake
-- task/git.rake
-- task/lib.rake
 - ext/rays/extconf.rb
-- ext/rays/rays.h
+- ext/rays/defs.h
 - ext/rays/bitmap.cpp
 - ext/rays/font.cpp
 - ext/rays/image.cpp
@@ -76,6 +89,7 @@ files:
 - include/rays/bitmap.h
 - include/rays/colorspace.h
 - include/rays/defs.h
+- include/rays/exception.h
 - include/rays/font.h
 - include/rays/helpers.h
 - include/rays/image.h
@@ -102,6 +116,7 @@ files:
 - src/cocoa/helpers.h
 - src/win32/gdi.h
 - src/colorspace.cpp
+- src/exception.cpp
 - src/helpers.cpp
 - src/image.cpp
 - src/painter.cpp
@@ -119,6 +134,13 @@ files:
 - test/test_painter.rb
 - test/test_rays.rb
 - test/test_texture.rb
+- .doc/ext/rays/bitmap.cpp
+- .doc/ext/rays/font.cpp
+- .doc/ext/rays/image.cpp
+- .doc/ext/rays/native.cpp
+- .doc/ext/rays/painter.cpp
+- .doc/ext/rays/rays.cpp
+- .doc/ext/rays/texture.cpp
 homepage: http://github.com/xord/rays
 licenses: []
 

data/support.rb

@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'erb'
-require 'pp'
-
-
-def glob (*patterns)
-  paths = []
-  patterns.each do |pattern|
-    paths.concat Dir.glob(pattern)
-  end
-  paths
-end
-
-def erb (str)
-  ERB.new(str, nil, "%").result binding
-end
-
-def compile (path, out)
-  open(path) do |input|
-    open(out, "w") do |output|
-      output.write erb(input.read)
-    end
-  end
-#rescue
-end
-
-def convertions (paths, convs)
-  raise "empty conversion." if convs.empty?
-  paths = paths.map do |path|
-    convpath = path
-    convs.each do |from, to|
-      convpath = convpath.sub(/#{from.gsub('.', '\.')}$/, to)
-    end
-    [path, convpath]
-  end
-  Hash[*paths.flatten]
-end
-
-alias sh_original sh
-
-def sh (*args)
-  sh_original *args
-#rescue
-end
-
-def win32? ()
-  RUBY_PLATFORM =~ /mswin|ming|cygwin/
-end
-
-def cocoa? ()
-  RUBY_PLATFORM =~ /darwin/
-end

data/task/ext.rake

@@ -1,41 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-
-
-require 'rucy/module'
-
-
-namespace :ext do
-
-  dir     = "#{EXTDIR}/#{NAME}"
-  name    = "#{NAME}/native"
-  outname = "#{name}.#{EXTEXT}"
-  out     = File.join EXTDIR, outname
-
-  extconf  = File.join dir, "extconf.rb"
-  makefile = File.join dir, "Makefile"
-  depend   = File.join dir, "depend"
-
-  cpps = Dir.glob("#{dir}/**/*.cpp")
-
-  task :build => makefile do
-    sh %( cd #{dir} && #{MAKE} )
-  end
-
-  task :clean do
-    sh %( cd #{dir} && #{MAKE} clean ) if File.exist? makefile
-    sh %( rm -f #{makefile} #{depend} )
-  end
-
-  file makefile => [extconf, depend] do
-    sh %( cd #{dir} && #{RUBY} #{File.basename extconf} )
-  end
-
-  file depend => ["lib:build"] + cpps do
-    incdirs = INCDIRS + Rucy.include_dirs
-    incdirs = incdirs.map{|s| " -I#{s}"}.join
-    srcs = cpps.map{|cpp| File.basename cpp}.join ' '
-    dep = File.basename depend
-    sh %( cd #{dir} && #{CC} -M #{CFLAGS} #{incdirs} #{srcs} > #{dep} )
-  end
-
-end# :ext

data/task/gem.rake

@@ -1,33 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-
-
-namespace :gem do
-
-  name = NAME
-
-  gemspec = "#{name}.gemspec"
-  gem     = "#{name}-#{MODULE.version}.gem"
-
-  task :build => gem
-
-  task :install => gem do
-    sh %( #{GEM} install #{gem} )
-  end
-
-  task :uninstall do
-    sh %( #{GEM} uninstall #{name} )
-  end
-
-  task :clean do
-    sh %( rm -f #{gem} )
-  end
-
-  task :upload => gem do
-    sh %( #{GEM} push #{gem} )
-  end
-
-  file gem => "lib:build" do
-    sh %( #{GEM} build #{gemspec} )
-  end
-
-end# :gem

data/task/git.rake

@@ -1,22 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-
-
-namespace :git do
-
-  task :status do
-    sh %( #{GIT} status )
-  end
-
-  task :diff do
-    sh %( #{GIT} diff | cat )
-  end
-
-  task :push do
-    sh %( #{GIT} push )
-  end
-
-  task :pull do
-    sh %( #{GIT} pull )
-  end
-
-end# :git

data/task/lib.rake

@@ -1,54 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-
-
-require 'rake/loaders/makefile'
-
-
-namespace :lib do
-
-  name    = NAME
-  outname = "lib#{name}.a"
-  out     = File.join LIBDIR, outname
-
-  headers = glob("include/**/*.h")
-  srcs    = glob("src/**/*.cpp")
-  srcs   += glob("src/**/*.mm") if cocoa?
-  srcs    = srcs.reject {|s| s =~ %r(/win32/)} unless win32?
-  srcs    = srcs.reject {|s| s =~ %r(/cocoa/)} unless cocoa?
-
-  depend = 'depend.mf'
-  objs   = convertions srcs, {".cpp" => ".o", ".mm" => ".o"}
-  tmps   = objs.values + [depend]
-
-  cflags  = CFLAGS.dup
-  cflags << INCDIRS.map{|s| " -I#{s}"}.join
-
-  task :build => out
-
-  task :compile => objs.values
-
-  task :clean do
-    sh %( rm -rf #{tmps.join " "} #{out} )
-  end
-
-  file out => objs.values do
-    sh %( #{AR} #{ARFLAGS} #{out} #{objs.values.join " "} )
-  end
-
-  file depend do
-    sh %( #{CC} -M #{cflags} #{srcs.join ' '} > #{depend} )
-    input = open(depend) {|f| f.read}
-    open(depend, 'w') do |output|
-      output << input.gsub(/\w+\.o/, SRCDIR + '/\0')
-    end
-  end
-
-  import depend if File.exist? depend
-
-  objs.each do |(src, obj)|
-    file obj => [depend, src] do
-      sh %( #{CC} -c #{cflags} -o #{obj} #{src} )
-    end
-  end
-
-end# :lib